refactor: monitor add - new endpoint for checking tribe tags (#40)

Reviewed-on: #40

internal/service/monitor.go

@@ -76,8 +76,14 @@ func (m *Monitor) Create(ctx context.Context, groupID, serverID, tribeTag string
 		}
 	}
 
-	// check if tribe exists
+	tribes, err := m.client.ListTribes(ctx, group.VersionCode, group.ServerKey, twhelp.ListTribesQueryParams{
-	tribe, err := m.client.GetTribeByTag(ctx, group.VersionCode, group.ServerKey, tribeTag)
+		Limit: 1,
+		Tags:  []string{tribeTag},
+		Deleted: twhelp.NullBool{
+			Valid: true,
+			Bool:  false,
+		},
+	})
 	if err != nil {
 		var apiErr twhelp.APIError
 		if !errors.As(err, &apiErr) {
@@ -87,12 +93,12 @@ func (m *Monitor) Create(ctx context.Context, groupID, serverID, tribeTag string
 			Tag: tribeTag,
 		}
 	}
-
+	if len(tribes) == 0 {
-	if !tribe.DeletedAt.IsZero() {
 		return domain.Monitor{}, domain.TribeDoesNotExistError{
 			Tag: tribeTag,
 		}
 	}
+	tribe := tribes[0]
 
 	params, err := domain.NewCreateMonitorParams(group.ID, tribe.ID)
 	if err != nil {

internal/service/monitor_test.go

@@ -53,7 +53,7 @@ func TestMonitor_Create(t *testing.T) {
 			ProfileURL: "https://pl151.plemiona.pl/game.php?screen=info_player&id=150",
 			DeletedAt:  time.Time{},
 		}
-		client.GetTribeByTagReturns(tribe, nil)
+		client.ListTribesReturns([]twhelp.Tribe{tribe}, nil)
 
 		groupID := uuid.NewString()
 
@@ -114,85 +114,65 @@ func TestMonitor_Create(t *testing.T) {
 	t.Run("ERR: tribe doesn't exist", func(t *testing.T) {
 		t.Parallel()
 
-		t.Run("API error", func(t *testing.T) {
+		tests := []struct {
-			t.Parallel()
+			name string
+			err  error
+		}{
+			{
+				name: "err=null",
+			},
+			{
+				name: "err!=null",
+				err: twhelp.APIError{
+					Code:    twhelp.ErrorCodeInternalServerError,
+					Message: "internal server error",
+				},
+			},
+		}
 
-			repo := &mock.FakeMonitorRepository{}
+		for _, tt := range tests {
-			repo.ListReturns(nil, nil)
+			tt := tt
-			repo.CreateCalls(func(ctx context.Context, params domain.CreateMonitorParams) (domain.Monitor, error) {
+
-				return domain.Monitor{
+			t.Run(tt.name, func(t *testing.T) {
-					ID:        uuid.NewString(),
+				t.Parallel()
-					TribeID:   params.TribeID(),
+
-					GroupID:   params.GroupID(),
+				repo := &mock.FakeMonitorRepository{}
-					CreatedAt: time.Now(),
+				repo.ListReturns(nil, nil)
-				}, nil
+				repo.CreateCalls(func(ctx context.Context, params domain.CreateMonitorParams) (domain.Monitor, error) {
+					return domain.Monitor{
+						ID:        uuid.NewString(),
+						TribeID:   params.TribeID(),
+						GroupID:   params.GroupID(),
+						CreatedAt: time.Now(),
+					}, nil
+				})
+
+				groupSvc := &mock.FakeGroupReader{}
+				groupSvc.GetCalls(func(ctx context.Context, groupID, serverID string) (domain.Group, error) {
+					return domain.Group{
+						ID:            groupID,
+						ServerID:      serverID,
+						ChannelGains:  "",
+						ChannelLosses: "",
+						ServerKey:     "pl151",
+						VersionCode:   "pl",
+						CreatedAt:     time.Now(),
+					}, nil
+				})
+
+				client := &mock.FakeTWHelpClient{}
+				client.ListTribesReturns(nil, tt.err)
+
+				tag := "TAG"
+
+				monitor, err := service.NewMonitor(repo, groupSvc, client, zap.NewNop(), 10).
+					Create(context.Background(), uuid.NewString(), uuid.NewString(), tag)
+				assert.ErrorIs(t, err, domain.TribeDoesNotExistError{
+					Tag: tag,
+				})
+				assert.Zero(t, monitor)
 			})
-
+		}
-			groupSvc := &mock.FakeGroupReader{}
-			groupSvc.GetCalls(func(ctx context.Context, groupID, serverID string) (domain.Group, error) {
-				return domain.Group{
-					ID:            groupID,
-					ServerID:      serverID,
-					ChannelGains:  "",
-					ChannelLosses: "",
-					ServerKey:     "pl151",
-					VersionCode:   "pl",
-					CreatedAt:     time.Now(),
-				}, nil
-			})
-
-			client := &mock.FakeTWHelpClient{}
-			client.GetTribeByTagReturns(twhelp.Tribe{}, twhelp.APIError{
-				Code:    twhelp.ErrorCodeEntityNotFound,
-				Message: "tribe not found",
-			})
-
-			tag := "TAG"
-
-			monitor, err := service.NewMonitor(repo, groupSvc, client, zap.NewNop(), 10).
-				Create(context.Background(), uuid.NewString(), uuid.NewString(), tag)
-			assert.ErrorIs(t, err, domain.TribeDoesNotExistError{
-				Tag: tag,
-			})
-			assert.Zero(t, monitor)
-		})
-
-		t.Run("tribe is deleted", func(t *testing.T) {
-			t.Parallel()
-
-			repo := &mock.FakeMonitorRepository{}
-			repo.ListReturns(nil, nil)
-
-			groupSvc := &mock.FakeGroupReader{}
-			groupSvc.GetCalls(func(ctx context.Context, groupID, serverID string) (domain.Group, error) {
-				return domain.Group{
-					ID:            groupID,
-					ServerID:      serverID,
-					ChannelGains:  "",
-					ChannelLosses: "",
-					ServerKey:     "pl151",
-					VersionCode:   "pl",
-					CreatedAt:     time.Now(),
-				}, nil
-			})
-
-			client := &mock.FakeTWHelpClient{}
-			tribe := twhelp.Tribe{
-				ID:         150,
-				Tag:        "*TAG*",
-				Name:       uuid.NewString(),
-				ProfileURL: "https://pl151.plemiona.pl/game.php?screen=info_player&id=150",
-				DeletedAt:  time.Now(),
-			}
-			client.GetTribeByTagReturns(tribe, nil)
-
-			monitor, err := service.NewMonitor(repo, groupSvc, client, zap.NewNop(), 10).
-				Create(context.Background(), uuid.NewString(), uuid.NewString(), tribe.Tag)
-			assert.ErrorIs(t, err, domain.TribeDoesNotExistError{
-				Tag: tribe.Tag,
-			})
-			assert.Zero(t, monitor)
-		})
 	})
 }
 

internal/service/service.go

@@ -11,14 +11,10 @@ import (
 //counterfeiter:generate -o internal/mock/twhelp_client.gen.go . TWHelpClient
 type TWHelpClient interface {
 	ListVersions(ctx context.Context) ([]twhelp.Version, error)
-	ListServers(
+	ListServers(ctx context.Context, version string, params twhelp.ListServersQueryParams) ([]twhelp.Server, error)
-		ctx context.Context,
-		version string,
-		params twhelp.ListServersQueryParams,
-	) ([]twhelp.Server, error)
 	GetServer(ctx context.Context, version, server string) (twhelp.Server, error)
+	ListTribes(ctx context.Context, version, server string, params twhelp.ListTribesQueryParams) ([]twhelp.Tribe, error)
 	GetTribeByID(ctx context.Context, version, server string, id int64) (twhelp.Tribe, error)
-	GetTribeByTag(ctx context.Context, version, server, tag string) (twhelp.Tribe, error)
 	ListEnnoblements(
 		ctx context.Context,
 		version, server string,

internal/twhelp/client.go

@@ -18,8 +18,8 @@ const (
 	endpointListVersions     = "/api/v1/versions"
 	endpointListServers      = "/api/v1/versions/%s/servers"
 	endpointGetServer        = "/api/v1/versions/%s/servers/%s"
+	endpointListTribes       = "/api/v1/versions/%s/servers/%s/tribes"
 	endpointGetTribeByID     = "/api/v1/versions/%s/servers/%s/tribes/%d"
-	endpointGetTribeByTag    = "/api/v1/versions/%s/servers/%s/tribes/tag/%s"
 	endpointListEnnoblements = "/api/v1/versions/%s/servers/%s/ennoblements"
 )
 
@@ -106,17 +106,49 @@ func (c *Client) GetServer(ctx context.Context, version, server string) (Server,
 	return resp.Data, nil
 }
 
-func (c *Client) GetTribeByID(ctx context.Context, version, server string, id int64) (Tribe, error) {
+type ListTribesQueryParams struct {
-	var resp getTribeResp
+	Limit   int32
-	if err := c.getJSON(ctx, fmt.Sprintf(endpointGetTribeByID, version, server, id), &resp); err != nil {
+	Offset  int32
-		return Tribe{}, err
+	Tags    []string
+	Deleted NullBool
+}
+
+func (c *Client) ListTribes(
+	ctx context.Context,
+	version, server string,
+	params ListTribesQueryParams,
+) ([]Tribe, error) {
+	q := url.Values{}
+
+	if params.Limit > 0 {
+		q.Set("limit", strconv.Itoa(int(params.Limit)))
 	}
+
+	if params.Offset > 0 {
+		q.Set("offset", strconv.Itoa(int(params.Offset)))
+	}
+
+	if params.Deleted.Valid {
+		q.Set("deleted", strconv.FormatBool(params.Deleted.Bool))
+	}
+
+	if params.Tags != nil {
+		for _, t := range params.Tags {
+			q.Add("tag", t)
+		}
+	}
+
+	var resp listTribesResp
+	if err := c.getJSON(ctx, fmt.Sprintf(endpointListTribes, version, server)+"?"+q.Encode(), &resp); err != nil {
+		return nil, err
+	}
+
 	return resp.Data, nil
 }
 
-func (c *Client) GetTribeByTag(ctx context.Context, version, server, tag string) (Tribe, error) {
+func (c *Client) GetTribeByID(ctx context.Context, version, server string, id int64) (Tribe, error) {
 	var resp getTribeResp
-	if err := c.getJSON(ctx, fmt.Sprintf(endpointGetTribeByTag, version, server, tag), &resp); err != nil {
+	if err := c.getJSON(ctx, fmt.Sprintf(endpointGetTribeByID, version, server, id), &resp); err != nil {
 		return Tribe{}, err
 	}
 	return resp.Data, nil

internal/twhelp/twhelp.go

@@ -65,6 +65,10 @@ type Tribe struct {
 	DeletedAt  time.Time `json:"deletedAt"`
 }
 
+type listTribesResp struct {
+	Data []Tribe `json:"data"`
+}
+
 type getTribeResp struct {
 	Data Tribe `json:"data"`
 }