From aad3826d027317ef15a95ae894295a415c25b7d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Oliveira?= <josepfo.w@gmail.com>
Date: Thu, 20 Jan 2022 22:49:51 +0000
Subject: [PATCH] fix: rename phone override fields

---
 lib/customers.js                                          | 4 ++--
 lib/new-admin/graphql/types/customer.type.js              | 4 ++--
 .../1641482376890-add-overrides-to-subscriber-info.js     | 6 +++---
 new-lamassu-admin/src/pages/Customers/CustomerData.js     | 8 +++-----
 new-lamassu-admin/src/pages/Customers/CustomerProfile.js  | 4 ++--
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/lib/customers.js b/lib/customers.js
index d8ff6b5b..0f8baceb 100644
--- a/lib/customers.js
+++ b/lib/customers.js
@@ -122,7 +122,7 @@ async function updateCustomer (id, data, userToken) {
       'sanctions_override',
       'front_camera_override',
       'suspended_until',
-      'subscriber_info_override'
+      'phone_override'
     ],
     _.mapKeys(_.snakeCase, data))
 
@@ -694,7 +694,7 @@ function getCustomerById (id) {
   phone, phone_at, sms_override, id_card_data_at, id_card_data, id_card_data_override, id_card_data_expiration,
   id_card_photo_path, id_card_photo_at, id_card_photo_override, us_ssn_at, us_ssn, us_ssn_override, sanctions, sanctions_at,
   sanctions_override, total_txs, total_spent, LEAST(created, last_transaction) AS last_active, fiat AS last_tx_fiat,
-  fiat_code AS last_tx_fiat_code, tx_class AS last_tx_class, subscriber_info, subscriber_info_at, subscriber_info_override, custom_fields, notes, is_test_customer
+  fiat_code AS last_tx_fiat_code, tx_class AS last_tx_class, subscriber_info, subscriber_info_at, phone_override, custom_fields, notes, is_test_customer
   FROM (
     SELECT c.id, c.authorized_override,
     greatest(0, date_part('day', c.suspended_until - now())) AS days_suspended,
diff --git a/lib/new-admin/graphql/types/customer.type.js b/lib/new-admin/graphql/types/customer.type.js
index ed41b6c0..c806ebcb 100644
--- a/lib/new-admin/graphql/types/customer.type.js
+++ b/lib/new-admin/graphql/types/customer.type.js
@@ -33,7 +33,7 @@ const typeDef = gql`
     lastTxClass: String
     transactions: [Transaction]
     subscriberInfo: JSONObject
-    subscriberInfoOverride: String
+    phoneOverride: String
     customFields: [CustomerCustomField]
     customInfoRequests: [CustomRequestData]
     notes: [CustomerNote]
@@ -64,7 +64,7 @@ const typeDef = gql`
     lastTxClass: String
     suspendedUntil: Date
     subscriberInfo: Boolean
-    subscriberInfoOverride: String
+    phoneOverride: String
   }
 
   input CustomerEdit {
diff --git a/migrations/1641482376890-add-overrides-to-subscriber-info.js b/migrations/1641482376890-add-overrides-to-subscriber-info.js
index e5e502ef..d7a9881a 100644
--- a/migrations/1641482376890-add-overrides-to-subscriber-info.js
+++ b/migrations/1641482376890-add-overrides-to-subscriber-info.js
@@ -3,9 +3,9 @@ var db = require('./db')
 exports.up = function (next) {
   var sql = [
     `ALTER TABLE customers 
-     ADD COLUMN subscriber_info_override VERIFICATION_TYPE NOT NULL DEFAULT 'automatic',
-     ADD COLUMN subscriber_info_override_by UUID,
-     ADD COLUMN subscriber_info_override_at TIMESTAMPTZ
+     ADD COLUMN phone_override VERIFICATION_TYPE NOT NULL DEFAULT 'automatic',
+     ADD COLUMN phone_override_by UUID,
+     ADD COLUMN phone_override_at TIMESTAMPTZ
     `,
     `ALTER TABLE edited_customer_data
      ADD COLUMN phone TEXT,
diff --git a/new-lamassu-admin/src/pages/Customers/CustomerData.js b/new-lamassu-admin/src/pages/Customers/CustomerData.js
index bd71b34c..f19dbf8a 100644
--- a/new-lamassu-admin/src/pages/Customers/CustomerData.js
+++ b/new-lamassu-admin/src/pages/Customers/CustomerData.js
@@ -164,11 +164,9 @@ const CustomerData = ({
       fields: customerDataElements.smsData,
       title: 'SMS data',
       titleIcon: <PhoneIcon className={classes.cardIcon} />,
-      state: R.path(['subscriberInfoOverride'])(customer),
-      authorize: () =>
-        updateCustomer({ subscriberInfoOverride: OVERRIDE_AUTHORIZED }),
-      reject: () =>
-        updateCustomer({ subscriberInfoOverride: OVERRIDE_REJECTED }),
+      state: R.path(['phoneOverride'])(customer),
+      authorize: () => updateCustomer({ phoneOverride: OVERRIDE_AUTHORIZED }),
+      reject: () => updateCustomer({ phoneOverride: OVERRIDE_REJECTED }),
       save: values => {
         editCustomer({
           phone: parsePhoneNumber(values.phoneNumber).number,
diff --git a/new-lamassu-admin/src/pages/Customers/CustomerProfile.js b/new-lamassu-admin/src/pages/Customers/CustomerProfile.js
index d54c7cb6..8716f643 100644
--- a/new-lamassu-admin/src/pages/Customers/CustomerProfile.js
+++ b/new-lamassu-admin/src/pages/Customers/CustomerProfile.js
@@ -70,7 +70,7 @@ const GET_CUSTOMER = gql`
       isSuspended
       isTestCustomer
       subscriberInfo
-      subscriberInfoOverride
+      phoneOverride
       customFields {
         id
         label
@@ -140,7 +140,7 @@ const SET_CUSTOMER = gql`
       lastTxFiatCode
       lastTxClass
       subscriberInfo
-      subscriberInfoOverride
+      phoneOverride
     }
   }
 `