partial compare feature API merge

Author: neel1996

API/branchCompareApi.js

@@ -0,0 +1,16 @@
+const { gitBranchCompare } = require("../git/gitBranchCompare");
+const { getRepoPath } = require("../global/fetchGitRepoPath");
+
+async function branchCompareApi(repoId, baseBranch, compareBranch) {
+  const repoPath = getRepoPath(repoId);
+
+  if (baseBranch !== compareBranch) {
+    return await gitBranchCompare(repoPath, baseBranch, compareBranch);
+  } else {
+    return {
+      message: "Nothing to compare as the branches are the same",
+    };
+  }
+}
+
+module.exports.branchCompareApi = branchCompareApi;

API/commitLogSearchApi.js

@@ -4,6 +4,14 @@ const { gitCommitLogSearchHandler } = require("../git/gitCommitLogSearchApi");
 
 async function gitCommitLogDbSerchApi(repoId, searchCategory, searchKey) {
   let searchQuery = "";
+  const db = new sqlite.Database(
+    path.join(__dirname, "..", "/database/commitLogs.sqlite"),
+    (err) => {
+      if (err) {
+        console.log("ERROR: Unable to open commit log SQLITE DB", err);
+      }
+    }
+  );
 
   switch (searchCategory) {
     case "hash":

git/gitBranchCompare.js

@@ -0,0 +1,102 @@
+const { exec } = require("child_process");
+const util = require("util");
+const execPromisified = util.promisify(exec);
+
+async function gitBranchCompare(repoPath, baseBranch, compareBranch) {
+  let formattedCommitLogs = [];
+
+  const commitLogs = await execPromisified(
+    `git log --oneline ${compareBranch}..${baseBranch} --pretty=format:"%h||%an||%ad||%s" --date=short`,
+    { windowsHide: true, maxBuffer: 1024 * 1024, cwd: repoPath }
+  )
+    .then((res) => {
+      const { stdout, stderr } = res;
+
+      if (stderr) {
+        console.log("ERROR", stderr);
+        return {
+          error: "Error occurred while comparing branches",
+        };
+      }
+
+      if (stdout) {
+        console.log(stdout.trim().split("\n"));
+        formattedCommitLogs = [...commitLogModel(stdout.trim().split("\n"))];
+
+        let dateGroupModel = [
+          {
+            date: "",
+            commits: [
+              {
+                hash: "",
+                author: "",
+                commitMessage: "",
+              },
+            ],
+          },
+        ];
+
+        let groupedCommits = [];
+
+        for (let i = 0; i < formattedCommitLogs.length; i++) {
+          let commitArray = [];
+          let dateGroup = {
+            date: formattedCommitLogs[i].commitDate,
+          };
+
+          for (var j = i; j < formattedCommitLogs.length; j++) {
+            let item = formattedCommitLogs[j];
+            if (formattedCommitLogs[i].commitDate === item.commitDate) {
+              commitArray.push({
+                hash: item.hash,
+                author: item.author,
+                commitMessage: item.commitMessage,
+              });
+            } else {
+              break;
+            }
+          }
+
+          i = j - 1;
+          dateGroup.commits = commitArray;
+          groupedCommits.push(dateGroup);
+        }
+
+        console.log(groupedCommits);
+
+        return groupedCommits;
+      }
+    })
+    .catch((err) => {
+      console.log("ERROR", err);
+      return {
+        error: "Error occurred while comparing branches",
+      };
+    });
+
+  return commitLogs;
+}
+
+function commitLogModel(commit) {
+  const formattedCommits = commit.map((item) => {
+    const splitCommit = item.split("||");
+
+    let commitObject = {
+      hash: "",
+      author: "",
+      commitDate: "",
+      commitMessage: "",
+    };
+
+    commitObject.hash = splitCommit[0];
+    commitObject.author = splitCommit[1];
+    commitObject.commitDate = splitCommit[2];
+    commitObject.commitMessage = splitCommit[3];
+
+    return commitObject;
+  });
+
+  return formattedCommits;
+}
+
+module.exports.gitBranchCompare = gitBranchCompare;

global/globalAPIHandler.js

@@ -18,6 +18,7 @@ const {
   SETTINGS_PORT,
   GIT_FOLDER_CONTENT,
   CODE_FILE_VIEW,
+  BRANCH_COMPARE,
 } = require("./globalRouteStore");
 
 const graphqlHTTP = require("express-graphql");
@@ -56,6 +57,7 @@ const {
   gitFolderContentApi,
   gitCommitLogSearchFunction,
   codeFileViewFunction,
+  branchCompareApi,
 } = require("./globalFunctionStore");
 
 app.use(
@@ -104,6 +106,8 @@ app.use(
             return gitFolderContentApi(parsedPayload);
           case CODE_FILE_VIEW:
             return codeFileViewFunction(parsedPayload);
+          case BRANCH_COMPARE:
+            return branchCompareApi(parsedPayload);
           default:
             return { message: "Query Termination" };
         }

global/globalFunctionStore.js

@@ -18,6 +18,7 @@ const { gitAddRemoteApi } = require("../git/gitAddRemoteApi");
 const { gitDeleteBranchApi } = require("../git/gitBranchDeleteApi");
 const { gitFetchFolderContentApi } = require("../git/gitFolderDetailsApi");
 const { codeFileViewApi } = require("../API/codeFileViewApi");
+const { branchCompareApi } = require("../API/branchCompareApi");
 const {
   fetchDatabaseFile,
   fetchRepoDetails,
@@ -460,3 +461,10 @@ module.exports.gitAddRemoteRepoApi = gitAddRemoteRepoApi = async (
 ) => {
   return await gitAddRemoteApi(repoId, remoteName, remoteUrl);
 };
+
+module.exports.branchCompareApi = branchCompareFunction = async (payload) => {
+  const { repoId, baseBranch, compareBranch } = JSON.parse(payload);
+  return await {
+    branchCompare: branchCompareApi(repoId, baseBranch, compareBranch),
+  };
+};

global/globalRouteStore.js

@@ -12,4 +12,5 @@ module.exports.SETTINGS_DBPATH = "SETTINGS_DBPATH";
 module.exports.SETTINGS_PORT = "SETTINGS_PORT";
 module.exports.SETTINGS_REPODETAILS = "SETTINGS_REPODETAILS";
 module.exports.GIT_FOLDER_CONTENT = "GIT_FOLDER_CONTENT";
-module.exports.CODE_FILE_VIEW = "CODE_FILE_VIEW";
+module.exports.CODE_FILE_VIEW = "CODE_FILE_VIEW";
+module.exports.BRANCH_COMPARE = "BRANCH_COMPARE";

global/gqlGlobalAPISchema.js

@@ -21,6 +21,7 @@ const globalAPISchema = new buildSchema(
             settingsPortDetails: Int!
             settingsRepoDetails: [settingsFetchRepoResults]!
             codeFileDetails: langType!
+            branchCompare: [branchCompareType]!
         }
 
         type healthCheckResults{
@@ -111,6 +112,17 @@ const globalAPISchema = new buildSchema(
             prism: String
         }
 
+        type branchCompareType{
+            date: String!
+            commits: [compareCommitType]
+        }
+
+        type compareCommitType{
+            hash: String!
+            author: String
+            commitMessage: String!
+        }
+
         type GitConvexMutation{
             addRepo(repoName: String!, repoPath: String!, initSwitch: Boolean!, cloneSwitch: Boolean!, cloneUrl: String): addRepoStatus!
             setBranch(repoId: String!, branch: String!): String!