From 692a3600652e6c63e683b926c65c6600269f949d Mon Sep 17 00:00:00 2001 From: D065023 Date: Mon, 2 Dec 2019 12:01:38 +0100 Subject: [PATCH] minor --- packages/bookshop/srv/admin-service.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/bookshop/srv/admin-service.js b/packages/bookshop/srv/admin-service.js index a9a7f8be..3b2bb4ce 100644 --- a/packages/bookshop/srv/admin-service.js +++ b/packages/bookshop/srv/admin-service.js @@ -1,5 +1,11 @@ const cds = require('@sap/cds') const { Books, ShippingAddresses, UserMappings } = cds.entities +const RELEVANT_ADDRESS_COLUMNS = [ + 'AddressID', + 'CityName', + 'StreetName', + 'HouseNumber' +] const bupaSrv = cds.connect.to('API_BUSINESS_PARTNER') @@ -7,7 +13,6 @@ const bupaSrv = cds.connect.to('API_BUSINESS_PARTNER') module.exports = cds.service.impl(function () { this.before('CREATE', 'Orders', _reduceStock) this.before('PATCH', 'Orders', _fillAddress) - this.on('READ', 'Addresses', _readAddresses) }) @@ -20,7 +25,7 @@ async function _readAddresses (req) { if (req.query && req.query.SELECT && req.query.SELECT.columns) { ql.columns(req.query.SELECT.columns) } else { - ql.columns('AddressID', 'CityName', 'StreetName', 'HouseNumber') + ql.columns(RELEVANT_ADDRESS_COLUMNS) } if (req.query && req.query.SELECT && req.query.SELECT.where) { ql.where(req.query.SELECT.where) @@ -47,7 +52,7 @@ async function _fillAddress (req) { const tx = bupaSrv.transaction(req) const response = await tx.run( SELECT.from('API_BUSINESS_PARTNER.A_BusinessPartnerAddress') - .columns('AddressID', 'CityName', 'StreetName', 'HouseNumber') + .columns(RELEVANT_ADDRESS_COLUMNS) .where({ AddressID: req.data.shippingAddress_AddressID, BusinessPartner: businessPartnerID