feat: remove QueryFilterByConceptIdsHelper deprecated method

Author: pieterlukasse

models/helper.go

@@ -48,24 +48,9 @@ func QueryFilterByConceptDefsPlusCohortPairsHelper(query *gorm.DB, sourceId int,
 	return query, finalObservationTableAlias
 }
 
-// DEPRECATED - USE QueryFilterByConceptDefsHelper
 // Helper function that adds extra filter clauses to the query, joining on the right set of tables.
 //   - It was added here to make it reusable, given these filters need to be added to many of the queries that take in
-//     a list of filters in the form of concept ids.
-func QueryFilterByConceptIdsHelper(query *gorm.DB, sourceId int, filterConceptIds []int64,
-	omopDataSource *utils.DbAndSchema, resultSchemaName string, personIdFieldForObservationJoin string) *gorm.DB {
-	// iterate over the filterConceptIds, adding a new INNER JOIN and filters for each, so that the resulting set is the
-	// set of persons that have a non-null value for each and every one of the concepts:
-	for i, filterConceptId := range filterConceptIds {
-		observationTableAlias := fmt.Sprintf("observation_filter_%d", i)
-		log.Printf("Adding extra INNER JOIN with alias %s", observationTableAlias)
-		query = query.Joins("INNER JOIN "+omopDataSource.Schema+".observation_continuous as "+observationTableAlias+omopDataSource.GetViewDirective()+" ON "+observationTableAlias+".person_id = "+personIdFieldForObservationJoin).
-			Where(observationTableAlias+".observation_concept_id = ?", filterConceptId).
-			Where(GetConceptValueNotNullCheckBasedOnConceptType(observationTableAlias, sourceId, filterConceptId))
-	}
-	return query
-}
-
+//     a list of filters in the form of concept definitions.
 func QueryFilterByConceptDefHelper(query *gorm.DB, sourceId int, filterConceptDef utils.CustomConceptVariableDef,
 	omopDataSource *utils.DbAndSchema, finalCohortAlias string, observationTableAlias string) (*gorm.DB, string, error) {
 	// 1  - check if filterConceptDef has a transformation

tests/models_tests/models_test.go

@@ -1154,39 +1154,9 @@ func TestToSQL(t *testing.T) {
 	}
 }
 
-func TestQueryFilterByConceptIdsHelper(t *testing.T) {
-	// This test checks whether the query succeeds when the mainObservationTableAlias
-	// argument passed to QueryFilterByConceptIdsHelper (last argument)
-	// matches the alias used in the main query, and whether it fails otherwise.
-
-	setUp(t)
-	omopDataSource := tests.GetOmopDataSource()
-	filterConceptIds := []int64{allConceptIds[0], allConceptIds[1], allConceptIds[2]}
-	var personIds []struct {
-		PersonId int64
-	}
-
-	// Subtest1: correct alias "observation":
-	query := omopDataSource.Db.Table(omopDataSource.Schema + ".observation_continuous as observation" + omopDataSource.GetViewDirective()).
-		Select("observation.person_id")
-	query = models.QueryFilterByConceptIdsHelper(query, testSourceId, filterConceptIds, omopDataSource, "", "observation.person_id")
-	meta_result := query.Scan(&personIds)
-	if meta_result.Error != nil {
-		t.Errorf("Did NOT expect an error")
-	}
-	// Subtest2: incorrect alias "observation"...should fail:
-	query = omopDataSource.Db.Table(omopDataSource.Schema + ".observation_continuous as observationWRONG").
-		Select("*")
-	query = models.QueryFilterByConceptIdsHelper(query, testSourceId, filterConceptIds, omopDataSource, "", "observation.person_id")
-	meta_result = query.Scan(&personIds)
-	if meta_result.Error == nil {
-		t.Errorf("Expected an error")
-	}
-}
-
 func TestQueryFilterByConceptDefsHelper(t *testing.T) {
 	// This test checks whether the query succeeds when the mainObservationTableAlias
-	// argument passed to QueryFilterByConceptIdsHelper (last argument)
+	// argument passed to QueryFilterByConceptDefsHelper (last argument)
 	// matches the alias used in the main query, and whether it fails otherwise.
 
 	setUp(t)