Always set scheduler instance id to None when importing (#394)

Author: kevinwallimann

src/main/scala/za/co/absa/hyperdrive/trigger/api/rest/services/WorkflowService.scala

@@ -218,6 +218,11 @@ class WorkflowServiceImpl(override val workflowRepository: WorkflowRepository,
   }
 
   private def convertToWorkflowJoineds(workflowImports: Seq[WorkflowImportExportWrapper])(implicit ec: ExecutionContext): Future[Seq[WorkflowJoined]] = {
+    resolveJobTemplates(workflowImports)
+      .map(resetSchedulerInstanceId)
+  }
+
+  private def resolveJobTemplates(workflowImports: Seq[WorkflowImportExportWrapper])(implicit ec: ExecutionContext): Future[Seq[WorkflowJoined]] = {
     val jobTemplatesNames = workflowImports.flatMap(_.jobTemplates.map(_.name)).distinct
     jobTemplateService.getJobTemplateIdsByNames(jobTemplatesNames).flatMap {
       newNameIdMap =>
@@ -263,6 +268,10 @@ class WorkflowServiceImpl(override val workflowRepository: WorkflowRepository,
     }
   }
 
+  private def resetSchedulerInstanceId(workflowJoineds: Seq[WorkflowJoined]): Seq[WorkflowJoined] = {
+    workflowJoineds.map(_.copy(schedulerInstanceId = None))
+  }
+
   private[services] def getUserName: () => String = {
     SecurityContextHolder.getContext.getAuthentication.getPrincipal.asInstanceOf[UserDetails].getUsername
   }

src/test/scala/za/co/absa/hyperdrive/trigger/api/rest/services/WorkflowServiceTest.scala

@@ -284,7 +284,7 @@ class WorkflowServiceTest extends AsyncFlatSpec with Matchers with MockitoSugar
 
   "WorkflowService.importWorkflows" should "import workflows and return projects" in {
     // given
-    val workflowJoined1 = WorkflowFixture.createWorkflowJoined().copy()
+    val workflowJoined1 = WorkflowFixture.createWorkflowJoined().copy(schedulerInstanceId = Some(42))
     val workflowJoined2 = WorkflowFixture.createTimeBasedShellScriptWorkflow("project").copy()
     val jobTemplates1 = Seq(JobTemplateFixture.GenericSparkJobTemplate, JobTemplateFixture.GenericShellJobTemplate)
     val jobTemplates2 = Seq(JobTemplateFixture.GenericShellJobTemplate)
@@ -329,6 +329,7 @@ class WorkflowServiceTest extends AsyncFlatSpec with Matchers with MockitoSugar
     workflowsToInsert should have size workflowImports.size
     workflowsToInsert.map(_.name) should contain theSameElementsAs workflowImports.map(_.workflowJoined.name)
     workflowsToInsert.map(_.isActive) should contain only false
+    workflowsToInsert.map(_.schedulerInstanceId) should contain only None
   }
 
   it should "fail with all job template conversion errors" in {
@@ -417,7 +418,7 @@ class WorkflowServiceTest extends AsyncFlatSpec with Matchers with MockitoSugar
   }
 
   "WorkflowService.convertToWorkflowJoined" should "match existing job templates by name and update job template ids" in {
-    val workflowJoined = WorkflowFixture.createWorkflowJoined().copy()
+    val workflowJoined = WorkflowFixture.createWorkflowJoined().copy(schedulerInstanceId = Some(98))
     val oldJobTemplates = Seq(JobTemplateFixture.GenericSparkJobTemplate, JobTemplateFixture.GenericShellJobTemplate)
     val workflowImport = WorkflowImportExportWrapper(workflowJoined, oldJobTemplates)
     val newJobTemplates = Seq(
@@ -431,6 +432,7 @@ class WorkflowServiceTest extends AsyncFlatSpec with Matchers with MockitoSugar
 
     result.dagDefinitionJoined.jobDefinitions.head.jobTemplateId shouldBe 11
     result.dagDefinitionJoined.jobDefinitions(1).jobTemplateId shouldBe 12
+    result.schedulerInstanceId shouldBe None
   }
 
   it should "return an import error if the given job template doesn't exist" in {