diff --git a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/ecf4/EcfCourtSpecificSerializer.java b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/ecf4/EcfCourtSpecificSerializer.java index 02127772..f82a5ebc 100644 --- a/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/ecf4/EcfCourtSpecificSerializer.java +++ b/proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/ecf4/EcfCourtSpecificSerializer.java @@ -523,9 +523,18 @@ public ContactInformationType serializeEcfContactInformation( boolean atLeastOnePhoneAdded = false; for (String phoneNumber : numbers) { if (!phoneRow.matchRegex(phoneNumber)) { - if (phoneNumber.contains("-")) { + if (phoneNumber.contains("-") + || phoneNumber.contains("(") + || phoneNumber.contains(")") + || phoneNumber.contains(" ")) { // HACK(brycew): Massachusetts doesn't like dashes in the number, just numbers - phoneNumber = phoneNumber.replace("-", "").replace("(", "").replace(")", "").strip(); + phoneNumber = + phoneNumber + .replace("-", "") + .replace("(", "") + .replace(")", "") + .strip() + .replace(" ", ""); } if (!phoneRow.matchRegex(phoneNumber)) { continue; diff --git a/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/ecf4/EcfCourtSpecificSerializerTest.java b/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/ecf4/EcfCourtSpecificSerializerTest.java index 30817f64..992ed168 100644 --- a/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/ecf4/EcfCourtSpecificSerializerTest.java +++ b/proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/ecf4/EcfCourtSpecificSerializerTest.java @@ -184,14 +184,14 @@ public void shouldAllowAtLeastOnePhone() throws FilingError { collector = new AllWrongCollector(); ContactInformation info = new ContactInformation( - List.of("1234567890", "123-456-7890 ", "123-abc"), + List.of("1234567890", "123-456-7890 ", "123-abc", "(123) 456-7890"), Optional.empty(), Optional.of("bob@example.com")); CourtLocationInfo loc = new CourtLocationInfo(); loc.code = "not_real"; EcfCourtSpecificSerializer courtSer = new EcfCourtSpecificSerializer(cd, loc); var contactInfoType = courtSer.serializeEcfContactInformation(info, collector); - assertThat(contactInfoType.getContactMeans()).hasSize(2); + assertThat(contactInfoType.getContactMeans()).hasSize(3); assertThat(collector.getWrong()).hasSize(0); }