fix: improve coverage of parsing.go

Author: pieterlukasse

tests/utils_tests/utils_test.go

@@ -376,3 +376,49 @@ func TestExtractConceptIdsFromCustomConceptVariablesDef(t *testing.T) {
 		t.Errorf("Expected %v but found %v", expectedResult, result)
 	}
 }
+
+func TestCheckAndGetLastCustomConceptVariableDef(t *testing.T) {
+	setUp(t)
+	testData := []interface{}{
+		utils.CustomDichotomousVariableDef{
+			CohortDefinitionId1: 123,
+			CohortDefinitionId2: 456,
+			ProvidedName:        "test",
+		},
+		utils.CustomConceptVariableDef{
+			ConceptId: 1234,
+		},
+	}
+
+	result, err := utils.CheckAndGetLastCustomConceptVariableDef(testData)
+
+	if result == nil || err != nil {
+		t.Errorf("Expected a valid result and no error. Result: %v, Error: %v", result, err)
+	}
+
+	testData = []interface{}{
+		utils.CustomConceptVariableDef{
+			ConceptId: 1234,
+		},
+		utils.CustomDichotomousVariableDef{
+			CohortDefinitionId1: 123,
+			CohortDefinitionId2: 456,
+			ProvidedName:        "test",
+		},
+	}
+
+	result, err = utils.CheckAndGetLastCustomConceptVariableDef(testData)
+
+	if result != nil || err == nil {
+		t.Errorf("Expected NO result and an error. Result: %v, Error: %v", result, err)
+	}
+
+	testData = []interface{}{}
+
+	result, err = utils.CheckAndGetLastCustomConceptVariableDef(testData)
+
+	if result != nil || err == nil {
+		t.Errorf("Expected NO result and an error. Result: %v, Error: %v", result, err)
+	}
+
+}

utils/parsing.go

@@ -310,19 +310,6 @@ func ParseSourceIdAndConceptTypes(c *gin.Context) (int, []string, error) {
 	return sourceId, conceptTypes.ConceptTypes, nil
 }
 
-func ParseSourceIdAndCohortIdAndConceptIds(c *gin.Context) (int, int, []int64, error) {
-	// parse and validate all parameters:
-	sourceId, conceptIds, err1 := ParseSourceIdAndConceptIds(c)
-	if err1 != nil {
-		return -1, -1, nil, err1
-	}
-	cohortId, err2 := ParseNumericArg(c, "cohortid")
-	if err2 != nil {
-		return -1, -1, nil, err2
-	}
-	return sourceId, cohortId, conceptIds, nil
-}
-
 func ParseSourceAndCohortId(c *gin.Context) (int, int, error) {
 	// parse and validate all parameters:
 	sourceId, err := ParseNumericArg(c, "sourceid")