Commit log enhancement API changes

Author: neel1996

git/gitCommitFilesApi.js

@@ -0,0 +1,50 @@
+const fetchRepopath = require("../global/fetchGitRepoPath");
+const { exec } = require("child_process");
+const util = require("util");
+const execPromisified = util.promisify(exec);
+
+const gitCommitFileApi = async (repoId, commitHash) => {
+  const repoPath = fetchRepopath.getRepoPath(repoId);
+  return await execPromisified(
+    `git diff-tree --no-commit-id --name-status -r ${commitHash}`,
+    { cwd: repoPath, windowsHide: true }
+  )
+    .then(({ stdout, stderr }) => {
+      if (stdout) {
+        const commitedFiles = stdout.trim().split("\n");
+        return commitedFiles.map((entry) => {
+          if (entry) {
+            const splitEntry = entry.split(/\s/gi);
+            return {
+              type: splitEntry[0],
+              fileName: splitEntry.slice(1, splitEntry.length).join(" "),
+            };
+          } else {
+            return {
+              type: "",
+              fileName: "",
+            };
+          }
+        });
+      } else {
+        console.log(stderr);
+        return [
+          {
+            type: "",
+            fileName: "",
+          },
+        ];
+      }
+    })
+    .catch((err) => {
+      console.log(err);
+      return [
+        {
+          type: "",
+          fileName: "",
+        },
+      ];
+    });
+};
+
+module.exports.gitCommitFileApi = gitCommitFileApi;

git/gitCommitLogsAPI.js

@@ -5,26 +5,79 @@ const execPromisified = util.promisify(exec);
 
 async function gitCommitLogHandler(repoId) {
   const repoPath = fetchRepopath.getRepoPath(repoId);
-  return await execPromisified(`git log --pretty=format:"%h||%an||%ad||%s"`, {
-    cwd: repoPath,
-    windowsHide: true,
-  }).then((res) => {
-    const { stdout, stderr } = res;
-
-    if (stdout && !stderr) {
-      let commits = stdout.trim();
-      let commitArray = commits.split("\n").map((commit) => {
-        return commitModel(commit);
-      });
-      return {
-        commits: commitArray,
-      };
-    } else {
+  return await execPromisified(
+    `git log --pretty=format:"%h||%an||%ad||%s" --date=short`,
+    {
+      cwd: repoPath,
+      windowsHide: true,
+    }
+  )
+    .then(async (res) => {
+      const { stdout, stderr } = res;
+
+      if (stdout && !stderr) {
+        let commits = stdout.trim();
+
+        let commitRelativeTime = await execPromisified(
+          `git log --pretty=format:"%ad" --date=relative`,
+          { cwd: repoPath, windowsHide: true }
+        )
+          .then(({ stdout, stderr }) => {
+            if (stdout) {
+              return stdout.trim().split("\n");
+            } else {
+              console.log(stderr);
+              return [];
+            }
+          })
+          .catch((err) => {
+            console.log(err);
+            return [];
+          });
+
+        let commitArray = commits.split("\n").map(async (commit, index) => {
+          commit += "||" + commitRelativeTime[index];
+          const commitFilesCount = await execPromisified(
+            `git diff-tree --no-commit-id --name-only -r ${
+              commit.split("||")[0]
+            }`,
+            { cwd: repoPath, windowsHide: true }
+          )
+            .then(({ stdout, stderr }) => {
+              if (stdout) {
+                return stdout.trim().split("\n").length;
+              } else {
+                console.log("Error occurred!");
+                return 0;
+              }
+            })
+            .catch((err) => {
+              console.log("Error occurred!");
+              return 0;
+            });
+          commit += "||" + commitFilesCount;
+          return commitModel(commit);
+        });
+        return {
+          commits: commitArray,
+        };
+      } else {
+        return {
+          commits: [],
+        };
+      }
+    })
+    .catch((err) => {
+      console.log("ERROR : Commit log collection Error!");
       return {
-        commits: [],
+        hash: "",
+        author: "",
+        commitTime: "",
+        commitMessage: "",
+        commitRelativeTime: "",
+        commitFilesCount: 0,
       };
-    }
-  });
+    });
 }
 
 function commitModel(commit) {
@@ -33,6 +86,8 @@ function commitModel(commit) {
     author: "",
     commitTime: "",
     commitMessage: "",
+    commitRelativeTime: "",
+    commitFilesCount: 0,
   };
 
   let commitSplit = commit.split("||");
@@ -41,6 +96,8 @@ function commitModel(commit) {
   commitObject.author = commitSplit[1];
   commitObject.commitTime = commitSplit[2];
   commitObject.commitMessage = commitSplit[3];
+  commitObject.commitRelativeTime = commitSplit[4];
+  commitObject.commitFilesCount = commitSplit[5];
 
   return commitObject;
 }

git/gitRepoStatus.js

@@ -34,6 +34,7 @@ const getGitStatus = async (repoPath) => {
       return isGitLogAvailable;
     })
     .catch((err) => {
+      console.log(err);
       isGitLogAvailable = false;
       return isGitLogAvailable;
     });
