Skip to content

Commit 6d1a231

Browse files
authored
fix(mongock): import historical entries through audit appender (#981)
1 parent 5a6fa10 commit 6d1a231

4 files changed

Lines changed: 96 additions & 219 deletions

File tree

‎legacy/mongock-importer-dynamodb/src/test/java/io/flamingock/importer/mongock/dynamodb/DynamoDBImporterJournalTest.java‎

Lines changed: 0 additions & 216 deletions
This file was deleted.

‎legacy/mongock-importer-mongodb/src/test/java/io/flamingock/importer/mongock/mongodb/MongoDBImporterTest.java‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,23 @@ void GIVEN_allMongockChangeUnitsAlreadyExecuted_WHEN_migratingToFlamingockCommun
118118

119119
flamingock.run();
120120

121+
List<String> persistedSnapshot = auditHelper.getAuditEntriesSorted().stream()
122+
.map(entry -> entry.getChangeId() + "|" + entry.getState() + "|"
123+
+ entry.getType() + "|" + entry.getStageId())
124+
.collect(java.util.stream.Collectors.toList());
125+
assertEquals(java.util.Arrays.asList(
126+
"system-change-00001_before|APPLIED|MONGOCK_BEFORE|flamingock-legacy-stage",
127+
"system-change-00001|APPLIED|MONGOCK_EXECUTION|flamingock-legacy-stage",
128+
"mongock-change-1_before|APPLIED|MONGOCK_BEFORE|flamingock-legacy-stage",
129+
"mongock-change-1|APPLIED|MONGOCK_EXECUTION|flamingock-legacy-stage",
130+
"mongock-change-2|APPLIED|MONGOCK_EXECUTION|flamingock-legacy-stage",
131+
"migration-mongock-to-flamingock-community|STARTED|STANDARD_CODE|flamingock-system-stage",
132+
"migration-mongock-to-flamingock-community|APPLIED|STANDARD_CODE|flamingock-system-stage",
133+
"create-users-collection-with-index|STARTED|STANDARD_CODE|changes",
134+
"create-users-collection-with-index|APPLIED|STANDARD_CODE|changes",
135+
"seed-users|STARTED|STANDARD_CODE|changes",
136+
"seed-users|APPLIED|STANDARD_CODE|changes"), persistedSnapshot);
137+
121138
// Verify audit sequence: 11 total entries as shown in actual execution
122139
// Final state only: imported and freshly-executed changes alike, once STARTED is filtered out
123140
auditHelper.verifyAuditFinalStateSequence(

‎legacy/mongock-support/src/main/java/io/flamingock/support/mongock/MongockImportChange.java‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@
2121
import io.flamingock.internal.common.core.pipeline.PipelineHelper;
2222
import io.flamingock.internal.common.core.audit.AuditEntry;
2323
import io.flamingock.internal.common.core.audit.AuditHistoryReader;
24-
import io.flamingock.internal.common.core.audit.AuditWriter;
2524
import io.flamingock.internal.common.core.error.FlamingockException;
2625
import io.flamingock.internal.common.core.pipeline.PipelineDescriptor;
26+
import io.flamingock.internal.core.external.store.AuditHistoryAppender;
2727
import io.flamingock.internal.core.external.targets.TargetSystemManager;
2828
import io.flamingock.internal.core.external.targets.operations.TargetSystemOps;
2929
import io.flamingock.internal.core.external.targets.operations.TransactionalTargetSystemOps;
30+
import io.flamingock.internal.util.Result;
3031
import org.slf4j.Logger;
3132
import org.slf4j.LoggerFactory;
3233

@@ -65,7 +66,8 @@ public void importHistory(@Named("change.targetSystem.id") String targetSystemId
6566
List<AuditEntry> legacyHistory = legacyHistoryReader.getAuditHistory();
6667
boolean ignoreUnknownEntries = resolveIgnoreUnknownEntries(ignoreUnknownEntriesPropertyValue);
6768
validate(legacyHistory, targetSystemId, emptyOriginAllowedPropertyValue);
68-
AuditWriter auditWriter = auditPersistenceFactory.get(PipelineHelper.LEGACY_STAGE_ID);
69+
AuditHistoryAppender auditHistoryAppender =
70+
(AuditHistoryAppender) auditPersistenceFactory.get(PipelineHelper.LEGACY_STAGE_ID);
6971
legacyHistory.forEach(auditEntryFromOrigin -> {
7072
Optional<String> stageId = pipelineHelper.findStageId(auditEntryFromOrigin);
7173
if (!stageId.isPresent()) {
@@ -84,7 +86,13 @@ public void importHistory(@Named("change.targetSystem.id") String targetSystemId
8486
AuditEntry auditEntryWithStageId = auditEntryFromOrigin.copyWithNewIdAndStageId(
8587
pipelineHelper.getStorableChangeId(auditEntryFromOrigin),
8688
stageId.get());
87-
auditWriter.writeEntry(auditEntryWithStageId);
89+
Result result = auditHistoryAppender.append(auditEntryWithStageId);
90+
if (result instanceof Result.Error) {
91+
throw new FlamingockException(String.format(
92+
"Error importing audit entry with changeId[%s] into stage[%s] for targetSystem[%s].",
93+
auditEntryWithStageId.getChangeId(), stageId.get(), targetSystemId),
94+
((Result.Error) result).getError());
95+
}
8896
});
8997
}
9098

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
/*
2+
* Copyright 2026 Flamingock (https://www.flamingock.io)
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package io.flamingock.support.mongock;
17+
18+
import io.flamingock.internal.common.core.audit.AuditEntry;
19+
import io.flamingock.internal.common.core.audit.AuditPersistenceFactory;
20+
import io.flamingock.internal.common.core.audit.AuditHistoryReader;
21+
import io.flamingock.internal.common.core.error.FlamingockException;
22+
import io.flamingock.internal.common.core.pipeline.PipelineDescriptor;
23+
import io.flamingock.internal.core.external.store.audit.community.CommunityAuditPersistence;
24+
import io.flamingock.internal.core.external.targets.TargetSystemManager;
25+
import io.flamingock.internal.core.external.targets.operations.TransactionalTargetSystemOps;
26+
import io.flamingock.internal.util.Result;
27+
import org.junit.jupiter.api.Test;
28+
29+
import java.util.Collections;
30+
import java.util.Optional;
31+
32+
import static io.flamingock.internal.common.core.audit.AuditReaderType.MONGOCK;
33+
import static org.junit.jupiter.api.Assertions.assertEquals;
34+
import static org.junit.jupiter.api.Assertions.assertSame;
35+
import static org.junit.jupiter.api.Assertions.assertThrows;
36+
import static org.mockito.ArgumentMatchers.any;
37+
import static org.mockito.Mockito.mock;
38+
import static org.mockito.Mockito.when;
39+
40+
class MongockImportChangeTest {
41+
@Test
42+
void failedAppendIncludesEntryIdentityAndOriginalCause() {
43+
TargetSystemManager manager = mock(TargetSystemManager.class);
44+
TransactionalTargetSystemOps ops = mock(TransactionalTargetSystemOps.class);
45+
AuditHistoryReader reader = mock(AuditHistoryReader.class);
46+
PipelineDescriptor pipeline = mock(PipelineDescriptor.class);
47+
CommunityAuditPersistence persistence = mock(CommunityAuditPersistence.class);
48+
AuditPersistenceFactory<CommunityAuditPersistence> factory = stageId -> {
49+
assertEquals("flamingock-legacy-stage", stageId);
50+
return persistence;
51+
};
52+
AuditEntry entry = mock(AuditEntry.class);
53+
RuntimeException cause = new RuntimeException("write failed");
54+
when(manager.getTargetSystem("mongo")).thenReturn(ops);
55+
when(ops.getAuditAuditReader(MONGOCK)).thenReturn(Optional.of(reader));
56+
when(reader.getAuditHistory()).thenReturn(Collections.singletonList(entry));
57+
when(entry.getChangeId()).thenReturn("change-1");
58+
when(entry.copyWithNewIdAndStageId("change-1", "stage-1")).thenReturn(entry);
59+
when(pipeline.getStageByChange("change-1")).thenReturn(Optional.of("stage-1"));
60+
when(persistence.append(any(AuditEntry.class))).thenReturn(new Result.Error(cause));
61+
62+
FlamingockException failure = assertThrows(FlamingockException.class,
63+
() -> new MongockImportChange().importHistory("mongo", manager, factory, pipeline, null, null, null));
64+
assertSame(cause, failure.getCause());
65+
assertEquals("Error importing audit entry with changeId[change-1] into stage[stage-1] for targetSystem[mongo].",
66+
failure.getMessage());
67+
}
68+
}

0 commit comments

Comments
 (0)