refactor: use flag in graphql objects

This commit is contained in:
José Oliveira 2021-03-02 12:28:13 +00:00 committed by Josh Harvey
parent 4116069bd5
commit f394606821
4 changed files with 14 additions and 10 deletions

View file

@ -488,7 +488,7 @@ function getCustomersList () {
*/ */
function getCustomerById (id) { function getCustomerById (id) {
const sql = `select id, authorized_override, days_suspended, front_camera_path, front_camera_override, const sql = `select id, authorized_override, days_suspended, front_camera_path, front_camera_override,
phone, name, sms_override, id_card_data, id_card_data_override, id_card_data_expiration, phone, 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, id_card_photo_path, id_card_photo_override, us_ssn, us_ssn_override, sanctions, sanctions_at,
sanctions_override, total_txs, total_spent, created as last_active, fiat as last_tx_fiat, sanctions_override, total_txs, total_spent, created as last_active, fiat as last_tx_fiat,
fiat_code as last_tx_fiat_code, tx_class as last_tx_class fiat_code as last_tx_fiat_code, tx_class as last_tx_class
@ -496,7 +496,7 @@ function getCustomerById (id) {
select c.id, c.authorized_override, select c.id, c.authorized_override,
greatest(0, date_part('day', c.suspended_until - now())) as days_suspended, greatest(0, date_part('day', c.suspended_until - now())) as days_suspended,
c.front_camera_path, c.front_camera_override, c.front_camera_path, c.front_camera_override,
c.phone, c.name, c.sms_override, c.id_card_data, c.id_card_data_override, c.id_card_data_expiration, c.phone, 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.id_card_photo_path, c.id_card_photo_override, c.us_ssn, c.us_ssn_override, c.sanctions,
c.sanctions_at, c.sanctions_override, t.tx_class, t.fiat, t.fiat_code, t.created, c.sanctions_at, c.sanctions_override, t.tx_class, t.fiat, t.fiat_code, t.created,
row_number() over (partition by c.id order by t.created desc) as rn, row_number() over (partition by c.id order by t.created desc) as rn,

View file

@ -16,6 +16,7 @@ const machineEventsByIdBatch = require('../../postgresql_interface').machineEven
const promoCodeManager = require('../../promo-codes') const promoCodeManager = require('../../promo-codes')
const notifierQueries = require('../../notifier/queries') const notifierQueries = require('../../notifier/queries')
const bills = require('../bills') const bills = require('../bills')
const anonymous = require('../../constants').anonymousCustomer
const serverVersion = require('../../../package.json').version const serverVersion = require('../../../package.json').version
const transactions = require('../transactions') const transactions = require('../transactions')
@ -86,7 +87,7 @@ const typeDefs = gql`
frontCameraPath: String frontCameraPath: String
frontCameraOverride: String frontCameraOverride: String
phone: String phone: String
name: String isAnonymous: Boolean
smsOverride: String smsOverride: String
idCardData: JSONObject idCardData: JSONObject
idCardDataOverride: String idCardDataOverride: String
@ -213,6 +214,7 @@ const typeDefs = gql`
cashInFeeCrypto: String cashInFeeCrypto: String
minimumTx: Float minimumTx: Float
customerId: ID customerId: ID
isAnonymous: Boolean
txVersion: Int! txVersion: Int!
termsAccepted: Boolean termsAccepted: Boolean
commissionPercentage: String commissionPercentage: String
@ -356,7 +358,11 @@ const resolvers = {
JSONObject: GraphQLJSONObject, JSONObject: GraphQLJSONObject,
Date: GraphQLDateTime, Date: GraphQLDateTime,
Customer: { Customer: {
transactions: parent => transactionsLoader.load(parent.id) transactions: parent => transactionsLoader.load(parent.id),
isAnonymous: parent => (parent.id === anonymous.uuid)
},
Transaction: {
isAnonymous: parent => (parent.customerId === anonymous.uuid)
}, },
Machine: { Machine: {
latestEvent: parent => machineEventsLoader.load(parent.deviceId) latestEvent: parent => machineEventsLoader.load(parent.deviceId)

View file

@ -27,7 +27,6 @@ import {
import { getFormattedPhone, getName } from './helper' import { getFormattedPhone, getName } from './helper'
const useStyles = makeStyles(styles) const useStyles = makeStyles(styles)
const ANONYMOUS_USER_NAME = 'anonymous'
const GET_CUSTOMER = gql` const GET_CUSTOMER = gql`
query customer($customerId: ID!) { query customer($customerId: ID!) {
@ -38,7 +37,7 @@ const GET_CUSTOMER = gql`
frontCameraPath frontCameraPath
frontCameraOverride frontCameraOverride
phone phone
name isAnonymous
smsOverride smsOverride
idCardData idCardData
idCardDataOverride idCardDataOverride
@ -167,7 +166,7 @@ const CustomerProfile = memo(() => {
locale={locale} locale={locale}
setShowCompliance={() => setShowCompliance(!showCompliance)} setShowCompliance={() => setShowCompliance(!showCompliance)}
/> />
{!loading && customerData.name !== ANONYMOUS_USER_NAME && ( {!loading && !customerData.isAnonymous && (
<div> <div>
<Label1 className={classes.actionLabel}>Actions</Label1> <Label1 className={classes.actionLabel}>Actions</Label1>
<ActionButton <ActionButton

View file

@ -22,7 +22,6 @@ import { getStatus } from './helper'
const useStyles = makeStyles(mainStyles) const useStyles = makeStyles(mainStyles)
const NUM_LOG_RESULTS = 1000 const NUM_LOG_RESULTS = 1000
const ANONYMOUS_USER_NAME = 'anonymous'
const GET_TRANSACTIONS_CSV = gql` const GET_TRANSACTIONS_CSV = gql`
query transactions($limit: Int, $from: Date, $until: Date) { query transactions($limit: Int, $from: Date, $until: Date) {
@ -59,6 +58,7 @@ const GET_TRANSACTIONS = gql`
customerPhone customerPhone
discount discount
customerId customerId
isAnonymous
} }
} }
` `
@ -88,7 +88,6 @@ const Transactions = () => {
if (tx.customerIdCardData) return formatCustomerName(tx.customerIdCardData) if (tx.customerIdCardData) return formatCustomerName(tx.customerIdCardData)
return tx.customerPhone return tx.customerPhone
} }
const elements = [ const elements = [
{ {
header: '', header: '',
@ -110,7 +109,7 @@ const Transactions = () => {
view: it => ( view: it => (
<div className={classes.flexWrapper}> <div className={classes.flexWrapper}>
<div className={classes.overflowTd}>{getCustomerDisplayName(it)}</div> <div className={classes.overflowTd}>{getCustomerDisplayName(it)}</div>
{getCustomerDisplayName(it) !== ANONYMOUS_USER_NAME && ( {!it.isAnonymous && (
<div onClick={() => redirect(it.customerId)}> <div onClick={() => redirect(it.customerId)}>
<CustomerLinkIcon className={classes.customerLinkIcon} /> <CustomerLinkIcon className={classes.customerLinkIcon} />
</div> </div>