Renaming a boolean flag

Author: alex-odysseus

src/main/java/org/ohdsi/webapi/cohortdefinition/CohortGenerationInfo.java

@@ -89,15 +89,15 @@ public  CohortGenerationInfo(CohortDefinition definition, Integer sourceId)
   private Long ccGenerateId;
 
   // If true, then demographic has been selected.
-  @Column(name = "is_choose_demographic")
-  private boolean isChooseDemographic;
+  @Column(name = "is_demographic")
+  private boolean isDemographic;
 
-  public boolean isChooseDemographic() {
-    return isChooseDemographic;
+  public boolean isDemographic() {
+    return isDemographic;
   }
 
-  public void setIsChooseDemographic(boolean isChooseDemographic) {
-    this.isChooseDemographic = isChooseDemographic;
+  public void setIsDemographic(boolean isDemographic) {
+    this.isDemographic = isDemographic;
   }
 
   public CohortGenerationInfoId getId() {

src/main/java/org/ohdsi/webapi/cohortdefinition/converter/CohortGenerationInfoToCohortGenerationInfoDTOConverter.java

@@ -23,7 +23,7 @@ public CohortGenerationInfoDTO convert(CohortGenerationInfo info) {
         dto.setStatus(info.getStatus());
         dto.setIsValid(info.isIsValid());
         dto.setCcGenerateId(info.getCcGenerateId());
-        dto.setIsChooseDemographic(info.isChooseDemographic());
+        dto.setIsDemographic(info.isDemographic());
 
         return dto;
     }

src/main/java/org/ohdsi/webapi/cohortdefinition/dto/CohortGenerationInfoDTO.java

@@ -46,14 +46,14 @@ public class CohortGenerationInfoDTO {
     private UserDTO createdBy;
 
     private Long ccGenerateId;
-    private boolean isChooseDemographic;
+    private boolean isDemographic;
 
-    public boolean getIsChooseDemographic() {
-        return isChooseDemographic;
+    public boolean getIsDemographic() {
+        return isDemographic;
     }
 
-    public void setIsChooseDemographic(boolean isChooseDemographic) {
-        this.isChooseDemographic = isChooseDemographic;
+    public void setIsDemographic(boolean isDemographic) {
+        this.isDemographic = isDemographic;
     }
 
 

src/main/java/org/ohdsi/webapi/service/CohortGenerationService.java

@@ -103,7 +103,7 @@ public JobExecutionResource generateCohortViaJob(UserEntity userEntity, CohortDe
               .orElse(new CohortGenerationInfo(cohortDefinition, source.getSourceId()));
 
       info.setCreatedBy(userEntity);
-      info.setIsChooseDemographic(demographicStat);
+      info.setIsDemographic(demographicStat);
 
       cohortDefinition.getGenerationInfoList().add(info);
 

src/main/resources/db/migration/postgresql/V2.14.0.20240506095654__extend_cohort_generation_info_demographics.sql

@@ -0,0 +1,2 @@
+ALTER TABLE ${ohdsiSchema}.cohort_generation_info ADD is_demographic BOOLEAN NOT NULL DEFAULT FALSE;
+ALTER TABLE ${ohdsiSchema}.cohort_generation_info ADD cc_generate_id INTEGER NULL;