Fix plural naming (#342)

* Fix plural in the `interactor` pkg

* Fix the `repos` pkg

* Fix the `api` pkg

Author: Noah Lee

cmd/cli/deployment_deploy.go

@@ -34,7 +34,7 @@ var deploymentDeployCommand = &cli.Command{
 		}
 
 		c := buildClient(cli)
-		d, err := c.Deployments.Create(cli.Context, ns, n, api.DeploymentCreateRequest{
+		d, err := c.Deployment.Create(cli.Context, ns, n, api.DeploymentCreateRequest{
 			Type: cli.String("type"),
 			Ref:  cli.String("ref"),
 			Env:  cli.String("env"),

cmd/cli/deployment_get.go

@@ -23,7 +23,7 @@ var deploymentGetCommand = &cli.Command{
 		}
 
 		c := buildClient(cli)
-		d, err := c.Deployments.Get(cli.Context, ns, n, number)
+		d, err := c.Deployment.Get(cli.Context, ns, n, number)
 		if err != nil {
 			return err
 		}

cmd/cli/deployment_list.go

@@ -40,7 +40,7 @@ var deploymentListCommand = &cli.Command{
 			return err
 		}
 
-		ds, err := c.Deployments.List(cli.Context, ns, n, api.DeploymentListOptions{
+		ds, err := c.Deployment.List(cli.Context, ns, n, api.DeploymentListOptions{
 			ListOptions: api.ListOptions{Page: cli.Int("page"), PerPage: cli.Int("per-page")},
 			Env:         cli.String("env"),
 			Status:      deployment.Status(cli.String("status")),

cmd/cli/deployment_update.go

@@ -22,7 +22,7 @@ var deploymentUpdateCommand = &cli.Command{
 		}
 
 		c := buildClient(cli)
-		d, err := c.Deployments.Update(cli.Context, ns, n, number)
+		d, err := c.Deployment.Update(cli.Context, ns, n, number)
 		if err != nil {
 			return err
 		}

cmd/cli/repo_get.go

@@ -19,7 +19,7 @@ var repoGetCommand = &cli.Command{
 		}
 
 		c := buildClient(cli)
-		repo, err := c.Repos.Get(cli.Context, ns, n)
+		repo, err := c.Repo.Get(cli.Context, ns, n)
 		if err != nil {
 			return err
 		}

cmd/cli/repo_list.go

@@ -40,11 +40,11 @@ var repoListCommand = &cli.Command{
 		)
 
 		if cli.Bool("all") {
-			if repos, err = c.Repos.ListAll(cli.Context); err != nil {
+			if repos, err = c.Repo.ListAll(cli.Context); err != nil {
 				return err
 			}
 		} else {
-			if repos, err = c.Repos.List(cli.Context, api.RepoListOptions{
+			if repos, err = c.Repo.List(cli.Context, api.RepoListOptions{
 				ListOptions: api.ListOptions{Page: cli.Int("page"), PerPage: cli.Int("per-page")},
 			}); err != nil {
 				return err

cmd/cli/repo_update.go

@@ -49,7 +49,7 @@ var repoUpdateCommand = &cli.Command{
 		}
 
 		c := buildClient(cli)
-		repo, err := c.Repos.Update(cli.Context, ns, n, req)
+		repo, err := c.Repo.Update(cli.Context, ns, n, req)
 		if err != nil {
 			return err
 		}

internal/interactor/deployment.go

@@ -15,13 +15,13 @@ import (
 )
 
 type (
-	DeploymentsInteractor service
+	DeploymentInteractor service
 )
 
 // IsApproved verifies that the request is approved or not.
 // It is approved if there is an approval of reviews at least, but
 // it is rejected if there is a reject of reviews.
-func (i *DeploymentsInteractor) IsApproved(ctx context.Context, d *ent.Deployment) bool {
+func (i *DeploymentInteractor) IsApproved(ctx context.Context, d *ent.Deployment) bool {
 	rvs, _ := i.store.ListReviews(ctx, d)
 
 	for _, r := range rvs {
@@ -43,7 +43,7 @@ func (i *DeploymentsInteractor) IsApproved(ctx context.Context, d *ent.Deploymen
 // But if it requires a review, it saves the payload on the DB
 // and waits until reviewed.
 // It returns an error for a undeployable payload.
-func (i *DeploymentsInteractor) Deploy(ctx context.Context, u *ent.User, r *ent.Repo, d *ent.Deployment, env *extent.Env) (*ent.Deployment, error) {
+func (i *DeploymentInteractor) Deploy(ctx context.Context, u *ent.User, r *ent.Repo, d *ent.Deployment, env *extent.Env) (*ent.Deployment, error) {
 	if err := i.isDeployable(ctx, u, r, d, env); err != nil {
 		return nil, err
 	}
@@ -128,7 +128,7 @@ func (i *DeploymentsInteractor) Deploy(ctx context.Context, u *ent.User, r *ent.
 // DeployToRemote posts a new deployment to SCM with the saved payload
 // after review has finished.
 // It returns an error for a undeployable payload.
-func (i *DeploymentsInteractor) DeployToRemote(ctx context.Context, u *ent.User, r *ent.Repo, d *ent.Deployment, env *extent.Env) (*ent.Deployment, error) {
+func (i *DeploymentInteractor) DeployToRemote(ctx context.Context, u *ent.User, r *ent.Repo, d *ent.Deployment, env *extent.Env) (*ent.Deployment, error) {
 	if d.Status != deployment.StatusWaiting {
 		return nil, e.NewErrorWithMessage(
 			e.ErrorCodeDeploymentStatusInvalid,
@@ -172,7 +172,7 @@ func (i *DeploymentsInteractor) DeployToRemote(ctx context.Context, u *ent.User,
 	return d, nil
 }
 
-func (i *DeploymentsInteractor) createRemoteDeployment(ctx context.Context, u *ent.User, r *ent.Repo, d *ent.Deployment, env *extent.Env) (*extent.RemoteDeployment, error) {
+func (i *DeploymentInteractor) createRemoteDeployment(ctx context.Context, u *ent.User, r *ent.Repo, d *ent.Deployment, env *extent.Env) (*extent.RemoteDeployment, error) {
 	// Rollback configures it can deploy the ref without any constraints.
 	// 1) Set auto_merge false to avoid the merge conflict.
 	// 2) Set required_contexts empty to skip the verfication.
@@ -184,7 +184,7 @@ func (i *DeploymentsInteractor) createRemoteDeployment(ctx context.Context, u *e
 	return i.scm.CreateRemoteDeployment(ctx, u, r, d, env)
 }
 
-func (i *DeploymentsInteractor) isDeployable(ctx context.Context, u *ent.User, r *ent.Repo, d *ent.Deployment, env *extent.Env) error {
+func (i *DeploymentInteractor) isDeployable(ctx context.Context, u *ent.User, r *ent.Repo, d *ent.Deployment, env *extent.Env) error {
 	// Skip verifications for roll back.
 	if !d.IsRollback {
 		if ok, err := env.IsDeployableRef(d.Ref); !ok {
@@ -210,7 +210,7 @@ func (i *DeploymentsInteractor) isDeployable(ctx context.Context, u *ent.User, r
 	return nil
 }
 
-func (i *DeploymentsInteractor) runClosingInactiveDeployment(stop <-chan struct{}) {
+func (i *DeploymentInteractor) runClosingInactiveDeployment(stop <-chan struct{}) {
 	ctx := context.Background()
 
 	ticker := time.NewTicker(time.Minute)

internal/interactor/deployment_test.go

@@ -17,8 +17,8 @@ import (
 	"github.com/gitploy-io/gitploy/pkg/e"
 )
 
-func newMockDeploymentsInteractor(store Store, scm SCM) *DeploymentsInteractor {
-	return &DeploymentsInteractor{
+func newMockDeploymentInteractor(store Store, scm SCM) *DeploymentInteractor {
+	return &DeploymentInteractor{
 		store: store,
 		scm:   scm,
 		log:   zap.L(),
@@ -44,7 +44,7 @@ func TestInteractor_IsApproved(t *testing.T) {
 				},
 			}, nil)
 
-		i := newMockDeploymentsInteractor(store, scm)
+		i := newMockDeploymentInteractor(store, scm)
 
 		expected := false
 		if ret := i.IsApproved(context.Background(), &ent.Deployment{}); ret != expected {
@@ -75,7 +75,7 @@ func TestInteractor_Deploy(t *testing.T) {
 		store := mock.NewMockStore(ctrl)
 		scm := mock.NewMockSCM(ctrl)
 
-		i := newMockDeploymentsInteractor(store, scm)
+		i := newMockDeploymentInteractor(store, scm)
 
 		_, err := i.Deploy(context.Background(), &ent.User{}, &ent.Repo{}, input.d, input.e)
 		if !e.HasErrorCode(err, e.ErrorCodeEntityUnprocessable) {
@@ -93,7 +93,7 @@ func TestInteractor_Deploy(t *testing.T) {
 			HasLockOfRepoForEnv(ctx, gomock.AssignableToTypeOf(&ent.Repo{}), "").
 			Return(true, nil)
 
-		i := newMockDeploymentsInteractor(store, scm)
+		i := newMockDeploymentInteractor(store, scm)
 
 		_, err := i.Deploy(context.Background(), &ent.User{}, &ent.Repo{}, &ent.Deployment{}, &extent.Env{})
 		if !e.HasErrorCode(err, e.ErrorCodeDeploymentLocked) {
@@ -159,7 +159,7 @@ func TestInteractor_Deploy(t *testing.T) {
 			EXPECT().
 			CreateDeploymentStatus(ctx, gomock.AssignableToTypeOf(&ent.DeploymentStatus{}))
 
-		i := newMockDeploymentsInteractor(store, scm)
+		i := newMockDeploymentInteractor(store, scm)
 
 		d, err := i.Deploy(context.Background(), &ent.User{}, &ent.Repo{}, input.d, input.e)
 		if err != nil {
@@ -243,7 +243,7 @@ func TestInteractor_Deploy(t *testing.T) {
 			CreateEvent(ctx, gomock.AssignableToTypeOf(&ent.Event{})).
 			Return(&ent.Event{}, nil)
 
-		i := newMockDeploymentsInteractor(store, scm)
+		i := newMockDeploymentInteractor(store, scm)
 
 		d, err := i.Deploy(context.Background(), &ent.User{}, &ent.Repo{}, input.d, input.e)
 		if err != nil {
@@ -281,7 +281,7 @@ func TestInteractor_DeployToRemote(t *testing.T) {
 		store := mock.NewMockStore(ctrl)
 		scm := mock.NewMockSCM(ctrl)
 
-		i := newMockDeploymentsInteractor(store, scm)
+		i := newMockDeploymentInteractor(store, scm)
 
 		_, err := i.DeployToRemote(context.Background(), &ent.User{}, &ent.Repo{}, input.d, input.e)
 		if !e.HasErrorCode(err, e.ErrorCodeDeploymentStatusInvalid) {
@@ -345,7 +345,7 @@ func TestInteractor_DeployToRemote(t *testing.T) {
 			EXPECT().
 			CreateDeploymentStatus(ctx, gomock.AssignableToTypeOf(&ent.DeploymentStatus{}))
 
-		i := newMockDeploymentsInteractor(store, scm)
+		i := newMockDeploymentInteractor(store, scm)
 
 		d, err := i.DeployToRemote(context.Background(), &ent.User{}, &ent.Repo{}, input.d, input.e)
 		if err != nil {

internal/interactor/event.go

@@ -15,22 +15,22 @@ const (
 )
 
 type (
-	EventsInteractor struct {
+	EventInteractor struct {
 		*service
 
 		events evbus.Bus
 	}
 )
 
-func (i *EventsInteractor) SubscribeEvent(fn func(e *ent.Event)) error {
+func (i *EventInteractor) SubscribeEvent(fn func(e *ent.Event)) error {
 	return i.events.SubscribeAsync(gitployEvent, fn, false)
 }
 
-func (i *EventsInteractor) UnsubscribeEvent(fn func(e *ent.Event)) error {
+func (i *EventInteractor) UnsubscribeEvent(fn func(e *ent.Event)) error {
 	return i.events.Unsubscribe(gitployEvent, fn)
 }
 
-func (i *EventsInteractor) runPublishingEvents(stop <-chan struct{}) {
+func (i *EventInteractor) runPublishingEvents(stop <-chan struct{}) {
 	ctx := context.Background()
 
 	// Read events periodically and publish to subscribers.