wip

Author: yanavasileva

data-migrator/core/src/main/java/io/camunda/migration/data/config/InterceptorConfiguration.java

@@ -23,6 +23,7 @@
 import io.camunda.migration.data.impl.interceptor.PrimitiveVariableTransformer;
 import io.camunda.migration.data.impl.interceptor.SpinJsonVariableTransformer;
 import io.camunda.migration.data.impl.interceptor.SpinXmlVariableTransformer;
+import io.camunda.migration.data.impl.interceptor.history.entity.AuditLogTransformer;
 import io.camunda.migration.data.impl.interceptor.history.entity.DecisionDefinitionTransformer;
 import io.camunda.migration.data.impl.interceptor.history.entity.DecisionInstanceTransformer;
 import io.camunda.migration.data.impl.interceptor.history.entity.DecisionRequirementsDefinitionTransformer;
@@ -367,4 +368,9 @@ public UserTaskTransformer userTaskTransformer() {
   public VariableTransformer variableTransformer() {
     return new VariableTransformer();
   }
+
+  @Bean
+  public AuditLogTransformer auditLogTransformer() {
+    return new AuditLogTransformer();
+  }
 }

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

@@ -8,23 +8,28 @@
 package io.camunda.migration.data.impl.history;
 
 import static io.camunda.migration.data.MigratorMode.RETRY_SKIPPED;
-import static io.camunda.migration.data.impl.logging.HistoryMigratorLogs.SKIP_REASON_BELONGS_TO_SKIPPED_TASK;
 import static io.camunda.migration.data.constants.MigratorConstants.C7_HISTORY_PARTITION_ID;
+import static io.camunda.migration.data.impl.logging.HistoryMigratorLogs.SKIP_REASON_BELONGS_TO_SKIPPED_TASK;
 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.logging.HistoryMigratorLogs.SKIP_REASON_MISSING_ROOT_PROCESS_INSTANCE;
 import static io.camunda.migration.data.impl.persistence.IdKeyMapper.TYPE.HISTORY_AUDIT_LOG;
 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 io.camunda.migration.data.impl.persistence.IdKeyMapper.TYPE.HISTORY_USER_TASK;
+import static io.camunda.migration.data.impl.util.ConverterUtil.convertDate;
 import static io.camunda.migration.data.impl.util.ConverterUtil.getNextKey;
 
 import io.camunda.db.rdbms.write.domain.AuditLogDbModel;
 import io.camunda.migration.data.exception.EntityInterceptorException;
 import io.camunda.migration.data.impl.logging.HistoryMigratorLogs;
 import io.camunda.migration.data.interceptor.property.EntityConversionContext;
 import io.camunda.search.entities.ProcessInstanceEntity;
+import java.time.OffsetDateTime;
+import java.time.Period;
+import java.util.Date;
 import org.camunda.bpm.engine.history.UserOperationLogEntry;
