style: rename "getAllTeams" handler and controller to "searchAllTeams"

moira-alert · Nov 20, 2024 · 6a4e448 · 6a4e448
1 parent 25d3f7b
commit 6a4e448
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/api/controller/team.go b/api/controller/team.go
@@ -83,8 +83,8 @@ func GetTeam(dataBase moira.Database, teamID string) (dto.TeamModel, *api.ErrorR
 	return teamModel, nil
 }
 
-// GetAllTeams is a controller function that returns all teams.
-func GetAllTeams(dataBase moira.Database, page, size int64, textRegexp *regexp.Regexp, sortOrder api.SortOrder) (dto.TeamsList, *api.ErrorResponse) {
+// SearchAllTeams is a controller function that returns all teams.
+func SearchAllTeams(dataBase moira.Database, page, size int64, textRegexp *regexp.Regexp, sortOrder api.SortOrder) (dto.TeamsList, *api.ErrorResponse) {
 	teams, err := dataBase.GetAllTeams()
 	if err != nil {
 		return dto.TeamsList{}, api.ErrorInternalServer(fmt.Errorf("cannot get teams from database: %w", err))

diff --git a/api/controller/team_test.go b/api/controller/team_test.go
@@ -194,8 +194,8 @@ func TestGetTeam(t *testing.T) {
 	})
 }
 
-func TestGetAllTeams(t *testing.T) {
-	Convey("GetTeamAllTeams", t, func() {
+func TestSearchAllTeams(t *testing.T) {
+	Convey("SearchAllTeams", t, func() {
 		mockCtrl := gomock.NewController(t)
 		defer mockCtrl.Finish()
 		dataBase := mock_moira_alert.NewMockDatabase(mockCtrl)
@@ -247,7 +247,7 @@ func TestGetAllTeams(t *testing.T) {
 				total       = int64(len(teamModels))
 			)
 
-			response, err := GetAllTeams(dataBase, page, allTeamsSize, anyText, api.NoSortOrder)
+			response, err := SearchAllTeams(dataBase, page, allTeamsSize, anyText, api.NoSortOrder)
 
 			So(err, ShouldBeNil)
 			So(response, ShouldResemble, dto.TeamsList{
@@ -265,7 +265,7 @@ func TestGetAllTeams(t *testing.T) {
 				total       = int64(len(teamModels))
 			)
 
-			response, err := GetAllTeams(dataBase, page, allTeamsSize, anyText, api.NoSortOrder)
+			response, err := SearchAllTeams(dataBase, page, allTeamsSize, anyText, api.NoSortOrder)
 
 			So(err, ShouldBeNil)
 			So(response, ShouldResemble, dto.TeamsList{
@@ -281,7 +281,7 @@ func TestGetAllTeams(t *testing.T) {
 
 			dataBase.EXPECT().GetAllTeams().Return(nil, dbErr)
 
-			response, err := GetAllTeams(dataBase, firstPage, allTeamsSize, anyText, api.NoSortOrder)
+			response, err := SearchAllTeams(dataBase, firstPage, allTeamsSize, anyText, api.NoSortOrder)
 
 			So(err, ShouldResemble, api.ErrorInternalServer(fmt.Errorf("cannot get teams from database: %w", dbErr)))
 			So(response, ShouldResemble, dto.TeamsList{})
@@ -291,7 +291,7 @@ func TestGetAllTeams(t *testing.T) {
 			dataBase.EXPECT().GetAllTeams().Return(teams, nil)
 			total := int64(len(teamModels))
 
-			response, err := GetAllTeams(dataBase, firstPage, allTeamsSize, anyText, api.NoSortOrder)
+			response, err := SearchAllTeams(dataBase, firstPage, allTeamsSize, anyText, api.NoSortOrder)
 
 			So(err, ShouldBeNil)
 			So(response, ShouldResemble, dto.TeamsList{
@@ -313,7 +313,7 @@ func TestGetAllTeams(t *testing.T) {
 
 				dataBase.EXPECT().GetAllTeams().Return(teams, nil)
 
-				response, err := GetAllTeams(dataBase, page0, size, anyText, api.NoSortOrder)
+				response, err := SearchAllTeams(dataBase, page0, size, anyText, api.NoSortOrder)
 				So(err, ShouldBeNil)
 				So(response, ShouldResemble, dto.TeamsList{
 					List:  teamModels[:size],
@@ -324,7 +324,7 @@ func TestGetAllTeams(t *testing.T) {
 
 				dataBase.EXPECT().GetAllTeams().Return(teams, nil)
 
-				response, err = GetAllTeams(dataBase, page1, size, anyText, api.NoSortOrder)
+				response, err = SearchAllTeams(dataBase, page1, size, anyText, api.NoSortOrder)
 				So(err, ShouldBeNil)
 				So(response, ShouldResemble, dto.TeamsList{
 					List:  teamModels[page1*size : page1*size+size],
@@ -343,7 +343,7 @@ func TestGetAllTeams(t *testing.T) {
 
 				dataBase.EXPECT().GetAllTeams().Return(teams, nil)
 
-				response, err := GetAllTeams(dataBase, page, size, anyText, api.NoSortOrder)
+				response, err := SearchAllTeams(dataBase, page, size, anyText, api.NoSortOrder)
 				So(err, ShouldBeNil)
 				So(response, ShouldResemble, dto.TeamsList{
 					List:  teamModels[page*size:],
@@ -362,7 +362,7 @@ func TestGetAllTeams(t *testing.T) {
 
 				dataBase.EXPECT().GetAllTeams().Return(teams, nil)
 
-				response, err := GetAllTeams(dataBase, page, size, anyText, api.NoSortOrder)
+				response, err := SearchAllTeams(dataBase, page, size, anyText, api.NoSortOrder)
 				So(err, ShouldBeNil)
 				So(response, ShouldResemble, dto.TeamsList{
 					List:  []dto.TeamModel{},
@@ -378,7 +378,7 @@ func TestGetAllTeams(t *testing.T) {
 			textRegexp := regexp.MustCompile(".*th-team-id")
 			total := int64(len(teamModels)) - 3
 
-			response, err := GetAllTeams(dataBase, firstPage, allTeamsSize, textRegexp, api.NoSortOrder)
+			response, err := SearchAllTeams(dataBase, firstPage, allTeamsSize, textRegexp, api.NoSortOrder)
 			So(err, ShouldBeNil)
 			So(response, ShouldResemble, dto.TeamsList{
 				List:  teamModels[3:],
@@ -393,7 +393,7 @@ func TestGetAllTeams(t *testing.T) {
 				dataBase.EXPECT().GetAllTeams().Return(teams, nil)
 				total := int64(len(teamModels))
 
-				response, err := GetAllTeams(dataBase, firstPage, allTeamsSize, anyText, api.AscSortOrder)
+				response, err := SearchAllTeams(dataBase, firstPage, allTeamsSize, anyText, api.AscSortOrder)
 				So(err, ShouldBeNil)
 				So(response, ShouldResemble, dto.TeamsList{
 					List: []dto.TeamModel{
@@ -415,7 +415,7 @@ func TestGetAllTeams(t *testing.T) {
 				dataBase.EXPECT().GetAllTeams().Return(teams, nil)
 				total := int64(len(teamModels))
 
-				response, err := GetAllTeams(dataBase, firstPage, allTeamsSize, anyText, api.DescSortOrder)
+				response, err := SearchAllTeams(dataBase, firstPage, allTeamsSize, anyText, api.DescSortOrder)
 				So(err, ShouldBeNil)
 				So(response, ShouldResemble, dto.TeamsList{
 					List: []dto.TeamModel{
@@ -443,7 +443,7 @@ func TestGetAllTeams(t *testing.T) {
 				size  int64 = 2
 			)
 
-			response, err := GetAllTeams(dataBase, page, size, textRegexp, api.DescSortOrder)
+			response, err := SearchAllTeams(dataBase, page, size, textRegexp, api.DescSortOrder)
 			So(err, ShouldBeNil)
 			So(response, ShouldResemble, dto.TeamsList{
 				List: []dto.TeamModel{

diff --git a/api/handler/team.go b/api/handler/team.go
@@ -18,7 +18,7 @@ func teams(router chi.Router) {
 		middleware.Paginate(getAllTeamsDefaultPage, getAllTeamsDefaultSize),
 		middleware.SearchTextContext(regexp.MustCompile(getAllTeamsDefaultRegexTemplate)),
 		middleware.SortOrderContext(api.AscSortOrder),
-	).Get("/all", getAllTeams)
+	).Get("/all", searchAllTeams)
 	router.Get("/", getAllTeamsForUser)
 	router.Post("/", createTeam)
 	router.Route("/{teamId}", func(router chi.Router) {
@@ -154,13 +154,13 @@ func getTeam(writer http.ResponseWriter, request *http.Request) {
 //	@failure	422			{object}	api.ErrorRenderExample			"Render error"
 //	@failure	500			{object}	api.ErrorInternalServerExample	"Internal server error"
 //	@router		/teams/all [get]
-func getAllTeams(writer http.ResponseWriter, request *http.Request) {
+func searchAllTeams(writer http.ResponseWriter, request *http.Request) {
 	page := middleware.GetPage(request)
 	size := middleware.GetSize(request)
 	textRegex := middleware.GetSearchText(request)
 	sort := middleware.GetSortOrder(request)
 
-	response, err := controller.GetAllTeams(database, page, size, textRegex, sort)
+	response, err := controller.SearchAllTeams(database, page, size, textRegex, sort)
 	if err != nil {
 		render.Render(writer, request, err) //nolint:errcheck
 		return

diff --git a/api/handler/team_test.go b/api/handler/team_test.go
@@ -31,7 +31,7 @@ func fillContextForGetAllTeams(ctx context.Context, testPage, testSize int64, se
 	return ctx
 }
 
-func TestGetAllTeams(t *testing.T) {
+func Test_searchAllTeams(t *testing.T) {
 	Convey("Test getting all teams", t, func() {
 		mockCtrl := gomock.NewController(t)
 		defer mockCtrl.Finish()
@@ -78,7 +78,7 @@ func TestGetAllTeams(t *testing.T) {
 			expectedDTO.Size = &defaultTestSize
 			expectedDTO.Total = &total
 
-			getAllTeams(responseWriter, testRequest)
+			searchAllTeams(responseWriter, testRequest)
 
 			response := responseWriter.Result()
 			defer response.Body.Close()
@@ -121,7 +121,7 @@ func TestGetAllTeams(t *testing.T) {
 				ErrorText:  expectedErrResponseFromController.ErrorText,
 			}
 
-			getAllTeams(responseWriter, testRequest)
+			searchAllTeams(responseWriter, testRequest)
 
 			response := responseWriter.Result()
 			defer response.Body.Close()