fix: remove the rollback method (#99)

Author: Noah Hanjun Lee

internal/interactor/deployment.go

@@ -19,14 +19,6 @@ func (i *Interactor) Deploy(ctx context.Context, u *ent.User, r *ent.Repo, d *en
 	return i.deploy(ctx, u, r, d, env)
 }
 
-func (i *Interactor) Rollback(ctx context.Context, u *ent.User, r *ent.Repo, d *ent.Deployment, env *vo.Env) (*ent.Deployment, error) {
-	d.UserID = u.ID
-	d.RepoID = r.ID
-	d.IsRollback = true
-
-	return i.deploy(ctx, u, r, d, env)
-}
-
 func (i *Interactor) deploy(ctx context.Context, u *ent.User, r *ent.Repo, d *ent.Deployment, e *vo.Env) (*ent.Deployment, error) {
 	if !e.IsApprovalEabled() {
 		rd, err := i.SCM.CreateRemoteDeployment(ctx, u, r, d, e)

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

@@ -306,11 +306,12 @@ func (r *Repo) RollbackDeployment(c *gin.Context) {
 		return
 	}
 
-	d, err = r.i.Rollback(ctx, u, re, &ent.Deployment{
-		Number: next,
-		Type:   d.Type,
-		Env:    d.Env,
-		Ref:    d.Ref,
+	d, err = r.i.Deploy(ctx, u, re, &ent.Deployment{
+		Number:     next,
+		Type:       d.Type,
+		Env:        d.Env,
+		Ref:        d.Ref,
+		IsRollback: true,
 	}, cf.GetEnv(d.Env))
 	if ent.IsConstraintError(err) {
 		r.log.Warn("The conflict occurs.", zap.Error(err))

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

@@ -31,7 +31,6 @@ type (
 		IsApproved(ctx context.Context, d *ent.Deployment) bool
 		Deploy(ctx context.Context, u *ent.User, re *ent.Repo, d *ent.Deployment, env *vo.Env) (*ent.Deployment, error)
 		CreateRemoteDeployment(ctx context.Context, u *ent.User, re *ent.Repo, d *ent.Deployment, env *vo.Env) (*ent.Deployment, error)
-		Rollback(ctx context.Context, u *ent.User, re *ent.Repo, d *ent.Deployment, env *vo.Env) (*ent.Deployment, error)
 		GetConfig(ctx context.Context, u *ent.User, r *ent.Repo) (*vo.Config, error)
 
 		ListApprovals(ctx context.Context, d *ent.Deployment) ([]*ent.Approval, error)

internal/server/api/v1/repos/mock/interactor.go

@@ -31,7 +31,6 @@ type (
 		FindDeploymentByID(ctx context.Context, id int) (*ent.Deployment, error)
 		GetNextDeploymentNumberOfRepo(ctx context.Context, r *ent.Repo) (int, error)
 		Deploy(ctx context.Context, u *ent.User, re *ent.Repo, d *ent.Deployment, env *vo.Env) (*ent.Deployment, error)
-		Rollback(ctx context.Context, u *ent.User, re *ent.Repo, d *ent.Deployment, env *vo.Env) (*ent.Deployment, error)
 		GetConfig(ctx context.Context, u *ent.User, r *ent.Repo) (*vo.Config, error)
 
 		CreateApproval(ctx context.Context, a *ent.Approval) (*ent.Approval, error)

internal/server/slack/interface.go

@@ -264,12 +264,13 @@ func (s *Slack) interactRollback(c *gin.Context) {
 		return
 	}
 
-	d, err = s.i.Rollback(ctx, cu.Edges.User, cb.Edges.Repo, &ent.Deployment{
-		Number: next,
-		Type:   deployment.Type(d.Type),
-		Ref:    d.Ref,
-		Sha:    d.Sha,
-		Env:    d.Env,
+	d, err = s.i.Deploy(ctx, cu.Edges.User, cb.Edges.Repo, &ent.Deployment{
+		Number:     next,
+		Type:       deployment.Type(d.Type),
+		Ref:        d.Ref,
+		Sha:        d.Sha,
+		Env:        d.Env,
+		IsRollback: true,
 	}, env)
 	if ent.IsConstraintError(err) {
 		postBotMessage(cu, "The conflict occurs, please retry.")

internal/server/slack/mock/interactor.go

@@ -149,12 +149,13 @@ func TestSlack_interactRollback(t *testing.T) {
 		t.Log("Roll back with the returned deployment.")
 		m.
 			EXPECT().
-			Rollback(gomock.Any(), gomock.AssignableToTypeOf(&ent.User{}), gomock.AssignableToTypeOf(&ent.Repo{}), &ent.Deployment{
-				Number: 4,
-				Type:   deployment.TypeCommit,
-				Ref:    "main",
-				Sha:    "ee411aa",
-				Env:    "prod",
+			Deploy(gomock.Any(), gomock.AssignableToTypeOf(&ent.User{}), gomock.AssignableToTypeOf(&ent.Repo{}), &ent.Deployment{
+				Number:     4,
+				Type:       deployment.TypeCommit,
+				Ref:        "main",
+				Sha:        "ee411aa",
+				Env:        "prod",
+				IsRollback: true,
 			}, gomock.AssignableToTypeOf(&vo.Env{})).
 			DoAndReturn(func(ctx context.Context, u *ent.User, r *ent.Repo, d *ent.Deployment, e *vo.Env) (*ent.Deployment, error) {
 				d.ID = deploymentID + 1