fix: CommonGitTest for id modification error

app/server/appsmith-server/src/main/java/com/appsmith/server/git/common/CommonGitServiceCEImpl.java

@@ -1321,12 +1321,10 @@ public Mono<? extends Artifact> checkoutBranch(
         Mono<Tuple2<? extends Artifact, ? extends Artifact>> baseAndBranchedArtifactMono =
                 getBaseAndBranchedArtifacts(branchedArtifactId, artifactType);
 
-        return baseAndBranchedArtifactMono
-                .flatMap(artifactTuples -> {
-                    Artifact sourceArtifact = artifactTuples.getT1();
-                    return checkoutBranch(sourceArtifact, branchToBeCheckedOut, addFileLock);
-                })
-                .as(transactionalOperator::transactional);
+        return baseAndBranchedArtifactMono.flatMap(artifactTuples -> {
+            Artifact sourceArtifact = artifactTuples.getT1();
+            return checkoutBranch(sourceArtifact, branchToBeCheckedOut, addFileLock);
+        });
     }
 
     protected Mono<? extends Artifact> checkoutBranch(

app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/ApplicationRepositoryCE.java

@@ -1,7 +1,6 @@
 package com.appsmith.server.repositories.ce;
 
 import com.appsmith.server.domains.Application;
-import com.appsmith.server.projections.IdOnly;
 import com.appsmith.server.repositories.BaseRepository;
 import com.appsmith.server.repositories.CustomApplicationRepository;
 import org.springframework.stereotype.Repository;
@@ -12,19 +11,9 @@
 @Repository
 public interface ApplicationRepositoryCE extends BaseRepository<Application, String>, CustomApplicationRepository {
 
-    Optional<Application> findByName(String name);
-
-    List<Application> findByIdIn(List<String> ids);
-
-    List<Application> findByWorkspaceId(String workspaceId);
-
     Optional<Long> countByWorkspaceId(String workspaceId);
 
-    List<IdOnly> findIdsByWorkspaceId(String workspaceId);
-
     List<Application> findByClonedFromApplicationId(String clonedFromApplicationId);
 
     Optional<Long> countByDeletedAtNull();
-
-    Optional<Application> findByIdAndExportWithConfiguration(String id, boolean exportWithConfiguration);
 }

app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationRepositoryCE.java

@@ -4,6 +4,7 @@
 import com.appsmith.server.domains.Application;
 import com.appsmith.server.domains.ApplicationPage;
 import com.appsmith.server.domains.User;
+import com.appsmith.server.projections.IdOnly;
 import com.appsmith.server.repositories.AppsmithRepository;
 import jakarta.persistence.EntityManager;
 
@@ -124,4 +125,11 @@ int protectBranchedApplications(
 
     List<String> findAllBranchedApplicationIdsByBranchedApplicationId(
             String branchedApplicationId, AclPermission permission, User currentUser, EntityManager entityManager);
+
+    List<Application> findByWorkspaceId(String workspaceId, EntityManager entityManager);
+
+    List<IdOnly> findIdsByWorkspaceId(String workspaceId, EntityManager entityManager);
+
+    Optional<Application> findByIdAndExportWithConfiguration(
+            String id, boolean exportWithConfiguration, EntityManager entityManager);
 }

app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomApplicationRepositoryCEImpl.java

@@ -417,4 +417,31 @@ public List<String> findAllBranchedApplicationIdsByBranchedApplicationId(
             return List.of(application.getId());
         }
     }
+
+    @Override
+    public List<Application> findByWorkspaceId(String workspaceId, EntityManager entityManager) {
+        return queryBuilder()
+                .criteria(Bridge.equal(Application.Fields.workspaceId, workspaceId))
+                .entityManager(entityManager)
+                .all();
+    }
+
+    @Override
+    public List<IdOnly> findIdsByWorkspaceId(String workspaceId, EntityManager entityManager) {
+        return queryBuilder()
+                .criteria(Bridge.equal(Application.Fields.workspaceId, workspaceId))
+                .entityManager(entityManager)
+                .all(IdOnly.class);
+    }
+
+    @Override
+    public Optional<Application> findByIdAndExportWithConfiguration(
+            String id, boolean exportWithConfiguration, EntityManager entityManager) {
+        return queryBuilder()
+                .byId(id)
+                .criteria(Bridge.equal(
+                        Application.Fields.exportWithConfiguration, String.valueOf(exportWithConfiguration)))
+                .entityManager(entityManager)
+                .one();
+    }
 }

app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCE.java

@@ -8,6 +8,7 @@
 import jakarta.persistence.EntityManager;
 import org.springframework.data.domain.Sort;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -145,4 +146,8 @@ List<NewAction> findAllPublishedActionsByContextIdAndContextType(
 
     List<NewAction> findAllByApplicationIds(
             List<String> branchedArtifactIds, List<String> includedFields, EntityManager entityManager);
+
+    List<NewAction> findByApplicationId(String applicationId, EntityManager entityManager);
+
+    List<NewAction> findAllByIdIn(Collection<String> ids, EntityManager entityManager);
 }

app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/CustomNewActionRepositoryCEImpl.java

@@ -17,6 +17,7 @@
 import org.springframework.data.jpa.repository.Modifying;
 
 import java.time.Instant;
+import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -571,4 +572,20 @@ public List<NewAction> findAllByApplicationIds(
                 .entityManager(entityManager)
                 .all();
     }
+
+    @Override
+    public List<NewAction> findByApplicationId(String applicationId, EntityManager entityManager) {
+        return queryBuilder()
+                .criteria(getCriterionForFindByApplicationId(applicationId))
+                .entityManager(entityManager)
+                .all();
+    }
+
+    @Override
+    public List<NewAction> findAllByIdIn(Collection<String> ids, EntityManager entityManager) {
+        return queryBuilder()
+                .criteria(Bridge.in(NewAction.Fields.id, ids))
+                .entityManager(entityManager)
+                .all();
+    }
 }

app/server/appsmith-server/src/main/java/com/appsmith/server/repositories/ce/NewActionRepositoryCE.java

@@ -8,23 +8,16 @@
 import com.appsmith.server.repositories.CustomNewActionRepository;
 import org.springframework.data.jpa.repository.Query;
 
-import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 
 public interface NewActionRepositoryCE extends BaseRepository<NewAction, String>, CustomNewActionRepository {
-
-    @Query(value = "SELECT a FROM NewAction a WHERE a.applicationId = :applicationId AND a.deletedAt IS NULL")
-    List<NewAction> findByApplicationId(String applicationId);
-
-    List<NewAction> findAllByIdIn(Collection<String> ids);
-
-    Optional<Long> countByDeletedAtNull();
-
     List<IdPoliciesOnly> findIdsAndPolicyMapByApplicationIdIn(List<String> applicationIds);
 
     List<IdAndDatasourceIdNewActionView> findIdAndDatasourceIdByApplicationIdIn(List<String> applicationIds);
 
+    Optional<Long> countByDeletedAtNull();
+
     @Query(
             """
         SELECT new com.appsmith.server.dtos.PluginTypeAndCountDTO(a.pluginType, count(a)) as count