chore: FS layer has additional reset responsibility before reconstruction

app/server/appsmith-git/src/main/java/com/appsmith/git/handler/ce/FSGitHandlerCEImpl.java

@@ -1414,6 +1414,18 @@ private Mono<Ref> resetToLastCommit(Git git) {
                 .subscribeOn(scheduler);
     }
 
+    /**
+     * reset to last commit on the current branch itself but doesn't checkout to any specific branch
+     * @param repoSuffix suffixedPath used to generate the base repo path this includes workspaceId, defaultAppId, repoName
+     * @return a boolean whether the operation was successfull or not
+     */
+    public Mono<Boolean> resetToLastCommit(Path repoSuffix) {
+        return Mono.using(
+                () -> Git.open(createRepoPath(repoSuffix).toFile()),
+                git -> this.resetToLastCommit(git).thenReturn(true).onErrorReturn(false),
+                Git::close);
+    }
+
     public Mono<Boolean> resetToLastCommit(Path repoSuffix, String branchName) {
         return Mono.using(
                 () -> Git.open(createRepoPath(repoSuffix).toFile()),

app/server/appsmith-interfaces/src/main/java/com/appsmith/external/git/handler/FSGitHandler.java

@@ -203,6 +203,13 @@ Mono<String> fetchRemote(
      */
     Mono<Boolean> resetToLastCommit(Path repoSuffix, String branchName) throws GitAPIException, IOException;
 
+    /**
+     * This method will reset the repo to last commit for the current branch on which it's present
+     * @param repoSuffix suffixedPath used to generate the base repo path this includes workspaceId, defaultAppId, repoName
+     * @return success status
+     */
+    Mono<Boolean> resetToLastCommit(Path repoSuffix);
+
     /**
      *
      * @param repoSuffix suffixedPath used to generate the base repo path this includes workspaceId, defaultAppId, repoName

app/server/appsmith-server/src/main/java/com/appsmith/server/git/central/CentralGitServiceCEImpl.java

@@ -869,7 +869,7 @@ protected Mono<? extends Artifact> createReference(
                                                 new AppsmithException(
                                                         AppsmithError.GIT_ACTION_FAILED,
                                                         "ref creation",
-                                                        "either ref name is already exists or it doesn't meet naming criteria, or the artifact is not in a publishable state"));
+                                                        "either ref name already exists or it doesn't meet naming criteria, or the artifact is not in a publishable state"));
                                     }
 
                                     Mono<? extends Artifact> newArtifactFromSourceMono = generateArtifactForRefCreation(

app/server/appsmith-server/src/main/java/com/appsmith/server/git/fs/GitFSServiceCEImpl.java

@@ -275,8 +275,18 @@ public void setRepositoryDetailsInGitArtifactMetadata(
     @Override
     public Mono<? extends ArtifactExchangeJson> reconstructArtifactJsonFromGitRepository(
             ArtifactJsonTransformationDTO artifactJsonTransformationDTO) {
-        return commonGitFileUtils.constructArtifactExchangeJsonFromGitRepositoryWithAnalytics(
-                artifactJsonTransformationDTO);
+        GitArtifactHelper<?> gitArtifactHelper =
+                gitArtifactHelperResolver.getArtifactHelper(artifactJsonTransformationDTO.getArtifactType());
+
+        Path repoSuffix = gitArtifactHelper.getRepoSuffixPath(
+                artifactJsonTransformationDTO.getWorkspaceId(),
+                artifactJsonTransformationDTO.getBaseArtifactId(),
+                artifactJsonTransformationDTO.getRepoName());
+
+        return fsGitHandler
+                .resetToLastCommit(repoSuffix)
+                .then(commonGitFileUtils.constructArtifactExchangeJsonFromGitRepositoryWithAnalytics(
+                        artifactJsonTransformationDTO));
     }
 
     @Override