From 4ac06937f9556280c1ee4dffb4e3442a5576e298 Mon Sep 17 00:00:00 2001
From: Nayan <nayan@appsmith.com>
Date: Thu, 11 Jan 2024 10:52:55 +0600
Subject: [PATCH] fix: Created at field in action is set again during import
 (#30177)

## Description
Skips `createdAt` field of unpublished action from being reset when
application is imported.

#### PR fixes following issue(s)
Fixes #30178
---
 .../newactions/base/NewActionServiceCEImpl.java       | 11 ++++++++++-
 .../solutions/ImportApplicationServiceTests.java      |  3 +++
 .../ImportApplicationTransactionServiceTest.java      |  4 +++-
 .../ImportExportServiceTest/valid-application.json    |  3 ++-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java
index 49bc7da4ec..3ae375bd95 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java
@@ -206,7 +206,16 @@ public class NewActionServiceCEImpl extends BaseService<NewActionRepository, New
         action.setId(newAction.getId());
         action.setUserPermissions(newAction.getUserPermissions());
         action.setPolicies(newAction.getPolicies());
-        action.setCreatedAt(newAction.getCreatedAt());
+        /*
+         * Important: This null check before setting the createdAt field to ActionDTO is temporary.
+         * createdAt is part of exported JSON, and we used to import actions with the same value from JSON.
+         * It's wrong but if we fix this, the existing Git connected applications will show a diff for all actions.
+         * We want to avoid this and hence this null check is there.
+         * We're going to remove the createdAt field from JSON and post that this null check will be removed.
+         */
+        if (action.getCreatedAt() == null) {
+            action.setCreatedAt(newAction.getCreatedAt());
+        }
     }
 
     @Override
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ImportApplicationServiceTests.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ImportApplicationServiceTests.java
index 6a15f29f58..20b453c498 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ImportApplicationServiceTests.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ImportApplicationServiceTests.java
@@ -1077,6 +1077,7 @@ public class ImportApplicationServiceTests {
                         ActionDTO actionDTO = newAction.getUnpublishedAction();
                         assertThat(actionDTO.getPageId())
                                 .isNotEqualTo(pageList.get(0).getName());
+
                         if (StringUtils.equals(actionDTO.getName(), "api_wo_auth")) {
                             ActionDTO publishedAction = newAction.getPublishedAction();
                             assertThat(publishedAction).isNotNull();
@@ -1084,6 +1085,8 @@ public class ImportApplicationServiceTests {
                             // Test the fallback page ID from the unpublishedAction is copied to published version when
                             // published version does not have pageId
                             assertThat(actionDTO.getPageId()).isEqualTo(publishedAction.getPageId());
+                            // check that createAt field is getting populated from JSON
+                            assertThat(actionDTO.getCreatedAt()).isEqualTo("2023-12-13T12:10:02Z");
                         }
 
                         if (!StringUtils.isEmpty(actionDTO.getCollectionId())) {
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/transactions/ImportApplicationTransactionServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/transactions/ImportApplicationTransactionServiceTest.java
index 232f8e65dc..9bbf793b12 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/transactions/ImportApplicationTransactionServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/transactions/ImportApplicationTransactionServiceTest.java
@@ -84,6 +84,9 @@ public class ImportApplicationTransactionServiceTest {
     @MockBean
     ImportableService<NewAction> newActionImportableService;
 
+    @Autowired
+    private Gson gson;
+
     Long applicationCount = 0L, pageCount = 0L, actionCount = 0L, actionCollectionCount = 0L;
     private ApplicationJson applicationJson = new ApplicationJson();
 
@@ -123,7 +126,6 @@ public class ImportApplicationTransactionServiceTest {
 
         return stringifiedFile
                 .map(data -> {
-                    Gson gson = new Gson();
                     return gson.fromJson(data, ApplicationJson.class);
                 })
                 .map(JsonSchemaMigration::migrateApplicationToLatestSchema);
diff --git a/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application.json b/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application.json
index e341ac8d6d..97d1ade72c 100644
--- a/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application.json
+++ b/app/server/appsmith-server/src/test/resources/test_assets/ImportExportServiceTest/valid-application.json
@@ -519,7 +519,8 @@
         "invalids": [],
         "jsonPathKeys": [],
         "confirmBeforeExecute": false,
-        "userPermissions": []
+        "userPermissions": [],
+        "createdAt": "2023-12-13T12:10:02Z"
       },
       "publishedAction": {
         "name": "api_wo_auth",