+import org.camunda.bpm.engine.impl.util.ClockUtil;
 import org.springframework.stereotype.Service;
 
 /**
@@ -82,6 +87,8 @@ public void migrateOne(UserOperationLogEntry c7AuditLog) {
         EntityConversionContext<?, ?> context = createEntityConversionContext(
             c7AuditLog, UserOperationLogEntry.class, auditLogDbModelBuilder);
 
+        setHistoryCleanupDate(c7AuditLog, auditLogDbModelBuilder);
+
         validateDependenciesAndInsert(c7AuditLog, context, c7AuditLogId);
       } catch (EntityInterceptorException e) {
         handleInterceptorException(c7AuditLogId, HISTORY_AUDIT_LOG, c7AuditLog.getTimestamp(), e);
@@ -200,4 +207,34 @@ protected AuditLogDbModel convertAuditLog(EntityConversionContext<?, ?> context)
     AuditLogDbModel.Builder builder = (AuditLogDbModel.Builder) entityConversionContext.getC8DbModelBuilder();
     return builder.build();
   }
+
+  protected OffsetDateTime calculateHistoryCleanupDate(OffsetDateTime endTime, Date c7RemovalTime) {
+    if (c7RemovalTime != null) {
+      return convertDate(c7RemovalTime);
+    }
+
+    Period ttl = getAutoCancelTtl();
+    if (ttl == null || ttl.isZero()) {
+      return null;
+    }
+    return endTime.plus(ttl);
+  }
+
+  protected OffsetDateTime calculateEndDate(Date c7EndDate) {
+    if (c7EndDate == null) {
+      return convertDate(ClockUtil.now());
+    }
+    return convertDate(c7EndDate);
+  }
+
+  protected void setHistoryCleanupDate(UserOperationLogEntry c7AuditLog,
+                                       AuditLogDbModel.Builder auditLogDbModelBuilder) {
+    Date c7EndTime = c7AuditLog.getTimestamp();
+    var c8EndTime = calculateEndDate(c7EndTime);
+    var c8HistoryCleanupDate = calculateHistoryCleanupDate(c8EndTime, c7AuditLog.getRemovalTime());
+
+    auditLogDbModelBuilder
+        .historyCleanupDate(c8HistoryCleanupDate)
+        .timestamp(c8EndTime);
+  }
 }

data-migrator/core/src/main/java/io/camunda/migration/data/impl/interceptor/history/entity/AuditLogTransformer.java

@@ -8,7 +8,9 @@
 package io.camunda.migration.data.impl.interceptor.history.entity;
 
 import static io.camunda.migration.data.constants.MigratorConstants.C7_HISTORY_PARTITION_ID;
+import static io.camunda.migration.data.constants.MigratorConstants.C8_DEFAULT_TENANT;
 import static io.camunda.migration.data.impl.util.ConverterUtil.convertDate;
+import static io.camunda.migration.data.impl.util.ConverterUtil.getTenantId;
 import static io.camunda.migration.data.impl.util.ConverterUtil.prefixDefinitionId;
 
 import io.camunda.db.rdbms.write.domain.AuditLogDbModel;
@@ -20,6 +22,7 @@
 import java.util.Set;
 import org.camunda.bpm.engine.EntityTypes;
 import org.camunda.bpm.engine.history.UserOperationLogEntry;
+import org.jspecify.annotations.NonNull;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
@@ -49,22 +52,31 @@ public void execute(EntityConversionContext<?, ?> context) {
       throw new EntityInterceptorException("C8 AuditLogDbModel.Builder is null in context");
     }
     convertOperationType(userOperationLog, builder);
+    String tenantId = getTenantId(userOperationLog.getTenantId());
     builder
         .entityType(convertEntityType(userOperationLog))
         .partitionId(C7_HISTORY_PARTITION_ID) // test
-        .timestamp(convertDate(userOperationLog.getTimestamp()))// test
+        .result(AuditLogEntity.AuditLogOperationResult.SUCCESS)
         .actorId(userOperationLog.getUserId()) // test
         .actorType(AuditLogEntity.AuditLogActorType.USER) // test
         .processDefinitionId(prefixDefinitionId(userOperationLog.getProcessDefinitionKey()))// test
         .annotation(userOperationLog.getAnnotation()) // test
-        .tenantId(userOperationLog.getTenantId()) // test
-        .tenantScope(AuditLogEntity.AuditLogTenantScope.TENANT) // test
-        .category(convertCategory(userOperationLog.getCategory()))
-        .historyCleanupDate(convertDate(userOperationLog.getRemovalTime()));
-    // Note: auditLogKey, processInstanceKey, rootProcessInstanceKey, processDefinitionKey, userTaskKey are set externally in AuditLogMigrator
-
+        .tenantId(tenantId) // test
+        .tenantScope(getAuditLogTenantScope(tenantId)) // test
+        .category(convertCategory(userOperationLog.getCategory()));
+    // Note: auditLogKey, processInstanceKey, rootProcessInstanceKey, processDefinitionKey, userTaskKey, historyCleanupDate are set
+    // externally in AuditLogMigrator
 
+  }
 
+  protected static AuditLogEntity.@NonNull AuditLogTenantScope getAuditLogTenantScope(String tenantId) {
+    AuditLogEntity.AuditLogTenantScope tenantScope;
+    if ( tenantId.equals(C8_DEFAULT_TENANT)) {
+      tenantScope = AuditLogEntity.AuditLogTenantScope.GLOBAL;
+    } else {
+      tenantScope = AuditLogEntity.AuditLogTenantScope.TENANT;
+    }
+    return tenantScope;
   }
 
   protected AuditLogEntity.AuditLogOperationCategory convertCategory(String category) {