[Fix] Periodic processes repository - process input config fix (#7495)

TouK · Jan 24, 2025 · 08a060d · 08a060d
1 parent de47aaf
commit 08a060d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/...erver/src/main/scala/pl/touk/nussknacker/ui/process/periodic/PeriodicProcessService.scala b/...erver/src/main/scala/pl/touk/nussknacker/ui/process/periodic/PeriodicProcessService.scala
@@ -505,10 +505,7 @@ class PeriodicProcessService(
         )
       }
       inputConfigDuringExecutionJsonOpt <- periodicProcessesRepository
-        .fetchInputConfigDuringExecutionJson(
-          processName,
-          versionId,
-        )
+        .fetchInputConfigDuringExecutionJson(deployment.periodicProcess.id)
         .run
       inputConfigDuringExecutionJson = inputConfigDuringExecutionJsonOpt.getOrElse {
         throw new PeriodicProcessException(

diff --git a/...pl/touk/nussknacker/ui/process/periodic/legacy/db/LegacyPeriodicProcessesRepository.scala b/...pl/touk/nussknacker/ui/process/periodic/legacy/db/LegacyPeriodicProcessesRepository.scala
@@ -420,9 +420,9 @@ class SlickLegacyPeriodicProcessesRepository(
   ): Future[Option[(CanonicalProcess, ProcessVersion)]] =
     fetchingProcessRepository.getCanonicalProcessWithVersion(processName, versionId)(NussknackerInternalUser.instance)
 
-  def fetchInputConfigDuringExecutionJson(processName: ProcessName, versionId: VersionId): Action[Option[String]] =
+  def fetchInputConfigDuringExecutionJson(periodicProcessId: PeriodicProcessId): Action[Option[String]] =
     PeriodicProcessesWithJson
-      .filter(p => p.processName === processName && p.processVersionId === versionId)
+      .filter(p => p.id === periodicProcessId)
       .map(_.inputConfigDuringExecutionJson)
       .result
       .headOption

diff --git a/...rc/main/scala/pl/touk/nussknacker/ui/process/repository/PeriodicProcessesRepository.scala b/...rc/main/scala/pl/touk/nussknacker/ui/process/repository/PeriodicProcessesRepository.scala
@@ -157,8 +157,7 @@ trait PeriodicProcessesRepository {
   ): Action[PeriodicProcessDeployment]
 
   def fetchInputConfigDuringExecutionJson(
-      processName: ProcessName,
-      versionId: VersionId
+      periodicProcessId: PeriodicProcessId,
   ): Action[Option[String]]
 
   def fetchCanonicalProcessWithVersion(
@@ -496,9 +495,9 @@ class SlickPeriodicProcessesRepository(
     update.map(_ => ())
   }
 
-  def fetchInputConfigDuringExecutionJson(processName: ProcessName, versionId: VersionId): Action[Option[String]] =
+  def fetchInputConfigDuringExecutionJson(periodicProcessId: PeriodicProcessId): Action[Option[String]] =
     PeriodicProcessesWithInputConfig
-      .filter(p => p.processName === processName && p.processVersionId === versionId)
+      .filter(p => p.id === periodicProcessId)
       .map(_.inputConfigDuringExecutionJson)
       .result
       .headOption

diff --git a/...a/pl/touk/nussknacker/ui/process/periodic/flink/db/InMemPeriodicProcessesRepository.scala b/...a/pl/touk/nussknacker/ui/process/periodic/flink/db/InMemPeriodicProcessesRepository.scala
@@ -354,8 +354,7 @@ class InMemPeriodicProcessesRepository(processingType: String) extends PeriodicP
   }
 
   override def fetchInputConfigDuringExecutionJson(
-      processName: ProcessName,
-      versionId: VersionId
+      periodicProcessId: PeriodicProcessId,
   ): Future[Option[String]] =
     Future.successful(Some("{}"))