Merge pull request #8 from codeforamerica/initial_modifications_and_d…

…b_changes Initial Updates - migration changes and some code tweaks
codeforamerica · Jan 17, 2024 · 78221f2 · 78221f2
2 parents 3b29403 + 25cab0c
commit 78221f2
Show file tree

Hide file tree

Showing 16 changed files with 12 additions and 250 deletions.
diff --git a/src/main/java/org/mdbenefits/app/config/DocUploadDisabledHandlerConfiguration.java b/src/main/java/org/mdbenefits/app/config/DocUploadDisabledHandlerConfiguration.java
diff --git a/src/main/java/org/mdbenefits/app/interceptors/DocUploadDisabledInterceptor.java b/src/main/java/org/mdbenefits/app/interceptors/DocUploadDisabledInterceptor.java
diff --git a/src/main/java/org/mdbenefits/app/submission/actions/SetExperimentGroups.java b/src/main/java/org/mdbenefits/app/submission/actions/SetExperimentGroups.java
diff --git a/src/main/java/org/mdbenefits/app/submission/conditions/EligibleForNolaWicEceApply.java b/src/main/java/org/mdbenefits/app/submission/conditions/EligibleForNolaWicEceApply.java
@@ -4,15 +4,13 @@
 import formflow.library.data.Submission;
 import org.springframework.stereotype.Component;
 
-import static org.mdbenefits.app.submission.actions.SetExperimentGroups.ExperimentGroup.APPLY;
-import static org.mdbenefits.app.utils.SubmissionUtilities.inExperimentGroup;
 import static org.mdbenefits.app.utils.SubmissionUtilities.isNolaParish;
 
 @Component
 public class EligibleForNolaWicEceApply implements Condition {
 
   @Override
   public Boolean run(Submission submission) {
-    return isNolaParish(submission) && inExperimentGroup(APPLY.name(), submission);
+    return isNolaParish(submission);
   }
 }
diff --git a/src/main/java/org/mdbenefits/app/submission/conditions/EligibleForNolaWicEceLinks.java b/src/main/java/org/mdbenefits/app/submission/conditions/EligibleForNolaWicEceLinks.java
@@ -4,15 +4,13 @@
 import formflow.library.data.Submission;
 import org.springframework.stereotype.Component;
 
-import static org.mdbenefits.app.submission.actions.SetExperimentGroups.ExperimentGroup.LINK;
-import static org.mdbenefits.app.utils.SubmissionUtilities.inExperimentGroup;
 import static org.mdbenefits.app.utils.SubmissionUtilities.isNolaParish;
 
 @Component
 public class EligibleForNolaWicEceLinks implements Condition {
 
   @Override
   public Boolean run(Submission submission) {
-    return isNolaParish(submission) && inExperimentGroup(LINK.name(), submission);
+    return isNolaParish(submission);
   }
 }
diff --git a/src/main/java/org/mdbenefits/app/submission/conditions/EligibleForOutsideNolaWicApply.java b/src/main/java/org/mdbenefits/app/submission/conditions/EligibleForOutsideNolaWicApply.java
@@ -4,15 +4,13 @@
 import formflow.library.data.Submission;
 import org.springframework.stereotype.Component;
 
-import static org.mdbenefits.app.submission.actions.SetExperimentGroups.ExperimentGroup.APPLY;
-import static org.mdbenefits.app.utils.SubmissionUtilities.inExperimentGroup;
 import static org.mdbenefits.app.utils.SubmissionUtilities.isNolaParish;
 
 @Component
 public class EligibleForOutsideNolaWicApply implements Condition {
 
   @Override
   public Boolean run(Submission submission) {
-    return !isNolaParish(submission) && inExperimentGroup(APPLY.name(), submission);
+    return !isNolaParish(submission);
   }
 }
diff --git a/src/main/java/org/mdbenefits/app/submission/conditions/EligibleForOutsideNolaWicLinks.java b/src/main/java/org/mdbenefits/app/submission/conditions/EligibleForOutsideNolaWicLinks.java
@@ -4,15 +4,13 @@
 import formflow.library.data.Submission;
 import org.springframework.stereotype.Component;
 
-import static org.mdbenefits.app.submission.actions.SetExperimentGroups.ExperimentGroup.LINK;
-import static org.mdbenefits.app.utils.SubmissionUtilities.inExperimentGroup;
 import static org.mdbenefits.app.utils.SubmissionUtilities.isNolaParish;
 
 @Component
 public class EligibleForOutsideNolaWicLinks implements Condition {
 
   @Override
   public Boolean run(Submission submission) {
-    return !isNolaParish(submission) && inExperimentGroup(LINK.name(), submission);
+    return !isNolaParish(submission);
   }
 }
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
@@ -54,6 +54,12 @@ spring:
       demo:
         - demo
         - form-flow-library
+      staging:
+        - staging
+        - form-flow-library
+      prod:
+        - prod
+        - form-flow-library
   security:
     user:
       name: ${DEFAULT_USER}

diff --git a/src/main/resources/db/migration/V1_1__submission_add_blank_rpa_status_column.sql b/src/main/resources/db/migration/V1_1__submission_add_blank_rpa_status_column.sql
diff --git a/src/main/resources/db/migration/V2023.12.15.14.23.41__update_doc_type_label_default.sql b/src/main/resources/db/migration/V2023.12.15.14.23.41__update_doc_type_label_default.sql
diff --git a/src/main/resources/db/migration/V2023.7.12__add_user_file_status.sql b/src/main/resources/db/migration/V2023.7.12__add_user_file_status.sql
diff --git a/src/main/resources/db/migration/V2023.7.13__modify_rpa_schema.sql b/src/main/resources/db/migration/V2023.7.13__modify_rpa_schema.sql
diff --git a/src/main/resources/db/migration/V2023.7.31__change_dates_to_timestamp.sql b/src/main/resources/db/migration/V2023.7.31__change_dates_to_timestamp.sql
diff --git a/src/main/resources/flows-config.yaml b/src/main/resources/flows-config.yaml
@@ -131,7 +131,6 @@ flow:
     nextScreens:
       - name: householdPregnancy
   householdPregnancy:
-    beforeSaveAction: SetExperimentGroups
     nextScreens:
       - name: householdPregnancyWho
         condition: IsPregnant

diff --git a/src/main/resources/templates/mdBenefitsFlow/wicLinks.html b/src/main/resources/templates/mdBenefitsFlow/wicLinks.html
@@ -16,8 +16,8 @@
           <span class="spacing-below-25" th:text="#{wic-links.at-the-end-of-this-app}"></span>
         </div>
         <th:block
-            th:replace="~{fragments/form :: form(action=('/flow/' + ${flow} + '/'+ ${screen} + '/submit' ), content=~{::submitForm})}">
-          <th:block th:ref="submitForm">
+            th:replace="~{fragments/form :: form(action=(${formAction}), content=~{::content})}">
+          <th:block th:ref="content">
             <div class="form-card__footer spacing-below-60">
               <th:block th:replace="~{fragments/inputs/yesOrNo :: yesOrNo(
                               label=#{wic-links.are-you-interested},

diff --git a/src/test/java/org/mdbenefits/app/submission/actions/SetExperimentGroupsTest.java b/src/test/java/org/mdbenefits/app/submission/actions/SetExperimentGroupsTest.java