Fix lint & test

Author: noah

internal/interactor/global.go

@@ -0,0 +1,8 @@
+package interactor
+
+// ContextKey is used for context access.
+type ContextKey int
+
+const (
+	KeyUser ContextKey = iota
+)

internal/interactor/interface.go

@@ -9,8 +9,6 @@ import (
 	"github.com/gitploy-io/gitploy/model/extent"
 )
 
-const KeyUser = "gitploy.user"
-
 type (
 	Store interface {
 		UserStore

internal/server/api/v1/repos/deployment_change.go

@@ -2,7 +2,6 @@ package repos
 
 import (
 	"context"
-	"fmt"
 	"net/http"
 	"strconv"
 
@@ -12,7 +11,6 @@ import (
 	i "github.com/gitploy-io/gitploy/internal/interactor"
 	gb "github.com/gitploy-io/gitploy/internal/server/global"
 	"github.com/gitploy-io/gitploy/model/ent"
-	"github.com/gitploy-io/gitploy/model/ent/deployment"
 	"github.com/gitploy-io/gitploy/pkg/e"
 )
 
@@ -48,7 +46,7 @@ func (s *DeploymentAPI) ListChanges(c *gin.Context) {
 	vr, _ := c.Get(KeyRepo)
 	re := vr.(*ent.Repo)
 
-	ctx := context.WithValue(c.Request.Context(), gb.KeyUser, u)
+	ctx := context.WithValue(c.Request.Context(), i.KeyUser, u)
 
 	d, err := s.i.FindDeploymentOfRepoByNumber(ctx, re, number)
 	if err != nil {
@@ -67,33 +65,6 @@ func (s *DeploymentAPI) ListChanges(c *gin.Context) {
 		return
 	}
 
+	s.log.Info("Get the changed commits for the deployment.", zap.Int("number", number))
 	gb.Response(c, http.StatusOK, commits)
 }
-
-func (s *DeploymentAPI) getCommitSha(ctx context.Context, u *ent.User, re *ent.Repo, typ deployment.Type, ref string) (string, error) {
-	switch typ {
-	case deployment.TypeCommit:
-		c, err := s.i.GetCommit(ctx, u, re, ref)
-		if err != nil {
-			return "", err
-		}
-
-		return c.SHA, nil
-	case deployment.TypeBranch:
-		b, err := s.i.GetBranch(ctx, u, re, ref)
-		if err != nil {
-			return "", err
-		}
-
-		return b.CommitSHA, nil
-	case deployment.TypeTag:
-		t, err := s.i.GetTag(ctx, u, re, ref)
-		if err != nil {
-			return "", err
-		}
-
-		return t.CommitSHA, nil
-	default:
-		return "", fmt.Errorf("Type must be one of commit, branch, tag.")
-	}
-}

internal/server/api/v1/repos/deployment_change_test.go

@@ -55,21 +55,12 @@ func TestDeploymentAPI_ListChanges(t *testing.T) {
 
 		m.
 			EXPECT().
-			FindPrevSuccessDeployment(ctx, any).
-			Return(&ent.Deployment{
-				ID:     5,
-				Sha:    base,
-				Status: deployment.StatusSuccess,
-			}, nil)
-
-		m.
-			EXPECT().
-			CompareCommits(ctx, any, any, base, head, gomock.Any()).
+			CompareCommitsFromLastestDeployment(ctx, any, gomock.AssignableToTypeOf(&ent.Deployment{}), any).
 			Return([]*extent.Commit{
 				{
 					SHA: head,
 				},
-			}, []*extent.CommitFile{}, nil)
+			}, nil)
 
 		// Ready the router to handle it.
 		gin.SetMode(gin.ReleaseMode)