Commit 37308198 authored by yangjianbo's avatar yangjianbo
Browse files

chore(合并): 修复合并冲突并保留分组上下文优化

解决 GroupRepository 接口签名更新导致的测试失败

保留 ctxkey.Group Hydrated 覆盖逻辑相关测试

测试: make test-backend
parent 297f08c6
...@@ -355,7 +355,7 @@ func (s *groupRepoStubForFallbackCycle) List(_ context.Context, _ pagination.Pag ...@@ -355,7 +355,7 @@ func (s *groupRepoStubForFallbackCycle) List(_ context.Context, _ pagination.Pag
panic("unexpected List call") panic("unexpected List call")
} }
func (s *groupRepoStubForFallbackCycle) ListWithFilters(_ context.Context, _ pagination.PaginationParams, _, _ string, _ *bool) ([]Group, *pagination.PaginationResult, error) { func (s *groupRepoStubForFallbackCycle) ListWithFilters(_ context.Context, _ pagination.PaginationParams, _, _, _ string, _ *bool) ([]Group, *pagination.PaginationResult, error) {
panic("unexpected ListWithFilters call") panic("unexpected ListWithFilters call")
} }
......
...@@ -223,7 +223,7 @@ func (m *mockGroupRepoForGateway) DeleteCascade(ctx context.Context, id int64) ( ...@@ -223,7 +223,7 @@ func (m *mockGroupRepoForGateway) DeleteCascade(ctx context.Context, id int64) (
func (m *mockGroupRepoForGateway) List(ctx context.Context, params pagination.PaginationParams) ([]Group, *pagination.PaginationResult, error) { func (m *mockGroupRepoForGateway) List(ctx context.Context, params pagination.PaginationParams) ([]Group, *pagination.PaginationResult, error) {
return nil, nil, nil return nil, nil, nil
} }
func (m *mockGroupRepoForGateway) ListWithFilters(ctx context.Context, params pagination.PaginationParams, platform, status string, isExclusive *bool) ([]Group, *pagination.PaginationResult, error) { func (m *mockGroupRepoForGateway) ListWithFilters(ctx context.Context, params pagination.PaginationParams, platform, status, search string, isExclusive *bool) ([]Group, *pagination.PaginationResult, error) {
return nil, nil, nil return nil, nil, nil
} }
func (m *mockGroupRepoForGateway) ListActive(ctx context.Context) ([]Group, error) { func (m *mockGroupRepoForGateway) ListActive(ctx context.Context) ([]Group, error) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment