Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/gradle/org.springframework.boot-3…
Browse files Browse the repository at this point in the history
….2.1
  • Loading branch information
bseeger authored Jan 17, 2024
2 parents ee1e3be + c5c2f50 commit 9c0c224
Show file tree
Hide file tree
Showing 33 changed files with 53 additions and 1,073 deletions.
43 changes: 0 additions & 43 deletions .github/workflows/run-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,46 +61,3 @@ jobs:
run: |
rm -f ~/.gradle/caches/modules-2/modules-2.lock
rm -f ~/.gradle/caches/modules-2/gc.properties
accessibility-test:
name: Run accessibility tests
runs-on: ubuntu-latest
permissions:
actions: read
services:
postgres:
image: postgres
env:
POSTGRES_USER: mdbenefits_test
POSTGRES_DB: mdbenefits_test
POSTGRES_PASSWORD: postgres
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
ports:
- 5432:5432
steps:
- uses: actions/checkout@v4
- name: Set up ChromeDriver
uses: nanasess/setup-chromedriver@v2.2.1
with:
chromedriver-version: '115.0.5790.102'
- name: Set up JDK
uses: actions/setup-java@v4.0.0
with:
distribution: 'adopt'
java-version: '17'
- name: Cache Gradle packages
uses: actions/cache@v3
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle-
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Test with Gradle
run: ./gradlew accessibilityTest
- name: Cleanup Gradle Cache
run: |
rm -f ~/.gradle/caches/modules-2/modules-2.lock
rm -f ~/.gradle/caches/modules-2/gc.properties
482 changes: 0 additions & 482 deletions messages_full.properties

This file was deleted.

24 changes: 7 additions & 17 deletions src/main/java/org/mdbenefits/app/StaticPageController.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,36 +22,26 @@ public class StaticPageController {
* @return the static page template
*/
@GetMapping("/")
ModelAndView getIndex(HttpServletRequest request,
@RequestParam(required = false) String ref_id) {
ModelAndView getIndex(HttpServletRequest request) {
HttpSession httpSession = request.getSession(false);
if (httpSession != null) {
httpSession.invalidate();
httpSession.invalidate();
}
httpSession = request.getSession(true);

// start new session
httpSession.setAttribute("ref_id", ref_id);

Map<String, Object> model = new HashMap();
Map<String, Object> model = new HashMap<>();
model.put("screen", "/");

return new ModelAndView("index", model);
}

@GetMapping("/privacy")
ModelAndView getPrivacy() {
Map<String, Object> model = new HashMap();
model.put("screen", "privacy");

return new ModelAndView("privacy", model);
String getPrivacy() {
return "privacy";
}

@GetMapping("/ssnFAQs")
ModelAndView getSSNFaqs() {
Map<String, Object> model = new HashMap();
model.put("screen", "ssnFAQs");

return new ModelAndView("ssnFAQs", model);
String getSSNFaqs() {
return "ssnFAQs";
}
}

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
10 changes: 0 additions & 10 deletions src/main/resources/application-demo.yaml

This file was deleted.

11 changes: 0 additions & 11 deletions src/main/resources/application-staging.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,9 @@
spring:
thymeleaf:
cache: true
datasource:
url: jdbc:postgresql://host.docker.internal:5432/mdbenefits
flyway:
placeholders:
uuid_function: "gen_random_uuid"
user_file_doc_type_default_label: ${form-flow.uploads.default-doc-type-label:#{null}}
session:
jdbc:
initialize-schema: always
management:
endpoints:
enabled-by-default: false
form-flow:
disabled-flows: ~
uploads:
max-file-size: '5'
default-doc-type-label: "NotSet"
Loading

0 comments on commit 9c0c224

Please sign in to comment.