From 9e090e7a9e2d8fde9f36cc9c3244c02f33d0f052 Mon Sep 17 00:00:00 2001
From: sondermanish <sonder.manish@gmail.com>
Date: Sun, 15 Dec 2024 00:47:37 +0530
Subject: [PATCH 1/9] added status changes

---
 app/server/.run/ServerApplication.run.xml     |   2 +-
 .../external/dtos/ce/GitStatusCE_DTO.java     |   1 +
 .../git/central/CentralGitServiceCE.java      |   4 +
 .../git/central/CentralGitServiceCEImpl.java  | 137 +++++++++++++++++-
 .../git/central/GitHandlingServiceCE.java     |   4 +
 .../server/git/fs/GitFSServiceCEImpl.java     |  16 ++
 6 files changed, 162 insertions(+), 2 deletions(-)

diff --git a/app/server/.run/ServerApplication.run.xml b/app/server/.run/ServerApplication.run.xml
index 96810c492986..660f5e60663e 100644
--- a/app/server/.run/ServerApplication.run.xml
+++ b/app/server/.run/ServerApplication.run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="ServerApplication" type="Application" factoryName="Application" nameIsGenerated="true">
-    <option name="ALTERNATIVE_JRE_PATH" value="temurin-17" />
+    <option name="ALTERNATIVE_JRE_PATH" value="/Library/Java/JavaVirtualMachines/openjdk-17.jdk/Contents/Home" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="INCLUDE_PROVIDED_SCOPE" value="true" />
     <option name="MAIN_CLASS_NAME" value="com.appsmith.server.ServerApplication" />
diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/dtos/ce/GitStatusCE_DTO.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/dtos/ce/GitStatusCE_DTO.java
index ed4e074f2417..0c1666a517b7 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/dtos/ce/GitStatusCE_DTO.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/dtos/ce/GitStatusCE_DTO.java
@@ -8,6 +8,7 @@
 /**
  * DTO to convey the status local git repo
  */
