Fixes 4292: filtering templates by repo uuids lists dups (#711)

* Fixes 4292: filtering templates by multiple repo uuids returns duplicates * add test
content-services · Jun 20, 2024 · dadfd64 · dadfd64
1 parent 33cd4f1
commit dadfd64
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/pkg/dao/templates.go b/pkg/dao/templates.go
@@ -245,11 +245,13 @@ func (t templateDaoImpl) List(ctx context.Context, orgID string, paginationData
 	// Get count
 	if filteredDB.
 		Model(&templates).
+		Distinct("uuid").
 		Count(&totalTemplates).Error != nil {
 		return api.TemplateCollectionResponse{}, totalTemplates, t.DBToApiError(filteredDB.Error)
 	}
 
 	if filteredDB.
+		Distinct("templates.*").
 		Preload("RepositoryConfigurations").
 		Order(order).
 		Limit(paginationData.Limit).

diff --git a/pkg/dao/templates_test.go b/pkg/dao/templates_test.go
@@ -265,12 +265,14 @@ func (s *TemplateSuite) TestListFilters() {
 
 	// Test Filter by RepositoryUUIDs
 	template, rcUUIDs := s.seedWithRepoConfig(orgIDTest, 2)
-	filterData = api.TemplateFilterData{RepositoryUUIDs: []string{rcUUIDs[0]}}
+	filterData = api.TemplateFilterData{RepositoryUUIDs: []string{rcUUIDs[0], rcUUIDs[1]}}
 	responses, total, err = templateDao.List(context.Background(), orgIDTest, api.PaginationData{Limit: -1}, filterData)
 	assert.NoError(s.T(), err)
 	assert.Equal(s.T(), int64(2), total)
 	assert.Len(s.T(), responses.Data, 2)
 	assert.True(s.T(), template.UUID == responses.Data[0].UUID || template.UUID == responses.Data[1].UUID)
+	assert.True(s.T(), rcUUIDs[0] == responses.Data[0].RepositoryUUIDS[0] || rcUUIDs[0] == responses.Data[1].RepositoryUUIDS[0])
+	assert.True(s.T(), rcUUIDs[1] == responses.Data[0].RepositoryUUIDS[1] || rcUUIDs[1] == responses.Data[1].RepositoryUUIDS[1])
 }
 
 func (s *TemplateSuite) TestListFilterSearch() {