@@ -190,11 +191,19 @@ const getGitStatus = async (repoPath) => {
     (await execPromised(`git log -1 --oneline --pretty=format:"%s"`, {
       cwd: repoPath,
       windowsHide: true,
-    }).then((res) => {
-      if (res && !res.stderr) {
-        gitLatestCommit = res.stdout.trim();
-      }
-    }));
+    })
+      .then((res) => {
+        if (res && !res.stderr) {
+          gitLatestCommit = res.stdout.trim();
+        } else {
+          console.log(stderr);
+          gitLatestCommit = "No Commits in the Current Branch";
+        }
+      })
+      .catch((err) => {
+        console.log(err);
+        gitLatestCommit = "No Commits in the Current Branch";
+      }));
 
   //Module to get all git tracked files
   var gitTrackedFileDetails = [];

global/globalAPIHandler.js

@@ -11,6 +11,7 @@ const {
   REPO_TRACKED_DIFF,
   REPO_FILE_DIFF,
   COMMIT_LOGS,
+  COMMIT_FILES,
   GIT_STAGED_FILES,
   GIT_UNPUSHED_COMMITS,
   SETTINGS_DBPATH,
@@ -30,6 +31,7 @@ const {
   healthCheckFunction,
   repoDetailsFunction,
   gitCommitLogsFunction,
+  gitCommitFileFunction,
   gitGetStagedFiles,
   gitUnpushedCommits,
   gitSetBranch,
@@ -84,6 +86,8 @@ app.use(
             return gitFileDiffFunction(parsedPayload);
           case COMMIT_LOGS:
             return gitCommitLogsFunction(parsedPayload);
+          case COMMIT_FILES:
+            return gitCommitFileFunction(parsedPayload);
           case GIT_STAGED_FILES:
             return gitGetStagedFiles(parsedPayload);
           case GIT_UNPUSHED_COMMITS:

global/globalFunctionStore.js

@@ -5,6 +5,7 @@ const { getGitRepoStatus } = require("../git/gitRepoAPI");
 const { gitTrackedDiff } = require("../git/gitTrackedDiff");
 const { gitFileDifferenceHandler } = require("../git/gitFileDifferenceAPI");
 const { gitCommitLogHandler } = require("../git/gitCommitLogsAPI");
+const { gitCommitFileApi } = require("../git/gitCommitFilesApi");
 const { getStagedFiles } = require("../git/gitGetStagedFilesAPI");
 const { gitGetUnpushedCommits } = require("../git/gitGetUnpushedCommits");
 const { gitSetBranchApi } = require("../git/gitSetBranch.js");
@@ -93,6 +94,16 @@ module.exports.gitCommitLogsFunction = gitCommitLogsFunction = async (
   }
 };
 
+module.exports.gitCommitFileFunction = gitCommitFileFunction = async (
+  parsedPayload
+) => {
+  const { repoId, commitHash } = JSON.parse(parsedPayload);
+  console.log(await gitCommitFileApi(repoId, commitHash));
+  return {
+    gitCommitFiles: [...(await gitCommitFileApi(repoId, commitHash))],
+  };
+};
+
 module.exports.repoDetailsFunction = repoDetailsFunction = async (
   parsedPayload
 ) => {

global/globalRouteStore.js

@@ -2,6 +2,7 @@ module.exports.HEALTH_CHECK = "HEALTH_CHECK";
 module.exports.FETCH_REPO = "FETCH_REPO";
 module.exports.ADD_REPO = "ADD_REPO";
 module.exports.COMMIT_LOGS = "COMMIT_LOGS";
+module.exports.COMMIT_FILES = "COMMIT_FILES";
 module.exports.REPO_DETAILS = "REPO_DETAILS";
 module.exports.REPO_TRACKED_DIFF = "REPO_TRACKED_DIFF";
 module.exports.REPO_FILE_DIFF = "REPO_FILE_DIFF";

global/gqlGlobalAPISchema.js

@@ -14,6 +14,7 @@ const globalAPISchema = new buildSchema(
             gitChanges: gitChangeResults!
             gitFileLineChanges: gitFileLineChangeResults!
             gitCommitLogs: gitCommitLogResults!
+            gitCommitFiles: [commitFileType]!
             gitStagedFiles: gitStagedFileResults!
             gitUnpushedCommits: gitUnpushedCommitResults!
             settingsDatabasePath: String!
@@ -43,6 +44,13 @@ const globalAPISchema = new buildSchema(
             author: String,
             commitTime: String,
             commitMessage: String,
+            commitRelativeTime: String
+            commitFilesCount: Int
+        }
+
+        type commitFileType{
+            type: String!
+            fileName: String!
         }
 
         type gitUnpushedCommitResults{