feature: persist transactional flag (#389)

dieppa · web-flow · commit afb36aa8fff4 · 2025-09-23T19:23:05.000+01:00
diff --git a/cloud/flamingock-cloud/src/main/java/io/flamingock/cloud/audit/HtttpAuditWriter.java b/cloud/flamingock-cloud/src/main/java/io/flamingock/cloud/audit/HtttpAuditWriter.java
@@ -97,12 +97,13 @@ private AuditEntryRequest buildRequest(AuditEntry auditEntry) {
                 auditEntry.getExecutionMillis(),
                 auditEntry.getExecutionHostname(),
                 auditEntry.getMetadata(),
-                auditEntry.getSystemChange(),
+                auditEntry.getSystemChange() != null ? auditEntry.getSystemChange() : false,
                 auditEntry.getErrorTrace(),
                 auditEntry.getTxType(),
                 auditEntry.getTargetSystemId(),
                 auditEntry.getOrder(),
-                auditEntry.getRecoveryStrategy()
+                auditEntry.getRecoveryStrategy(),
+                auditEntry.getTransactionFlag()
         );
     }
 
diff --git a/cloud/flamingock-cloud/src/test/java/io/flamingock/cloud/audit/HttpAuditWriterMapperTest.java b/cloud/flamingock-cloud/src/test/java/io/flamingock/cloud/audit/HttpAuditWriterMapperTest.java
@@ -61,12 +61,13 @@ void shouldIncludeTxTypeInRequest() {
                 auditEntry.getExecutionMillis(),
                 auditEntry.getExecutionHostname(),
                 auditEntry.getMetadata(),
-                auditEntry.getSystemChange(),
+                auditEntry.getSystemChange() != null ? auditEntry.getSystemChange() : false,
                 auditEntry.getErrorTrace(),
                 auditEntry.getTxType(),
                 auditEntry.getTargetSystemId(),
                 auditEntry.getOrder(),
-                auditEntry.getRecoveryStrategy()
+                auditEntry.getRecoveryStrategy(),
+                auditEntry.getTransactionFlag()
         );
 
         // Then
@@ -91,12 +92,13 @@ void shouldHandleNullTxType() {
                 auditEntry.getExecutionMillis(),
                 auditEntry.getExecutionHostname(),
                 auditEntry.getMetadata(),
-                auditEntry.getSystemChange(),
+                auditEntry.getSystemChange() != null ? auditEntry.getSystemChange() : false,
                 auditEntry.getErrorTrace(),
                 auditEntry.getTxType(),
                 auditEntry.getTargetSystemId(),
                 auditEntry.getOrder(),
-                auditEntry.getRecoveryStrategy()
+                auditEntry.getRecoveryStrategy(),
+                auditEntry.getTransactionFlag()
         );
 
         // Then
