feat: typesafe query and more UI changes

packages/server/lib/customers.js

@@ -8,7 +8,6 @@ const fs = require('fs')
 const util = require('util')
 
 const db = require('./db')
-const anonymous = require('../lib/constants').anonymousCustomer
 const complianceOverrides = require('./compliance_overrides')
 const writeFile = util.promisify(fs.writeFile)
 const notifierQueries = require('./notifier/queries')
@@ -17,6 +16,7 @@ const sms = require('./sms')
 const settingsLoader = require('./new-settings-loader')
 const logger = require('./logger')
 const externalCompliance = require('./compliance-external')
+const { getCustomerList } = require('typesafe-db/lib/customers')
 
 const { APPROVED, RETRY } = require('./plugins/compliance/consts')
 
@@ -489,88 +489,8 @@ function getSlimCustomerByIdBatch(ids) {
   return db.any(sql, [ids]).then(customers => _.map(camelize, customers))
 }
 
-// TODO: getCustomersList and getCustomerById are very similar, so this should be refactored
-
-/**
- * Query all customers, ordered by last activity
- * and with aggregate columns based on their
- * transactions
- *
- * @returns {array} Array of customers with it's transactions aggregations
- */
-
-function getCustomersList(
-  phone = null,
-  name = null,
-  address = null,
-  id = null,
-  email = null,
-) {
-  const passableErrorCodes = _.map(
-    Pgp.as.text,
-    TX_PASSTHROUGH_ERROR_CODES,
-  ).join(',')
-
-  const sql = `SELECT id, authorized_override, days_suspended, is_suspended, front_camera_path, front_camera_override,
-  phone, email, sms_override, id_card_data, id_card_data_override, id_card_data_expiration,
-  id_card_photo_path, id_card_photo_override, us_ssn, us_ssn_override, sanctions, sanctions_at,
-  sanctions_override, total_txs, total_spent, GREATEST(created, last_transaction, last_data_provided, last_auth_attempt) AS last_active, fiat AS last_tx_fiat,
-  fiat_code AS last_tx_fiat_code, tx_class AS last_tx_class, 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,
-    c.suspended_until > NOW() AS is_suspended,
-    c.front_camera_path, c.front_camera_override,
-    c.phone, c.email, c.sms_override, c.id_card_data, c.id_card_data_override, c.id_card_data_expiration,
-    c.id_card_photo_path, c.id_card_photo_override, c.us_ssn, c.us_ssn_override, c.sanctions, c.last_auth_attempt,
-    GREATEST(c.phone_at, c.email_at, c.id_card_data_at, c.front_camera_at, c.id_card_photo_at, c.us_ssn_at) AS last_data_provided,
-    c.sanctions_at, c.sanctions_override, c.is_test_customer, c.created, t.tx_class, t.fiat, t.fiat_code, t.created as last_transaction, cn.notes,
-    row_number() OVER (partition by c.id order by t.created desc) AS rn,
-    sum(CASE WHEN t.id IS NOT NULL THEN 1 ELSE 0 END) OVER (partition by c.id) AS total_txs,
-    coalesce(sum(CASE WHEN error_code IS NULL OR error_code NOT IN ($1^) THEN t.fiat ELSE 0 END) OVER (partition by c.id), 0) AS total_spent, ccf.custom_fields
-    FROM customers c LEFT OUTER JOIN (
-      SELECT 'cashIn' AS tx_class, id, fiat, fiat_code, created, customer_id, error_code
-      FROM cash_in_txs WHERE send_confirmed = true OR batched = true UNION
-      SELECT 'cashOut' AS tx_class, id, fiat, fiat_code, created, customer_id, error_code
-      FROM cash_out_txs WHERE confirmed_at IS NOT NULL) AS t ON c.id = t.customer_id
-      LEFT OUTER JOIN (
-        SELECT cf.customer_id, json_agg(json_build_object('id', cf.custom_field_id, 'label', cf.label, 'value', cf.value)) AS custom_fields FROM (
-          SELECT ccfp.custom_field_id, ccfp.customer_id, cfd.label, ccfp.value FROM custom_field_definitions cfd
-          LEFT OUTER JOIN customer_custom_field_pairs ccfp ON cfd.id = ccfp.custom_field_id
-        ) cf GROUP BY cf.customer_id
-      ) ccf ON c.id = ccf.customer_id
-      LEFT OUTER JOIN (
-        SELECT customer_id, coalesce(json_agg(customer_notes.*), '[]'::json) AS notes FROM customer_notes
-        GROUP BY customer_notes.customer_id
-      ) cn ON c.id = cn.customer_id
-    WHERE c.id != $2
-  ) AS cl WHERE rn = 1
-  AND ($4 IS NULL OR phone = $4)
-  AND ($5 IS NULL OR  CONCAT(id_card_data::json->>'firstName', ' ', id_card_data::json->>'lastName') = $5 OR id_card_data::json->>'firstName' = $5 OR id_card_data::json->>'lastName' = $5)
-  AND ($6 IS NULL OR  id_card_data::json->>'address' = $6)
-  AND ($7 IS NULL OR  id_card_data::json->>'documentNumber' = $7)
-  AND ($8 IS NULL OR email = $8)
-  ORDER BY last_active DESC
-  limit $3`
-  return db
-    .any(sql, [
-      passableErrorCodes,
-      anonymous.uuid,
-      null,
-      phone,
-      name,
-      address,
-      id,
-      email,
-    ])
-    .then(customers =>
-      Promise.all(
-        _.map(
-          customer => getCustomInfoRequestsData(customer).then(camelizeDeep),
-          customers,
-        ),
-      ),
-    )
+function getCustomersList() {
+  return getCustomerList({ withCustomInfoRequest: true })
 }
 
 /**

packages/server/lib/new-admin/graphql/resolvers/customer.resolver.js

@@ -17,8 +17,7 @@ const resolvers = {
     isAnonymous: parent => parent.customerId === anonymous.uuid,
   },
   Query: {
-    customers: (...[, { phone, email, name, address, id }]) =>
-      customers.getCustomersList(phone, name, address, id, email),
+    customers: () => customers.getCustomersList(),
     customer: (...[, { customerId }]) =>
       customers.getCustomerById(customerId).then(addLastUsedMachineName),
   },