fix: fix the .last methods; add better data

Author: pieterlukasse

tests/data_generator/example_test_data_config2.yaml

@@ -40,7 +40,7 @@ cohorts:
    clone_count: 2
    # concepts that will be created and linked to persons in this cohort via observations:
    concepts:
-    - concept: concept-name
+    - concept: concept-name-small
       value_type: number
       # this means ~1/3 of the persons in the cohort will have this concept associated to them in the observation table:
       ratio_of_persons: 0.34
@@ -68,7 +68,7 @@ cohorts:
    clone_count: 2
    # concepts that will be created and linked to persons in this cohort via observations:
    concepts:
-    - concept: concept-name
+    - concept: concept-name-medium
       value_type: number
       # this means ~1/3 of the persons in the cohort will have this concept associated to them in the observation table:
       ratio_of_persons: 0.34
@@ -96,7 +96,7 @@ cohorts:
    clone_count: 2
    # concepts that will be created and linked to persons in this cohort via observations:
    concepts:
-    - concept: concept-name
+    - concept: concept-name-large
       value_type: number
       # this means ~1/3 of the persons in the cohort will have this concept associated to them in the observation table:
       ratio_of_persons: 0.34

tests/testutils.go

@@ -109,7 +109,7 @@ func EmptyTable(dataSource *utils.DbAndSchema, tableName string) {
 func GetLastCohortId() int {
 	dataSource := db.GetAtlasDB()
 	var lastCohortDefinition models.CohortDefinition
-	dataSource.Db.Last(&lastCohortDefinition)
+	dataSource.Db.Order("id DESC").First(&lastCohortDefinition)
 	return lastCohortDefinition.Id
 }
 
@@ -124,21 +124,23 @@ func GetNextCohortId() int {
 func GetLastConceptId(sourceId int) int64 {
 	dataSource := GetOmopDataSourceForSourceId(sourceId)
 	var lastConcept models.Concept
-	dataSource.Db.Last(&lastConcept)
+	dataSource.Db.Order("concept_id DESC").First(&lastConcept)
+	log.Printf("Last concept id found %d",
+		lastConcept.ConceptId)
 	return lastConcept.ConceptId
 }
 
 func GetLastObservationId(sourceId int) int64 {
 	dataSource := GetOmopDataSourceForSourceId(sourceId)
 	var lastObservation models.Observation
-	dataSource.Db.Last(&lastObservation)
+	dataSource.Db.Order("observation_id DESC").First(&lastObservation)
 	return lastObservation.ObservationId
 }
 
 func GetLastPersonId(sourceId int) int64 {
 	dataSource := GetOmopDataSourceForSourceId(sourceId)
 	var lastPerson models.Person
-	dataSource.Db.Last(&lastPerson)
+	dataSource.Db.Order("person_id DESC").First(&lastPerson)
 	return lastPerson.PersonId
 }