Commit compare API modules

Author: neel1996

API/commitCompareApi.js

@@ -0,0 +1,16 @@
+const { gitCommitCompare } = require("../git/gitCommitCompareApi");
+const { getRepoPath } = require("../global/fetchGitRepoPath");
+
+async function commitCompareApi(repoId, baseCommit, compareCommit) {
+  const repoPath = getRepoPath(repoId);
+
+  if (baseCommit !== compareCommit) {
+    return await gitCommitCompare(repoPath, baseCommit, compareCommit);
+  } else {
+    return {
+      message: "Nothing to compare as the commits are the same",
+    };
+  }
+}
+
+module.exports.commitCompareApi = commitCompareApi;

git/gitCommitCompareApi.js

@@ -0,0 +1,57 @@
+const { exec } = require("child_process");
+const util = require("util");
+const execPromisified = util.promisify(exec);
+
+async function gitCommitCompare(repoPath, baseCommit, compareCommit) {
+  const diffFileItems = await execPromisified(
+    `git diff ${baseCommit}..${compareCommit} --raw`,
+    { windowsHide: true, maxBuffer: 1024 * 1024, cwd: repoPath }
+  )
+    .then((res) => {
+      const { stdout, stderr } = res;
+
+      if (stderr) {
+        console.log(stderr);
+        return {
+          message: "Error occurred while fetching commit difference",
+        };
+      }
+
+      if (stdout) {
+        const fileChanges = stdout.trim().split("\n");
+        let diffArray = [];
+
+        if (fileChanges) {
+          diffArray = fileChanges.map((change) => {
+            const splitItem = change.split(/\s/gi);
+
+            let status = splitItem[4];
+            let fileName = splitItem[splitItem.length - 1];
+
+            return {
+              status,
+              fileName,
+            };
+          });
+
+          return { difference: diffArray };
+        } else {
+          return {
+            message: "No difference found",
+          };
+        }
+      }
+    })
+    .catch((err) => {
+      console.log("ERROR", err);
+      return {
+        message: "Error occurred while comparing branches",
+      };
+    });
+
+  console.log(diffFileItems);
+
+  return diffFileItems;
+}
+
+module.exports.gitCommitCompare = gitCommitCompare;

global/globalAPIHandler.js

@@ -19,6 +19,7 @@ const {
   GIT_FOLDER_CONTENT,
   CODE_FILE_VIEW,
   BRANCH_COMPARE,
+  COMMIT_COMPARE,
 } = require("./globalRouteStore");
 
 const graphqlHTTP = require("express-graphql");
@@ -58,6 +59,7 @@ const {
   gitCommitLogSearchFunction,
   codeFileViewFunction,
   branchCompareApi,
+  commitCompareApi,
 } = require("./globalFunctionStore");
 
 app.use(
@@ -108,6 +110,8 @@ app.use(
             return codeFileViewFunction(parsedPayload);
           case BRANCH_COMPARE:
             return branchCompareApi(parsedPayload);
+          case COMMIT_COMPARE:
+            return commitCompareApi(parsedPayload);
           default:
             return { message: "Query Termination" };
         }

global/globalFunctionStore.js

@@ -19,6 +19,7 @@ const { gitDeleteBranchApi } = require("../git/gitBranchDeleteApi");
 const { gitFetchFolderContentApi } = require("../git/gitFolderDetailsApi");
 const { codeFileViewApi } = require("../API/codeFileViewApi");
 const { branchCompareApi } = require("../API/branchCompareApi");
+const { commitCompareApi } = require("../API/commitCompareApi");
 const {
   fetchDatabaseFile,
   fetchRepoDetails,
@@ -462,9 +463,26 @@ module.exports.gitAddRemoteRepoApi = gitAddRemoteRepoApi = async (
   return await gitAddRemoteApi(repoId, remoteName, remoteUrl);
 };
 
+/**
+ * @param {String} payload - Stringified JSON
+ * @returns {Object} branchCompare - list of all difference between two selected branches
+ */
+
 module.exports.branchCompareApi = branchCompareFunction = async (payload) => {
   const { repoId, baseBranch, compareBranch } = JSON.parse(payload);
   return await {
     branchCompare: branchCompareApi(repoId, baseBranch, compareBranch),
   };
 };
+
+/**
+ * @param {String} payload - Stringified JSON
+ * @returns {Object} branchCompare - list of all difference between two selected branches
+ */
+
+module.exports.commitCompareApi = commitCompareFunction = async (payload) => {
+  const { repoId, baseCommit, compareCommit } = JSON.parse(payload);
+  return await {
+    commitCompare: commitCompareApi(repoId, baseCommit, compareCommit),
+  };
+};

global/globalRouteStore.js

@@ -14,3 +14,4 @@ module.exports.SETTINGS_REPODETAILS = "SETTINGS_REPODETAILS";
 module.exports.GIT_FOLDER_CONTENT = "GIT_FOLDER_CONTENT";
 module.exports.CODE_FILE_VIEW = "CODE_FILE_VIEW";
 module.exports.BRANCH_COMPARE = "BRANCH_COMPARE";
+module.exports.COMMIT_COMPARE = "COMMIT_COMPARE";

global/gqlGlobalAPISchema.js

@@ -22,6 +22,7 @@ const globalAPISchema = new buildSchema(
             settingsRepoDetails: [settingsFetchRepoResults]!
             codeFileDetails: langType!
             branchCompare: [branchCompareType]!
+            commitCompare: commitCompareType!
         }
 
         type healthCheckResults{
@@ -117,12 +118,22 @@ const globalAPISchema = new buildSchema(
             commits: [compareCommitType]
         }
 
+        type commitCompareType{
+            message: String
+            difference: [commitCompareFileType]!
+        }
+
         type compareCommitType{
             hash: String!
             author: String
             commitMessage: String!
         }
 
+        type commitCompareFileType{
+            status: String!
+            fileName: String!
+        }
+
         type GitConvexMutation{
             addRepo(repoName: String!, repoPath: String!, initSwitch: Boolean!, cloneSwitch: Boolean!, cloneUrl: String): addRepoStatus!
             setBranch(repoId: String!, branch: String!): String!