test: Add comprehensive tests for QueryResourcesCount endpoint

Add complete test coverage for the new resource count functionality:

- Service layer tests for QueryResourcesCount endpoint with various scenarios
- OpenSearch implementation tests with mock client for count and aggregation
- Mock resource searcher tests covering count operations and filters
- Enhanced mock implementations with test helper methods
- Service struct verification for new resourceCountService field

Tests cover success scenarios, error handling, access control integration,
and all query parameters (name, type, tags, parent filters).

Generated with Claude Code (https://claude.ai/code)

Signed-off-by: Andres Tobon <[email protected]>

Author: andrest50

cmd/service/service.go

@@ -72,7 +72,7 @@ func (s *querySvcsrvc) QueryResources(ctx context.Context, p *querysvc.QueryReso
 // relationship.
 func (s *querySvcsrvc) QueryResourcesCount(ctx context.Context, p *querysvc.QueryResourcesCountPayload) (*querysvc.QueryResourcesCountResult, error) {
 
-	slog.DebugContext(ctx, "querySvc.query-resources",
+	slog.DebugContext(ctx, "querySvc.query-resource-counts",
 		"name", p.Name,
 	)
 

cmd/service/service_test.go

@@ -5,6 +5,7 @@ package service
 
 import (
 	"context"
+	"fmt"
 	"testing"
 
 	querysvc "github.com/linuxfoundation/lfx-v2-query-service/gen/query_svc"
@@ -172,6 +173,129 @@ func TestQuerySvcsrvc_QueryResources(t *testing.T) {
 	}
 }
 
+func TestQuerySvcsrvc_QueryResourcesCount(t *testing.T) {
+	tests := []struct {
+		name              string
+		payload           *querysvc.QueryResourcesCountPayload
+		setupMocks        func(*mock.MockResourceSearcher, *mock.MockAccessControlChecker)
+		expectedError     bool
+		expectedErrorType interface{}
+		expectedCount     uint64
+	}{
+		{
+			name: "successful count query",
+			payload: &querysvc.QueryResourcesCountPayload{
+				Version: "1",
+				Type:    stringPtr("project"),
+			},
+			setupMocks: func(searcher *mock.MockResourceSearcher, accessChecker *mock.MockAccessControlChecker) {
+				searcher.SetQueryResourcesCountResponse(&model.CountResult{
+					Count:   5,
+					HasMore: false,
+				})
+				accessChecker.DefaultResult = "allowed"
+			},
+			expectedError: false,
+			expectedCount: 5,
+		},
+		{
+			name: "successful count query with name filter",
+			payload: &querysvc.QueryResourcesCountPayload{
+				Version: "1",
+				Name:    stringPtr("Test"),
+				Type:    stringPtr("committee"),
+			},
+			setupMocks: func(searcher *mock.MockResourceSearcher, accessChecker *mock.MockAccessControlChecker) {
+				searcher.SetQueryResourcesCountResponse(&model.CountResult{
+					Count:   2,
+					HasMore: false,
+				})
+				accessChecker.DefaultResult = "allowed"
+			},
+			expectedError: false,
+			expectedCount: 2,
+		},
+		{
+			name: "count query with tags",
+			payload: &querysvc.QueryResourcesCountPayload{
+				Version: "1",
+				Tags:    []string{"active", "governance"},
+			},
+			setupMocks: func(searcher *mock.MockResourceSearcher, accessChecker *mock.MockAccessControlChecker) {
+				searcher.SetQueryResourcesCountResponse(&model.CountResult{
+					Count:   10,
+					HasMore: true,
+				})
+				accessChecker.DefaultResult = "allowed"
+			},
+			expectedError: false,
+			expectedCount: 10,
+		},
+		{
+			name: "count query with parent filter",
+			payload: &querysvc.QueryResourcesCountPayload{
+				Version: "1",
+				Parent:  stringPtr("project:123"),
+			},
+			setupMocks: func(searcher *mock.MockResourceSearcher, accessChecker *mock.MockAccessControlChecker) {
+				searcher.SetQueryResourcesCountResponse(&model.CountResult{
+					Count:   3,
+					HasMore: false,
+				})
+				accessChecker.DefaultResult = "allowed"
+			},
+			expectedError: false,
+			expectedCount: 3,
+		},
+		{
+			name: "count query with service error",
+			payload: &querysvc.QueryResourcesCountPayload{
+				Version: "1",
+				Type:    stringPtr("invalid"),
+			},
+			setupMocks: func(searcher *mock.MockResourceSearcher, accessChecker *mock.MockAccessControlChecker) {
+				searcher.SetQueryResourcesCountError(fmt.Errorf("service error"))
+			},
+			expectedError:     true,
+			expectedErrorType: &querysvc.InternalServerError{},
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			// Setup mocks
+			mockResourceSearcher := mock.NewMockResourceSearcher()
+			mockAccessChecker := mock.NewMockAccessControlChecker()
+			mockOrgSearcher := mock.NewMockOrganizationSearcher()
+			tc.setupMocks(mockResourceSearcher, mockAccessChecker)
+
+			service := NewQuerySvc(mockResourceSearcher, mockAccessChecker, mockOrgSearcher, mock.NewMockAuthService())
+			svc, ok := service.(*querySvcsrvc)
+			assert.True(t, ok)
+
+			ctx := context.WithValue(context.Background(), constants.PrincipalContextID, "test-user")
+
+			// Execute
+			result, err := svc.QueryResourcesCount(ctx, tc.payload)
+
+			// Verify
+			if tc.expectedError {
+				assert.Error(t, err)
+				if tc.expectedErrorType != nil {
+					assert.IsType(t, tc.expectedErrorType, err)
+				}
+				assert.Nil(t, result)
+			} else {
+				assert.NoError(t, err)
+				assert.NotNil(t, result)
+				assert.Equal(t, tc.expectedCount, result.Count)
+				// HasMore is returned from the service
+				assert.NotNil(t, result.HasMore)
+			}
+		})
+	}
+}
+
 func TestQuerySvcsrvc_QueryOrgs(t *testing.T) {
 	tests := []struct {
 		name              string
@@ -454,6 +578,7 @@ func TestNewQuerySvc(t *testing.T) {
 				// Cast to concrete type to verify internal fields
 				if svc, ok := result.(*querySvcsrvc); ok {
 					assert.NotNil(t, svc.resourceService)
+					assert.NotNil(t, svc.resourceCountService)
 					assert.NotNil(t, svc.organizationService)
 				}
 			} else {

internal/infrastructure/mock/access_control.go

@@ -25,6 +25,10 @@ type MockAccessControlChecker struct {
 	SimulateErrors bool
 	// DefaultResult is the default access result ("allowed" or "denied")
 	DefaultResult string
+	// Test helper fields
+	checkAccessResponse map[string]string
+	checkAccessError    error
+	isReadyError        error
 }
 
 // CheckAccess implements the AccessControlChecker interface with mock behavior
@@ -36,6 +40,16 @@ func (m *MockAccessControlChecker) CheckAccess(ctx context.Context, subj string,
 		"public_only", m.PublicResourcesOnly,
 	)
 
+	// If test has set a mock error, return it
+	if m.checkAccessError != nil {
+		return nil, m.checkAccessError
+	}
+
+	// If test has set a mock response, return it
+	if m.checkAccessResponse != nil {
+		return m.checkAccessResponse, nil
+	}
+
 	result := make(model.AccessCheckResult)
 
 	// Parse the input data - expecting line-separated permission requests
@@ -85,6 +99,9 @@ func (m *MockAccessControlChecker) Close() error {
 
 // IsReady implements the AccessControlChecker interface (always ready for mock)
 func (m *MockAccessControlChecker) IsReady(ctx context.Context) error {
+	if m.isReadyError != nil {
+		return m.isReadyError
+	}
 	return nil
 }
 
@@ -171,3 +188,20 @@ func NewMockAccessControlCheckerDenyAll() *MockAccessControlChecker {
 		DefaultResult:       "denied",
 	}
 }
+
+// Test helper methods for setting up mock responses
+
+// SetCheckAccessResponse sets the mock response for CheckAccess calls
+func (m *MockAccessControlChecker) SetCheckAccessResponse(response map[string]string) {
+	m.checkAccessResponse = response
+}
+
+// SetCheckAccessError sets the mock error for CheckAccess calls
+func (m *MockAccessControlChecker) SetCheckAccessError(err error) {
+	m.checkAccessError = err
+}
+
+// SetIsReadyError sets the mock error for IsReady calls
+func (m *MockAccessControlChecker) SetIsReadyError(err error) {
+	m.isReadyError = err
+}

internal/infrastructure/mock/resource_searcher.go

@@ -14,7 +14,10 @@ import (
 // MockResourceSearcher is a mock implementation of ResourceSearcher for testing
 // This demonstrates how the clean architecture allows easy swapping of implementations
 type MockResourceSearcher struct {
-	resources []model.Resource
+	resources                    []model.Resource
+	queryResourcesCountResponse  *model.CountResult
+	queryResourcesCountError     error
+	isReadyError                 error
 }
 
 // NewMockResourceSearcher creates a new mock searcher with some sample data
@@ -219,6 +222,16 @@ func (m *MockResourceSearcher) QueryResources(ctx context.Context, criteria mode
 func (m *MockResourceSearcher) QueryResourcesCount(ctx context.Context, countCriteria model.SearchCriteria, aggregationCriteria model.SearchCriteria, publicOnly bool) (*model.CountResult, error) {
 	slog.DebugContext(ctx, "executing mock count search", "countCriteria", countCriteria, "aggregationCriteria", aggregationCriteria, "publicOnly", publicOnly)
 
+	// If test has set a mock error, return it
+	if m.queryResourcesCountError != nil {
+		return nil, m.queryResourcesCountError
+	}
+
+	// If test has set a mock response, return it
+	if m.queryResourcesCountResponse != nil {
+		return m.queryResourcesCountResponse, nil
+	}
+
 	// Filter resources based on countCriteria
 	var filteredResources []model.Resource
 
@@ -331,6 +344,9 @@ func (m *MockResourceSearcher) QueryResourcesCount(ctx context.Context, countCri
 
 // IsReady implements the ResourceSearcher interface (always ready for mock)
 func (m *MockResourceSearcher) IsReady(ctx context.Context) error {
+	if m.isReadyError != nil {
+		return m.isReadyError
+	}
 	return nil
 }
 
@@ -428,3 +444,20 @@ func (m *MockResourceSearcher) ClearResources() {
 func (m *MockResourceSearcher) GetResourceCount() int {
 	return len(m.resources)
 }
+
+// Test helper methods for setting up mock responses
+
+// SetQueryResourcesCountResponse sets the mock response for QueryResourcesCount calls
+func (m *MockResourceSearcher) SetQueryResourcesCountResponse(response *model.CountResult) {
+	m.queryResourcesCountResponse = response
+}
+
+// SetQueryResourcesCountError sets the mock error for QueryResourcesCount calls
+func (m *MockResourceSearcher) SetQueryResourcesCountError(err error) {
+	m.queryResourcesCountError = err
+}
+
+// SetIsReadyError sets the mock error for IsReady calls
+func (m *MockResourceSearcher) SetIsReadyError(err error) {
+	m.isReadyError = err
+}