entity changelog fixes 2

euu-rocks · Sep 18, 2023 · 9959bc6 · 9959bc6
1 parent 9fbe901
commit 9959bc6
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/src/main/java/org/seed/core/entity/EntityChangeLogBuilder.java b/src/main/java/org/seed/core/entity/EntityChangeLogBuilder.java
@@ -132,16 +132,16 @@ else if (nextVersionObject == null) {
 			dropEntityTables();
 		}
 		else {
+			// audit state change
+			if (currentVersionObject.isAudited() != nextVersionObject.isAudited()) {
+				buildAuditTableChange();
+			}
+
 			// rename table
 			if (!currentVersionObject.getEffectiveTableName().equals(nextVersionObject.getEffectiveTableName())) {
 				renameEntity();
 			}
 
-			// audit state changee
-			if (currentVersionObject.isAudited() != nextVersionObject.isAudited()) {
-				buildAuditTableChange();
-			}
-
 			// status field change
 			if (currentVersionObject.hasStatus() != nextVersionObject.hasStatus()) {
 				buildStatusFieldChange();
@@ -234,7 +234,7 @@ private void renameEntity() {
 
 	private void renameRelation(Entity related, EntityRelation oldRelation, EntityRelation newRelation) {
 		addRenameRelationTableChanges(related, oldRelation, newRelation, false);
-		if (oldRelation.getEntity().isAudited()) {
+		if (newRelation.getEntity().isAudited()) {
 			addRenameRelationTableChanges(related, oldRelation, newRelation, true);
 		}
 	}
@@ -725,10 +725,14 @@ private void buildStatusFieldChange() {
 
 	private void buildAuditTableChange() {
 		if (nextVersionObject.isAudited()) {
-			addCreateTableChangeSet(nextVersionObject, true);
+			addCreateTableChangeSet(currentVersionObject, true);
+			currentVersionObject.getAllRelations().forEach(
+				relation -> addCreateTableChangeSet(relation, true));
 		}
 		else {
 			addDropTableChangeSet(currentVersionObject, true);
+			currentVersionObject.getAllRelations().forEach(
+				relation -> addDropTableChangeSet(relation, true));
 		}
 	}