[DUOS-2835][DUOS-2878][risk=no] Use the url dataset property instead …

…of the dbGap version (#2278)

Co-authored-by: aarohinadkarni <[email protected]>

src/main/java/org/broadinstitute/consent/http/service/DatasetService.java

@@ -497,9 +497,6 @@ public Study convertDatasetToStudy(User user, Dataset dataset, StudyConversion s
       // Handle "URL"
       newPropConversion(dictionaries, dataset, "URL", "url", PropertyType.String,
           studyConversion.getUrl());
-      // Handle "dbGAP"
-      legacyPropConversion(dictionaries, dataset, "dbGAP", "url", PropertyType.String,
-          studyConversion.getUrl());
     }
 
     // Handle "Data Submitter User ID"

src/main/resources/changelog-master.xml

@@ -146,4 +146,6 @@
     relativeToChangelogFile="true"/>
   <include file="changesets/changelog-consent-2024-04-01-rm-piname.xml"
     relativeToChangelogFile="true"/>
+  <include file="changesets/changelog-consent-2024-04-02-rm-old-dbgap-url.xml"
+    relativeToChangelogFile="true"/>
 </databaseChangeLog>

src/main/resources/changesets/changelog-consent-2024-04-02-rm-old-dbgap-url.xml

@@ -0,0 +1,18 @@
+<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 id="changelog-consent-2024-03-28-dataset-dac-id-props.xml" author="grushton">
+    <sql>
+      -- Remove duplicate properties
+      DELETE
+      FROM dataset_property
+      WHERE property_key IN (SELECT key_id FROM dictionary d WHERE KEY = 'dbGAP')
+    </sql>
+    <sql>
+      -- Remove deprecated property key from dictionary
+      DELETE
+      FROM dictionary
+      WHERE key = 'dbGAP';
+    </sql>
+  </changeSet>
+</databaseChangeLog>