From b3d9fdb8b32c9592e30b52846998e829e9d929a8 Mon Sep 17 00:00:00 2001
From: D065023 <david.kunz@sap.com>
Date: Mon, 2 Dec 2019 10:57:52 +0100
Subject: [PATCH] refactor

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

diff --git a/packages/bookshop/srv/admin-service.js b/packages/bookshop/srv/admin-service.js
index 8bbe92fa..a9a7f8be 100644
--- a/packages/bookshop/srv/admin-service.js
+++ b/packages/bookshop/srv/admin-service.js
@@ -6,7 +6,6 @@ const bupaSrv = cds.connect.to('API_BUSINESS_PARTNER')
 /** Service implementation for CatalogService */
 module.exports = cds.service.impl(function () {
   this.before('CREATE', 'Orders', _reduceStock)
-  // this.before('CREATE', 'Orders', _fillAddress)
   this.before('PATCH', 'Orders', _fillAddress)
 
   this.on('READ', 'Addresses', _readAddresses)
@@ -18,12 +17,12 @@ async function _readAddresses (req) {
   const ql = SELECT.from('API_BUSINESS_PARTNER.A_BusinessPartnerAddress').where(
     { BusinessPartner: businessPartnerID }
   )
-  if (req.query.SELECT.columns) {
+  if (req.query && req.query.SELECT && req.query.SELECT.columns) {
     ql.columns(req.query.SELECT.columns)
   } else {
     ql.columns('AddressID', 'CityName', 'StreetName', 'HouseNumber')
   }
-  if (req.query.SELECT.where) {
+  if (req.query && req.query.SELECT && req.query.SELECT.where) {
     ql.where(req.query.SELECT.where)
   }
   const result = await tx.run(ql)
diff --git a/packages/bookshop/srv/init.js b/packages/bookshop/srv/init.js
index 5b32e7b9..49c429e6 100644
--- a/packages/bookshop/srv/init.js
+++ b/packages/bookshop/srv/init.js
@@ -7,10 +7,17 @@ module.exports = db => {
   INSERT.into(Addresses).entries(
     {
       BusinessPartner: '1234567',
-      AddressID: '12345',
+      AddressID: '11111',
       CityName: 'Walldorf',
       StreetName: 'Dietmar-Hopp-Allee',
-      HouseNumber: '123'
+      HouseNumber: '111'
+    },
+    {
+      BusinessPartner: '1234567',
+      AddressID: '22222',
+      CityName: 'Walldorf',
+      StreetName: 'Dietmar-Hopp-Allee',
+      HouseNumber: '222'
     },
     {
       BusinessPartner: '1003765',