From e93a5ff11fee7adac2897b3251db7abbbad4bcc5 Mon Sep 17 00:00:00 2001 From: kolaente Date: Thu, 29 Dec 2022 18:53:52 +0100 Subject: [PATCH] fix: rename after rebase --- pkg/integrations/user_project_test.go | 4 ++-- pkg/routes/api/v1/user_list.go | 2 +- pkg/routes/routes.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/integrations/user_project_test.go b/pkg/integrations/user_project_test.go index 1e201d95f35..00e70a0b61b 100644 --- a/pkg/integrations/user_project_test.go +++ b/pkg/integrations/user_project_test.go @@ -26,12 +26,12 @@ import ( func TestUserProject(t *testing.T) { t.Run("Normal test", func(t *testing.T) { - rec, err := newTestRequestWithUser(t, http.MethodPost, apiv1.UserProject, &testuser1, "", nil, nil) + rec, err := newTestRequestWithUser(t, http.MethodPost, apiv1.UserList, &testuser1, "", nil, nil) assert.NoError(t, err) assert.Equal(t, "null\n", rec.Body.String()) }) t.Run("Search for user3", func(t *testing.T) { - rec, err := newTestRequestWithUser(t, http.MethodPost, apiv1.UserProject, &testuser1, "", map[string][]string{"s": {"user3"}}, nil) + rec, err := newTestRequestWithUser(t, http.MethodPost, apiv1.UserList, &testuser1, "", map[string][]string{"s": {"user3"}}, nil) assert.NoError(t, err) assert.Contains(t, rec.Body.String(), `user3`) assert.NotContains(t, rec.Body.String(), `user1`) diff --git a/pkg/routes/api/v1/user_list.go b/pkg/routes/api/v1/user_list.go index a30ccd851c9..df7e6f8c4ac 100644 --- a/pkg/routes/api/v1/user_list.go +++ b/pkg/routes/api/v1/user_list.go @@ -41,7 +41,7 @@ import ( // @Failure 400 {object} web.HTTPError "Something's invalid." // @Failure 500 {object} models.Message "Internal server error." // @Router /users [get] -func UserProject(c echo.Context) error { +func UserList(c echo.Context) error { search := c.QueryParam("s") s := db.NewSession() diff --git a/pkg/routes/routes.go b/pkg/routes/routes.go index 8de2f5aed4a..6f2cf14273d 100644 --- a/pkg/routes/routes.go +++ b/pkg/routes/routes.go @@ -287,7 +287,7 @@ func registerAPIRoutes(a *echo.Group) { u.GET("", apiv1.UserShow) u.POST("/password", apiv1.UserChangePassword) - u.GET("s", apiv1.UserProject) + u.GET("s", apiv1.UserList) u.POST("/token", apiv1.RenewToken) u.POST("/settings/email", apiv1.UpdateUserEmail) u.GET("/settings/avatar", apiv1.GetUserAvatarProvider)