Temp commit

EpamLifeSciencesTeam · Feb 16, 2022 · ea04c1c · ea04c1c
1 parent 4b205d9
commit ea04c1c
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 18 deletions.
diff --git a/...lers/src/test/scala/cromwell/pipeline/controller/ProjectConfigurationControllerTest.scala b/...lers/src/test/scala/cromwell/pipeline/controller/ProjectConfigurationControllerTest.scala
@@ -47,21 +47,19 @@ class ProjectConfigurationControllerTest extends AsyncWordSpec with Matchers wit
 
       "return success for update configuration" in {
         when(configurationService.addConfiguration(configuration, accessToken.userId)).thenReturn(Future.unit)
-        Put(s"/projects/${projectId}/configurations", configurationAdditionRequest) ~> configurationController
-          .route(
-            accessToken
-          ) ~> check {
+        Put(s"/projects/${projectId}/configurations", configurationAdditionRequest) ~> configurationController.route(
+          accessToken
+        ) ~> check {
           status shouldBe StatusCodes.NoContent
         }
       }
 
       "return InternalServerError when failure update configuration" in {
         val error = InternalError("Something went wrong")
         when(configurationService.addConfiguration(configuration, accessToken.userId)).thenReturn(Future.failed(error))
-        Put(s"/projects/${projectId}/configurations", configurationAdditionRequest) ~> configurationController
-          .route(
-            accessToken
-          ) ~> check {
+        Put(s"/projects/${projectId}/configurations", configurationAdditionRequest) ~> configurationController.route(
+          accessToken
+        ) ~> check {
           status shouldBe StatusCodes.InternalServerError
           entityAs[String] shouldBe "Something went wrong"
         }
@@ -70,10 +68,9 @@ class ProjectConfigurationControllerTest extends AsyncWordSpec with Matchers wit
       "return NotFound when failure find project to update configuration" in {
         when(configurationService.addConfiguration(configuration, accessToken.userId))
           .thenReturn(Future.failed(NotFound()))
-        Put(s"/projects/${projectId}/configurations", configurationAdditionRequest) ~> configurationController
-          .route(
-            accessToken
-          ) ~> check {
+        Put(s"/projects/${projectId}/configurations", configurationAdditionRequest) ~> configurationController.route(
+          accessToken
+        ) ~> check {
           status shouldBe StatusCodes.NotFound
         }
       }

diff --git a/...n/scala/cromwell/pipeline/datastorage/dao/repository/ProjectConfigurationRepository.scala b/...n/scala/cromwell/pipeline/datastorage/dao/repository/ProjectConfigurationRepository.scala
@@ -2,8 +2,8 @@ package cromwell.pipeline.datastorage.dao.repository
 
 import cromwell.pipeline.datastorage.dao.mongo.DocumentCodecInstances.projectConfigurationDocumentCodec
 import cromwell.pipeline.datastorage.dao.mongo.DocumentRepository
-import cromwell.pipeline.datastorage.dto.{ ProjectConfiguration, ProjectConfigurationId, ProjectId }
-import cromwell.pipeline.model.wrapper.ProjectId
+import cromwell.pipeline.datastorage.dto.ProjectConfiguration
+import cromwell.pipeline.model.wrapper.{ ProjectConfigurationId, ProjectId }
 
 import scala.concurrent.{ ExecutionContext, Future }
 

diff --git a/repositories/src/main/scala/cromwell/pipeline/datastorage/dao/repository/RunRepository.scala b/repositories/src/main/scala/cromwell/pipeline/datastorage/dao/repository/RunRepository.scala
@@ -2,7 +2,7 @@ package cromwell.pipeline.datastorage.dao.repository
 
 import cromwell.pipeline.database.PipelineDatabaseEngine
 import cromwell.pipeline.datastorage.dao.entry.RunEntry
-import cromwell.pipeline.datastorage.dto.{ ProjectId, Run }
+import cromwell.pipeline.datastorage.dto.Run
 import cromwell.pipeline.model.wrapper.{ ProjectId, RunId, UserId }
 
 import scala.concurrent.Future

diff --git a/repositories/src/main/scala/cromwell/pipeline/datastorage/dto/Project.scala b/repositories/src/main/scala/cromwell/pipeline/datastorage/dto/Project.scala
@@ -18,6 +18,7 @@ final case class Project(
   version: PipelineVersion,
   visibility: Visibility = Private
 )
+
 object Project {
   implicit lazy val projectFormat: OFormat[Project] = Json.format[Project]
 }

diff --git a/...ala/cromwell/pipeline/datastorage/dao/repository/ProjectConfigurationRepositoryTest.scala b/...ala/cromwell/pipeline/datastorage/dao/repository/ProjectConfigurationRepositoryTest.scala
@@ -1,11 +1,11 @@
 package cromwell.pipeline.datastorage.dao.repository
 
 import java.nio.file.Paths
-
 import cromwell.pipeline.datastorage.dao.mongo.DocumentCodecInstances.projectConfigurationDocumentCodec
 import cromwell.pipeline.datastorage.dao.mongo.DocumentRepository
 import cromwell.pipeline.datastorage.dao.utils.TestProjectUtils
 import cromwell.pipeline.datastorage.dto._
+import cromwell.pipeline.model.wrapper.{ ProjectConfigurationId, ProjectId }
 import org.mockito.Mockito.when
 import org.scalatest.{ AsyncWordSpec, Matchers }
 import org.scalatestplus.mockito.MockitoSugar

diff --git a/services/src/main/scala/cromwell/pipeline/service/ProjectConfigurationService.scala b/services/src/main/scala/cromwell/pipeline/service/ProjectConfigurationService.scala
@@ -3,7 +3,12 @@ package cromwell.pipeline.service
 import cromwell.pipeline.datastorage.dao.repository.ProjectConfigurationRepository
 import cromwell.pipeline.datastorage.dto._
 import cromwell.pipeline.model.wrapper.{ ProjectConfigurationId, ProjectId, UserId }
-import cromwell.pipeline.service.ProjectConfigurationService.Exceptions.{ AccessDenied, InternalError, NotFound, ValidationError }
+import cromwell.pipeline.service.ProjectConfigurationService.Exceptions.{
+  AccessDenied,
+  InternalError,
+  NotFound,
+  ValidationError
+}
 import cromwell.pipeline.service.ProjectService.Exceptions.ProjectServiceException
 import cromwell.pipeline.service.exceptions.ServiceException
 import cromwell.pipeline.womtool.WomToolAPI

diff --git a/services/src/test/scala/cromwell/pipeline/service/AggregationServiceTest.scala b/services/src/test/scala/cromwell/pipeline/service/AggregationServiceTest.scala
@@ -4,7 +4,11 @@ import cromwell.pipeline.datastorage.dao.utils.{ TestProjectUtils, TestRunUtils,
 import cromwell.pipeline.datastorage.dto._
 import cromwell.pipeline.model.wrapper.ProjectConfigurationId
 import cromwell.pipeline.service.ProjectService.Exceptions.NotFound
-import cromwell.pipeline.service.impls.{ ProjectConfigurationServiceTestImpl, ProjectServiceTestImpl, ProjectVersioningTestImpl }
+import cromwell.pipeline.service.impls.{
+  ProjectConfigurationServiceTestImpl,
+  ProjectServiceTestImpl,
+  ProjectVersioningTestImpl
+}
 import org.scalatest.{ AsyncWordSpec, Matchers }
 
 import java.nio.file.Paths