diff --git a/backend/internal/repository/user_repo_integration_test.go b/backend/internal/repository/user_repo_integration_test.go index c492fda6..ab2195e3 100644 --- a/backend/internal/repository/user_repo_integration_test.go +++ b/backend/internal/repository/user_repo_integration_test.go @@ -166,7 +166,7 @@ func (s *UserRepoSuite) TestListWithFilters_Status() { s.mustCreateUser(&service.User{Email: "active@test.com", Status: service.StatusActive}) s.mustCreateUser(&service.User{Email: "disabled@test.com", Status: service.StatusDisabled}) - users, _, err := s.repo.ListWithFilters(s.ctx, pagination.PaginationParams{Page: 1, PageSize: 10}, service.StatusActive, "", "") + users, _, err := s.repo.ListWithFilters(s.ctx, pagination.PaginationParams{Page: 1, PageSize: 10}, service.UserListFilters{Status: service.StatusActive}) s.Require().NoError(err) s.Require().Len(users, 1) s.Require().Equal(service.StatusActive, users[0].Status) @@ -176,7 +176,7 @@ func (s *UserRepoSuite) TestListWithFilters_Role() { s.mustCreateUser(&service.User{Email: "user@test.com", Role: service.RoleUser}) s.mustCreateUser(&service.User{Email: "admin@test.com", Role: service.RoleAdmin}) - users, _, err := s.repo.ListWithFilters(s.ctx, pagination.PaginationParams{Page: 1, PageSize: 10}, "", service.RoleAdmin, "") + users, _, err := s.repo.ListWithFilters(s.ctx, pagination.PaginationParams{Page: 1, PageSize: 10}, service.UserListFilters{Role: service.RoleAdmin}) s.Require().NoError(err) s.Require().Len(users, 1) s.Require().Equal(service.RoleAdmin, users[0].Role) @@ -186,7 +186,7 @@ func (s *UserRepoSuite) TestListWithFilters_Search() { s.mustCreateUser(&service.User{Email: "alice@test.com", Username: "Alice"}) s.mustCreateUser(&service.User{Email: "bob@test.com", Username: "Bob"}) - users, _, err := s.repo.ListWithFilters(s.ctx, pagination.PaginationParams{Page: 1, PageSize: 10}, "", "", "alice") + users, _, err := s.repo.ListWithFilters(s.ctx, pagination.PaginationParams{Page: 1, PageSize: 10}, service.UserListFilters{Search: "alice"}) s.Require().NoError(err) s.Require().Len(users, 1) s.Require().Contains(users[0].Email, "alice") @@ -196,7 +196,7 @@ func (s *UserRepoSuite) TestListWithFilters_SearchByUsername() { s.mustCreateUser(&service.User{Email: "u1@test.com", Username: "JohnDoe"}) s.mustCreateUser(&service.User{Email: "u2@test.com", Username: "JaneSmith"}) - users, _, err := s.repo.ListWithFilters(s.ctx, pagination.PaginationParams{Page: 1, PageSize: 10}, "", "", "john") + users, _, err := s.repo.ListWithFilters(s.ctx, pagination.PaginationParams{Page: 1, PageSize: 10}, service.UserListFilters{Search: "john"}) s.Require().NoError(err) s.Require().Len(users, 1) s.Require().Equal("JohnDoe", users[0].Username) @@ -216,7 +216,7 @@ func (s *UserRepoSuite) TestListWithFilters_LoadsActiveSubscriptions() { c.SetExpiresAt(time.Now().Add(-1 * time.Hour)) }) - users, _, err := s.repo.ListWithFilters(s.ctx, pagination.PaginationParams{Page: 1, PageSize: 10}, "", "", "sub@") + users, _, err := s.repo.ListWithFilters(s.ctx, pagination.PaginationParams{Page: 1, PageSize: 10}, service.UserListFilters{Search: "sub@"}) s.Require().NoError(err, "ListWithFilters") s.Require().Len(users, 1, "expected 1 user") s.Require().Len(users[0].Subscriptions, 1, "expected 1 active subscription") @@ -245,7 +245,7 @@ func (s *UserRepoSuite) TestListWithFilters_CombinedFilters() { Status: service.StatusDisabled, }) - users, page, err := s.repo.ListWithFilters(s.ctx, pagination.PaginationParams{Page: 1, PageSize: 10}, service.StatusActive, service.RoleAdmin, "b@") + users, page, err := s.repo.ListWithFilters(s.ctx, pagination.PaginationParams{Page: 1, PageSize: 10}, service.UserListFilters{Status: service.StatusActive, Role: service.RoleAdmin, Search: "b@"}) s.Require().NoError(err, "ListWithFilters") s.Require().Equal(int64(1), page.Total, "ListWithFilters total mismatch") s.Require().Len(users, 1, "ListWithFilters len mismatch") @@ -487,7 +487,7 @@ func (s *UserRepoSuite) TestCRUD_And_Filters_And_AtomicUpdates() { s.Require().Equal(user1.Concurrency+3, got5.Concurrency) params := pagination.PaginationParams{Page: 1, PageSize: 10} - users, page, err := s.repo.ListWithFilters(s.ctx, params, service.StatusActive, service.RoleAdmin, "b@") + users, page, err := s.repo.ListWithFilters(s.ctx, params, service.UserListFilters{Status: service.StatusActive, Role: service.RoleAdmin, Search: "b@"}) s.Require().NoError(err, "ListWithFilters") s.Require().Equal(int64(1), page.Total, "ListWithFilters total mismatch") s.Require().Len(users, 1, "ListWithFilters len mismatch")