pr comments

Author: subhashish-devtron

pkg/git/GitFormatter.go

@@ -12,7 +12,7 @@ const _dl_ = "devtron_delimiter"
 
 // GITFORMAT Refer git official doc for supported placeholders to add new fields
 // Need to make sure the output does not break the json structure which is ensured
-//by having the _dl_ delimiter which is later replaced by quotes
+// by having the _dl_ delimiter which is later replaced by quotes
 var GITFORMAT = "--pretty=format:{" +
 	_dl_ + "commit" + _dl_ + ":" + _dl_ + "%H" + _dl_ + "," +
 	_dl_ + "parent" + _dl_ + ":" + _dl_ + "%P" + _dl_ + "," +
@@ -57,7 +57,7 @@ func parseFormattedLogOutput(out string) ([]GitCommitFormat, error) {
 	//replace the delimiter with quotes to make it parsable json
 	logOut = strings.ReplaceAll(logOut, _dl_, `"`)
 
-	logOut = logOut[1 : len(logOut)-2]   // trim surround characters (surrounding quotes and trailing com,a)
+	logOut = logOut[1 : len(logOut)-2]   // trim surround characters (surrounding quotes and trailing comma)
 	logOut = fmt.Sprintf("[%s]", logOut) // Add []
 
 	var gitCommitFormattedList []GitCommitFormat
@@ -67,3 +67,25 @@ func parseFormattedLogOutput(out string) ([]GitCommitFormat, error) {
 	}
 	return gitCommitFormattedList, nil
 }
+
+func (formattedCommit GitCommitFormat) transformToCommit() *Commit {
+	return &Commit{
+		Hash: &Hash{
+			Long: formattedCommit.Commit,
+		},
+		Author: &Author{
+			Name:  formattedCommit.Author.Name,
+			Email: formattedCommit.Author.Email,
+			Date:  formattedCommit.Author.Date,
+		},
+		Committer: &Committer{
+			Name:  formattedCommit.Commiter.Name,
+			Email: formattedCommit.Commiter.Email,
+			Date:  formattedCommit.Commiter.Date,
+		},
+		Tag:     &Tag{},
+		Tree:    &Tree{},
+		Subject: formattedCommit.Subject,
+		Body:    formattedCommit.Body,
+	}
+}

pkg/git/RepositoryManagerAnalytics.go

@@ -214,7 +214,17 @@ func (impl RepositoryManagerAnalyticsImpl) ChangesSinceByRepositoryForAnalytics(
 	GitChanges.FileStats = fileStats
 	impl.logger.Debugw("computed files stats", "filestats", fileStats)
 
+	commits, err := impl.computeCommitDiff(gitCtx, checkoutPath, oldHash, newHash, repository)
+	if err != nil {
+		return nil, err
+	}
+	GitChanges.Commits = commits
+	return GitChanges, nil
+}
+
+func (impl RepositoryManagerAnalyticsImpl) computeCommitDiff(gitCtx GitContext, checkoutPath string, oldHash plumbing.Hash, newHash plumbing.Hash, repository *GitRepository) ([]*Commit, error) {
 	var commitsCli, commitsGoGit []*Commit
+	var err error
 	if impl.configuration.UseGitCli || impl.configuration.AnalyticsDebug {
 		commitsCli, err = impl.gitManager.LogMergeBase(gitCtx, checkoutPath, oldHash.String(), newHash.String())
 		if err != nil {
@@ -234,15 +244,13 @@ func (impl RepositoryManagerAnalyticsImpl) ChangesSinceByRepositoryForAnalytics(
 		}
 	}
 	if impl.configuration.AnalyticsDebug {
-		impl.logOldestCommitComparison(commitsGoGit, commitsCli, checkoutPath, Old, New)
+		impl.logOldestCommitComparison(commitsGoGit, commitsCli, checkoutPath, oldHash.String(), newHash.String())
 	}
 
 	if !impl.configuration.UseGitCli {
-		GitChanges.Commits = commitsGoGit
-	} else {
-		GitChanges.Commits = commitsCli
+		return commitsGoGit, nil
 	}
-	return GitChanges, nil
+	return commitsCli, nil
 }
 
 func (impl RepositoryManagerAnalyticsImpl) logOldestCommitComparison(commitsGoGit []*Commit, commitsCli []*Commit, checkoutPath string, old string, new string) {
@@ -324,29 +332,8 @@ func processGitLogOutputForAnalytics(out string) ([]*Commit, error) {
 	if err != nil {
 		return gitCommits, err
 	}
-
 	for _, formattedCommit := range gitCommitFormattedList {
-
-		cm := Commit{
-			Hash: &Hash{
-				Long: formattedCommit.Commit,
-			},
-			Author: &Author{
-				Name:  formattedCommit.Author.Name,
-				Email: formattedCommit.Author.Email,
-				Date:  formattedCommit.Author.Date,
-			},
-			Committer: &Committer{
-				Name:  formattedCommit.Commiter.Name,
-				Email: formattedCommit.Commiter.Email,
-				Date:  formattedCommit.Commiter.Date,
-			},
-			Tag:     &Tag{},
-			Tree:    &Tree{},
-			Subject: formattedCommit.Subject,
-			Body:    formattedCommit.Body,
-		}
-		gitCommits = append(gitCommits, &cm)
+		gitCommits = append(gitCommits, formattedCommit.transformToCommit())
 	}
 	return gitCommits, nil
 }