[risk=no][RW-13631] Add cdr config for the VWB template that will be cloned to create a workspace

api/config/cdr_config_local.json

@@ -145,7 +145,8 @@
       "hasCopeSurveyData": true,
       "hasSurveyConductData": true,
       "accessTier": "registered",
-      "tanagraEnabled": true
+      "tanagraEnabled": true,
+      "vwbTemplateId": "03e0a1e6-ddbc-499f-bdaa-6c0c91dc295a"
     },
     {
       "cdrVersionId": 10,
@@ -168,7 +169,8 @@
       "microarrayVcfSingleSampleStoragePath": "microarray/vcf/single_sample",
       "accessTier": "controlled",
       "tanagraEnabled": true,
-      "needsV8GenomicExtractionWorkflow": true
+      "needsV8GenomicExtractionWorkflow": true,
+      "vwbTemplateId": "03e0a1e6-ddbc-499f-bdaa-6c0c91dc295a"
     }
   ]
 }

api/db/changelog/db.changelog-244-add-lab-column-to-workspace.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                      http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+    <changeSet author="tarekahmed" id="db.changelog-244-add-lab-column-to-workspace">
+        <addColumn tableName="workspace">
+            <column name="lab" type="ENUM('AOU', 'VWB')">
+                <constraints nullable="true"/>
+            </column>
+        </addColumn>
+    </changeSet>
+</databaseChangeLog>

api/db/changelog/db.changelog-245-add-vwb-template-id-cdr-version.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                      http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+    <changeSet author="tarekahmed" id="db.changelog-245-add-vwb-template-id-cdr-version">
+        <addColumn tableName="cdr_version">
+            <column name="vwb_template_id" type="varchar(100)"/>
+        </addColumn>
+    </changeSet>
+</databaseChangeLog>
+
+

api/db/changelog/db.changelog-master.xml

@@ -251,6 +251,8 @@
   <include file="changelog/db.changelog-241-replace-user-initial-credits-expiration-status.xml"/>
   <include file="changelog/db.changelog-242-remove-old-workspace-columns.xml"/>
   <include file="changelog/db.changelog-243-replace-extension-count.xml"/>
+  <include file="changelog/db.changelog-244-add-lab-column-to-workspace.xml"/>
+  <include file="changelog/db.changelog-245-add-vwb-template-id-cdr-version.xml"/>
   <!--
    Note: to update the DB locally, do the following:
    - Migrate schema changes: `./project.rb run-local-all-migrations`

api/src/main/java/org/pmiops/workbench/db/model/DbCdrVersion.java

