リファクタ時の不要な変更をRevert

{cocoide} · {cocoide} · commit 09f7c6dafcb1 · 2023-10-05T15:31:57.000+09:00
diff --git a/internal/handler/separate_commit.go b/internal/handler/separate_commit.go
@@ -2,7 +2,7 @@ package handler
 
 import (
 	"context"
-	entity2 "github.com/cocoide/commitify-grpc-server/internal/domain/entity"
+	"github.com/cocoide/commitify-grpc-server/internal/domain/entity"
 	"github.com/cocoide/commitify-grpc-server/internal/usecase"
 	pb "github.com/cocoide/commitify-grpc-server/pkg/grpc"
 )
@@ -17,13 +17,13 @@ type separateCommitServer struct {
 }
 
 func (s *separateCommitServer) GenerateMultipleCommitMessage(ctx context.Context, req *pb.SeparateCommitRequest) (*pb.SeparateCommitResponse, error) {
-	var fileChanges []entity2.FileChange
+	var fileChanges []entity.FileChange
 
 	for _, v := range req.FileChanges {
-		fileChanges = append(fileChanges, entity2.ConvertPbToFileChange(v))
+		fileChanges = append(fileChanges, entity.ConvertPbToFileChange(v))
 	}
-	format := entity2.ConvertPbCodeFormatToEntity(req.CodeFormat)
-	language := entity2.ConvertPbLanguageToEntity(req.Language)
+	format := entity.ConvertPbCodeFormatToEntity(req.CodeFormat)
+	language := entity.ConvertPbLanguageToEntity(req.Language)
 
 	commitMessages, err := s.su.GenerateMultipleFileMessages(fileChanges, format, language)
 	if err != nil {
diff --git a/internal/usecase/separate_commit.go b/internal/usecase/separate_commit.go
@@ -1,7 +1,7 @@
 package usecase
 
 import (
-	entity2 "github.com/cocoide/commitify-grpc-server/internal/domain/entity"
+	"github.com/cocoide/commitify-grpc-server/internal/domain/entity"
 	"github.com/cocoide/commitify-grpc-server/internal/domain/service"
 	"sort"
 	"strings"
@@ -18,26 +18,26 @@ func NewSeparateCommitUsecaes(nlp service.NLPService, lang service.LangService,
 	return &SeparateCommitUsecase{nlp: nlp, lang: lang, cu: cu}
 }
 
-func (u *SeparateCommitUsecase) GenerateMultipleFileMessages(changes []entity2.FileChange, format entity2.CodeFormatType, language entity2.LanguageType) ([]entity2.SeparatedCommitMessage, error) {
-	var result []entity2.SeparatedCommitMessage
+func (u *SeparateCommitUsecase) GenerateMultipleFileMessages(changes []entity.FileChange, format entity.CodeFormatType, language entity.LanguageType) ([]entity.SeparatedCommitMessage, error) {
+	var result []entity.SeparatedCommitMessage
 	var wg sync.WaitGroup
 	var mu sync.Mutex
 	var firstError error
 
 	for _, change := range changes {
 		wg.Add(1)
-		go func(change entity2.FileChange) {
+		go func(change entity.FileChange) {
 			defer wg.Done()
 
 			var messages []string
 			var err error
 			code := u.generateCodePrompt(change)
 			switch format {
-			case entity2.NormalFormat:
+			case entity.NormalFormat:
 				messages, err = u.cu.GenerateNormalMessage(code, language)
-			case entity2.EmojiFormat:
+			case entity.EmojiFormat:
 				messages, err = u.cu.GenerateEmojiMessage(code, language)
-			case entity2.PrefixFormat:
+			case entity.PrefixFormat:
 				messages, err = u.cu.GeneratePrefixMessage(code, language)
 			}
 			if err != nil {
@@ -50,7 +50,7 @@ func (u *SeparateCommitUsecase) GenerateMultipleFileMessages(changes []entity2.F
 			}
 
 			mu.Lock()
-			result = append(result, entity2.SeparatedCommitMessage{
+			result = append(result, entity.SeparatedCommitMessage{
 				Messages:   messages,
 				Filename:   change.Filename,
 				ChangeType: change.ChangeType,
@@ -66,22 +66,22 @@ func (u *SeparateCommitUsecase) GenerateMultipleFileMessages(changes []entity2.F
 	return result, nil
 }
 
-func (u *SeparateCommitUsecase) generateCodePrompt(change entity2.FileChange) string {
+func (u *SeparateCommitUsecase) generateCodePrompt(change entity.FileChange) string {
 	var builder strings.Builder
 
 	builder.WriteString(change.Filename)
 	builder.WriteString(", Diff: [")
 
 	// Combine added and deleted lines into a single slice
-	allLines := make([]entity2.LineDiff, 0, len(change.CodeDiff.Added)+len(change.CodeDiff.Deleted))
+	allLines := make([]entity.LineDiff, 0, len(change.CodeDiff.Added)+len(change.CodeDiff.Deleted))
 	for _, lineDiff := range change.CodeDiff.Added {
 		if lineDiff.Line != "" {
-			allLines = append(allLines, entity2.LineDiff{Index: lineDiff.Index, Line: "+ " + lineDiff.Line})
+			allLines = append(allLines, entity.LineDiff{Index: lineDiff.Index, Line: "+ " + lineDiff.Line})
 		}
 	}
 	for _, lineDiff := range change.CodeDiff.Deleted {
 		if lineDiff.Line != "" {
-			allLines = append(allLines, entity2.LineDiff{Index: lineDiff.Index, Line: "- " + lineDiff.Line})
+			allLines = append(allLines, entity.LineDiff{Index: lineDiff.Index, Line: "- " + lineDiff.Line})
 		}
 	}
 
