From b12e7538e60f3cf3a3c181284cd2a3faf37d4153 Mon Sep 17 00:00:00 2001
From: Nidhi <nidhi@appsmith.com>
Date: Thu, 28 Dec 2023 10:23:41 +0530
Subject: [PATCH] chore: Split get by page id for export (#29910)

---
 .../appsmith/server/newactions/base/NewActionServiceCE.java | 2 ++
 .../server/newactions/base/NewActionServiceCEImpl.java      | 6 ++++++
 .../exports/NewActionExportableServiceCEImpl.java           | 6 +++---
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCE.java
index 800d3287da..6dc6863bdd 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCE.java
@@ -138,6 +138,8 @@ public interface NewActionServiceCE extends CrudService<NewAction, String> {
 
     Flux<NewAction> findByPageIds(List<String> unpublishedPages, Optional<AclPermission> optionalPermission);
 
+    Flux<NewAction> findByPageIdsForExport(List<String> unpublishedPages, Optional<AclPermission> optionalPermission);
+
     Flux<NewAction> findAllActionsByContextIdAndContextTypeAndViewMode(
             String contextId,
             CreatorContextType contextType,
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 5a8bf766c8..0312804c49 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
@@ -1759,6 +1759,12 @@ public class NewActionServiceCEImpl extends BaseService<NewActionRepository, New
         return repository.findByPageIds(unpublishedPages, optionalPermission);
     }
 
+    @Override
+    public Flux<NewAction> findByPageIdsForExport(
+            List<String> unpublishedPages, Optional<AclPermission> optionalPermission) {
+        return repository.findByPageIds(unpublishedPages, optionalPermission);
+    }
+
     @Override
     public Flux<NewAction> findAllActionsByContextIdAndContextTypeAndViewMode(
             String contextId,
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/exports/NewActionExportableServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/exports/NewActionExportableServiceCEImpl.java
index 210803b59c..e7ac24fe16 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/exports/NewActionExportableServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/newactions/exports/NewActionExportableServiceCEImpl.java
@@ -38,8 +38,8 @@ public class NewActionExportableServiceCEImpl implements ExportableServiceCE<New
     }
 
     // Requires datasourceIdToNameMap, pageIdToNameMap, pluginMap, collectionIdToNameMap
-    // Updates actionId to name map in exportable resources. Also directly updates required collection information in
-    // application json
+    // Updates actionId to name map in exportable resources.
+    // Also, directly updates required collection information in application json
     @Override
     public Mono<Void> getExportableEntities(
             ExportingMetaDTO exportingMetaDTO,
@@ -51,7 +51,7 @@ public class NewActionExportableServiceCEImpl implements ExportableServiceCE<New
                 exportingMetaDTO.getIsGitSync(), exportingMetaDTO.getExportWithConfiguration()));
 
         Flux<NewAction> actionFlux =
-                newActionService.findByPageIds(exportingMetaDTO.getUnpublishedPages(), optionalPermission);
+                newActionService.findByPageIdsForExport(exportingMetaDTO.getUnpublishedPages(), optionalPermission);
 
         return actionFlux
                 .collectList()