Updates zip code query to big int and the County zip_code to long

codeforamerica · Feb 10, 2025 · 58823d3 · 58823d3
1 parent 772a4f6
commit 58823d3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/src/main/java/org/ilgcc/app/data/County.java b/src/main/java/org/ilgcc/app/data/County.java
@@ -24,7 +24,7 @@ public class County implements Serializable {
 
     @Id
     @Column(name = "zip_code")
-    private String zipCode;
+    private Long zipCode;
 
     @Column(name = "city")
     private String city;

diff --git a/src/main/java/org/ilgcc/app/data/CountyRepository.java b/src/main/java/org/ilgcc/app/data/CountyRepository.java
@@ -1,11 +1,12 @@
 package org.ilgcc.app.data;
 
+import java.math.BigInteger;
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public interface CountyRepository extends JpaRepository<County, String> {
 
-    Optional<County> findByZipCode(String truncatedZip);
+    Optional<County> findByZipCode(BigInteger truncatedZip);
 }
diff --git a/src/main/java/org/ilgcc/app/data/importer/CCMSDataServiceImpl.java b/src/main/java/org/ilgcc/app/data/importer/CCMSDataServiceImpl.java
@@ -28,7 +28,8 @@ public CCMSDataServiceImpl(ProviderRepository providerRepository, CountyReposito
     @Override
     public Optional<County> getCountyByZipCode(String zipCode) {
         final String truncatedZip = zipCode.substring(0, 5);
-        return countyRepository.findByZipCode(truncatedZip);
+        final BigInteger zipCodeInt = new BigInteger(truncatedZip);
+        return countyRepository.findByZipCode(zipCodeInt);
     }
 
     @Override

diff --git a/src/test/java/org/ilgcc/app/submission/actions/SetOrganizationIdAndCCRRNameTest.java b/src/test/java/org/ilgcc/app/submission/actions/SetOrganizationIdAndCCRRNameTest.java
@@ -41,7 +41,7 @@ void setUp() {
         action.applicationRouterService = applicationRouterService;
         action.submissionRepositoryService = submissionRepositoryService;
         action.ccmsDataServiceImpl=ccmsDataServiceImpl;
-        County cookCounty = new County("60304", "city" , "Cook", 123, 123, "AA" );
+        County cookCounty = new County(Long.parseLong("60304"), "city" , "Cook", 123, 123, "AA" );
         when(ccmsDataServiceImpl.getCountyByZipCode("60304")).thenReturn(Optional.of(cookCounty));
     }
 
@@ -65,7 +65,7 @@ public void setsOrganizationIdFromParentHomeAddressIfNotValidated() {
                 .with("applicationCounty", CountyOption.LEE.getValue())
                 .build();
 
-        County jasperCounty = new County("62479", "city" , "Jasper", 123, 123, "AA" );
+        County jasperCounty = new County(Long.parseLong("62479"), "city" , "Jasper", 123, 123, "AA" );
         when(ccmsDataServiceImpl.getCountyByZipCode("62479")).thenReturn(Optional.of(jasperCounty));
 
         action.run(submission);