services/git:bugfix - error git diff breaking parse and invalid filepath

Signed-off-by: Nathan Martins <nathan.martins@zup.com.br>
ZupIT · Dec 3, 2021 · 259fe2b · 259fe2b
1 parent 59c327f
commit 259fe2b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/internal/services/formatters/service.go b/internal/services/formatters/service.go
@@ -143,10 +143,15 @@ func (s *Service) RemoveSrcFolderFromPath(path string) string {
 	if path == "" || len(path) <= 4 || !strings.Contains(path[:4], "src") {
 		return path
 	}
+
+	path = strings.Replace(filepath.ToSlash(path), "/src/", "", 1)
+
 	if runtime.GOOS == "windows" {
-		return strings.Replace(path, `src\`, "", 1)
+		return filepath.FromSlash(path)
 	}
-	return strings.Replace(path, "src/", "", 1)
+
+
+	return path
 }
 
 func (s *Service) GetCodeWithMaxCharacters(code string, column int) string {

diff --git a/internal/services/formatters/service_test.go b/internal/services/formatters/service_test.go
@@ -423,9 +423,14 @@ func TestService_GetCodeWithMaxCharacters(t *testing.T) {
 func TestRemoveSrcFolderFromPath(t *testing.T) {
 	t.Run("should return path without src prefix", func(t *testing.T) {
 		monitorController := NewFormatterService(&analysis.Analysis{}, testutil.NewDockerMock(), &config.Config{})
-		result := monitorController.RemoveSrcFolderFromPath(filepath.Join("src", "something"))
+		result := monitorController.RemoveSrcFolderFromPath(filepath.Join("/", "src", "something"))
 		assert.Equal(t, filepath.Base("something"), result)
 	})
+	t.Run("should return path without src prefix", func(t *testing.T) {
+		monitorController := NewFormatterService(&analysis.Analysis{}, testutil.NewDockerMock(), &config.Config{})
+		result := monitorController.RemoveSrcFolderFromPath(filepath.Join("/", "src", "something", "test"))
+		assert.Equal(t, filepath.Join("something", "test"), result)
+	})
 	t.Run("should return path without diff when src is after 4 index position", func(t *testing.T) {
 		monitorController := NewFormatterService(&analysis.Analysis{}, testutil.NewDockerMock(), &config.Config{})
 		result := monitorController.RemoveSrcFolderFromPath(filepath.Join("something", "src"))

diff --git a/internal/services/git/git.go b/internal/services/git/git.go
@@ -84,6 +84,7 @@ func (g *Git) executeCMD(line, filePath string) ([]byte, error) {
 		"git",
 		"log",
 		"-1",
+		"--no-patch",
 		`--format={
 			^^^^^author^^^^^: ^^^^^%an^^^^^,
 			^^^^^email^^^^^:^^^^^%ae^^^^^,