diff --git a/core/flamingock-core-commons/src/main/java/io/flamingock/internal/common/cloud/audit/AuditEntryRequest.java b/core/flamingock-core-commons/src/main/java/io/flamingock/internal/common/cloud/audit/AuditEntryRequest.java
@@ -67,6 +67,8 @@ public enum Status {
 
     protected Boolean systemChange;//TODO not in server
 
+    private final Boolean transactionFlag;
+
     public AuditEntryRequest(String stageId,
                              String taskId,
                              String author,
@@ -83,7 +85,8 @@ public AuditEntryRequest(String stageId,
                              AuditTxType txType,
                              String targetSystemId,
                              String order,
-                             RecoveryStrategy recoveryStrategy) {
+                             RecoveryStrategy recoveryStrategy,
+                             Boolean transactionFlag) {
         this.stageId = stageId;
         this.taskId = taskId;
         this.author = author;
@@ -100,6 +103,7 @@ public AuditEntryRequest(String stageId,
         this.targetSystemId = targetSystemId;
         this.order = order;
         this.recoveryStrategy = recoveryStrategy;
+        this.transactionFlag = transactionFlag;
 
         this.systemChange = systemChange;
     }
@@ -172,6 +176,10 @@ public RecoveryStrategy getRecoveryStrategy() {
         return recoveryStrategy;
     }
 
+    public Boolean getTransactionFlag() {
+        return transactionFlag;
+    }
+
 
 }
 
diff --git a/core/flamingock-core-commons/src/main/java/io/flamingock/internal/common/core/audit/AuditEntry.java b/core/flamingock-core-commons/src/main/java/io/flamingock/internal/common/core/audit/AuditEntry.java
@@ -41,6 +41,7 @@ public class AuditEntry implements Comparable<AuditEntry> {
     private final String targetSystemId;
     private final String order;
     private final RecoveryStrategy recoveryStrategy;
+    private final Boolean transactionFlag;
 
     public AuditEntry(String executionId,
                       String stageId,
@@ -59,7 +60,8 @@ public AuditEntry(String executionId,
                       AuditTxType txType,
                       String targetSystemId,
                       String order,
-                      RecoveryStrategy recoveryStrategy) {
+                      RecoveryStrategy recoveryStrategy,
+                      Boolean transactionFlag) {
         this.executionId = executionId;
         this.stageId = stageId;
         this.taskId = taskId;
@@ -78,6 +80,7 @@ public AuditEntry(String executionId,
         this.order = order;
         this.systemChange = systemChange;
         this.recoveryStrategy = recoveryStrategy != null ? recoveryStrategy : RecoveryStrategy.MANUAL_INTERVENTION;
+        this.transactionFlag = transactionFlag;
     }
 
     /**
@@ -100,8 +103,8 @@ public AuditEntry(String executionId,
                       boolean systemChange,
                       String errorTrace,
                       AuditTxType txType) {
-        this(executionId, stageId, taskId, author, timestamp, state, type, className, methodName, 
-             executionMillis, executionHostname, metadata, systemChange, errorTrace, txType, null, null, RecoveryStrategy.MANUAL_INTERVENTION);
+        this(executionId, stageId, taskId, author, timestamp, state, type, className, methodName,
+             executionMillis, executionHostname, metadata, systemChange, errorTrace, txType, null, null, RecoveryStrategy.MANUAL_INTERVENTION, null);
     }
 
     /**
@@ -123,8 +126,8 @@ public AuditEntry(String executionId,
                       Object metadata,
                       boolean systemChange,
                       String errorTrace) {
-        this(executionId, stageId, taskId, author, timestamp, state, type, className, methodName, 
-             executionMillis, executionHostname, metadata, systemChange, errorTrace, null, null, null, RecoveryStrategy.MANUAL_INTERVENTION);
+        this(executionId, stageId, taskId, author, timestamp, state, type, className, methodName,
+             executionMillis, executionHostname, metadata, systemChange, errorTrace, null, null, null, RecoveryStrategy.MANUAL_INTERVENTION, null);
     }
 
     public static AuditEntry getMostRelevant(AuditEntry currentEntry, AuditEntry newEntry) {
@@ -210,6 +213,10 @@ public RecoveryStrategy getRecoveryStrategy() {
         return recoveryStrategy;
     }
 
+    public Boolean getTransactionFlag() {
+        return transactionFlag;
+    }
+
 
     private boolean shouldBeReplacedBy(AuditEntry newEntry) {
         if(this.getState().equals(newEntry.getState())) {
@@ -242,7 +249,8 @@ public AuditEntry copyWithNewIdAndStageId(String id, String stageId) {
                 getTxType(),
                 getTargetSystemId(),
                 getOrder(),
-                getRecoveryStrategy()
+                getRecoveryStrategy(),
+                getTransactionFlag()
         );
     }
 
diff --git a/core/flamingock-core/src/main/java/io/flamingock/internal/core/builder/ops/OpsClient.java b/core/flamingock-core/src/main/java/io/flamingock/internal/core/builder/ops/OpsClient.java
@@ -101,7 +101,8 @@ public FixResult fixAuditIssue(String changeId, Resolution resolution) {
                 currentEntry.getTxType(),
                 currentEntry.getTargetSystemId(),
                 currentEntry.getOrder(),
-                currentEntry.getRecoveryStrategy()
+                currentEntry.getRecoveryStrategy(),
+                currentEntry.getTransactionFlag()
         );
         auditPersistence.writeEntry(fixedAuditEntry);
         return FixResult.APPLIED;
diff --git a/core/flamingock-core/src/main/java/io/flamingock/internal/core/store/audit/domain/AuditContextBundle.java b/core/flamingock-core/src/main/java/io/flamingock/internal/core/store/audit/domain/AuditContextBundle.java
@@ -108,7 +108,8 @@ public AuditEntry toAuditEntry() {
                 getAuditTxType(),
                 getTargetSystemId(),
                 loadedTask.getOrder().orElseThrow(() -> new IllegalStateException("Order is required but not present")),
-                loadedTask.getRecovery().getStrategy()
+                loadedTask.getRecovery().getStrategy(),
+                loadedTask.isTransactional()
         );
     }
 
diff --git a/core/importer/flamingock-importer-dynamodb-tests/src/test/java/io/flamingock/importer/dynamodb/dynamodb/DynamoDBAuditEntryEntity.java b/core/importer/flamingock-importer-dynamodb-tests/src/test/java/io/flamingock/importer/dynamodb/dynamodb/DynamoDBAuditEntryEntity.java
@@ -48,6 +48,7 @@ public class DynamoDBAuditEntryEntity implements Comparable<DynamoDBAuditEntryEn
     private String targetSystemId;
     private String order;
     private String recoveryStrategy;
+    private Boolean transactionFlag;
 
     public static DynamoDBAuditEntryEntity fromAuditEntry(AuditEntry auditEntry) {
         return new DynamoDBAuditEntryEntity(auditEntry);
@@ -73,6 +74,7 @@ public DynamoDBAuditEntryEntity(AuditEntry auditEntry) {
         this.order = auditEntry.getOrder();
         this.systemChange = auditEntry.getSystemChange();
         this.recoveryStrategy = auditEntry.getRecoveryStrategy().name();
+        this.transactionFlag = auditEntry.getTransactionFlag();
     }
 
     public DynamoDBAuditEntryEntity() {}
@@ -253,6 +255,15 @@ public void setRecoveryStrategy(String recoveryStrategy) {
         this.recoveryStrategy = recoveryStrategy;
     }
 
+    @DynamoDbAttribute(AuditEntryFieldConstants.KEY_TRANSACTION_FLAG)
+    public Boolean getTransactionFlag() {
+        return transactionFlag;
+    }
+
+    public void setTransactionFlag(Boolean transactionFlag) {
+        this.transactionFlag = transactionFlag;
+    }
+
     @Override
     public int compareTo(DynamoDBAuditEntryEntity other) {
         if (other == null) {
@@ -290,7 +301,8 @@ public AuditEntry toAuditEntry() {
                 txType,
                 targetSystemId,
                 order,
-                recoveryStrategy != null ? RecoveryStrategy.valueOf(recoveryStrategy) : RecoveryStrategy.MANUAL_INTERVENTION
+                recoveryStrategy != null ? RecoveryStrategy.valueOf(recoveryStrategy) : RecoveryStrategy.MANUAL_INTERVENTION,
+                transactionFlag
         );
     }
 }
diff --git a/utils/couchbase-util/src/main/java/io/flamingock/internal/common/couchbase/CouchbaseAuditMapper.java b/utils/couchbase-util/src/main/java/io/flamingock/internal/common/couchbase/CouchbaseAuditMapper.java
@@ -33,6 +33,7 @@
 import static io.flamingock.internal.util.constants.AuditEntryFieldConstants.KEY_METADATA;
 import static io.flamingock.internal.util.constants.AuditEntryFieldConstants.KEY_ORDER;
 import static io.flamingock.internal.util.constants.AuditEntryFieldConstants.KEY_RECOVERY_STRATEGY;
+import static io.flamingock.internal.util.constants.AuditEntryFieldConstants.KEY_TRANSACTION_FLAG;
 import static io.flamingock.internal.util.constants.AuditEntryFieldConstants.KEY_TX_TYPE;
 import static io.flamingock.internal.util.constants.AuditEntryFieldConstants.KEY_STATE;
 import static io.flamingock.internal.util.constants.AuditEntryFieldConstants.KEY_SYSTEM_CHANGE;
@@ -62,6 +63,7 @@ public JsonObject toDocument(AuditEntry auditEntry) {
         CouchbaseUtils.addFieldToDocument(document, KEY_TARGET_SYSTEM_ID, auditEntry.getTargetSystemId());
         CouchbaseUtils.addFieldToDocument(document, KEY_ORDER, auditEntry.getOrder());
         CouchbaseUtils.addFieldToDocument(document, KEY_RECOVERY_STRATEGY, auditEntry.getRecoveryStrategy().name());
+        CouchbaseUtils.addFieldToDocument(document, KEY_TRANSACTION_FLAG, auditEntry.getTransactionFlag());
         return document;
     }
 
@@ -96,7 +98,8 @@ public AuditEntry fromDocument(JsonObject jsonObject) {
                 jsonObject.getString(KEY_ORDER),
                 jsonObject.getString(KEY_RECOVERY_STRATEGY) != null
                         ? RecoveryStrategy.valueOf(jsonObject.getString(KEY_RECOVERY_STRATEGY))
-                        : RecoveryStrategy.MANUAL_INTERVENTION
+                        : RecoveryStrategy.MANUAL_INTERVENTION,
+                jsonObject.getBoolean(KEY_TRANSACTION_FLAG)
         );
     }
 }
diff --git a/utils/dynamodb-util/src/main/java/io/flamingock/internal/util/dynamodb/entities/AuditEntryEntity.java b/utils/dynamodb-util/src/main/java/io/flamingock/internal/util/dynamodb/entities/AuditEntryEntity.java
@@ -50,6 +50,7 @@ public class AuditEntryEntity implements Comparable<AuditEntryEntity> {
     private String targetSystemId;
     private String order;
     private String recoveryStrategy;
+    private Boolean transactionFlag;
 
     public static AuditEntryEntity fromAuditEntry(AuditEntry auditEntry) {
         return new AuditEntryEntity(auditEntry);
@@ -75,6 +76,7 @@ public AuditEntryEntity(AuditEntry auditEntry) {
         this.order = auditEntry.getOrder();
         this.recoveryStrategy = auditEntry.getRecoveryStrategy().name();
         this.systemChange = auditEntry.getSystemChange();
+        this.transactionFlag = auditEntry.getTransactionFlag();
     }
 
     public AuditEntryEntity() {
@@ -256,6 +258,15 @@ public void setRecoveryStrategy(String recoveryStrategy) {
         this.recoveryStrategy = recoveryStrategy;
     }
 
+    @DynamoDbAttribute(AuditEntryFieldConstants.KEY_TRANSACTION_FLAG)
+    public Boolean getTransactionFlag() {
+        return transactionFlag;
+    }
+
+    public void setTransactionFlag(Boolean transactionFlag) {
+        this.transactionFlag = transactionFlag;
+    }
+
     @Override
     public int compareTo(AuditEntryEntity other) {
         if (other == null) {
@@ -299,7 +310,8 @@ public AuditEntry toAuditEntry() {
                 txType,
                 targetSystemId,
                 order,
-                recoveryStrategy != null ? RecoveryStrategy.valueOf(recoveryStrategy) : RecoveryStrategy.MANUAL_INTERVENTION
+                recoveryStrategy != null ? RecoveryStrategy.valueOf(recoveryStrategy) : RecoveryStrategy.MANUAL_INTERVENTION,
+                transactionFlag
         );
     }
 }
diff --git a/utils/general-util/src/main/java/io/flamingock/internal/util/constants/AuditEntryFieldConstants.java b/utils/general-util/src/main/java/io/flamingock/internal/util/constants/AuditEntryFieldConstants.java
@@ -34,4 +34,5 @@ public class AuditEntryFieldConstants {
     public static final String KEY_TARGET_SYSTEM_ID = "targetSystemId";
     public static final String KEY_ORDER = "order";
     public static final String KEY_RECOVERY_STRATEGY = "recoveryStrategy";
+    public static final String KEY_TRANSACTION_FLAG = "transactionFlag";
 }
diff --git a/utils/mongodb-util/src/main/java/io/flamingock/internal/common/mongodb/MongoDBAuditMapper.java b/utils/mongodb-util/src/main/java/io/flamingock/internal/common/mongodb/MongoDBAuditMapper.java
@@ -33,6 +33,7 @@
 import static io.flamingock.internal.util.constants.AuditEntryFieldConstants.KEY_METADATA;
 import static io.flamingock.internal.util.constants.AuditEntryFieldConstants.KEY_ORDER;
 import static io.flamingock.internal.util.constants.AuditEntryFieldConstants.KEY_RECOVERY_STRATEGY;
+import static io.flamingock.internal.util.constants.AuditEntryFieldConstants.KEY_TRANSACTION_FLAG;
 import static io.flamingock.internal.util.constants.AuditEntryFieldConstants.KEY_TX_TYPE;
 import static io.flamingock.internal.util.constants.AuditEntryFieldConstants.KEY_STAGE_ID;
 import static io.flamingock.internal.util.constants.AuditEntryFieldConstants.KEY_STATE;
@@ -69,6 +70,7 @@ public DOCUMENT_WRAPPER toDocument(AuditEntry auditEntry) {
         document.append(KEY_TARGET_SYSTEM_ID, auditEntry.getTargetSystemId());
         document.append(KEY_ORDER, auditEntry.getOrder());
         document.append(KEY_RECOVERY_STRATEGY, auditEntry.getRecoveryStrategy().name());
+        document.append(KEY_TRANSACTION_FLAG, auditEntry.getTransactionFlag());
         return document;
     }
 
@@ -105,7 +107,8 @@ public AuditEntry fromDocument(DocumentHelper entry) {
                 entry.getString(KEY_ORDER),
                 entry.getString(KEY_RECOVERY_STRATEGY) != null
                         ? RecoveryStrategy.valueOf(entry.getString(KEY_RECOVERY_STRATEGY))
-                        : RecoveryStrategy.MANUAL_INTERVENTION
+                        : RecoveryStrategy.MANUAL_INTERVENTION,
+                entry.getBoolean(KEY_TRANSACTION_FLAG)
 
         );
 
diff --git a/utils/test-util/src/main/java/io/flamingock/core/kit/audit/AuditEntryTestFactory.java b/utils/test-util/src/main/java/io/flamingock/core/kit/audit/AuditEntryTestFactory.java
@@ -93,7 +93,8 @@ public static AuditEntry createTestAuditEntry(String changeId, AuditEntry.Status
                 txType,                       // txType
                 "test-target-system",         // targetSystemId
                 "001",                        // order
-                recoveryStrategy               // recoveryStrategy
+                recoveryStrategy,              // recoveryStrategy
+                null                          // transactionFlag
         );
     }
 
@@ -121,7 +122,8 @@ public static AuditEntry createTestAuditEntry(String changeId, AuditEntry.Status
                 txType,                       // txType
                 "test-target-system",         // targetSystemId
                 "001",                        // order
-                RecoveryStrategy.MANUAL_INTERVENTION          // recoveryStrategy
+                RecoveryStrategy.MANUAL_INTERVENTION,          // recoveryStrategy
+                null                          // transactionFlag
         );
     }
 
@@ -228,7 +230,8 @@ public static AuditEntry createTestAuditEntry(String changeId, AuditEntry.Status
                 txType,                       // txType
                 targetSystemId,               // targetSystemId
                 "001",                        // order
-                recoveryStrategy              // recoveryStrategy
+                recoveryStrategy,             // recoveryStrategy
+                null                          // transactionFlag
         );
     }
 
@@ -255,7 +258,8 @@ public static AuditEntry createTestAuditEntry(String changeId, AuditEntry.Status
                 txType,                       // txType
                 targetSystemId,               // targetSystemId
                 "001",                        // order
-                RecoveryStrategy.MANUAL_INTERVENTION // recoveryStrategy
+                RecoveryStrategy.MANUAL_INTERVENTION, // recoveryStrategy
+                null                          // transactionFlag
         );
     }
 
@@ -287,7 +291,8 @@ public static AuditEntry createTestAuditEntryWithRecoveryStrategy(String changeI
                 txType,                       // txType
                 null,                         // targetSystemId
                 "001",                        // order
-                RecoveryStrategy.MANUAL_INTERVENTION // recoveryStrategy
+                RecoveryStrategy.MANUAL_INTERVENTION, // recoveryStrategy
+                null                          // transactionFlag
         );
     }
 }
diff --git a/utils/test-util/src/main/java/io/flamingock/core/kit/audit/AuditTestHelper.java b/utils/test-util/src/main/java/io/flamingock/core/kit/audit/AuditTestHelper.java

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,8 @@ public AuditEntry toAuditEntry() {`
`108`	`108`	`getAuditTxType(),`
`109`	`109`	`getTargetSystemId(),`
`110`	`110`	`loadedTask.getOrder().orElseThrow(() -> new IllegalStateException("Order is required but not present")),`
`111`		`- loadedTask.getRecovery().getStrategy()`
	`111`	`+ loadedTask.getRecovery().getStrategy(),`
	`112`	`+ loadedTask.isTransactional()`
`112`	`113`	`);`
`113`	`114`	`}`
`114`	`115`
Original file line number	Diff line number	Diff line change
`@@ -34,4 +34,5 @@ public class AuditEntryFieldConstants {`
`34`	`34`	`public static final String KEY_TARGET_SYSTEM_ID = "targetSystemId";`
`35`	`35`	`public static final String KEY_ORDER = "order";`
`36`	`36`	`public static final String KEY_RECOVERY_STRATEGY = "recoveryStrategy";`
	`37`	`+ public static final String KEY_TRANSACTION_FLAG = "transactionFlag";`
`37`	`38`	`}`