Fix prod bug with spaces on the end of phone numbers (#336)

A regex for the MA Appeals court was failing on a phone number because one
of the two possible numbers from a user had a space at the end that wasn't stripped.

Fixed in a few regards:

* adds the regex to the end of the error description (would have saved
me a bit of time when triaging)
* strips spaces off the end of the phone number if it doesn't pass the
regex the first time
* if at least one number that the user gives is valid, use it, and just
discard the others.

Related to the recent production alerts.

Author: BryceStevenWilley

proxyserver/src/main/java/edu/suffolk/litlab/efsp/server/ecf4/EcfCourtSpecificSerializer.java

@@ -514,18 +514,23 @@ public ContactInformationType serializeEcfContactInformation(
       List<String> numbers = contactInfo.getPhoneNumbers();
       InterviewVariable var =
           collector.requestVar(
-              "phone_number", "Phone number", "text", List.of(), Optional.of(numbers.toString()));
+              "phone_number",
+              "Phone number with regex: " + phoneRow.regularexpression,
+              "text",
+              List.of(),
+              Optional.of(numbers.toString()));
       if (phoneRow.isrequired && numbers.isEmpty()) {
         collector.addRequired(var);
       }
-      for (String phoneNumber : contactInfo.getPhoneNumbers()) {
+      boolean atLeastOnePhoneAdded = false;
+      for (String phoneNumber : numbers) {
         if (!phoneRow.matchRegex(phoneNumber)) {
           if (phoneNumber.contains("-")) {
             // HACK(brycew): Massachusetts doesn't like dashes in the number, just numbers
-            phoneNumber = phoneNumber.replace("-", "").replace("(", "").replace(")", "");
+            phoneNumber = phoneNumber.replace("-", "").replace("(", "").replace(")", "").strip();
           }
           if (!phoneRow.matchRegex(phoneNumber)) {
-            collector.addWrong(var);
+            continue;
           }
         }
 
@@ -534,6 +539,10 @@ public ContactInformationType serializeEcfContactInformation(
         ftnt.setTelephoneNumberFullID(Ecf4Helper.convertString(phoneNumber));
         tnt.setTelephoneNumberRepresentation(niemObjFac.createFullTelephoneNumber(ftnt));
         cit.getContactMeans().add(niemObjFac.createContactTelephoneNumber(tnt));
+        atLeastOnePhoneAdded = true;
+      }
+      if (!numbers.isEmpty() && !atLeastOnePhoneAdded) {
+        collector.addWrong(var);
       }
     }
 

proxyserver/src/test/java/edu/suffolk/litlab/efsp/server/ecf4/EcfCourtSpecificSerializerTest.java

@@ -1,9 +1,10 @@
 package edu.suffolk.litlab.efsp.server.ecf4;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
-import static org.mockito.Mockito.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -25,6 +26,7 @@
 import edu.suffolk.litlab.efsp.model.ContactInformation;
 import edu.suffolk.litlab.efsp.model.Name;
 import edu.suffolk.litlab.efsp.model.Person;
+import edu.suffolk.litlab.efsp.utils.AllWrongCollector;
 import edu.suffolk.litlab.efsp.utils.FailFastCollector;
 import edu.suffolk.litlab.efsp.utils.FilingError;
 import edu.suffolk.litlab.efsp.utils.InfoCollector;
@@ -81,6 +83,20 @@ public void setUp() {
                             "",
                             "",
                             false,
+                            ""),
+                        "PartyPhone",
+                        new DataFieldRow(
+                            "PartyPhone",
+                            "Party Phone",
+                            true,
+                            false,
+                            "",
+                            "",
+                            "",
+                            "Do not use hyphens or other characters--just numbers",
+                            "^(\\+0?1\\s)?\\(?\\d{3}\\)?\\d{3}\\d{4}$",
+                            "",
+                            false,
                             "")))));
     collector = new FailFastCollector();
   }
@@ -163,6 +179,22 @@ public void shouldBeEmptyPersonIfIsUser() throws FilingError, JAXBException {
     Ecf4Helper.objectToXmlStr(cptPer, CaseParticipantType.class);
   }
 
+  @Test
+  public void shouldAllowAtLeastOnePhone() throws FilingError {
+    collector = new AllWrongCollector();
+    ContactInformation info =
+        new ContactInformation(
+            List.of("1234567890", "123-456-7890 ", "123-abc"),
+            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(collector.getWrong()).hasSize(0);
+  }
+
   @Test
   public void shouldThrowIfRequiredButNotPresent() {
     CourtLocationInfo loc = new CourtLocationInfo();