From 8e22ce7c70c0e80ddeb921088c27f01093995675 Mon Sep 17 00:00:00 2001
From: Pavlo Tkach <3469726+ptkach@users.noreply.github.com>
Date: Mon, 20 May 2024 16:32:23 -0400
Subject: [PATCH] Add phone and fax number to console whois endpoint (#2447)

---
 .../src/app/registrar/registrarsTable.component.ts     | 10 ++++++----
 .../console/settings/WhoisRegistrarFieldsAction.java   |  2 ++
 .../settings/WhoisRegistrarFieldsActionTest.java       |  9 ++++++++-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/console-webapp/src/app/registrar/registrarsTable.component.ts b/console-webapp/src/app/registrar/registrarsTable.component.ts
index ffa31b492..c0bdfe363 100644
--- a/console-webapp/src/app/registrar/registrarsTable.component.ts
+++ b/console-webapp/src/app/registrar/registrarsTable.component.ts
@@ -51,10 +51,12 @@ export const columns = [
     columnDef: 'billingAccountMap',
     header: 'Billing Accounts',
     cell: (record: Registrar) =>
-      // @ts-ignore - completely legit line, but TS keeps complaining
-      `${Object.entries(record.billingAccountMap).reduce((acc, [key, val]) => {
-        return `${acc}${key}=${val}<br/>`;
-      }, '')}`,
+      `${Object.entries(record.billingAccountMap || {}).reduce(
+        (acc, [key, val]) => {
+          return `${acc}${key}=${val}<br/>`;
+        },
+        ''
+      )}`,
   },
   {
     columnDef: 'registryLockAllowed',
diff --git a/core/src/main/java/google/registry/ui/server/console/settings/WhoisRegistrarFieldsAction.java b/core/src/main/java/google/registry/ui/server/console/settings/WhoisRegistrarFieldsAction.java
index cbba5c70f..b58802ab2 100644
--- a/core/src/main/java/google/registry/ui/server/console/settings/WhoisRegistrarFieldsAction.java
+++ b/core/src/main/java/google/registry/ui/server/console/settings/WhoisRegistrarFieldsAction.java
@@ -81,6 +81,8 @@ public class WhoisRegistrarFieldsAction extends ConsoleApiAction {
     newRegistrar.setWhoisServer(providedRegistrar.getWhoisServer());
     newRegistrar.setUrl(providedRegistrar.getUrl());
     newRegistrar.setLocalizedAddress(providedRegistrar.getLocalizedAddress());
+    newRegistrar.setPhoneNumber(providedRegistrar.getPhoneNumber());
+    newRegistrar.setFaxNumber(providedRegistrar.getFaxNumber());
     tm().put(newRegistrar.build());
     consoleApiParams.response().setStatus(HttpStatusCodes.STATUS_CODE_OK);
   }
diff --git a/core/src/test/java/google/registry/ui/server/console/settings/WhoisRegistrarFieldsActionTest.java b/core/src/test/java/google/registry/ui/server/console/settings/WhoisRegistrarFieldsActionTest.java
index 3f12283d4..507d74c38 100644
--- a/core/src/test/java/google/registry/ui/server/console/settings/WhoisRegistrarFieldsActionTest.java
+++ b/core/src/test/java/google/registry/ui/server/console/settings/WhoisRegistrarFieldsActionTest.java
@@ -105,6 +105,10 @@ public class WhoisRegistrarFieldsActionTest {
         ImmutableMap.of(
             "whoisServer",
             "whois.nic.google",
+            "phoneNumber",
+            "+1.4155552671",
+            "faxNumber",
+            "+1.4155552672",
             "url",
             "\"https://newurl.example\"",
             "localizedAddress",
@@ -118,10 +122,13 @@ public class WhoisRegistrarFieldsActionTest {
     assertThat(newRegistrar.getWhoisServer()).isEqualTo("whois.nic.google");
     assertThat(newRegistrar.getUrl()).isEqualTo("https://newurl.example");
     assertThat(newRegistrar.getLocalizedAddress().toJsonMap()).isEqualTo(addressMap);
+    assertThat(newRegistrar.getPhoneNumber()).isEqualTo("+1.4155552671");
+    assertThat(newRegistrar.getFaxNumber()).isEqualTo("+1.4155552672");
     // the non-changed fields should be the same
     assertAboutImmutableObjects()
         .that(newRegistrar)
-        .isEqualExceptFields(oldRegistrar, "whoisServer", "url", "localizedAddress");
+        .isEqualExceptFields(
+            oldRegistrar, "whoisServer", "url", "localizedAddress", "phoneNumber", "faxNumber");
   }
 
   @Test