From 85e3c162257982e77bb3feaeb10b74c971ad85e0 Mon Sep 17 00:00:00 2001 From: siiky Date: Thu, 18 Jul 2024 17:32:59 +0100 Subject: [PATCH] refactor: don't try to get machine name if there's no `lastUsedMachine` --- lib/new-admin/graphql/resolvers/customer.resolver.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/new-admin/graphql/resolvers/customer.resolver.js b/lib/new-admin/graphql/resolvers/customer.resolver.js index d8bcac55..98d40d44 100644 --- a/lib/new-admin/graphql/resolvers/customer.resolver.js +++ b/lib/new-admin/graphql/resolvers/customer.resolver.js @@ -5,12 +5,9 @@ const filters = require('../../filters') const customerNotes = require('../../../customer-notes') const machineLoader = require('../../../machine-loader') -const getCustomerById = customerId => - customers.getCustomerById(customerId) - .then(customer => - machineLoader.getMachineName(customer.lastUsedMachine) - .then(lastUsedMachineName => Object.assign(customer, { lastUsedMachineName })) - ) +const addLastUsedMachineName = customer => + (customer.lastUsedMachine ? machineLoader.getMachineName(customer.lastUsedMachine) : Promise.resolve(null)) + .then(lastUsedMachineName => Object.assign(customer, { lastUsedMachineName })) const resolvers = { Customer: { @@ -18,7 +15,7 @@ const resolvers = { }, Query: { customers: (...[, { phone, email, name, address, id }]) => customers.getCustomersList(phone, name, address, id, email), - customer: (...[, { customerId }]) => getCustomerById(customerId), + customer: (...[, { customerId }]) => customers.getCustomerById(customerId).then(addLastUsedMachineName), customerFilters: () => filters.customer() }, Mutation: {