Fix to add RepoID when creating a status

Author: noah

internal/interactor/deployment.go

@@ -125,6 +125,7 @@ func (i *DeploymentInteractor) Deploy(ctx context.Context, u *ent.User, r *ent.R
 			Status:       string(deployment.StatusWaiting),
 			Description:  "Gitploy waits the reviews.",
 			DeploymentID: d.ID,
+			RepoID:       r.ID,
 		}); err != nil {
 			i.log.Error("Failed to create a deployment status.", zap.Error(err))
 		}
@@ -153,6 +154,7 @@ func (i *DeploymentInteractor) Deploy(ctx context.Context, u *ent.User, r *ent.R
 		Status:       string(deployment.StatusCreated),
 		Description:  "Gitploy starts to deploy.",
 		DeploymentID: d.ID,
+		RepoID:       r.ID,
 	}); err != nil {
 		i.log.Error("Failed to create a deployment status.", zap.Error(err))
 	}
@@ -235,6 +237,7 @@ func (i *DeploymentInteractor) DeployToRemote(ctx context.Context, u *ent.User,
 		Status:       string(deployment.StatusCreated),
 		Description:  "Gitploy start to deploy.",
 		DeploymentID: d.ID,
+		RepoID:       r.ID,
 	})
 
 	return d, nil
@@ -301,6 +304,7 @@ L:
 							Status:       "canceled",
 							Description:  "Gitploy cancels the inactive deployment.",
 							DeploymentID: d.ID,
+							RepoID:       d.RepoID,
 						}
 						if err := i.scm.CancelDeployment(ctx, d.Edges.User, d.Edges.Repo, d, s); err != nil {
 							i.log.Error("It has failed to cancel the remote deployment.", zap.Error(err))

internal/pkg/store/deploymentstatus.go

@@ -21,13 +21,27 @@ func (s *Store) ListDeploymentStatuses(ctx context.Context, d *ent.Deployment) (
 	return dss, nil
 }
 
+func (s *Store) FindDeploymentStatusByID(ctx context.Context, id int) (*ent.DeploymentStatus, error) {
+	ds, err := s.c.DeploymentStatus.Query().
+		Where(deploymentstatus.IDEQ(id)).
+		WithDeployment().
+		WithRepo().
+		Only(ctx)
+	if ent.IsNotFound(err) {
+		return nil, e.NewError(e.ErrorCodeEntityNotFound, err)
+	}
+
+	return ds, nil
+}
+
 func (s *Store) CreateEntDeploymentStatus(ctx context.Context, ds *ent.DeploymentStatus) (*ent.DeploymentStatus, error) {
 	// Build the query creating a deployment status.
 	qry := s.c.DeploymentStatus.Create().
 		SetStatus(ds.Status).
 		SetDescription(ds.Description).
 		SetLogURL(ds.LogURL).
-		SetDeploymentID(ds.DeploymentID)
+		SetDeploymentID(ds.DeploymentID).
+		SetRepoID(ds.RepoID)
 
 	if !ds.CreatedAt.IsZero() {
 		qry.SetCreatedAt(ds.CreatedAt.UTC())
@@ -49,12 +63,3 @@ func (s *Store) CreateEntDeploymentStatus(ctx context.Context, ds *ent.Deploymen
 
 	return ret, nil
 }
-
-func (s *Store) FindDeploymentStatusByID(ctx context.Context, id int) (*ent.DeploymentStatus, error) {
-	ds, err := s.c.DeploymentStatus.Get(ctx, id)
-	if ent.IsNotFound(err) {
-		return nil, e.NewError(e.ErrorCodeEntityNotFound, err)
-	}
-
-	return ds, nil
-}

internal/pkg/store/event.go

@@ -30,7 +30,8 @@ func (s *Store) ListEventsGreaterThanTime(ctx context.Context, t time.Time) ([]*
 		}).
 		WithDeploymentStatus(func(dsq *ent.DeploymentStatusQuery) {
 			dsq.
-				WithDeployment()
+				WithDeployment().
+				WithRepo()
 		}).
 		WithReview(func(rq *ent.ReviewQuery) {
 			rq.

internal/server/hooks/hook.go

@@ -117,6 +117,7 @@ func (h *Hooks) handleGithubDeploymentEvent(c *gin.Context) {
 	}
 
 	ds.DeploymentID = d.ID
+	ds.RepoID = d.RepoID
 	if ds, err = h.i.CreateDeploymentStatus(ctx, ds); err != nil {
 		h.log.Check(gb.GetZapLogLevel(err), "Failed to create a new the deployment status.").Write(zap.Error(err))
 		gb.ResponseWithError(c, err)