wip

Author: yanavasileva

data-migrator/core/src/main/java/io/camunda/migration/data/impl/history/migrator/JobMigrator.java

@@ -8,10 +8,13 @@
 package io.camunda.migration.data.impl.history.migrator;
 
 import static io.camunda.migration.data.impl.logging.HistoryMigratorLogs.SKIP_REASON_MISSING_PROCESS_INSTANCE;
+import static io.camunda.migration.data.impl.logging.HistoryMigratorLogs.SKIP_REASON_UNSUPPORTED_JOBS;
 import static io.camunda.migration.data.impl.logging.HistoryMigratorLogs.logMigratingJob;
 import static io.camunda.migration.data.impl.persistence.IdKeyMapper.TYPE.HISTORY_JOB;
 import static io.camunda.migration.data.impl.persistence.IdKeyMapper.TYPE.HISTORY_PROCESS_INSTANCE;
 import static io.camunda.migration.data.impl.util.ConverterUtil.getNextKey;
+import static org.camunda.bpm.engine.impl.jobexecutor.MessageJobDeclaration.ASYNC_AFTER;
+import static org.camunda.bpm.engine.impl.jobexecutor.MessageJobDeclaration.ASYNC_BEFORE;
 
 import io.camunda.db.rdbms.read.domain.FlowNodeInstanceDbQuery;
 import io.camunda.db.rdbms.write.domain.FlowNodeInstanceDbModel;
@@ -27,6 +30,7 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 import org.camunda.bpm.engine.history.HistoricJobLog;
+import org.camunda.bpm.engine.impl.jobexecutor.MessageJobDeclaration;
 import org.springframework.stereotype.Service;
 
 /**
@@ -81,6 +85,10 @@ public IdKeyMapper.TYPE getType() {
   public Long migrateTransactionally(final HistoricJobLog c7JobLog) {
     final String c7JobId = c7JobLog.getJobId();
     if (shouldMigrate(c7JobId, HISTORY_JOB)) {
+      String jobDefinitionConfiguration = c7JobLog.getJobDefinitionConfiguration();
+      if (ASYNC_BEFORE.equals(jobDefinitionConfiguration) && ASYNC_AFTER.equals(jobDefinitionConfiguration)) {
+        throw new EntitySkippedException(c7JobLog, SKIP_REASON_UNSUPPORTED_JOBS); //TODO test case for non-async jobs
+      }
       logMigratingJob(c7JobId);
 
       final var jobKey = getNextKey();

data-migrator/core/src/main/java/io/camunda/migration/data/impl/logging/HistoryMigratorLogs.java

@@ -40,6 +40,7 @@ public class HistoryMigratorLogs {
   public static final String SKIP_REASON_UNSUPPORTED_CMMN_VARIABLES = "C7 CMMN variables not supported in C8.";
   public static final String SKIP_REASON_UNSUPPORTED_CMMN_TASKS = "C7 CMMN user tasks not supported in C8.";
   public static final String SKIP_REASON_MISSING_JOB_REFERENCE = "Missing job reference";
+  public static final String SKIP_REASON_UNSUPPORTED_JOBS = "Only async-before and async-after jobs are supported for migration.";
 
   // HistoryMigrator Messages
   public static final String MIGRATING = "Migrating {}s.";

data-migrator/qa/integration-tests/src/test/java/io/camunda/migration/data/qa/history/HistoryMigrationListSkippedTest.java

@@ -7,13 +7,18 @@
  */
 package io.camunda.migration.data.qa.history;
 
-import static io.camunda.migration.data.MigratorMode.LIST_SKIPPED;
 import static io.camunda.migration.data.impl.logging.HistoryMigratorLogs.SKIPPING;
 import static io.camunda.migration.data.impl.logging.HistoryMigratorLogs.SKIP_REASON_MISSING_PROCESS_DEFINITION;
 import static io.camunda.migration.data.impl.logging.HistoryMigratorLogs.SKIP_REASON_MISSING_PROCESS_INSTANCE;
 import static io.camunda.migration.data.impl.persistence.IdKeyMapper.TYPE;
+import static io.camunda.migration.data.impl.persistence.IdKeyMapper.TYPE.HISTORY_AUDIT_LOG;
+import static io.camunda.migration.data.impl.persistence.IdKeyMapper.TYPE.HISTORY_DECISION_DEFINITION;
+import static io.camunda.migration.data.impl.persistence.IdKeyMapper.TYPE.HISTORY_DECISION_INSTANCE;
+import static io.camunda.migration.data.impl.persistence.IdKeyMapper.TYPE.HISTORY_DECISION_REQUIREMENT;
 import static io.camunda.migration.data.impl.persistence.IdKeyMapper.TYPE.HISTORY_FLOW_NODE;
