From 28a51f48379c80597f265a95417f42f726c55d10 Mon Sep 17 00:00:00 2001
From: D065023 <david.kunz@sap.com>
Date: Tue, 3 Dec 2019 10:58:53 +0100
Subject: [PATCH] Added Country and Postal Code

---
 packages/bookshop/app/_i18n/i18n.properties    |  2 ++
 packages/bookshop/app/common.cds               |  2 ++
 packages/bookshop/app/orders/fiori-service.cds |  4 +++-
 packages/bookshop/db/schema.cds                |  2 ++
 packages/bookshop/srv/admin-service.js         |  2 ++
 packages/bookshop/srv/init.js                  | 10 ++++++++++
 6 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/packages/bookshop/app/_i18n/i18n.properties b/packages/bookshop/app/_i18n/i18n.properties
index 501f1cb1..d08ea9c4 100644
--- a/packages/bookshop/app/_i18n/i18n.properties
+++ b/packages/bookshop/app/_i18n/i18n.properties
@@ -14,3 +14,5 @@ Price = Price
 ShippingAddress = Shipping Address
 HouseNumber = House Number
 StreetName = Street Name
+PostalCode = Postal Code
+Country = Country
diff --git a/packages/bookshop/app/common.cds b/packages/bookshop/app/common.cds
index cf37b87f..d0a9c626 100644
--- a/packages/bookshop/app/common.cds
+++ b/packages/bookshop/app/common.cds
@@ -77,5 +77,7 @@ annotate my.ShippingAddresses with {
 	AddressID @title:'{i18n>AddressID}';
 	CityName @title:'{i18n>CityName}';
 	StreetName @title:'{i18n>StreetName}';
+	PostalCode @title:'{i18n>PostalCode}';
+	Country @title:'{i18n>Country}';
 	HouseNumber @title:'{i18n>HouseNumber}';
 }
\ No newline at end of file
diff --git a/packages/bookshop/app/orders/fiori-service.cds b/packages/bookshop/app/orders/fiori-service.cds
index 0777b8cb..3c93535c 100644
--- a/packages/bookshop/app/orders/fiori-service.cds
+++ b/packages/bookshop/app/orders/fiori-service.cds
@@ -89,7 +89,9 @@ annotate AdminService.Orders with @(
 			Data: [
 				{Value: shippingAddress_AddressID, Label:'{i18n>ShippingAddress}'},
 				{Value: shippingAddress.HouseNumber, Label:'{i18n>HouseNumber}'},
-				{Value: shippingAddress.StreetName, Label:'{i18n>StreetName}'}
+				{Value: shippingAddress.StreetName, Label:'{i18n>StreetName}'},
+				{Value: shippingAddress.PostalCode, Label:'{i18n>PostalCode}'},
+				{Value: shippingAddress.Country, Label:'{i18n>Country}'}
 			]
 		},
 	},
diff --git a/packages/bookshop/db/schema.cds b/packages/bookshop/db/schema.cds
index 46f96205..b5e8d622 100644
--- a/packages/bookshop/db/schema.cds
+++ b/packages/bookshop/db/schema.cds
@@ -44,7 +44,9 @@ entity OrderItems : cuid {
 // TODO: Use external information
 entity ShippingAddresses  {
   key AddressID: String;
+  Country: String @readonly;
   CityName: String @readonly;
+  PostalCode: String @readonly;
   StreetName: String @readonly;
   HouseNumber: String @readonly;
 }
diff --git a/packages/bookshop/srv/admin-service.js b/packages/bookshop/srv/admin-service.js
index 3b2bb4ce..38397678 100644
--- a/packages/bookshop/srv/admin-service.js
+++ b/packages/bookshop/srv/admin-service.js
@@ -4,6 +4,8 @@ const RELEVANT_ADDRESS_COLUMNS = [
   'AddressID',
   'CityName',
   'StreetName',
+  'PostalCode',
+  'Country',
   'HouseNumber'
 ]
 
diff --git a/packages/bookshop/srv/init.js b/packages/bookshop/srv/init.js
index 49c429e6..e848a307 100644
--- a/packages/bookshop/srv/init.js
+++ b/packages/bookshop/srv/init.js
@@ -9,6 +9,8 @@ module.exports = db => {
       BusinessPartner: '1234567',
       AddressID: '11111',
       CityName: 'Walldorf',
+      PostalCode: '69190',
+      Country: 'Germany',
       StreetName: 'Dietmar-Hopp-Allee',
       HouseNumber: '111'
     },
@@ -16,6 +18,8 @@ module.exports = db => {
       BusinessPartner: '1234567',
       AddressID: '22222',
       CityName: 'Walldorf',
+      PostalCode: '69190',
+      Country: 'Germany',
       StreetName: 'Dietmar-Hopp-Allee',
       HouseNumber: '222'
     },
@@ -23,6 +27,8 @@ module.exports = db => {
       BusinessPartner: '1003765',
       AddressID: '28241',
       CityName: 'Palo Alto',
+      PostalCode: '94306',
+      Country: 'United States',
       StreetName: 'Hillview Avenue',
       HouseNumber: '26'
     },
@@ -30,6 +36,8 @@ module.exports = db => {
       BusinessPartner: '1003766',
       AddressID: '28244',
       CityName: 'Hallbergmoos',
+      PostalCode: '85396',
+      Country: 'Germany',
       StreetName: 'Zeppelinstraße',
       HouseNumber: '93'
     },
@@ -37,6 +45,8 @@ module.exports = db => {
       BusinessPartner: '1003767',
       AddressID: '28247',
       CityName: 'Potsdam',
+      PostalCode: '14467',
+      Country: 'Germany',
       StreetName: 'Konrad-Zuse-Ring',
       HouseNumber: '29'
     }