@@ -63,6 +63,8 @@ public class DbCdrVersion {
 
   private Boolean needsV8GenomicExtractionWorkflow;
 
+  private String vwbTemplateID;
+
   @Id
   @Column(name = "cdr_version_id")
   public long getCdrVersionId() {
@@ -506,6 +508,16 @@ public DbCdrVersion setNeedsV8GenomicExtractionWorkflow(
     return this;
   }
 
+  @Column(name = "vwb_template_id")
+  public String getVwbTemplateID() {
+    return vwbTemplateID;
+  }
+
+  public DbCdrVersion setVwbTemplateID(String vwbTemplateID) {
+    this.vwbTemplateID = vwbTemplateID;
+    return this;
+  }
+
   @Override
   public int hashCode() {
     return Objects.hash(
@@ -550,7 +562,8 @@ public int hashCode() {
         wgsLongReadsHailT2T,
         wgsLongReadsJointVcfGRCh38,
         wgsLongReadsJointVcfT2T,
-        needsV8GenomicExtractionWorkflow);
+        needsV8GenomicExtractionWorkflow,
+        vwbTemplateID);
   }
 
   @Override
@@ -604,6 +617,7 @@ public boolean equals(Object o) {
         && Objects.equals(wgsLongReadsHailT2T, that.wgsLongReadsHailT2T)
         && Objects.equals(wgsLongReadsJointVcfGRCh38, that.wgsLongReadsJointVcfGRCh38)
         && Objects.equals(wgsLongReadsJointVcfT2T, that.wgsLongReadsJointVcfT2T)
-        && Objects.equals(needsV8GenomicExtractionWorkflow, that.needsV8GenomicExtractionWorkflow);
+        && Objects.equals(needsV8GenomicExtractionWorkflow, that.needsV8GenomicExtractionWorkflow)
+        && Objects.equals(vwbTemplateID, that.vwbTemplateID);
   }
 }

api/src/main/java/org/pmiops/workbench/db/model/DbWorkspace.java

@@ -27,11 +27,7 @@
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.pmiops.workbench.db.model.DbFeaturedWorkspace.DbFeaturedCategory;
-import org.pmiops.workbench.model.BillingStatus;
-import org.pmiops.workbench.model.DisseminateResearchEnum;
-import org.pmiops.workbench.model.ResearchOutcomeEnum;
-import org.pmiops.workbench.model.SpecificPopulationEnum;
-import org.pmiops.workbench.model.WorkspaceActiveStatus;
+import org.pmiops.workbench.model.*;
 
 @Entity
 @SecondaryTable(
@@ -96,6 +92,8 @@ public class DbWorkspace {
   private DbFeaturedCategory featuredCategory;
   private boolean usesTanagra;
 
+  private Workspace.LabEnum lab;
+
   public DbWorkspace() {
     setWorkspaceActiveStatusEnum(WorkspaceActiveStatus.ACTIVE);
   }
@@ -790,4 +788,14 @@ public DbWorkspace setUsesTanagra(boolean usesTanagra) {
   public boolean isCDRAndWorkspaceTanagraEnabled() {
     return usesTanagra && cdrVersion.getTanagraEnabled();
   }
+
+  @Column(name = "lab")
+  @Enumerated(EnumType.STRING)
+  public Workspace.LabEnum getLab() {
+    return lab;
+  }
+
+  public void setLab(Workspace.LabEnum lab) {
+    this.lab = lab;
+  }
 }

api/src/main/java/org/pmiops/workbench/tools/cdrconfig/CdrVersionVO.java

@@ -55,4 +55,6 @@ public class CdrVersionVO {
   public String wgsLongReadsJointVcfT2T;
 
   public Boolean needsV8GenomicExtractionWorkflow;
+
+  public String vwbTemplateID;
 }

api/src/main/java/org/pmiops/workbench/utils/mappers/WorkspaceMapper.java

@@ -59,6 +59,7 @@ public interface WorkspaceMapper {
   @Mapping(target = "initialCredits.exhausted", source = "dbWorkspace.initialCreditsExhausted")
   @Mapping(target = "initialCredits.expired", source = "dbWorkspace.initialCreditsExpired")
   @Mapping(target = "usesTanagra", source = "dbWorkspace.usesTanagra")
+  @Mapping(target = "lab", source = "dbWorkspace.lab")
   Workspace toApiWorkspace(
       DbWorkspace dbWorkspace,
       RawlsWorkspaceDetails fcWorkspace,
@@ -139,6 +140,7 @@ default List<WorkspaceResponse> toApiWorkspaceResponseList(
   @Mapping(target = "namespace", source = "workspaceNamespace")
   @Mapping(target = "researchPurpose", source = "dbWorkspace")
   @Mapping(target = "accessTierShortName", source = "dbWorkspace.cdrVersion.accessTier.shortName")
+  @Mapping(target = "lab", source = "dbWorkspace.lab")
   // provides an incomplete workspace!  Only for use by the RecentWorkspace mapper
   Workspace onlyForMappingRecentWorkspace(
       DbWorkspace dbWorkspace, @Context InitialCreditsService initialCreditsService);
@@ -202,6 +204,7 @@ RecentWorkspace toApiRecentWorkspace(
   @Mapping(target = "initialCreditsExpired", ignore = true)
   @Mapping(target = "initialCreditsExhausted", ignore = true)
   @Mapping(target = "usesTanagra", ignore = true)
+  @Mapping(target = "lab", ignore = true)
   void mergeResearchPurposeIntoWorkspace(
       @MappingTarget DbWorkspace workspace, ResearchPurpose researchPurpose);
 

api/src/main/resources/workbench-api.yaml

@@ -7321,6 +7321,12 @@ components:
           type: boolean
           description: Whether a workspace uses Tanagra
           default: false
+        lab:
+          type: string
+          description: the lab that owns the workspace (aou or vwb)
+          enum:
+            - AOU
+            - VWB
 
       example:
         billingAccountName: billingAccounts/000000-AAAAAA-111111