+import static io.camunda.migration.data.impl.persistence.IdKeyMapper.TYPE.HISTORY_FORM_DEFINITION;
 import static io.camunda.migration.data.impl.persistence.IdKeyMapper.TYPE.HISTORY_INCIDENT;
+import static io.camunda.migration.data.impl.persistence.IdKeyMapper.TYPE.HISTORY_JOB;
 import static io.camunda.migration.data.impl.persistence.IdKeyMapper.TYPE.HISTORY_PROCESS_INSTANCE;
 import static io.camunda.migration.data.impl.persistence.IdKeyMapper.TYPE.HISTORY_USER_TASK;
 import static io.camunda.migration.data.impl.persistence.IdKeyMapper.TYPE.HISTORY_VARIABLE;
@@ -241,12 +246,13 @@ protected void verifySkippedEntitiesOutput(Map<String, List<String>> skippedEnti
             HISTORY_FLOW_NODE.getDisplayName(),
             HISTORY_USER_TASK.getDisplayName(),
             HISTORY_VARIABLE.getDisplayName(),
-            TYPE.HISTORY_AUDIT_LOG.getDisplayName(),
+            HISTORY_AUDIT_LOG.getDisplayName(),
+            HISTORY_JOB.getDisplayName(),
             HISTORY_INCIDENT.getDisplayName(),
-            TYPE.HISTORY_DECISION_DEFINITION.getDisplayName(),
-            TYPE.HISTORY_DECISION_REQUIREMENT.getDisplayName(),
-            TYPE.HISTORY_DECISION_INSTANCE.getDisplayName(),
-            TYPE.HISTORY_FORM_DEFINITION.getDisplayName()
+            HISTORY_DECISION_DEFINITION.getDisplayName(),
+            HISTORY_DECISION_REQUIREMENT.getDisplayName(),
+            HISTORY_DECISION_INSTANCE.getDisplayName(),
+            HISTORY_FORM_DEFINITION.getDisplayName()
         };
 
         assertThat(skippedEntitiesByType.keySet().toArray()).containsExactlyInAnyOrder(expectedEntityTypes);

data-migrator/qa/integration-tests/src/test/java/io/camunda/migration/data/qa/history/entity/HistoryJobTest.java

@@ -9,6 +9,8 @@
 
 import static io.camunda.migration.data.constants.MigratorConstants.C8_DEFAULT_TENANT;
 import static io.camunda.migration.data.impl.persistence.IdKeyMapper.TYPE.HISTORY_JOB;
+import static io.camunda.migration.data.impl.persistence.IdKeyMapper.TYPE.HISTORY_PROCESS_DEFINITION;
+import static io.camunda.migration.data.impl.persistence.IdKeyMapper.TYPE.HISTORY_PROCESS_INSTANCE;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.camunda.migration.data.qa.history.HistoryMigrationAbstractTest;
@@ -34,9 +36,9 @@ public void shouldMigrateJobsForAsyncBeforeTask() {
     managementService.executeJob(c7JobId);
 
     // when: jobs and process instances are migrated
-    historyMigrator.migrateProcessDefinitions();
-    historyMigrator.migrateProcessInstances();
-    historyMigrator.migrateJobs();
+    historyMigrator.migrateByType(HISTORY_PROCESS_DEFINITION);
+    historyMigrator.migrateByType(HISTORY_PROCESS_INSTANCE);
+    historyMigrator.migrateByType(HISTORY_JOB);
 
     // then: the process instance was migrated
     List<ProcessInstanceEntity> processInstances = searchHistoricProcessInstances("asyncBeforeUserTaskProcessId");
@@ -129,9 +131,9 @@ public void shouldDeduplicateJobsByJobId() {
     assertThat(jobLogCount).as("Should have multiple job log entries").isGreaterThan(1);
 
     // when
-    historyMigrator.migrateProcessDefinitions();
-    historyMigrator.migrateProcessInstances();
-    historyMigrator.migrateJobs();
+    historyMigrator.migrateByType(HISTORY_PROCESS_DEFINITION);
+    historyMigrator.migrateByType(HISTORY_PROCESS_INSTANCE);
+    historyMigrator.migrateByType(HISTORY_JOB);
 
     // then: only ONE C8 job entry created despite multiple log entries (tracked by job ID)
     List<ProcessInstanceEntity> processInstances = searchHistoricProcessInstances("failingServiceTaskProcessId");