feat: simplify name of GetUniqueCohortDefinitionIdsList

Author: pieterlukasse

middlewares/teamprojectauthz.go

@@ -75,7 +75,7 @@ func (u TeamProjectAuthz) TeamProjectValidationForCohort(ctx *gin.Context, cohor
 
 func (u TeamProjectAuthz) TeamProjectValidation(ctx *gin.Context, cohortDefinitionIds []int, filterCohortPairs []utils.CustomDichotomousVariableDef) bool {
 
-	uniqueCohortDefinitionIdsList := utils.GetUniqueCohortDefinitionIdsListFromRequest(cohortDefinitionIds, filterCohortPairs)
+	uniqueCohortDefinitionIdsList := utils.GetUniqueCohortDefinitionIdsList(cohortDefinitionIds, filterCohortPairs)
 	return u.TeamProjectValidationForCohortIdsList(ctx, uniqueCohortDefinitionIdsList)
 }
 

tests/models_tests/models_test.go

@@ -573,7 +573,7 @@ func TestGetTeamProjectsThatMatchAllCohortDefinitionIdsOnlyDefaultMatch(t *testi
 			CohortDefinitionId2: largestCohort.Id,
 			ProvidedName:        "test"},
 	}
-	uniqueCohortDefinitionIdsList := utils.GetUniqueCohortDefinitionIdsListFromRequest([]int{cohortDefinitionId}, filterCohortPairs)
+	uniqueCohortDefinitionIdsList := utils.GetUniqueCohortDefinitionIdsList([]int{cohortDefinitionId}, filterCohortPairs)
 	if len(uniqueCohortDefinitionIdsList) != 3 {
 		t.Errorf("Expected uniqueCohortDefinitionIdsList length to be 3")
 	}
@@ -590,7 +590,7 @@ func TestGetTeamProjectsThatMatchAllCohortDefinitionIdsOnlyDefaultMatch(t *testi
 			CohortDefinitionId2: largestCohort.Id,
 			ProvidedName:        "test"},
 	}
-	uniqueCohortDefinitionIdsList = utils.GetUniqueCohortDefinitionIdsListFromRequest([]int{cohortDefinitionId}, filterCohortPairs)
+	uniqueCohortDefinitionIdsList = utils.GetUniqueCohortDefinitionIdsList([]int{cohortDefinitionId}, filterCohortPairs)
 	if len(uniqueCohortDefinitionIdsList) != 2 {
 		t.Errorf("Expected uniqueCohortDefinitionIdsList length to be 2")
 	}
@@ -609,7 +609,7 @@ func TestGetTeamProjectsThatMatchAllCohortDefinitionIds(t *testing.T) {
 			CohortDefinitionId2: 32,
 			ProvidedName:        "test"},
 	}
-	uniqueCohortDefinitionIdsList := utils.GetUniqueCohortDefinitionIdsListFromRequest([]int{cohortDefinitionId}, filterCohortPairs)
+	uniqueCohortDefinitionIdsList := utils.GetUniqueCohortDefinitionIdsList([]int{cohortDefinitionId}, filterCohortPairs)
 	if len(uniqueCohortDefinitionIdsList) != 2 {
 		t.Errorf("Expected uniqueCohortDefinitionIdsList length to be 2")
 	}

utils/parsing.go

@@ -301,7 +301,7 @@ func MakeUnique(input []int) []int {
 // Utility function to parse out the cohort definition ids from a specific structure in which
 // they can be found (in this case deep inside CustomDichotomousVariableDef items) and concatenate them
 // with another given list of ids, removing duplicate ids (if any). 
-func GetUniqueCohortDefinitionIdsListFromRequest(cohortDefinitionIds []int, filterCohortPairs []CustomDichotomousVariableDef) []int {
+func GetUniqueCohortDefinitionIdsList(cohortDefinitionIds []int, filterCohortPairs []CustomDichotomousVariableDef) []int {
 	var idsList []int
 	idsList = append(idsList, cohortDefinitionIds...)
 	if len(filterCohortPairs) > 0 {