From 7deae997bbcab0c91997962ee54001a2add22fa6 Mon Sep 17 00:00:00 2001
From: D065023 <david.kunz@sap.com>
Date: Fri, 6 Dec 2019 10:59:50 +0100
Subject: [PATCH] fixed minor issues

---
 packages/bookshop/srv/admin-service.js | 10 +++++-----
 packages/bookshop/srv/init.js          |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/bookshop/srv/admin-service.js b/packages/bookshop/srv/admin-service.js
index 26eeed6c..b59c62af 100644
--- a/packages/bookshop/srv/admin-service.js
+++ b/packages/bookshop/srv/admin-service.js
@@ -2,6 +2,7 @@ const cds = require('@sap/cds')
 const { Books, ShippingAddresses, Orders } = cds.entities
 const RELEVANT_ADDRESS_COLUMNS = [
   'AddressID',
+  'BusinessPartner',
   'CityName',
   'StreetName',
   'PostalCode',
@@ -57,10 +58,10 @@ module.exports = cds.service.impl(function () {
 })
 
 async function _readAddresses (req) {
-  const BusinessPartner = req.user.id
+  const businessPartner = req.user.id
   const tx = bupaSrv.transaction(req)
   const ql = SELECT.from('API_BUSINESS_PARTNER.A_BusinessPartnerAddress').where(
-    { BusinessPartner }
+    { BusinessPartner: businessPartner.toUpperCase() }
   )
   if (req.query && req.query.SELECT && req.query.SELECT.columns) {
     ql.columns(req.query.SELECT.columns)
@@ -78,18 +79,17 @@ async function _readAddresses (req) {
 /** Fill Address data from external service */
 async function _fillAddress (req) {
   if (req.data.shippingAddress_AddressID) {
-    const BusinessPartner = req.user.id
+    const businessPartner = req.user.id
     const tx = bupaSrv.transaction(req)
     const response = await tx.run(
       SELECT.from('API_BUSINESS_PARTNER.A_BusinessPartnerAddress')
         .columns(RELEVANT_ADDRESS_COLUMNS)
         .where({
           AddressID: req.data.shippingAddress_AddressID,
-          BusinessPartner
+          BusinessPartner: businessPartner.toUpperCase()
         })
     )
     if (response && response.length > 0) {
-      response[0].BusinessPartner = BusinessPartner
       console.log('to be inserted: ', response)
       const tx2 = cds.transaction(req)
       try {
diff --git a/packages/bookshop/srv/init.js b/packages/bookshop/srv/init.js
index 3416692f..352db79b 100644
--- a/packages/bookshop/srv/init.js
+++ b/packages/bookshop/srv/init.js
@@ -6,7 +6,7 @@ module.exports = db => {
   DELETE.from(Addresses)
   INSERT.into(Addresses).entries(
     {
-      BusinessPartner: 'anonymous',
+      BusinessPartner: 'ANONYMOUS',
       AddressID: '62640',
       CityName: 'Walldorf',
       PostalCode: '69190',
@@ -15,7 +15,7 @@ module.exports = db => {
       HouseNumber: '16'
     },
     {
-      BusinessPartner: 'anonymous',
+      BusinessPartner: 'ANONYMOUS',
       AddressID: '22222',
       CityName: 'St. Leon-Rot',
       PostalCode: '68789',