[ATL-11] Added saving of the covariates checkbox state

OHDSI · Nov 15, 2024 · 787e805 · 787e805
1 parent 8170bd5
commit 787e805
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 2 deletions.
diff --git a/src/main/java/org/ohdsi/webapi/cohortdefinition/CohortGenerationInfo.java b/src/main/java/org/ohdsi/webapi/cohortdefinition/CohortGenerationInfo.java
@@ -84,6 +84,8 @@ public  CohortGenerationInfo(CohortDefinition definition, Integer sourceId)
   @ManyToOne(fetch = FetchType.LAZY)
   @JoinColumn(name = "created_by_id")
   private UserEntity createdBy;
+  @Column(name = "is_choose_covariates")
+  private boolean isChooseCovariates;
 
   public CohortGenerationInfoId getId() {
     return id;
@@ -187,4 +189,12 @@ public void setCreatedBy(UserEntity createdBy) {
   public UserEntity getCreatedBy() {
     return createdBy;
   }
+
+  public boolean isChooseCovariates() {
+    return isChooseCovariates;
+  }
+
+  public void setChooseCovariates(boolean chooseCovariates) {
+    isChooseCovariates = chooseCovariates;
+  }
 }
diff --git a/...pi/cohortdefinition/converter/CohortGenerationInfoToCohortGenerationInfoDTOConverter.java b/...pi/cohortdefinition/converter/CohortGenerationInfoToCohortGenerationInfoDTOConverter.java
@@ -22,6 +22,7 @@ public CohortGenerationInfoDTO convert(CohortGenerationInfo info) {
         dto.setStartTime(info.getStartTime());
         dto.setStatus(info.getStatus());
         dto.setIsValid(info.isIsValid());
+        dto.setChooseCovariates(info.isChooseCovariates());
 
         return dto;
     }

diff --git a/src/main/java/org/ohdsi/webapi/cohortdefinition/dto/CohortGenerationInfoDTO.java b/src/main/java/org/ohdsi/webapi/cohortdefinition/dto/CohortGenerationInfoDTO.java
@@ -45,6 +45,8 @@ public class CohortGenerationInfoDTO {
 
     private UserDTO createdBy;
 
+    private boolean isChooseCovariates;
+
     public CohortGenerationInfoId getId() {
         return id;
     }
@@ -124,4 +126,12 @@ public UserDTO getCreatedBy() {
     public void setCreatedBy(UserDTO createdBy) {
         this.createdBy = createdBy;
     }
+
+    public boolean isChooseCovariates() {
+        return isChooseCovariates;
+    }
+
+    public void setChooseCovariates(boolean chooseCovariates) {
+        isChooseCovariates = chooseCovariates;
+    }
 }
diff --git a/src/main/java/org/ohdsi/webapi/service/CohortGenerationService.java b/src/main/java/org/ohdsi/webapi/service/CohortGenerationService.java
@@ -11,7 +11,6 @@
 import org.ohdsi.webapi.job.GeneratesNotification;
 import org.ohdsi.webapi.job.JobExecutionResource;
 import org.ohdsi.webapi.shiro.Entities.UserEntity;
-import org.ohdsi.webapi.shiro.Entities.UserRepository;
 import org.ohdsi.webapi.source.Source;
 import org.ohdsi.webapi.source.SourceService;
 import org.ohdsi.webapi.util.SessionUtils;
@@ -38,10 +37,10 @@
 import static org.ohdsi.webapi.Constants.Params.COHORT_DEFINITION_ID;
 import static org.ohdsi.webapi.Constants.Params.GENERATE_STATS;
 import static org.ohdsi.webapi.Constants.Params.JOB_NAME;
+import static org.ohdsi.webapi.Constants.Params.RETAIN_COHORT_COVARIATES;
 import static org.ohdsi.webapi.Constants.Params.SESSION_ID;
 import static org.ohdsi.webapi.Constants.Params.SOURCE_ID;
 import static org.ohdsi.webapi.Constants.Params.TARGET_DATABASE_SCHEMA;
-import static org.ohdsi.webapi.Constants.Params.RETAIN_COHORT_COVARIATES;
 
 @Component
 @DependsOn("flyway")
@@ -79,6 +78,7 @@ public JobExecutionResource generateCohortViaJob(UserEntity userEntity, CohortDe
             .orElse(new CohortGenerationInfo(cohortDefinition, source.getSourceId()));
 
     info.setCreatedBy(userEntity);
+    info.setChooseCovariates(retainCohortCovariates);
 
     cohortDefinition.getGenerationInfoList().add(info);
 

diff --git a/...migration/postgresql/V2.14.0.20240704000000__extend_cohort_generation_info_covariates.sql b/...migration/postgresql/V2.14.0.20240704000000__extend_cohort_generation_info_covariates.sql
@@ -0,0 +1 @@
+ALTER TABLE ${ohdsiSchema}.cohort_generation_info ADD is_choose_covariates BOOLEAN NOT NULL DEFAULT FALSE;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE ${ohdsiSchema}.cohort_generation_info ADD is_choose_covariates BOOLEAN NOT NULL DEFAULT FALSE;