drop pipeline_name unique constraint from user_quotas table (#165)

Co-authored-by: Jose Soto <[email protected]>
DataBiosphere · Nov 21, 2024 · f42d24d · f42d24d
1 parent 6ab1aa8
commit f42d24d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/service/src/main/resources/db/changelog.xml b/service/src/main/resources/db/changelog.xml
@@ -32,6 +32,7 @@
   <include file="changesets/20241030_add_pipeline_quotas.yaml" relativeToChangelogFile="true"/>
   <include file="changesets/20241103_add_user_quotas.yaml" relativeToChangelogFile="true"/>
   <include file="changesets/20241106_array_imputation_rename.yaml" relativeToChangelogFile="true"/>
+  <include file="changesets/20241121_remove_user_quota_pname_uk.yaml" relativeToChangelogFile="true"/>
 
   <include file="changesets/20240412-testdata.yaml" relativeToChangelogFile="true"/>
 

diff --git a/service/src/main/resources/db/changesets/20241121_remove_user_quota_pname_uk.yaml b/service/src/main/resources/db/changesets/20241121_remove_user_quota_pname_uk.yaml
@@ -0,0 +1,11 @@
+# remove pipeline_name unique key constraint from the user_quotas table
+
+databaseChangeLog:
+  -  changeSet:
+       id:  drop user quotas pipeline_name unique constraint
+       author:  js
+       changes:
+         -  dropUniqueConstraint:
+              tableName:  user_quotas
+              constraintName:  user_quotas_pipeline_name_key
+              uniqueColumns:  pipeline_name
diff --git a/service/src/test/java/bio/terra/pipelines/service/QuotasServiceTest.java b/service/src/test/java/bio/terra/pipelines/service/QuotasServiceTest.java
@@ -52,7 +52,7 @@ void getOrCreateQuotaForUserAndPipeline() {
   }
 
   @Test
-  void addRowForNonExistentUserQuota() {
+  void addRowForNonExistentUserQuotaAndSecondUser() {
     // assert nothing exists in the user_quotas table
     assertTrue(
         userQuotasRepository
@@ -80,6 +80,16 @@ void addRowForNonExistentUserQuota() {
         userQuotasRepository
             .findByUserIdAndPipelineName(TestUtils.TEST_USER_ID_1, PipelinesEnum.ARRAY_IMPUTATION)
             .isPresent());
+
+    // call service with second user to test for unique constraints
+    quotasService.getOrCreateQuotaForUserAndPipeline(
+        TestUtils.TEST_USER_ID_2, PipelinesEnum.ARRAY_IMPUTATION);
+
+    // assert user + pipeline exists in the user_quotas table for the second user
+    assertTrue(
+        userQuotasRepository
+            .findByUserIdAndPipelineName(TestUtils.TEST_USER_ID_2, PipelinesEnum.ARRAY_IMPUTATION)
+            .isPresent());
   }
 
   UserQuota createAndSaveUserQuota(