Fixed tests

TouK · Sep 10, 2024 · 909c3e7 · 909c3e7
1 parent 9113a0f
commit 909c3e7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 17 deletions.
diff --git a/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/migration/SlickMigration.scala b/designer/server/src/main/scala/pl/touk/nussknacker/ui/db/migration/SlickMigration.scala
@@ -40,7 +40,6 @@ trait ProcessJsonMigration extends SlickMigration with NuTables with LazyLogging
 
   override protected def migrateActions
       : DBIOAction[Seq[Int], NoStream, Effect.Read with Effect.Read with Effect.Write] = {
-    logger.error("Migration")
     for {
       allVersionIds <- processVersionsTableWithUnit.map(pve => (pve.id, pve.processId)).result
       updated <- DBIOAction.sequence(allVersionIds.zipWithIndex.map { case ((id, processId), scenarioIndex) =>

diff --git a/...a/pl/touk/nussknacker/ui/process/repository/activities/DbScenarioActivityRepository.scala b/...a/pl/touk/nussknacker/ui/process/repository/activities/DbScenarioActivityRepository.scala
@@ -278,17 +278,9 @@ class DbScenarioActivityRepository(override protected val dbRef: DbRef)(
   }
 
   def getActivityStats: DB[Map[String, Int]] = {
-    val activityTypesWithLegacyComments = Set(
-      ScenarioActivityType.ScenarioDeployed,
-      ScenarioActivityType.ScenarioPaused,
-      ScenarioActivityType.ScenarioCanceled,
-      ScenarioActivityType.ScenarioModified,
-      ScenarioActivityType.ScenarioNameChanged,
-      ScenarioActivityType.CommentAdded,
-    )
     val findScenarioProcessActivityStats = for {
       attachmentsTotal <- attachmentsTable.length.result
-      commentsTotal <- scenarioActivityTable.filter(_.activityType inSet activityTypesWithLegacyComments).length.result
+      commentsTotal    <- scenarioActivityTable.filter(_.comment.isDefined).length.result
     } yield Map(
       AttachmentsTotal -> attachmentsTotal,
       CommentsTotal    -> commentsTotal,

diff --git a/...r/src/test/scala/db/migration/V1_056__MigrateActionsAndCommentsToScenarioActivities.scala b/...r/src/test/scala/db/migration/V1_056__MigrateActionsAndCommentsToScenarioActivities.scala
@@ -124,16 +124,15 @@ class V1_056__MigrateActionsAndCommentsToScenarioActivities
         _       <- commentsDefinitions.table += commentEntity(process)
         _       <- processActionsDefinitions.table += processActionEntity(process)
         result  <- migration.migrateActions
-      } yield result._1
+      } yield (process, result._1)
 
-      val activitiesCreatedDuringMigration = Await.result(runner.run(dbOperations), Duration.Inf)
-
-      activitiesCreatedDuringMigration shouldBe
+      val (createdProcess, insertedActivities) = Await.result(runner.run(dbOperations), Duration.Inf)
+      insertedActivities shouldBe
         List(
           ScenarioActivityEntityData(
             id = -1,
             activityType = "SCENARIO_DEPLOYED",
-            scenarioId = 1,
+            scenarioId = createdProcess.id.value,
             activityId = actionId,
             userId = None,
             userName = user,

diff --git a/designer/server/src/test/scala/pl/touk/nussknacker/test/base/db/DbTesting.scala b/designer/server/src/test/scala/pl/touk/nussknacker/test/base/db/DbTesting.scala
@@ -84,8 +84,7 @@ trait DbTesting extends BeforeAndAfterEach with BeforeAndAfterAll {
 
   def cleanDB(): Try[Unit] = Using(testDbRef.db.createSession()) { session =>
     session.prepareStatement("""delete from "process_attachments"""").execute()
-    session.prepareStatement("""delete from "process_comments"""").execute()
-    session.prepareStatement("""delete from "process_actions"""").execute()
+    session.prepareStatement("""delete from "scenario_activities"""").execute()
     session.prepareStatement("""delete from "process_versions"""").execute()
     session.prepareStatement("""delete from "tags"""").execute()
     session.prepareStatement("""delete from "environments"""").execute()