diff --git a/src/main/java/org/ilgcc/app/data/CountyRepository.java b/src/main/java/org/ilgcc/app/data/CountyRepository.java index 20c46aadd..57916aa4e 100644 --- a/src/main/java/org/ilgcc/app/data/CountyRepository.java +++ b/src/main/java/org/ilgcc/app/data/CountyRepository.java @@ -4,11 +4,17 @@ import java.util.List; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; @Repository public interface CountyRepository extends JpaRepository { + @Query("SELECT c FROM County c WHERE UPPER(c.county) = UPPER(:countyName)") + List findByCounty(@Param("countyName") String countyName); + Optional findByZipCode(BigInteger truncatedZip); - List findByCounty(String countyName); + + } \ No newline at end of file diff --git a/src/test/java/org/ilgcc/app/data/FakeResourceOrganization.java b/src/test/java/org/ilgcc/app/data/FakeResourceOrganization.java index f37be9fbb..7f5287199 100644 --- a/src/test/java/org/ilgcc/app/data/FakeResourceOrganization.java +++ b/src/test/java/org/ilgcc/app/data/FakeResourceOrganization.java @@ -56,7 +56,7 @@ public void afterPropertiesSet() { resourceOrganizationRepository.save(PROJECT_CHILD_TEST_DATA); ACTIVE_PROJECT_CHILD_COUNTY = new County(); - ACTIVE_PROJECT_CHILD_COUNTY.setCounty("Ramsey"); + ACTIVE_PROJECT_CHILD_COUNTY.setCounty("RamSey"); ACTIVE_PROJECT_CHILD_COUNTY.setZipCode(new BigInteger(zip_62863.getValue())); ACTIVE_PROJECT_CHILD_COUNTY.setCaseloadCode("QQ"); countyRepository.save(ACTIVE_PROJECT_CHILD_COUNTY); diff --git a/src/test/java/org/ilgcc/app/submission/actions/SetOrganizationIdAndCCRRNameTest.java b/src/test/java/org/ilgcc/app/submission/actions/SetOrganizationIdAndCCRRNameTest.java index b1e18007f..d73c00df6 100644 --- a/src/test/java/org/ilgcc/app/submission/actions/SetOrganizationIdAndCCRRNameTest.java +++ b/src/test/java/org/ilgcc/app/submission/actions/SetOrganizationIdAndCCRRNameTest.java @@ -43,7 +43,7 @@ void setUp() { public void setsResourceOrgBasedOnApplicationCountyIfNoHomeAddress() { Submission submission = new SubmissionTestBuilder() .withFlow("gcc") - .with("applicationCounty", ACTIVE_FOUR_C_COUNTY.getCounty()) + .with("applicationCounty", "DEKALB") .build(); action.run(submission);