Add cohort details expression to endpoint (#113)

* add cohort details expression to endpoint

Author: tianj7

models/cohortdefinition.go

@@ -26,6 +26,7 @@ type CohortDefinition struct {
 	ExpressionType string `json:",omitempty"`
 	CreatedById    int    `json:",omitempty"`
 	ModifiedById   int    `json:",omitempty"`
+	Expression     string `json:",omitempty"`
 }
 
 type CohortDefinitionStats struct {
@@ -35,11 +36,14 @@ type CohortDefinitionStats struct {
 }
 
 func (h CohortDefinition) GetCohortDefinitionById(id int) (*CohortDefinition, error) {
+	atlasDb := db.GetAtlasDB()
 	db2 := db.GetAtlasDB().Db
 	var cohortDefinition *CohortDefinition
 	query := db2.Model(&CohortDefinition{}).
-		Select("id, name, description").
-		Where("id = ?", id)
+		Select("cohort_definition.id, cohort_definition.name, cohort_definition.description, cohort_definition_details.expression").
+		Where("cohort_definition.id = ?", id).
+		Joins("INNER JOIN " + atlasDb.Schema + ".cohort_definition_details ON cohort_definition.id = cohort_definition_details.id")
+
 	query, cancel := utils.AddTimeoutToQuery(query)
 	defer cancel()
 	meta_result := query.Scan(&cohortDefinition)

tests/models_tests/models_test.go

@@ -722,6 +722,13 @@ func TestGetAllCohortDefinitionsAndStatsOrderBySizeDescWhenCohortDefinitionIsMis
 		firstCohort.Id,
 		firstCohort.Name,
 		firstCohort.Name))
+
+	tests.ExecAtlasSQLString(fmt.Sprintf("insert into %s.cohort_definition_details (id,expression,hash_code) "+
+		"values (%d, '{\"expression\" : \"%d\" }', %d)",
+		db.GetAtlasDB().Schema,
+		firstCohort.Id,
+		firstCohort.Id,
+		555444))
 }
 
 func TestGetCohortName(t *testing.T) {
@@ -1022,6 +1029,9 @@ func TestGetCohortDefinitionById(t *testing.T) {
 	if allCohortDefinitions[0].Id != foundCohortDefinition.Id {
 		t.Errorf("Expected data not found")
 	}
+	if foundCohortDefinition.Expression != "{\"expression\" : \"1\" }" {
+		t.Errorf("Expected expression data not found")
+	}
 }
 
 func TestRetrieveDataByOriginalCohortAndNewCohort(t *testing.T) {

tests/setup_local_db/ddl_atlas.sql

@@ -38,6 +38,18 @@ CREATE TABLE atlas.cohort_definition
     CONSTRAINT PK_cohort_definition PRIMARY KEY (id)
 );
 
+CREATE TABLE atlas.cohort_definition_details
+(
+    id integer NOT NULL ,
+    expression text NOT NULL,
+    hash_code integer,
+    CONSTRAINT PK_cohort_definition_details PRIMARY KEY (id),
+    CONSTRAINT fk_cohort_definition_details_to_cohort_definition FOREIGN KEY (id)
+        REFERENCES atlas.cohort_definition (id) MATCH SIMPLE
+        ON UPDATE NO ACTION
+        ON DELETE CASCADE
+);
+
 CREATE TABLE atlas.sec_role
 (
     id integer NOT NULL,

tests/setup_local_db/test_data_atlas.sql

@@ -27,6 +27,16 @@ values
     (4,'Test cohort4','Extra Larger cohort')
 ;
 
+insert into atlas.cohort_definition_details
+(id,expression,hash_code)
+values
+    (1,'{"expression" : "1" }',987654321),
+    (2,'{"expression" : "2" }',1234567890),
+    (3,'{"expression" : "3" }', 33333445),
+    (4,'{"expression" : "4" }', 555444),
+    (32,'{"expression" : "32" }', 323232)
+;
+
 insert into atlas.sec_role
     (id, name, system_role)
 values