refactor: TeamsList dto

moira-alert · Nov 20, 2024 · 418e731 · 418e731
1 parent a82ef93
commit 418e731
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 45 deletions.
diff --git a/api/controller/team.go b/api/controller/team.go
@@ -115,9 +115,9 @@ func SearchTeams(dataBase moira.Database, page, size int64, textRegexp *regexp.R
 	if page < 0 || (page > 0 && size < 0) {
 		return dto.TeamsList{
 			List:  []dto.TeamModel{},
-			Page:  &page,
-			Size:  &size,
-			Total: &total,
+			Page:  page,
+			Size:  size,
+			Total: total,
 		}, nil
 	}
 
@@ -135,9 +135,9 @@ func SearchTeams(dataBase moira.Database, page, size int64, textRegexp *regexp.R
 	}
 
 	model := dto.NewTeamsList(teams)
-	model.Page = &page
-	model.Size = &size
-	model.Total = &total
+	model.Page = page
+	model.Size = size
+	model.Total = total
 
 	return model, nil
 }

diff --git a/api/controller/team_test.go b/api/controller/team_test.go
@@ -252,9 +252,9 @@ func TestSearchTeams(t *testing.T) {
 			So(err, ShouldBeNil)
 			So(response, ShouldResemble, dto.TeamsList{
 				List:  []dto.TeamModel{},
-				Page:  &page,
-				Size:  &allTeamsSize,
-				Total: &total,
+				Page:  page,
+				Size:  allTeamsSize,
+				Total: total,
 			})
 		})
 
@@ -270,9 +270,9 @@ func TestSearchTeams(t *testing.T) {
 			So(err, ShouldBeNil)
 			So(response, ShouldResemble, dto.TeamsList{
 				List:  []dto.TeamModel{},
-				Page:  &page,
-				Size:  &allTeamsSize,
-				Total: &total,
+				Page:  page,
+				Size:  allTeamsSize,
+				Total: total,
 			})
 		})
 
@@ -296,9 +296,9 @@ func TestSearchTeams(t *testing.T) {
 			So(err, ShouldBeNil)
 			So(response, ShouldResemble, dto.TeamsList{
 				List:  teamModels,
-				Page:  &firstPage,
-				Size:  &allTeamsSize,
-				Total: &total,
+				Page:  firstPage,
+				Size:  allTeamsSize,
+				Total: total,
 			})
 		})
 
@@ -317,9 +317,9 @@ func TestSearchTeams(t *testing.T) {
 				So(err, ShouldBeNil)
 				So(response, ShouldResemble, dto.TeamsList{
 					List:  teamModels[:size],
-					Page:  &page0,
-					Size:  &size,
-					Total: &total,
+					Page:  page0,
+					Size:  size,
+					Total: total,
 				})
 
 				dataBase.EXPECT().GetAllTeams().Return(teams, nil)
@@ -328,9 +328,9 @@ func TestSearchTeams(t *testing.T) {
 				So(err, ShouldBeNil)
 				So(response, ShouldResemble, dto.TeamsList{
 					List:  teamModels[page1*size : page1*size+size],
-					Page:  &page1,
-					Size:  &size,
-					Total: &total,
+					Page:  page1,
+					Size:  size,
+					Total: total,
 				})
 			})
 
@@ -347,9 +347,9 @@ func TestSearchTeams(t *testing.T) {
 				So(err, ShouldBeNil)
 				So(response, ShouldResemble, dto.TeamsList{
 					List:  teamModels[page*size:],
-					Page:  &page,
-					Size:  &size,
-					Total: &total,
+					Page:  page,
+					Size:  size,
+					Total: total,
 				})
 			})
 
@@ -366,9 +366,9 @@ func TestSearchTeams(t *testing.T) {
 				So(err, ShouldBeNil)
 				So(response, ShouldResemble, dto.TeamsList{
 					List:  []dto.TeamModel{},
-					Page:  &page,
-					Size:  &size,
-					Total: &total,
+					Page:  page,
+					Size:  size,
+					Total: total,
 				})
 			})
 		})
@@ -382,9 +382,9 @@ func TestSearchTeams(t *testing.T) {
 			So(err, ShouldBeNil)
 			So(response, ShouldResemble, dto.TeamsList{
 				List:  teamModels[3:],
-				Page:  &firstPage,
-				Size:  &allTeamsSize,
-				Total: &total,
+				Page:  firstPage,
+				Size:  allTeamsSize,
+				Total: total,
 			})
 		})
 
@@ -405,9 +405,9 @@ func TestSearchTeams(t *testing.T) {
 						teamModels[5],
 						teamModels[2],
 					},
-					Page:  &firstPage,
-					Size:  &allTeamsSize,
-					Total: &total,
+					Page:  firstPage,
+					Size:  allTeamsSize,
+					Total: total,
 				})
 			})
 
@@ -427,9 +427,9 @@ func TestSearchTeams(t *testing.T) {
 						teamModels[0],
 						teamModels[4],
 					},
-					Page:  &firstPage,
-					Size:  &allTeamsSize,
-					Total: &total,
+					Page:  firstPage,
+					Size:  allTeamsSize,
+					Total: total,
 				})
 			})
 		})
@@ -450,9 +450,9 @@ func TestSearchTeams(t *testing.T) {
 					teamModels[3],
 					teamModels[4],
 				},
-				Page:  &page,
-				Size:  &size,
-				Total: &total,
+				Page:  page,
+				Size:  size,
+				Total: total,
 			})
 		})
 	})

diff --git a/api/dto/team.go b/api/dto/team.go
@@ -110,9 +110,9 @@ func (TeamSettings) Render(w http.ResponseWriter, r *http.Request) error {
 // TeamsList is a structure that represents a list of existing teams in db.
 type TeamsList struct {
 	List  []TeamModel `json:"list"`
-	Page  *int64      `json:"page,omitempty" format:"int64" extensions:"x-nullable"`
-	Size  *int64      `json:"size,omitempty" format:"int64" extensions:"x-nullable"`
-	Total *int64      `json:"total,omitempty" format:"int64" extensions:"x-nullable"`
+	Page  int64       `json:"page" example:"0" format:"int64"`
+	Size  int64       `json:"size" example:"100" format:"int64"`
+	Total int64       `json:"total" example:"10" format:"int64"`
 }
 
 // Render is a function that implements chi Renderer interface for TeamsList.

diff --git a/api/handler/team_test.go b/api/handler/team_test.go
@@ -74,9 +74,9 @@ func Test_searchTeams(t *testing.T) {
 			total := int64(len(testTeams))
 
 			expectedDTO := dto.NewTeamsList(testTeams)
-			expectedDTO.Page = &defaultTestPage
-			expectedDTO.Size = &defaultTestSize
-			expectedDTO.Total = &total
+			expectedDTO.Page = defaultTestPage
+			expectedDTO.Size = defaultTestSize
+			expectedDTO.Total = total
 
 			searchTeams(responseWriter, testRequest)