+// TODO: @Manish modify git status DTO accordingly
 @Data
 public class GitStatusCE_DTO {
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/CentralGitServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/CentralGitServiceCE.java
index 4254b5d4dd2a..e92f22cb4f37 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/CentralGitServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/CentralGitServiceCE.java
@@ -1,5 +1,6 @@
 package com.appsmith.server.git.central;
 
+import com.appsmith.external.dtos.GitStatusDTO;
 import com.appsmith.git.dto.CommitDTO;
 import com.appsmith.server.constants.ArtifactType;
 import com.appsmith.server.constants.ce.RefType;
@@ -33,4 +34,7 @@ Mono<String> fetchRemoteChanges(
             RefType refType);
 
     Mono<? extends Artifact> discardChanges(String branchedArtifactId, ArtifactType artifactType, GitType gitType);
+
+    Mono<GitStatusDTO> getStatus(
+        String branchedArtifactId, boolean compareRemote, ArtifactType artifactType, GitType gitType);
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/CentralGitServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/CentralGitServiceCEImpl.java
index 55e1692b816e..9d244ab846fd 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/CentralGitServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/CentralGitServiceCEImpl.java
@@ -1,6 +1,7 @@
 package com.appsmith.server.git.central;
 
 import com.appsmith.external.constants.AnalyticsEvents;
+import com.appsmith.external.dtos.GitStatusDTO;
 import com.appsmith.external.git.constants.GitConstants;
 import com.appsmith.external.git.constants.GitSpan;
 import com.appsmith.external.models.Datasource;
@@ -67,6 +68,7 @@
 import static com.appsmith.external.git.constants.ce.GitConstantsCE.GIT_CONFIG_ERROR;
 import static com.appsmith.external.git.constants.ce.GitConstantsCE.GIT_PROFILE_ERROR;
 import static com.appsmith.external.git.constants.ce.GitSpanCE.OPS_COMMIT;
+import static com.appsmith.external.git.constants.ce.GitSpanCE.OPS_STATUS;
 import static com.appsmith.external.helpers.AppsmithBeanUtils.copyNestedNonNullProperties;
 import static com.appsmith.server.constants.FieldName.BRANCH_NAME;
 import static com.appsmith.server.constants.FieldName.DEFAULT;
@@ -929,6 +931,137 @@ private boolean isBaseGitMetadataInvalid(GitArtifactMetadata gitArtifactMetadata
                         .isGitAuthInvalid(gitArtifactMetadata.getGitAuth());
     }
 
+    private Mono<GitStatusDTO> getStatusAfterComparingWithRemote(
+            String baseArtifactId, boolean isFileLock, ArtifactType artifactType, GitType gitType) {
+        return getStatus(baseArtifactId, isFileLock, true, artifactType, gitType);
+    }
+
+    @Override
+    public Mono<GitStatusDTO> getStatus(
+            String branchedArtifactId, boolean compareRemote, ArtifactType artifactType, GitType gitType) {
+        return getStatus(branchedArtifactId, true, compareRemote, artifactType, gitType);
+    }
+
+    /**
+     * Get the status of the artifact for given branched id
+     *
+     * @param branchedArtifactId branched id of the artifact
+     * @param isFileLock         if the locking is required, since the status API is used in the other flows of git
+     *                           Only for the direct hits from the client the locking will be added
+     * @param artifactType       Type of artifact in context
+     * @param gitType            Type of the service
+     * @return Map of json file names which are added, modified, conflicting, removed and the working tree if this is clean
+     */
+    private Mono<GitStatusDTO> getStatus(
+            String branchedArtifactId,
+            boolean isFileLock,
+            boolean compareRemote,
+            ArtifactType artifactType,
+            GitType gitType) {
+
+        Mono<Tuple2<? extends Artifact, ? extends Artifact>> baseAndBranchedArtifacts =
+                getBaseAndBranchedArtifacts(branchedArtifactId, artifactType);
+
+        return baseAndBranchedArtifacts.flatMap(artifactTuple -> {
+            Artifact baseArtifact = artifactTuple.getT1();
+            Artifact branchedArtifact = artifactTuple.getT2();
+            return getStatus(baseArtifact, branchedArtifact, isFileLock, compareRemote, gitType);
+        });
+    }
+
+    protected Mono<GitStatusDTO> getStatus(
+            Artifact baseArtifact,
+            Artifact branchedArtifact,
+            boolean isFileLock,
+            boolean compareRemote,
+            GitType gitType) {
+
+        ArtifactType artifactType = baseArtifact.getArtifactType();
+        GitArtifactHelper<?> gitArtifactHelper = gitArtifactHelperResolver.getArtifactHelper(artifactType);
+        GitHandlingService gitHandlingService = gitHandlingServiceResolver.getGitHandlingService(gitType);
+
+        GitArtifactMetadata baseGitMetadata = baseArtifact.getGitArtifactMetadata();
+        final String baseArtifactId = baseGitMetadata.getDefaultArtifactId();
+
+        GitArtifactMetadata branchedGitMetadata = branchedArtifact.getGitArtifactMetadata();
+        branchedGitMetadata.setGitAuth(baseGitMetadata.getGitAuth());
+
+        final String finalBranchName = branchedGitMetadata.getBranchName();
+
+        if (!StringUtils.hasText(finalBranchName)) {
+            return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.BRANCH_NAME));
+        }
+
+        Mono<? extends ArtifactExchangeJson> exportedArtifactJsonMono =
+                exportService.exportByArtifactId(branchedArtifact.getId(), VERSION_CONTROL, artifactType);
+
+        Mono<GitStatusDTO> statusMono = exportedArtifactJsonMono
+                .flatMap(artifactExchangeJson -> {
+                    return gitRedisUtils
+                            .acquireGitLock(baseArtifactId, GitConstants.GitCommandConstants.STATUS, isFileLock)
+                            .thenReturn(artifactExchangeJson);
+                })
+                .flatMap(artifactExchangeJson -> {
+                    ArtifactJsonTransformationDTO jsonTransformationDTO = new ArtifactJsonTransformationDTO();
+                    jsonTransformationDTO.setRefType(RefType.BRANCH);
+                    jsonTransformationDTO.setWorkspaceId(baseArtifact.getWorkspaceId());
+                    jsonTransformationDTO.setBaseArtifactId(baseArtifact.getId());
+                    jsonTransformationDTO.setRepoName(
+                            branchedArtifact.getGitArtifactMetadata().getRepoName());
+                    jsonTransformationDTO.setArtifactType(artifactExchangeJson.getArtifactJsonType());
+                    jsonTransformationDTO.setRefName(finalBranchName);
+
+                    Mono<Boolean> prepareForStatus =
+                            gitHandlingService.prepareChangesToBeCommitted(jsonTransformationDTO, artifactExchangeJson);
+                    Mono<String> fetchRemoteMono;
+
+                    if (compareRemote) {
+                        fetchRemoteMono = Mono.defer(
+                                () -> fetchRemoteChanges(baseArtifact, branchedArtifact, FALSE, gitType, RefType.BRANCH)
+                                        .onErrorResume(error -> Mono.error(new AppsmithException(
+                                                AppsmithError.GIT_GENERIC_ERROR, error.getMessage()))));
+                    } else {
+                        fetchRemoteMono = Mono.just("ignored");
+                    }
+
+                    return Mono.zip(prepareForStatus, fetchRemoteMono)
+                            .then(gitHandlingService.getStatus(jsonTransformationDTO));
+                })
+                .doFinally(signalType -> gitRedisUtils.releaseFileLock(baseArtifactId, isFileLock))
+                .onErrorResume(throwable -> {
+                    /*
+                     in case of any error, the global exception handler will release the lock
+                     hence we don't need to do that manually
+                    */
+                    log.error(
+                            "Error to get status for application: {}, branch: {}",
+                            baseArtifactId,
+                            finalBranchName,
+                            throwable);
+                    return Mono.error(new AppsmithException(AppsmithError.GIT_GENERIC_ERROR, throwable.getMessage()));
+                });
+
+        return Mono.zip(statusMono, sessionUserService.getCurrentUser())
+                .elapsed()
+                .flatMap(objects -> {
+                    Long elapsedTime = objects.getT1();
+                    GitStatusDTO gitStatusDTO = objects.getT2().getT1();
+                    User currentUser = objects.getT2().getT2();
+                    String flowName;
+                    if (compareRemote) {
+                        flowName = AnalyticsEvents.GIT_STATUS.getEventName();
+                    } else {
+                        flowName = AnalyticsEvents.GIT_STATUS_WITHOUT_FETCH.getEventName();
+                    }
+
+                    return gitAnalyticsUtils
+                            .sendUnitExecutionTimeAnalyticsEvent(flowName, elapsedTime, currentUser, branchedArtifact)
+                            .thenReturn(gitStatusDTO);
+                })
+                .name(OPS_STATUS)
+                .tap(Micrometer.observation(observationRegistry));
+    }
+
     public Mono<String> fetchRemoteChanges(
             Artifact baseArtifact, Artifact refArtifact, boolean isFileLock, GitType gitType, RefType refType) {
 
@@ -967,7 +1100,9 @@ public Mono<String> fetchRemoteChanges(
                 .then(Mono.defer(() ->
                         gitHandlingService.fetchRemoteChanges(jsonTransformationDTO, baseArtifactGitData.getGitAuth())))
                 .flatMap(fetchedRemoteStatusString -> {
-                    return gitRedisUtils.releaseFileLock(baseArtifactId).thenReturn(fetchedRemoteStatusString);
+                    return gitRedisUtils
+                            .releaseFileLock(baseArtifactId, isFileLock)
+                            .thenReturn(fetchedRemoteStatusString);
                 })
                 .onErrorResume(throwable -> {
                     /*
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/GitHandlingServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/GitHandlingServiceCE.java
index de387a9e75ee..57a2847af58c 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/GitHandlingServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/GitHandlingServiceCE.java
@@ -1,5 +1,6 @@
 package com.appsmith.server.git.central;
 
+import com.appsmith.external.dtos.GitStatusDTO;
 import com.appsmith.git.dto.CommitDTO;
 import com.appsmith.server.domains.Artifact;
 import com.appsmith.server.domains.GitArtifactMetadata;
@@ -51,6 +52,7 @@ Mono<Boolean> initialiseReadMe(
 
     Mono<String> createFirstCommit(ArtifactJsonTransformationDTO jsonTransformationDTO, CommitDTO commitDTO);
 
+    // TODO: provide a proper name
     Mono<Boolean> prepareChangesToBeCommitted(
             ArtifactJsonTransformationDTO jsonTransformationDTO, ArtifactExchangeJson artifactExchangeJson);
 
@@ -61,4 +63,6 @@ Mono<Tuple2<? extends Artifact, String>> commitArtifact(
 
     Mono<? extends ArtifactExchangeJson> recreateArtifactJsonFromLastCommit(
             ArtifactJsonTransformationDTO jsonTransformationDTO);
+
+    Mono<GitStatusDTO> getStatus(ArtifactJsonTransformationDTO jsonTransformationDTO);
 }
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/fs/GitFSServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/fs/GitFSServiceCEImpl.java
index 27dc09fde456..6b6f412c1e1e 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/fs/GitFSServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/fs/GitFSServiceCEImpl.java
@@ -2,6 +2,7 @@
 
 import com.appsmith.external.constants.AnalyticsEvents;
 import com.appsmith.external.dtos.GitBranchDTO;
+import com.appsmith.external.dtos.GitStatusDTO;
 import com.appsmith.external.git.constants.GitConstants;
 import com.appsmith.external.git.constants.GitSpan;
 import com.appsmith.external.git.handler.FSGitHandler;
@@ -617,4 +618,19 @@ public Mono<? extends ArtifactExchangeJson> recreateArtifactJsonFromLastCommit(
                     workspaceId, baseArtifactId, repoName, refName, artifactType);
         });
     }
+
+    @Override
+    public Mono<GitStatusDTO> getStatus(ArtifactJsonTransformationDTO jsonTransformationDTO) {
+        String workspaceId = jsonTransformationDTO.getWorkspaceId();
+        String baseArtifactId = jsonTransformationDTO.getBaseArtifactId();
+        String repoName = jsonTransformationDTO.getRepoName();
+        String refName = jsonTransformationDTO.getRefName();
+
+        ArtifactType artifactType = jsonTransformationDTO.getArtifactType();
+        GitArtifactHelper<?> gitArtifactHelper = gitArtifactHelperResolver.getArtifactHelper(artifactType);
+        Path repoSuffix = gitArtifactHelper.getRepoSuffixPath(workspaceId, baseArtifactId, repoName);
+
+        Path repoPath = fsGitHandler.createRepoPath(repoSuffix);
+        return fsGitHandler.getStatus(repoPath, refName);
+    }
 }

From 7d556edfc0da3830352c75fcf7625d14d4e8d4da Mon Sep 17 00:00:00 2001
From: sondermanish <sonder.manish@gmail.com>
Date: Sun, 15 Dec 2024 16:11:38 +0530
Subject: [PATCH 2/9] added spotless

---
 .../com/appsmith/server/git/central/CentralGitServiceCE.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/CentralGitServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/CentralGitServiceCE.java
index e92f22cb4f37..40b65564d7e3 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/CentralGitServiceCE.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/CentralGitServiceCE.java
@@ -36,5 +36,5 @@ Mono<String> fetchRemoteChanges(
     Mono<? extends Artifact> discardChanges(String branchedArtifactId, ArtifactType artifactType, GitType gitType);
 
     Mono<GitStatusDTO> getStatus(
-        String branchedArtifactId, boolean compareRemote, ArtifactType artifactType, GitType gitType);
+            String branchedArtifactId, boolean compareRemote, ArtifactType artifactType, GitType gitType);
 }

From 21933b8455aece0eb77603a4ca24c248134a991f Mon Sep 17 00:00:00 2001
From: sondermanish <sonder.manish@gmail.com>
Date: Mon, 16 Dec 2024 12:10:30 +0530
Subject: [PATCH 3/9] reverted config file commit

---
 app/server/.run/ServerApplication.run.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/server/.run/ServerApplication.run.xml b/app/server/.run/ServerApplication.run.xml
index 660f5e60663e..f5b48b1caea4 100644
--- a/app/server/.run/ServerApplication.run.xml
+++ b/app/server/.run/ServerApplication.run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="ServerApplication" type="Application" factoryName="Application" nameIsGenerated="true">
-    <option name="ALTERNATIVE_JRE_PATH" value="/Library/Java/JavaVirtualMachines/openjdk-17.jdk/Contents/Home" />
+    <option name="ALTERNATIVE_JRE_PATH" value="temurin-17"" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="INCLUDE_PROVIDED_SCOPE" value="true" />
     <option name="MAIN_CLASS_NAME" value="com.appsmith.server.ServerApplication" />
@@ -21,4 +21,4 @@
       <option name="Make" enabled="true" />
     </method>
   </configuration>
-</component>
\ No newline at end of file
+</component>

From 4cd584fcfd2ae881d6fe92b6ead4c671602fa4f1 Mon Sep 17 00:00:00 2001
From: sondermanish <sonder.manish@gmail.com>
Date: Mon, 16 Dec 2024 12:11:43 +0530
Subject: [PATCH 4/9] reverted config changes

---
 app/server/.run/ServerApplication.run.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/server/.run/ServerApplication.run.xml b/app/server/.run/ServerApplication.run.xml
index f5b48b1caea4..7d45805664a7 100644
--- a/app/server/.run/ServerApplication.run.xml
+++ b/app/server/.run/ServerApplication.run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="ServerApplication" type="Application" factoryName="Application" nameIsGenerated="true">
-    <option name="ALTERNATIVE_JRE_PATH" value="temurin-17"" />
+    <option name="ALTERNATIVE_JRE_PATH" value="temurin-17" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="INCLUDE_PROVIDED_SCOPE" value="true" />
     <option name="MAIN_CLASS_NAME" value="com.appsmith.server.ServerApplication" />

From a7b86065148786587eefefe8a26405e4c3c36468 Mon Sep 17 00:00:00 2001
From: sondermanish <sonder.manish@gmail.com>
Date: Mon, 16 Dec 2024 12:12:16 +0530
Subject: [PATCH 5/9] reverted config changes

---
 app/server/.run/ServerApplication.run.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/server/.run/ServerApplication.run.xml b/app/server/.run/ServerApplication.run.xml
index 7d45805664a7..58fbf44b4c2a 100644
--- a/app/server/.run/ServerApplication.run.xml
+++ b/app/server/.run/ServerApplication.run.xml
@@ -22,3 +22,4 @@
     </method>
   </configuration>
 </component>
+

From 9f2f3bc33adb731b7503497c8d9af2948b056b3e Mon Sep 17 00:00:00 2001
From: sondermanish <sonder.manish@gmail.com>
Date: Mon, 16 Dec 2024 12:13:31 +0530
Subject: [PATCH 6/9] reverted config changes

---
 app/server/.run/ServerApplication.run.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/server/.run/ServerApplication.run.xml b/app/server/.run/ServerApplication.run.xml
index 58fbf44b4c2a..7d45805664a7 100644
--- a/app/server/.run/ServerApplication.run.xml
+++ b/app/server/.run/ServerApplication.run.xml
@@ -22,4 +22,3 @@
     </method>
   </configuration>
 </component>
-

From 592833efbb42812dff8fbd05c566c1fb45a44ce2 Mon Sep 17 00:00:00 2001
From: sondermanish <sonder.manish@gmail.com>
Date: Mon, 16 Dec 2024 12:32:01 +0530
Subject: [PATCH 7/9] changes to EOF for commit file

---
 app/server/.run/ServerApplication.run.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/server/.run/ServerApplication.run.xml b/app/server/.run/ServerApplication.run.xml
index 7d45805664a7..58fbf44b4c2a 100644
--- a/app/server/.run/ServerApplication.run.xml
+++ b/app/server/.run/ServerApplication.run.xml
@@ -22,3 +22,4 @@
     </method>
   </configuration>
 </component>
+

From f5dcc3f2743b1c4b2f7910b624c051f84b8ae1dd Mon Sep 17 00:00:00 2001
From: sondermanish <sonder.manish@gmail.com>
Date: Mon, 16 Dec 2024 12:37:48 +0530
Subject: [PATCH 8/9] added changes

---
 app/server/.run/ServerApplication.run.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/server/.run/ServerApplication.run.xml b/app/server/.run/ServerApplication.run.xml
index 58fbf44b4c2a..7d45805664a7 100644
--- a/app/server/.run/ServerApplication.run.xml
+++ b/app/server/.run/ServerApplication.run.xml
@@ -22,4 +22,3 @@
     </method>
   </configuration>
 </component>
-

From 73a48ae397ebd37ad68b96f88aeb9a9952cea98f Mon Sep 17 00:00:00 2001
From: sondermanish <sonder.manish@gmail.com>
Date: Mon, 16 Dec 2024 12:54:48 +0530
Subject: [PATCH 9/9] maded EOF change to config file

---
 app/server/.run/ServerApplication.run.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/server/.run/ServerApplication.run.xml b/app/server/.run/ServerApplication.run.xml
index 7d45805664a7..96810c492986 100644
--- a/app/server/.run/ServerApplication.run.xml
+++ b/app/server/.run/ServerApplication.run.xml
@@ -21,4 +21,4 @@
       <option name="Make" enabled="true" />
     </method>
   </configuration>
-</component>
+</component>
\ No newline at end of file