Skip to content
This repository was archived by the owner on May 30, 2024. It is now read-only.

fix: remove CheckEagerLoading method #125

Merged
merged 1 commit into from
Sep 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions ent/custom_approval.go

This file was deleted.

17 changes: 0 additions & 17 deletions ent/custom_deployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,6 @@ import (
"github.com/gitploy-io/gitploy/ent/deployment"
)

// CheckEagerLoading checks the deployment has required edges; Repo and User.
func (d *Deployment) CheckEagerLoading() error {
if d.Edges.Repo == nil {
return &EagerLoadingError{
Edge: "repo",
}
}

if d.Edges.User == nil {
return &EagerLoadingError{
Edge: "user",
}
}

return nil
}

func (d *Deployment) GetShortRef() string {
const maxlen = 7

Expand Down
19 changes: 0 additions & 19 deletions ent/custom_errors.go

This file was deleted.

24 changes: 0 additions & 24 deletions ent/custom_event.go

This file was deleted.

21 changes: 10 additions & 11 deletions internal/server/slack/notification.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,14 @@ func (s *Slack) Notify(ctx context.Context, e *ent.Event) {
}

func (s *Slack) notifyDeploymentEvent(ctx context.Context, e *ent.Event) {
if err := e.CheckEagerLoading(); err != nil {
var d *ent.Deployment

if d = e.Edges.Deployment; d == nil {
s.log.Error("The eager loading of event has failed.")
return
}

d := e.Edges.Deployment
if err := d.CheckEagerLoading(); err != nil {
if d.Edges.User == nil || d.Edges.Repo == nil {
s.log.Error("The eager loading of deployment has failed.")
return
}
Expand Down Expand Up @@ -82,19 +83,17 @@ func (s *Slack) notifyDeploymentEvent(ctx context.Context, e *ent.Event) {
}

func (s *Slack) notifyApprovalEvent(ctx context.Context, e *ent.Event) {
if err := e.CheckEagerLoading(); err != nil {
s.log.Error("The eager loading of event has failed.")
return
}
var (
a *ent.Approval
d *ent.Deployment
)

a := e.Edges.Approval
if err := a.CheckEagerLoading(); err != nil {
if a = e.Edges.Approval; a == nil {
s.log.Error("The eager loading of approval has failed.")
return
}

d := a.Edges.Deployment
if err := d.CheckEagerLoading(); err != nil {
if d = a.Edges.Deployment; d != nil {
s.log.Error("The eager loading of deployment has failed.")
return
}
Expand Down