Fix failing test.

content-services · Oct 19, 2023 · 1da5d1b · 1da5d1b
1 parent 11ef10b
commit 1da5d1b
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/pkg/dao/snapshots.go b/pkg/dao/snapshots.go
@@ -52,14 +52,9 @@ func (sDao snapshotDaoImpl) List(orgID string, repoConfigUuid string, pagination
 	var snaps []models.Snapshot
 	var totalSnaps int64
 	var repoConfig models.RepositoryConfiguration
-	filteredDB := sDao.db.
-		Model(&models.Snapshot{}).
-		Joins("JOIN repository_configurations ON repository_configuration_uuid = repository_configurations.uuid").
-		Where("repository_configurations.org_id = ?", orgID).
-		Where("repository_configuration_uuid = ?", UuidifyString(repoConfigUuid))
 
 	// First check if repo config exists
-	result := filteredDB.First(&repoConfig)
+	result := sDao.db.Where("uuid = ?", UuidifyString(repoConfigUuid)).First(&repoConfig)
 	if result.Error != nil {
 		if result.Error == gorm.ErrRecordNotFound {
 			return api.SnapshotCollectionResponse{}, totalSnaps, &ce.DaoError{
@@ -75,6 +70,12 @@ func (sDao snapshotDaoImpl) List(orgID string, repoConfigUuid string, pagination
 
 	order := convertSortByToSQL(paginationData.SortBy, sortMap, "created_at asc")
 
+	filteredDB := sDao.db.
+		Model(&models.Snapshot{}).
+		Joins("JOIN repository_configurations ON repository_configuration_uuid = repository_configurations.uuid").
+		Where("repository_configurations.org_id = ?", orgID).
+		Where("repository_configuration_uuid = ?", UuidifyString(repoConfigUuid))
+
 	// Get count
 	filteredDB.Count(&totalSnaps)