b.santos/cloud-cap-samples
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed minor issues

Browse Source
This commit is contained in:
D065023
2019-12-06 10:59:50 +01:00
parent 12aee3e38c
commit 7deae997bb
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/bookshop/srv/admin-service.js
View File

@@ -2,6 +2,7 @@ const cds = require('@sap/cds')
const { Books, ShippingAddresses, Orders } = cds.entities const { Books, ShippingAddresses, Orders } = cds.entities
const RELEVANT_ADDRESS_COLUMNS = [ const RELEVANT_ADDRESS_COLUMNS = [
'AddressID', 'AddressID',
'BusinessPartner',
'CityName', 'CityName',
'StreetName', 'StreetName',
'PostalCode', 'PostalCode',
@@ -57,10 +58,10 @@ module.exports = cds.service.impl(function () {
}) })
async function _readAddresses (req) { async function _readAddresses (req) {
const BusinessPartner = req.user.id const businessPartner = req.user.id
const tx = bupaSrv.transaction(req) const tx = bupaSrv.transaction(req)
const ql = SELECT.from('API_BUSINESS_PARTNER.A_BusinessPartnerAddress').where( const ql = SELECT.from('API_BUSINESS_PARTNER.A_BusinessPartnerAddress').where(
{ BusinessPartner } { BusinessPartner: businessPartner.toUpperCase() }
) )
if (req.query && req.query.SELECT && req.query.SELECT.columns) { if (req.query && req.query.SELECT && req.query.SELECT.columns) {
ql.columns(req.query.SELECT.columns) ql.columns(req.query.SELECT.columns)
@@ -78,18 +79,17 @@ async function _readAddresses (req) {
/** Fill Address data from external service */ /** Fill Address data from external service */
async function _fillAddress (req) { async function _fillAddress (req) {
if (req.data.shippingAddress_AddressID) { if (req.data.shippingAddress_AddressID) {
const BusinessPartner = req.user.id const businessPartner = req.user.id
const tx = bupaSrv.transaction(req) const tx = bupaSrv.transaction(req)
const response = await tx.run( const response = await tx.run(
SELECT.from('API_BUSINESS_PARTNER.A_BusinessPartnerAddress') SELECT.from('API_BUSINESS_PARTNER.A_BusinessPartnerAddress')
.columns(RELEVANT_ADDRESS_COLUMNS) .columns(RELEVANT_ADDRESS_COLUMNS)
.where({ .where({
AddressID: req.data.shippingAddress_AddressID, AddressID: req.data.shippingAddress_AddressID,
BusinessPartner BusinessPartner: businessPartner.toUpperCase()
}) })
) )
if (response && response.length > 0) { if (response && response.length > 0) {
response[0].BusinessPartner = BusinessPartner
console.log('to be inserted: ', response) console.log('to be inserted: ', response)
const tx2 = cds.transaction(req) const tx2 = cds.transaction(req)
try { try {

4
packages/bookshop/srv/init.js
View File

@@ -6,7 +6,7 @@ module.exports = db => {
DELETE.from(Addresses) DELETE.from(Addresses)
INSERT.into(Addresses).entries( INSERT.into(Addresses).entries(
{ {
BusinessPartner: 'anonymous', BusinessPartner: 'ANONYMOUS',
AddressID: '62640', AddressID: '62640',
CityName: 'Walldorf', CityName: 'Walldorf',
PostalCode: '69190', PostalCode: '69190',
@@ -15,7 +15,7 @@ module.exports = db => {
HouseNumber: '16' HouseNumber: '16'
}, },
{ {
BusinessPartner: 'anonymous', BusinessPartner: 'ANONYMOUS',
AddressID: '22222', AddressID: '22222',
CityName: 'St. Leon-Rot', CityName: 'St. Leon-Rot',
PostalCode: '68789', PostalCode: '68789',