diff --git a/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/scenariodetails/ScenarioWithDetails.scala b/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/scenariodetails/ScenarioWithDetails.scala index 10cf4e39199..d884e8feac9 100644 --- a/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/scenariodetails/ScenarioWithDetails.scala +++ b/designer/restmodel/src/main/scala/pl/touk/nussknacker/restmodel/scenariodetails/ScenarioWithDetails.scala @@ -40,8 +40,7 @@ final case class ScenarioWithDetails( override val validationResult: Option[ValidationResult], override val history: Option[List[ScenarioVersion]], override val modelVersion: Option[Int], - state: Option[ProcessState], - additionalDetails: Option[Map[String, String]], + state: Option[ProcessState] ) extends BaseScenarioWithDetailsForMigrations { def parameters: ScenarioParameters = ScenarioParameters(processingMode, processCategory, engineSetupName) diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/customhttpservice/ScenarioServiceImpl.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/customhttpservice/ScenarioServiceImpl.scala index 7b1338900cf..8d6211944ec 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/customhttpservice/ScenarioServiceImpl.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/customhttpservice/ScenarioServiceImpl.scala @@ -4,7 +4,7 @@ import pl.touk.nussknacker.engine.api.process.ProcessId import pl.touk.nussknacker.restmodel.scenariodetails.ScenarioWithDetails import pl.touk.nussknacker.ui.customhttpservice.services.ScenarioService import pl.touk.nussknacker.ui.process.ProcessService.GetScenarioWithDetailsOptions -import pl.touk.nussknacker.ui.process.repository.FetchingProcessRepository.ScenarioVersionMetadata +import pl.touk.nussknacker.ui.process.repository.ScenarioVersionMetadata import pl.touk.nussknacker.ui.process.{ProcessService, ScenarioQuery} import pl.touk.nussknacker.ui.security.api.LoggedUser diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/ProcessService.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/ProcessService.scala index 72142f1cb96..e69938763b7 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/ProcessService.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/ProcessService.scala @@ -28,7 +28,6 @@ import pl.touk.nussknacker.ui.process.label.ScenarioLabel import pl.touk.nussknacker.ui.process.marshall.CanonicalProcessConverter import pl.touk.nussknacker.ui.process.processingtype.ScenarioParametersService import pl.touk.nussknacker.ui.process.processingtype.provider.ProcessingTypeDataProvider -import pl.touk.nussknacker.ui.process.repository.FetchingProcessRepository.ScenarioVersionMetadata import pl.touk.nussknacker.ui.process.repository.ProcessDBQueryRepository.{ ProcessNotFoundError, ProcessVersionNotFoundError diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/ScenarioWithDetailsConversions.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/ScenarioWithDetailsConversions.scala index faa6843f781..a035b0a401f 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/ScenarioWithDetailsConversions.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/ScenarioWithDetailsConversions.scala @@ -53,8 +53,7 @@ object ScenarioWithDetailsConversions { validationResult = None, history = details.history, modelVersion = details.modelVersion, - state = None, - additionalDetails = None, + state = None ) } diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/DBFetchingProcessRepository.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/DBFetchingProcessRepository.scala index 9a689dc1ed8..6715c354950 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/DBFetchingProcessRepository.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/DBFetchingProcessRepository.scala @@ -14,7 +14,6 @@ import pl.touk.nussknacker.ui.db.DbRef import pl.touk.nussknacker.ui.db.entity._ import pl.touk.nussknacker.ui.process.label.ScenarioLabel import pl.touk.nussknacker.ui.process.marshall.CanonicalProcessConverter -import pl.touk.nussknacker.ui.process.repository.FetchingProcessRepository.ScenarioVersionMetadata import pl.touk.nussknacker.ui.process.repository.ProcessDBQueryRepository.ProcessNotFoundError import pl.touk.nussknacker.ui.process.{ScenarioQuery, repository} import pl.touk.nussknacker.ui.security.api.LoggedUser diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/FetchingProcessRepository.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/FetchingProcessRepository.scala index 13ae9b79ace..ac354eca04b 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/FetchingProcessRepository.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/FetchingProcessRepository.scala @@ -4,10 +4,8 @@ import cats.Monad import pl.touk.nussknacker.engine.api.ProcessVersion import pl.touk.nussknacker.engine.api.process._ import pl.touk.nussknacker.ui.process.ScenarioQuery -import pl.touk.nussknacker.ui.process.repository.FetchingProcessRepository.ScenarioVersionMetadata import pl.touk.nussknacker.ui.security.api.LoggedUser -import java.time.Instant import scala.concurrent.ExecutionContext import scala.language.higherKinds @@ -52,7 +50,3 @@ abstract class FetchingProcessRepository[F[_]: Monad] extends ProcessDBQueryRepo )(implicit loggedUser: LoggedUser, ec: ExecutionContext): F[ProcessingType] } - -object FetchingProcessRepository { - final case class ScenarioVersionMetadata(versionId: VersionId, createdAt: Instant, createdByUser: String) -} diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/ScenarioWithDetailsEntity.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/ScenarioWithDetailsEntity.scala index 56bd104ca55..7aabfadd21f 100644 --- a/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/ScenarioWithDetailsEntity.scala +++ b/designer/server/src/main/scala/pl/touk/nussknacker/ui/process/repository/ScenarioWithDetailsEntity.scala @@ -68,3 +68,5 @@ final case class ScenarioWithDetailsEntity[ScenarioShape]( } } + +final case class ScenarioVersionMetadata(versionId: VersionId, createdAt: Instant, createdByUser: String) diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/test/base/it/NuItTest.scala b/designer/server/src/test/scala/pl/touk/nussknacker/test/base/it/NuItTest.scala index 375f3eac1da..8be5ad259d1 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/test/base/it/NuItTest.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/test/base/it/NuItTest.scala @@ -3,14 +3,13 @@ package pl.touk.nussknacker.test.base.it import cats.effect.IO import cats.effect.unsafe.implicits.global import com.typesafe.config.Config -import com.typesafe.config.ConfigValueFactory._ +import com.typesafe.config.ConfigValueFactory.fromAnyRef import org.scalatest.{BeforeAndAfterAll, Suite} import pl.touk.nussknacker.test.DefaultUniquePortProvider import pl.touk.nussknacker.test.base.db.WithHsqlDbTesting import pl.touk.nussknacker.test.config.WithDesignerConfig import pl.touk.nussknacker.ui.config.SimpleConfigLoadingDesignerConfigLoader import pl.touk.nussknacker.ui.factory.NussknackerAppFactory -import scala.jdk.CollectionConverters._ trait NuItTest extends WithHsqlDbTesting with DefaultUniquePortProvider with WithClock with BeforeAndAfterAll { this: Suite with WithDesignerConfig => @@ -37,13 +36,10 @@ trait NuItTest extends WithHsqlDbTesting with DefaultUniquePortProvider with Wit super.afterAll() } - protected val testTechnicalUser = "Test Technical User" - private def adjustNuTestConfig(): Config = { designerConfig .withValue("db", testDbConfig.getConfig("db").root()) .withValue("http.port", fromAnyRef(port)) - .withValue("technicalUsers", fromIterable(List(testTechnicalUser).asJava)) } } diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/test/base/it/NuResourcesTest.scala b/designer/server/src/test/scala/pl/touk/nussknacker/test/base/it/NuResourcesTest.scala index 8ba3b08e58e..e83e04ddf75 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/test/base/it/NuResourcesTest.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/test/base/it/NuResourcesTest.scala @@ -6,7 +6,7 @@ import akka.http.scaladsl.testkit.ScalatestRouteTest import akka.http.scaladsl.unmarshalling.FromEntityUnmarshaller import cats.effect.IO import cats.effect.unsafe.implicits.global -import com.typesafe.config.{Config, ConfigFactory} +import com.typesafe.config.Config import com.typesafe.scalalogging.LazyLogging import db.util.DBIOActionInstances.DB import de.heikoseeberger.akkahttpcirce.FailFastCirceSupport @@ -61,7 +61,7 @@ import pl.touk.nussknacker.ui.process.repository._ import pl.touk.nussknacker.ui.process.repository.activities.ScenarioActivityRepository import pl.touk.nussknacker.ui.process.test.{PreliminaryScenarioTestDataSerDe, ScenarioTestService} import pl.touk.nussknacker.ui.processreport.ProcessCounter -import pl.touk.nussknacker.ui.security.api.{LoggedUser, NussknackerInternalUser, RealLoggedUser} +import pl.touk.nussknacker.ui.security.api.{LoggedUser, RealLoggedUser} import pl.touk.nussknacker.ui.util.{MultipartUtils, NuPathMatchers} import slick.dbio.DBIOAction diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/test/base/it/WithAccessControlCheckingConfigScenarioHelper.scala b/designer/server/src/test/scala/pl/touk/nussknacker/test/base/it/WithAccessControlCheckingConfigScenarioHelper.scala index c0857baaf2b..8e51d04625d 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/test/base/it/WithAccessControlCheckingConfigScenarioHelper.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/test/base/it/WithAccessControlCheckingConfigScenarioHelper.scala @@ -6,7 +6,6 @@ import pl.touk.nussknacker.test.base.db.WithTestDb import pl.touk.nussknacker.test.config.WithAccessControlCheckingDesignerConfig import pl.touk.nussknacker.test.config.WithAccessControlCheckingDesignerConfig.TestCategory import pl.touk.nussknacker.test.utils.domain.ScenarioHelper -import pl.touk.nussknacker.ui.security.api.LoggedUser import scala.concurrent.ExecutionContext.Implicits.global @@ -55,8 +54,4 @@ trait WithAccessControlCheckingConfigScenarioHelper { rawScenarioHelper.createDeployedScenario(scenarioName, category.stringify, isFragment = false) } - def updateScenario(processId: ProcessId, canonicalProcess: CanonicalProcess, user: LoggedUser): Unit = { - rawScenarioHelper.updateScenario(processId, canonicalProcess, user) - } - } diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/test/mock/MockFetchingProcessRepository.scala b/designer/server/src/test/scala/pl/touk/nussknacker/test/mock/MockFetchingProcessRepository.scala index 311135ae02b..0bc8d59e4a6 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/test/mock/MockFetchingProcessRepository.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/test/mock/MockFetchingProcessRepository.scala @@ -12,7 +12,6 @@ import pl.touk.nussknacker.test.utils.domain.TestFactory import pl.touk.nussknacker.ui.db.DbRef import pl.touk.nussknacker.ui.process.ScenarioQuery import pl.touk.nussknacker.ui.process.marshall.CanonicalProcessConverter -import pl.touk.nussknacker.ui.process.repository.FetchingProcessRepository.ScenarioVersionMetadata import pl.touk.nussknacker.ui.process.repository.ScenarioShapeFetchStrategy.{ FetchCanonical, FetchComponentsUsages, @@ -22,7 +21,6 @@ import pl.touk.nussknacker.ui.process.repository.ScenarioShapeFetchStrategy.{ import pl.touk.nussknacker.ui.process.repository._ import pl.touk.nussknacker.ui.security.api.LoggedUser -import java.sql.Timestamp import scala.concurrent.{ExecutionContext, Future} object MockFetchingProcessRepository { diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/ScenarioHelper.scala b/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/ScenarioHelper.scala index 81449fd4dcf..b60441a84d5 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/ScenarioHelper.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/ScenarioHelper.scala @@ -54,11 +54,7 @@ private[test] class ScenarioHelper(dbRef: DbRef, clock: Clock, designerConfig: C ) private val futureFetchingScenarioRepository: DBFetchingProcessRepository[Future] = - new DBFetchingProcessRepository[Future]( - dbRef, - actionRepository, - scenarioLabelsRepository, - ) with BasicRepository + new DBFetchingProcessRepository[Future](dbRef, actionRepository, scenarioLabelsRepository) with BasicRepository def createEmptyScenario(scenarioName: ProcessName, category: String, isFragment: Boolean): ProcessId = { val newProcessPreparer: NewProcessPreparer = new NewProcessPreparer( @@ -84,14 +80,6 @@ private[test] class ScenarioHelper(dbRef: DbRef, clock: Clock, designerConfig: C saveAndGetId(scenario, category, isFragment).futureValue } - def updateScenario( - processId: ProcessId, - newScenario: CanonicalProcess, - user: LoggedUser, - ): ProcessUpdated = { - update(processId, newScenario, user).futureValue - } - def updateScenario( scenarioName: ProcessName, newScenario: CanonicalProcess @@ -220,22 +208,6 @@ private[test] class ScenarioHelper(dbRef: DbRef, clock: Clock, designerConfig: C } yield id } - private def update( - processId: ProcessId, - newScenario: CanonicalProcess, - user: LoggedUser, - ): Future[ProcessUpdated] = { - val action = UpdateProcessAction( - processId, - newScenario, - comment = None, - labels = List.empty, - increaseVersionWhenJsonNotChanged = true, - forwardedUserName = None - ) - dbioRunner.runInTransaction(writeScenarioRepository.updateProcess(action)(user)) - } - private def updateAndGetScenarioVersions( scenarioName: ProcessName, newScenario: CanonicalProcess diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/TestProcessUtil.scala b/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/TestProcessUtil.scala index c4aae47e756..11c19396a28 100644 --- a/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/TestProcessUtil.scala +++ b/designer/server/src/test/scala/pl/touk/nussknacker/test/utils/domain/TestProcessUtil.scala @@ -43,7 +43,6 @@ object TestProcessUtil { processingType: String = ProcessingTypeStreaming, lastAction: Option[ScenarioActionName] = None, json: Option[ScenarioGraph] = None, - history: Option[List[ScenarioVersion]] = None, ): ScenarioWithDetailsEntity[ScenarioGraph] = wrapWithScenarioDetailsEntity( ProcessName(name), @@ -52,8 +51,7 @@ object TestProcessUtil { isFragment = false, isArchived, processingType, - lastAction = lastAction, - history = history, + lastAction = lastAction ) def createFragmentEntity(