Change the interface of CompareCommits...

Author: noah

internal/interactor/deployment.go

@@ -275,13 +275,7 @@ func (i *DeploymentInteractor) CreateDeploymentStatus(ctx context.Context, ds *e
 
 // CompareCommitsFromLastestDeployment returns the changed commit from the last deployment.
 // If there is no last deployment, an empty slice is returned.
-func (i *DeploymentInteractor) CompareCommitsFromLastestDeployment(ctx context.Context, r *ent.Repo, number int, options *ListOptions) ([]*extent.Commit, error) {
-	d, err := i.store.FindDeploymentOfRepoByNumber(ctx, r, number)
-	if err != nil {
-		i.log.Sugar().Errorf("Failed to find the deployment by ID(%d).", number)
-		return nil, err
-	}
-
+func (i *DeploymentInteractor) CompareCommitsFromLastestDeployment(ctx context.Context, r *ent.Repo, d *ent.Deployment, options *ListOptions) ([]*extent.Commit, error) {
 	if d.Status == deployment.StatusWaiting {
 		i.log.Info("The deployment is waiting, it doesn't have an SHA to compare.")
 		return []*extent.Commit{}, nil

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

@@ -50,7 +50,14 @@ func (s *DeploymentAPI) ListChanges(c *gin.Context) {
 
 	ctx := context.WithValue(c.Request.Context(), gb.KeyUser, u)
 
-	commits, err := s.i.CompareCommitsFromLastestDeployment(ctx, re, number, &i.ListOptions{
+	d, err := s.i.FindDeploymentOfRepoByNumber(ctx, re, number)
+	if err != nil {
+		s.log.Warn("Failed to find the deployment.", zap.Error(err))
+		gb.ResponseWithError(c, err)
+		return
+	}
+
+	commits, err := s.i.CompareCommitsFromLastestDeployment(ctx, re, d, &i.ListOptions{
 		Page:    page,
 		PerPage: perPage,
 	})

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

@@ -32,7 +32,7 @@ type (
 		DeployToRemote(ctx context.Context, u *ent.User, r *ent.Repo, d *ent.Deployment, env *extent.Env) (*ent.Deployment, error)
 		GetConfig(ctx context.Context, u *ent.User, r *ent.Repo) (*extent.Config, error)
 		GetEvaluatedConfig(ctx context.Context, u *ent.User, r *ent.Repo, v *extent.EvalValues) (*extent.Config, error)
-		CompareCommitsFromLastestDeployment(ctx context.Context, r *ent.Repo, number int, options *i.ListOptions) ([]*extent.Commit, error)
+		CompareCommitsFromLastestDeployment(ctx context.Context, r *ent.Repo, d *ent.Deployment, options *i.ListOptions) ([]*extent.Commit, error)
 
 		ListDeploymentStatuses(ctx context.Context, d *ent.Deployment) ([]*ent.DeploymentStatus, error)
 		CreateRemoteDeploymentStatus(ctx context.Context, u *ent.User, r *ent.Repo, d *ent.Deployment, ds *extent.RemoteDeploymentStatus) (*extent.RemoteDeploymentStatus, error)