modify snapshot task logic to move from normal collection to timeseries one.

dragonpoo · ludomikula · commit f7a6179e51f2 · 2024-11-22T11:40:47.000+01:00
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/DatabaseChangelog.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/migrations/DatabaseChangelog.java
@@ -329,7 +329,7 @@ public void addTimeSeriesSnapshotHistory(MongockTemplate mongoTemplate, CommonCo
 
             // Aggregation pipeline to fetch the records
             List<Document> aggregationPipeline = Arrays.asList(
-                    new Document("$match", new Document("createdAt", new Document("$gte", thresholdDate))),
+                    new Document("$match", new Document("createdAt", new Document("$lte", thresholdDate))),
                     new Document("$project", new Document()
                             .append("applicationId", 1)
                             .append("dsl", 1)
@@ -365,7 +365,7 @@ public void addTimeSeriesSnapshotHistory(MongockTemplate mongoTemplate, CommonCo
 
             // Aggregation pipeline with $out
             List<Document> aggregationPipeline = Arrays.asList(
-                    new Document("$match", new Document("createdAt", new Document("$gte", thresholdDate))),
+                    new Document("$match", new Document("createdAt", new Document("$lte", thresholdDate))),
                     new Document("$project", new Document()
                             .append("applicationId", 1)
                             .append("dsl", 1)
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/task/ArchiveSnapshotTask.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/runner/task/ArchiveSnapshotTask.java
@@ -46,8 +46,8 @@ private int getMongoDBVersion() {
     private void archiveForVersion5AndAbove(Instant thresholdDate) {
         log.info("Running archival for MongoDB version >= 5");
 
-        MongoCollection<Document> sourceCollection = mongoTemplate.getDb().getCollection("applicationHistorySnapshotTS");
-        MongoCollection<Document> targetCollection = mongoTemplate.getDb().getCollection("applicationHistorySnapshot");
+        MongoCollection<Document> sourceCollection = mongoTemplate.getDb().getCollection("applicationHistorySnapshot");
+        MongoCollection<Document> targetCollection = mongoTemplate.getDb().getCollection("applicationHistorySnapshotTS");
 
         long totalDocuments = sourceCollection.countDocuments(Filters.lte("createdAt", thresholdDate));
         log.info("Total documents to archive: {}", totalDocuments);
@@ -91,7 +91,7 @@ private void archiveForVersion5AndAbove(Instant thresholdDate) {
     private void archiveForVersionBelow5(Instant thresholdDate) {
         log.info("Running archival for MongoDB version < 5");
 
-        MongoCollection<Document> sourceCollection = mongoTemplate.getDb().getCollection("applicationHistorySnapshotTS");
+        MongoCollection<Document> sourceCollection = mongoTemplate.getDb().getCollection("applicationHistorySnapshot");
 
         long totalDocuments = sourceCollection.countDocuments(Filters.lte("createdAt", thresholdDate));
         log.info("Total documents to archive: {}", totalDocuments);
@@ -119,7 +119,7 @@ private void archiveForVersionBelow5(Instant thresholdDate) {
                                     .append("modifiedBy", document.get("modifiedBy"))
                                     .append("updatedAt", document.get("updatedAt"))
                                     .append("id", document.get("id"))),
-                            new Document("$out", "applicationHistorySnapshot")
+                            new Document("$out", "applicationHistorySnapshotTS")
                     )).first();
                 } catch (Exception e) {
                     log.error("Failed to aggregate and insert document with ID {}. Error: {}", document.getObjectId("id"), e.getMessage());
