Patch of _reduceStock() under @sap/cds 4 (#136)

* Bump to cds 4
* Cosmetics in handler code
  * await and cds.run([...]) instead of Promise.all

Co-authored-by: Christian Georgi <christian.georgi@sap.com>

.npmrc

@@ -1 +1 @@
-@sap:registry=https://npm.sap.com
+registry=https://registry.npmjs.org

.vscode/launch.json

@@ -5,18 +5,45 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "bookshop", "request": "launch", "type": "node", "runtimeExecutable": "npx", "runtimeArgs": [ "-n" ],
+      "name": "bookshop",
-      "args": [ "--", "cds", "run", "--in-memory" ],
+      "request": "launch",
+      "type": "node",
+      "runtimeExecutable": "npx",
+      "runtimeArgs": [
+        "-n"
+      ],
+      "args": [
+        "--",
+        "cds",
+        "run",
+        "--in-memory"
+      ],
       "cwd": "${workspaceFolder}/packages/bookshop",
       "console": "integratedTerminal",
-      "skipFiles": ["<node_internals>/**"]
+      "skipFiles": [
+        "<node_internals>/**"
+      ]
     },
     {
-      "name": "cds run ...", "request": "launch", "type": "node", "runtimeExecutable": "npx", "runtimeArgs": [ "-n" ],
+      "name": "cds run ...",
-      "args": [ "--", "cds", "run", "--with-mocks", "--in-memory?" ],
+      "request": "launch",
+      "type": "node",
+      "runtimeExecutable": "npx",
+      "runtimeArgs": [
+        "-n"
+      ],
+      "args": [
+        "--",
+        "cds",
+        "run",
+        "--with-mocks",
+        "--in-memory?"
+      ],
       "cwd": "${workspaceFolder}/packages/${input:service}",
       "console": "integratedTerminal",
-      "skipFiles": ["<node_internals>/**"]
+      "skipFiles": [
+        "<node_internals>/**"
+      ]
     }
   ],
   "inputs": [

README.md

@@ -1,71 +1,118 @@
-# cloud-cap-samples
+# Welcome to SAP Cloud Application Programming model samples
 
-This is a monorepository for sample projects on [SAP Cloud Application Programming Model](https://cap.cloud.sap).
+Find here the samples for the openSAP course [Building Applications with the SAP Cloud Application Programming Model](https://open.sap.com/courses/cp7).
 
-## Description
+## Get Access to SAP Business Application Studio
+The recommended environment for the course is SAP Business Application Studio.  Watch [unit 2 of week 1](https://open.sap.com/courses/cp7/items/51pzQUzbXHr2kdbOmVs6jI) for how to get access.
 
-This repository provides a list of samples and reusable packages created based on SAP Cloud Application Programming Model.
+## Setup
-The SAP Cloud Application Programming Model enables you to quickly create business applications by allowing you to focus on your domain logic. It offers a consistent end-to-end programming model that includes languages, libraries and APIs tailored for full-stack development on SAP Cloud Platform.
 
-The samples provided can be run in a local setup on SQLite Database.
+In SAP Business Application Studio, open a terminal.
+Then clone the repo with this specific branch:
 
-
-## Requirements
-* [Node.js](https://nodejs.org/en/) v8 or higher
-* [Git](https://git-scm.com)
-* [SQLite DB](https://www.sqlite.org/download.html) (Windows only; pre-installed on Mac/Linux)
-
-#### Optional (if you want to import the code into an editor)
-* [VS Code](https://code.visualstudio.com)
-* [Add CDS extension to VS](https://cap.cloud.sap/docs/get-started/in-vscode#add-cds-editor)
-
-## Download and Installation
-
-#### Install `cds` development kit
 ```sh
-# `@sap`-scoped packages are set via .npmrc
+git clone https://github.com/sap-samples/cloud-cap-samples projects/cloud-cap-samples -b openSAP-week3-unit5
-npm install -g @sap/cds-dk
+cd projects/cloud-cap-samples
-cds  #> test-run it
 ```
-Got issues?  Check out the [documentation](https://cap.cloud.sap/docs/get-started/).
 
-#### Clone and build the application
+In the `cloud-cap-samples` folder run:
-`git clone https://github.com/SAP-samples/cloud-cap-samples samples && cd samples && npm i`
+```sh
+npm install
+```
 
-#### Run the samples
+## Run
 
-With that you're ready to run the samples, e.g. start the [_bookshop_](./packages/bookshop) sample as follows:
+Now you're ready to run the samples, for example:
+```sh
+cd packages/bookshop
+cds deploy
+cds watch
+```
 
-`npm run bookshop`
+After that, watch out for the little popup in the lower right corner of SAP Business Application Studio that asks you to open the application in your browser.
 
-## Test
+## Hints
+- If your demo user logon window does not show up:  clear the browsers login data
+- If your port is still in use run in your terminal:
+```
+> pkill node      //kill running node proceses
+```
 
-For example, try these links in your browser:
+## Deploy to Cloud Foundry
-- <http://localhost:4004> to test with generic index page.
+
-- <http://localhost:4004/fiori.html> to test with Fiori sandbox.
+Clean-up the CF space in your trial account if you already used it before. Make sure that there are no services or applications deployed.
+
+Generation of the XSUAA service configuration file xs-security.json:
+```sh
+cds compile srv/ --to xsuaa > xs-security.json
+```
+
+In this unit we use  [MTA](https://sap.github.io/cloud-mta-build-tool/) to do the deployment to CF
+```sh
+npm install -g mbt
+```
+You can generate the MTA.yaml from CDS and do manual modifications or simply use the already generated and adapted  mta.yaml in the branch and directly generate the .mtar file
 
 
-## Debug
 
-For example, in [VS Code](https://code.visualstudio.com) switch to _Debug_ view and launch one of the prepared _cds run_ launch configurations.
+#### BEGIN OPTIONAL PART
 
+If you want to generate the MTA.YAML yourself please do the following:
 
-## Limitations
+- Generate the mta.yaml with the HANA dependency
+```sh
+cds add hana --force
+cds add mta
+```
 
-None
+- Add the path to the generated xs-security.json in the MTA.YAML
+```
+    parameters:
+         path: ./xs-security.json
+         service:xsuaa
+         service-plan: application
+         ....
+```
+- Add the application block in the MTA.YAML
+```
+     ##############    APP   #########################
+     - name: capire-bookshop-app
+       type: nodejs
+       path: gen/app
+       parameters:
+          memory: 256M
+       build-parameters:
+         requires:
+           - name: capire-bookshop-srv
+       requires:
+        - name: capire-bookshop-uaa
+        - name: srv-binding
+          group: destinations
+          properties:
+             forwardAuthToken: true
+             name: srv-binding
+             url: ~{srv-url}
+```
+- Make sure to use service hanatrial instead of hana in the MTA.YAML
+```
+   parameters:
+     service: hanatrial
+```
+#### END OPTIONAL PART
 
-## Known Issues
+Generate the .mtar file for the deployment and deploy to cloud foundry:
+```sh
+mbt build -t ./
+cf login -a https://api.cf.eu10.hana.ondemand.com
+cf deploy sap.capire-bookshop_1.0.0.mtar
+```
 
-None
+## Get Support
 
-## How to obtain support
+Check out the cap docs at https://cap.cloud.sap. <br>
+In case you find a bug or need support, please [open an issue in here](https://github.com/SAP-samples/cloud-cap-samples/issues/new).
 
-Check out the documentation on https://cap.cloud.sap.  In case you find a bug, or you need additional support, please open an issue [here](https://github.com/SAP-samples/cloud-cap-samples/issues/new) in GitHub.
-
-## To-Do (upcoming changes)
-
-None
 
 ## License
 
-Copyright (c) 2019 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under SAP Sample Code License Agreement, except as noted otherwise in the [LICENSE](/LICENSE) file.
+Copyright (c) 2020 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under SAP Sample Code License Agreement, except as noted otherwise in the [LICENSE](/LICENSE) file.

db/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "deploy",
+  "dependencies": {
+    "@sap/hdi-deploy": "^3.8.2"
+  },
+  "engines": {
+    "node": "^8"
+  },
+  "scripts": {
+    "start": "node node_modules/@sap/hdi-deploy/deploy.js"
+  }
+}

package.json

@@ -8,16 +8,11 @@
     "lerna": "npx --no-install lerna -v > /dev/null || npm i lerna --no-save",
     "install": "(npm -s run lerna) && lerna bootstrap --hoist",
     "cleanup": "lerna clean -y && rm -fr node_modules",
-    "bookshop": "cds watch packages/bookshop",
+    "bookshop": "cds watch packages/bookshop"
-    "bookshop-enhanced": "cds watch packages/bookshop-enhanced",
-    "reviews-service": "cds watch packages/reviews-service",
-
-    "bookstore": "cds watch packages/bookstore",
-    "media-server": "cds watch packages/media-server"
   },
   "dependencies": {
-    "@sap/cds": "latest",
+    "@sap/cds": "^4",
-    "express": "*"
+    "express": "^4"
   },
   "devDependencies": {
     "sqlite3": "*"

packages/bookshop-enhanced/app/index.cds

@@ -1 +0,0 @@
-using from '@sap/capire-bookshop/app';

packages/bookshop-enhanced/db/schema.cds

@@ -1,25 +0,0 @@
-/*
-  In this model we demonstrate how to add Genres to Books in
-  as if it was an external extension. For example we use
-  CDS Aspects' to extend the core domain model's Books entity
-  as well as the AdminService.
- */
-
-namespace sap.capire.bookshop;
-using { sap.capire.reviews.ReviewsService as external } from '@sap/capire-reviews';
-using { sap.capire.bookshop.Books } from '@sap/capire-bookshop/db/schema';
-using { sap.common.CodeList } from '@sap/cds/common';
-
-// Extending Books by Reviews and Genres
-extend Books with {
-  reviews : Composition of many external.Reviews on reviews.subject = ID;
-  rating : external.Reviews.rating;
-  genre : Association to Genres;
-}
-
-// Hierarchical Code List for Genres
-entity Genres : CodeList {
-  key ID : Integer;
-  children : Composition of many Genres on children.parent = $self;
-  parent : Association to Genres;
-}

packages/bookshop-enhanced/package.json

@@ -1,29 +0,0 @@
-{
-  "name": "@sap/capire-bookshop-enhanced",
-  "version": "1.0.0",
-  "description": "A sample for extending a base application package, in this case bookshop, e.g. in context of verticalization or customization.",
-  "repository": "https://github.com/SAP-samples/cloud-cap-samples.git",
-  "license": "SAP SAMPLE CODE LICENSE",
-  "dependencies": {
-    "@sap/capire-bookshop": "^1.0.0",
-    "@sap/capire-reviews": "^1.0.0",
-    "@sap/cds": "latest",
-    "express": "*"
-  },
-  "scripts": {
-    "reviews-service": "PORT=5005 cds run ../reviews-service --bind --in-memory?",
-    "start": "cds run --in-memory?",
-    "watch": "cds watch"
-  },
-  "cds": {
-    "requires": {
-      "sap.capire.reviews.ReviewsService": {
-        "kind": "odata",
-        "model": "@sap/capire-reviews"
-      },
-      "messaging": {
-        "kind": "file-based-messaging"
-      }
-    }
-  }
-}

packages/bookshop-enhanced/srv/services.cds

@@ -1,9 +0,0 @@
-namespace sap.capire.bookshop;
-
-using { AdminService } from '@sap/capire-bookshop/srv/admin-service';
-using { sap.capire.bookshop } from '../db/schema';
-
-@impl:'srv/services'
-extend service AdminService with {
-  entity Genres as projection on bookshop.Genres;
-}

packages/bookshop-enhanced/srv/services.js

@@ -1,30 +0,0 @@
-const cds = require ('@sap/cds')
-
-module.exports = cds.service.impl (async()=>{
-
-    const ReviewsService = await cds.connect.to ('sap.capire.reviews.ReviewsService')
-    const CatalogService = await cds.connect.to ('CatalogService')
-    const db = await cds.connect.to ('db')
-    // import model definitions from connected services to work with subsequently
-    const { Books } = db.entities
-    const { Reviews } = ReviewsService.entities
-
-    CatalogService.impl (srv => {
-        // delegate requests to read reviews to ReviewsService
-        srv.on ('READ', 'Books/reviews', (req) => {
-            const [ subject ] = req.params
-            const tx = ReviewsService.transaction (req)
-            return tx.run (SELECT.from (Reviews) .where ({subject}))
-        })
-    })
-
-    // react on event messages from reviews service
-    ReviewsService.on ('reviewed', (msg) => {
-        console.debug ('> received:', msg.event, msg.data)
-        const { subject, rating } = msg.data
-        const tx = db // TODO: db.transaction (msg)
-        return tx.run (UPDATE (Books, subject) .with ({rating}))
-        // return tx.update (Books, subject) .with ({rating})
-    })
-
-})

packages/bookshop-enhanced/tests/genres.http

@@ -1,33 +0,0 @@
-#################################################
-#
-#   Genres
-#
-
-GET http://localhost:4004/admin/Genres?
-###
-
-POST http://localhost:4004/admin/Genres?
-Content-Type: application/json
-
-{ "ID":100, "name":"Some Sample Genres...", "children":[
-    { "ID":101, "name":"Cat", "children":[
-        { "ID":102, "name":"Kitty", "children":[
-            { "ID":103, "name":"Kitty Cat", "children":[
-                { "ID":104, "name":"Aristocat" } ]},
-            { "ID":105, "name":"Kitty Bat" } ]},
-        { "ID":106, "name":"Catwoman", "children":[
-            { "ID":107, "name":"Catalina" } ]} ]},
-    { "ID":108, "name":"Catweazle" }
-]}
-###
-
-GET http://localhost:4004/admin/Genres(100)?
-# &$expand=children
-# &$expand=children($expand=children($expand=children($expand=children)))
-###
-
-DELETE http://localhost:4004/admin/Genres(103)
-###
-
-DELETE http://localhost:4004/admin/Genres(100)
-###

packages/bookshop-enhanced/tests/reviews.http

@@ -1,32 +0,0 @@
-#################################################
-#
-#   Reviews Service
-#
-
-
-### Use this one for ReviewsService running as a separate process
-# Note: use 5005 instead of 4004 in case of separate service
-POST http://localhost:5005/reviews/Reviews
-# POST http://localhost:4004/reviews/Reviews
-Content-Type: application/json;IEEE754Compatible=true
-
-{"subject":"201", "rating":"5", "title":"boo"}
-
-### Direct Request to ReviewsService
-# Note: use 5005 instead of 4004 in case of separate service
-GET http://localhost:5005/reviews/Reviews?
-# GET http://localhost:4004/reviews/Reviews?
-# &$filter=subject eq '201'
-
-
-### Request to CatalogService > delegated to ReviewsService
-GET http://localhost:4004/browse/Books(201)/reviews
-
-### Alternative OData URL
-GET http://localhost:4004/browse/Books/201/reviews
-
-###
-GET http://localhost:4004/browse/Books(201)?
-&$select=ID,title,rating
-# &$expand=reviews
-# Note: the latter only works in case of ReviewsService in same process

packages/bookshop/.cdsrc.json

@@ -0,0 +1,67 @@
+{
+    "odata": {
+        "version": "v4"
+    },
+    "build": {
+        "target": "gen",
+        "tasks": [
+            {
+                "src": "db",
+                "for": "hana",
+                "options": {
+                    "model": [
+                        "db",
+                        "srv"
+                    ]
+                }
+            },
+            {
+                "src": "srv",
+                "for": "node-cf",
+                "options": {
+                    "model": [
+                        "db",
+                        "srv",
+                        "app"
+                    ]
+                }
+            },
+            {
+                "src": "app",
+                "for": "fiori",
+                "options": {
+                    "model": [
+                        "app"
+                    ]
+                }
+            }
+        ]
+    },
+    "auth": {
+        "passport": {
+            "strategy": "mock",
+            "users": {
+                "alice": {
+                    "password": "123",
+                    "ID": "alice",
+                    "roles": [
+                        "admin",
+                        "authenticated-user"
+                    ],
+                    "xs.user.attributes": {
+                        "currency": [
+                            "USD"
+                        ]
+                    }
+                },
+                "bob": {
+                    "password": "123",
+                    "ID": "bob",
+                    "roles": [
+                        "authenticated-user"
+                    ]
+                }
+            }
+        }
+    }
+}

packages/bookshop/.vscode/launch.json

@@ -0,0 +1,29 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Run bookshop",
+      "request": "launch",
+      "type": "node",
+      "cwd": "/home/user/projects/cloud-cap-samples/packages/bookshop",
+      "runtimeExecutable": "npx",
+      "runtimeArgs": [
+        "-n"
+      ],
+      "args": [
+        "--",
+        "cds",
+        "run",
+        "--in-memory?"
+      ],
+      "console": "internalConsole",
+      "internalConsoleOptions": "openOnSessionStart",
+      "skipFiles": [
+        "<node_internals>/**"
+      ],
+      "env": {
+        "run.config": "{\"handlerId\":\"cap_run_config_handler_id\",\"runnableId\":\"/home/user/projects/cloud-cap-samples/packages/bookshop\"}"
+      }
+    }
+  ]
+}

packages/bookshop/app/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "capire-bookshop-approuter",
+  "version": "0.0.1",
+  "description": "",
+  "dependencies": {
+    "@sap/approuter": "^8"
+  },
+  "scripts": {
+    "start": "node node_modules/@sap/approuter/approuter.js"
+  }
+}

packages/bookshop/app/xs-app.json

@@ -0,0 +1,22 @@
+{
+  "welcomeFile": "/fiori.html",
+  "authenticationMethod": "route",
+  "routes": [
+    {
+      "source": "^/.*(html|js)$",
+      "localDir": "."
+    },
+    {
+      "source": "^/sapui5/.*",
+      "localDir": "."
+    },
+    {
+      "source": "^/.*/webapp/.*",
+      "localDir": "."
+    },
+    {
+      "source": "/",
+      "destination": "srv-binding"
+    }
+  ]
+}

packages/bookshop/db/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "deploy",
+  "dependencies": {
+    "@sap/hdi-deploy": "^3.8.2"
+  },
+  "engines": {
+    "node": "^12"
+  },
+  "scripts": {
+    "start": "node node_modules/@sap/hdi-deploy/deploy.js"
+  }
+}

packages/bookshop/db/src/.hdiconfig

@@ -0,0 +1,136 @@
+{
+    "file_suffixes": {
+        "csv": {
+            "plugin_name": "com.sap.hana.di.tabledata.source"
+        },
+        "hdbafllangprocedure": {
+            "plugin_name": "com.sap.hana.di.afllangprocedure"
+        },
+        "hdbanalyticprivilege": {
+            "plugin_name": "com.sap.hana.di.analyticprivilege"
+        },
+        "hdbcalculationview": {
+            "plugin_name": "com.sap.hana.di.calculationview"
+        },
+        "hdbcollection": {
+            "plugin_name": "com.sap.hana.di.collection"
+        },
+        "hdbconstraint": {
+            "plugin_name": "com.sap.hana.di.constraint"
+        },
+        "hdbdropcreatetable": {
+            "plugin_name": "com.sap.hana.di.dropcreatetable"
+        },
+        "hdbflowgraph": {
+            "plugin_name": "com.sap.hana.di.flowgraph"
+        },
+        "hdbfunction": {
+            "plugin_name": "com.sap.hana.di.function"
+        },
+        "hdbgraphworkspace": {
+            "plugin_name": "com.sap.hana.di.graphworkspace"
+        },
+        "hdbhadoopmrjob": {
+            "plugin_name": "com.sap.hana.di.virtualfunctionpackage.hadoop"
+        },
+        "hdbindex": {
+            "plugin_name": "com.sap.hana.di.index"
+        },
+        "hdblibrary": {
+            "plugin_name": "com.sap.hana.di.library"
+        },
+        "hdbmigrationtable": {
+            "plugin_name": "com.sap.hana.di.table.migration"
+        },
+        "hdbprocedure": {
+            "plugin_name": "com.sap.hana.di.procedure"
+        },
+        "hdbprojectionview": {
+            "plugin_name": "com.sap.hana.di.projectionview"
+        },
+        "hdbprojectionviewconfig": {
+            "plugin_name": "com.sap.hana.di.projectionview.config"
+        },
+        "hdbreptask": {
+            "plugin_name": "com.sap.hana.di.reptask"
+        },
+        "hdbresultcache": {
+            "plugin_name": "com.sap.hana.di.resultcache"
+        },
+        "hdbrole": {
+            "plugin_name": "com.sap.hana.di.role"
+        },
+        "hdbroleconfig": {
+            "plugin_name": "com.sap.hana.di.role.config"
+        },
+        "hdbsearchruleset": {
+            "plugin_name": "com.sap.hana.di.searchruleset"
+        },
+        "hdbsequence": {
+            "plugin_name": "com.sap.hana.di.sequence"
+        },
+        "hdbstatistics": {
+            "plugin_name": "com.sap.hana.di.statistics"
+        },
+        "hdbstructuredprivilege": {
+            "plugin_name": "com.sap.hana.di.structuredprivilege"
+        },
+        "hdbsynonym": {
+            "plugin_name": "com.sap.hana.di.synonym"
+        },
+        "hdbsynonymconfig": {
+            "plugin_name": "com.sap.hana.di.synonym.config"
+        },
+        "hdbsystemversioning": {
+            "plugin_name": "com.sap.hana.di.systemversioning"
+        },
+        "hdbtable": {
+            "plugin_name": "com.sap.hana.di.table"
+        },
+        "hdbtabledata": {
+            "plugin_name": "com.sap.hana.di.tabledata"
+        },
+        "hdbtabletype": {
+            "plugin_name": "com.sap.hana.di.tabletype"
+        },
+        "hdbtrigger": {
+            "plugin_name": "com.sap.hana.di.trigger"
+        },
+        "hdbview": {
+            "plugin_name": "com.sap.hana.di.view"
+        },
+        "hdbvirtualfunction": {
+            "plugin_name": "com.sap.hana.di.virtualfunction"
+        },
+        "hdbvirtualfunctionconfig": {
+            "plugin_name": "com.sap.hana.di.virtualfunction.config"
+        },
+        "hdbvirtualpackagehadoop": {
+            "plugin_name": "com.sap.hana.di.virtualpackage.hadoop"
+        },
+        "hdbvirtualpackagesparksql": {
+            "plugin_name": "com.sap.hana.di.virtualpackage.sparksql"
+        },
+        "hdbvirtualprocedure": {
+            "plugin_name": "com.sap.hana.di.virtualprocedure"
+        },
+        "hdbvirtualprocedureconfig": {
+            "plugin_name": "com.sap.hana.di.virtualprocedure.config"
+        },
+        "hdbvirtualtable": {
+            "plugin_name": "com.sap.hana.di.virtualtable"
+        },
+        "hdbvirtualtableconfig": {
+            "plugin_name": "com.sap.hana.di.virtualtable.config"
+        },
+        "properties": {
+            "plugin_name": "com.sap.hana.di.tabledata.properties"
+        },
+        "tags": {
+            "plugin_name": "com.sap.hana.di.tabledata.properties"
+        },
+        "txt": {
+            "plugin_name": "com.sap.hana.di.copyonly"
+        }
+    }
+}

packages/bookshop/mta.yaml

@@ -0,0 +1,94 @@
+####### Generated mta.yaml based on template version 0.2.0
+####### appName = capire-bookshop
+####### language=nodejs; multiTenant=
+####### approuter=
+_schema-version: '3.1'
+ID: sap.capire-bookshop
+version: 1.0.0
+description: "A simple bookshop application, build in a self-contained all-in-one fashion, i.e. w/o reusing other packages."
+
+build-parameters:
+  before-all:
+   - builder: custom
+     commands:
+      - npm install
+      - cds build/all
+
+parameters:
+  enable-parallel-deployments: true  
+
+modules:
+ ##############    SERVER MODULE   ##########################
+ - name: capire-bookshop-srv
+   type: nodejs
+   path: gen/srv
+   properties:
+     EXIT: 1  # required by deploy.js task to terminate 
+
+   
+   requires:
+    #### Resources extracted from CAP configuration ####
+    - name: capire-bookshop-db
+    - name: capire-bookshop-uaa
+
+   provides:
+    - name: srv-binding    # required by consumers of CAP services (e.g. approuter)
+      properties:
+        srv-url: ${default-url}
+
+ ############################################################
+
+ ##############    SIDECAR MODULE   #########################
+ - name: db
+    
+   type: hdb
+   path: gen/db  
+   parameters:
+     app-name: capire-bookshop-db  
+   requires:
+    #### Hana and xsuaa resources extracted from CAP configuration ####
+    - name: capire-bookshop-db
+    - name: capire-bookshop-uaa
+ ############################################################
+
+  ##############    APP   #########################
+ - name: capire-bookshop-app
+   type: nodejs
+   path: gen/app
+   parameters:
+      memory: 256M
+   build-parameters:
+     requires:
+       - name: capire-bookshop-srv
+   requires:
+    - name: capire-bookshop-uaa
+    - name: srv-binding
+      group: destinations
+      properties:
+         forwardAuthToken: true
+         name: srv-binding
+         url: ~{srv-url}
+
+##############  RESOURCES  ##################################
+resources:
+ ##### Services extracted from CAP configuration  ####
+ ##### 'service-plan' can be configured via 'cds.requires.<name>.vcap.plan'
+ - name: capire-bookshop-db
+   type: com.sap.xs.hdi-container 
+   
+   parameters:
+     service: hanatrial
+   properties:
+     hdi-service-name: ${service-name}   # required for Java case
+ - name: capire-bookshop-uaa
+    
+   type: org.cloudfoundry.managed-service
+   parameters:
+    ##### Path to xs-security.json to add roles and scopes   ####    
+     path: ./xs-security.json
+     service: xsuaa
+     service-plan: application  
+     config:
+       xsappname: capire-bookshop-${space}    #  name + space dependency
+       tenant-mode: dedicated
+############################################################

packages/bookshop/package.json

@@ -1,14 +1,29 @@
 {
-  "name": "@sap/capire-bookshop",
+    "name": "@sap/capire-bookshop",
-  "version": "1.0.0",
+    "version": "1.0.0",
-  "description": "A simple bookshop application, build in a self-contained all-in-one fashion, i.e. w/o reusing other packages.",
+    "description": "A simple bookshop application, build in a self-contained all-in-one fashion, i.e. w/o reusing other packages.",
-  "license": "SAP SAMPLE CODE LICENSE",
+    "license": "SAP SAMPLE CODE LICENSE",
-  "dependencies": {
+    "dependencies": {
-    "@sap/cds": "latest",
+        "@sap/cds": "^4",
-    "express": "*"
+        "express": "^4",
-  },
+        "hdb": "^0.18.1",
-  "scripts": {
+        "passport": "^0.4.1"
-    "start": "cds run --in-memory?",
+    },
-    "watch": "cds watch"
+    "scripts": {
-  }
+        "start": "cds run --in-memory?",
+        "watch": "cds watch"
+    },
+    "cds": {
+        "requires": {
+            "db": {
+                "kind": "sql",
+                "[production]": {
+                    "kind": "hana"
+                }
+            },
+            "uaa": {
+                "kind": "xsuaa"
+            }
+        }
+    }
 }

packages/bookshop/srv/admin-service.cds

@@ -14,3 +14,7 @@ annotate AdminService.Orders with @odata.draft.enabled;
 extend service AdminService with {
   entity OrderItems as select from my.OrderItems;
 }
+// Restrict access to orders to users with role "admin"
+ annotate AdminService.Orders with  @(restrict: [
+   { grant: 'READ', to: 'admin' } 
+  ]);

packages/bookshop/srv/admin-service.js

@@ -0,0 +1,10 @@
+/** Service implementation for AdminService */
+module.exports = cds.service.impl(function() {
+    this.before ('CREATE', 'Orders', _checkOrderCreateAuth)
+  })
+  
+  
+  /** Check authorization  */
+  function _checkOrderCreateAuth (req) {
+    req.user.currency[0] === req.data.currency_code || req.reject(403)
+  }

packages/bookshop/srv/cat-service.cds

@@ -8,6 +8,10 @@ service CatalogService {
   } excluding { createdBy, modifiedBy };
 
   @requires_: 'authenticated-user'
-  @insertonly entity Orders as projection on my.Orders;
+  entity Orders as projection on my.Orders;
 
 }
+// Example for an instance restriction
+ annotate CatalogService.Orders with  @(restrict: [
+   { grant: 'READ', where: 'currency_code = $user.currency'  } 
+  ]);

packages/bookshop/srv/cat-service.js

@@ -14,13 +14,20 @@ function _addDiscount2 (each,discount) {
 
 /** Reduce stock of ordered books if available stock suffices */
 async function _reduceStock (req) {
-  const { Items: OrderItems } = req.data
+  const { Items: orderItems } = req.data
-  return cds.transaction(req) .run (()=> OrderItems.map (order =>
+  if (!Array.isArray(orderItems))  return
-    UPDATE (Books) .set ('stock -=', order.amount)
+
-    .where ('ID =', order.book_ID) .and ('stock >=', order.amount)
+  const all = await cds.transaction(req).run(orderItems.map(item =>
-  )) .then (all => all.forEach ((affectedRows,i) => {
+    UPDATE(Books)
-    if (affectedRows === 0)  req.error (409,
+      .set('stock -=', item.amount)
-      `${OrderItems[i].amount} exceeds stock for book #${OrderItems[i].book_ID}`
+      .where('ID =', item.book_ID).and('stock >=', item.amount)
-    )
+  ))
-  }))
+  all.forEach((affectedRows, i) => {
+    if (affectedRows === 0) {
+      req.error(409, `${orderItems[i].amount} exceeds stock for book #${orderItems[i].book_ID}`)
+    }
+  })
+
+ return all
+
 }

packages/bookshop/xs-security.json

@@ -0,0 +1,37 @@
+{
+  "xsappname": "capire-bookshop",
+  "tenant-mode": "dedicated",
+  "scopes": [
+    {
+      "name": "$XSAPPNAME.admin",
+      "description": "admin"
+    }
+  ],
+  "attributes": [
+    {
+      "name": "currency",
+      "description": "currency",
+      "valueType": "s",
+      "valueRequired": false
+    }
+  ],
+  "role-templates": [
+    {
+      "name": "admin",
+      "description": "generated",
+      "scope-references": [
+        "$XSAPPNAME.admin"
+      ],
+      "attribute-references": []
+    },
+    {
+      "name": "userattributes",
+      "description": "generated",
+      "default-role-name": "Attributes of a User",
+      "scope-references": [],
+      "attribute-references": [
+        "currency"
+      ]
+    }
+  ]
+}

packages/bookstore/db/data/sap.capire.bookstore-Authors.csv

@@ -1,5 +0,0 @@
-ID;firstname;lastname;dateOfBirth;placeOfBirth;dateOfDeath;placeOfDeath
-101;Emily;Brontë;1818-07-30;Thornton, Yorkshire;1848-12-19;Haworth, Yorkshire
-107;Charlotte;Brontë;1818-04-21;Thornton, Yorkshire;1855-03-31;Haworth, Yorkshire
-150;Edgar Allen;Poe;1809-01-19;Boston, Massachusetts;1849-10-07;Baltimore, Maryland
-170;Richard;Carpenter;1929-08-14;King’s Lynn, Norfolk;2012-02-26;Hertfordshire, England

packages/bookstore/db/data/sap.capire.products-Categories.csv

@@ -1,11 +0,0 @@
-ID;parent_ID;name
-1;;Poetry
-2;;Biography
-3;;Fantasy
-4;;Science Fiction
-5;;Romance
-6;;Mystery
-7;;Thriller
-8;;Dystopia
-9;;Tragedy
-10;;Novel

packages/bookstore/db/data/sap.capire.products-Products.csv

@@ -1,6 +0,0 @@
-ID;title;descr;author_ID;stock;price;currency_code;category_ID
-201;Wuthering Heights;"Wuthering Heights, Emily Brontë's only novel, was published in 1847 under the pseudonym ""Ellis Bell"". It was written between October 1845 and June 1846. Wuthering Heights and Anne Brontë's Agnes Grey were accepted by publisher Thomas Newby before the success of their sister Charlotte's novel Jane Eyre. After Emily's death, Charlotte edited the manuscript of Wuthering Heights and arranged for the edited version to be published as a posthumous second edition in 1850.";101;12;11.11;GBP;9
-207;Jane Eyre;"Jane Eyre /ɛər/ (originally published as Jane Eyre: An Autobiography) is a novel by English writer Charlotte Brontë, published under the pen name ""Currer Bell"", on 16 October 1847, by Smith, Elder & Co. of London. The first American edition was published the following year by Harper & Brothers of New York. Primarily a bildungsroman, Jane Eyre follows the experiences of its eponymous heroine, including her growth to adulthood and her love for Mr. Rochester, the brooding master of Thornfield Hall. The novel revolutionised prose fiction in that the focus on Jane's moral and spiritual development is told through an intimate, first-person narrative, where actions and events are coloured by a psychological intensity. The book contains elements of social criticism, with a strong sense of Christian morality at its core and is considered by many to be ahead of its time because of Jane's individualistic character and how the novel approaches the topics of class, sexuality, religion and feminism.";107;11;12.34;GBP;10
-251;The Raven;"“The Raven"" is a narrative poem by American writer Edgar Allan Poe. First published in January 1845, the poem is often noted for its musicality, stylized language, and supernatural atmosphere. It tells of a talking raven's mysterious visit to a distraught lover, tracing the man's slow fall into madness. The lover, often identified as being a student, is lamenting the loss of his love, Lenore. Sitting on a bust of Pallas, the raven seems to further distress the protagonist with its constant repetition of the word ""Nevermore"". The poem makes use of folk, mythological, religious, and classical references.";150;333;13.13;USD;1
-252;Eleonora;"""Eleonora"" is a short story by Edgar Allan Poe, first published in 1842 in Philadelphia in the literary annual The Gift. It is often regarded as somewhat autobiographical and has a relatively ""happy"" ending.";150;555;14;USD;5
-271;Catweazle;Catweazle is a British fantasy television series, starring Geoffrey Bayldon in the title role, and created by Richard Carpenter for London Weekend Television. The first series, produced and directed by Quentin Lawrence, was screened in the UK on ITV in 1970. The second series, directed by David Reid and David Lane, was shown in 1971. Each series had thirteen episodes, most but not all written by Carpenter, who also published two books based on the scripts.;170;22;15;EUR;3

packages/bookstore/db/data/sap.capire.products-Products_texts.csv

@@ -1,4 +0,0 @@
-ID;locale;title;descr
-201;de;Sturmhöhe;Sturmhöhe (Originaltitel: Wuthering Heights) ist der einzige Roman der englischen Schriftstellerin Emily Brontë (1818–1848). Der 1847 unter dem Pseudonym Ellis Bell veröffentlichte Roman wurde vom viktorianischen Publikum weitgehend abgelehnt, heute gilt er als ein Klassiker der britischen Romanliteratur des 19. Jahrhunderts.
-207;de;Jane Eyre;Jane Eyre. Eine Autobiographie (Originaltitel: Jane Eyre. An Autobiography), erstmals erschienen im Jahr 1847 unter dem Pseudonym Currer Bell, ist der erste veröffentlichte Roman der britischen Autorin Charlotte Brontë und ein Klassiker der viktorianischen Romanliteratur des 19. Jahrhunderts. Der Roman erzählt in Form einer Ich-Erzählung die Lebensgeschichte von Jane Eyre (ausgesprochen /ˌdʒeɪn ˈɛə/), die nach einer schweren Kindheit eine Stelle als Gouvernante annimmt und sich in ihren Arbeitgeber verliebt, jedoch immer wieder um ihre Freiheit und Selbstbestimmung kämpfen muss. Als klein, dünn, blass, stets schlicht dunkel gekleidet und mit strengem Mittelscheitel beschrieben, gilt die Heldin des Romans Jane Eyre nicht zuletzt aufgrund der Kino- und Fernsehversionen der melodramatischen Romanvorlage als die bekannteste englische Gouvernante der Literaturgeschichte
-252;de;Eleonora;“Eleonora” ist eine Erzählung von Edgar Allan Poe. Sie wurde 1841 erstveröffentlicht. In ihr geht es um das Paradox der Treue in der Treulosigkeit.

packages/bookstore/db/schema.cds

@@ -1,18 +0,0 @@
-namespace sap.capire.bookstore;
-
-// We reuse Products, which are Books in our domain
-using { sap.capire.products.Products as Books } from '@sap/capire-products';
-extend Books with {
-  author : Association to Authors;
-  rating : Decimal(2,1);
-}
-
-// We reuse aspect Person to define Authors
-using { sap.capire.contacts.Person } from '@sap/capire-contacts';
-entity Authors : Person {
-  key ID : UUID;
-  books  : Association to many Books on books.author = $self;
-}
-
-// we use enhanced currencies code lists
-using from '@sap/capire-currencies';

packages/bookstore/package.json

@@ -1,48 +0,0 @@
-{
-  "name": "@sap/capire-bookstore",
-  "version": "1.0.0",
-  "description": "A variant of the bookshop application, built on top of products-service and common reuse packages.",
-  "repository": "https://github.com/SAP-samples/cloud-cap-samples.git",
-  "license": "SAP SAMPLE CODE LICENSE",
-  "dependencies": {
-    "@sap/capire-products": "^1.0.0",
-    "@sap/capire-reviews": "^1.0.0",
-    "@sap/capire-orders": "^1.0.0",
-    "@sap/capire-media": "^1.0.0",
-    "@sap/capire-users": "^1.0.0",
-    "@sap/capire-contacts": "^1.0.0",
-    "@sap/capire-currencies": "^1.0.0",
-    "@sap/cds": "latest",
-    "express": "*"
-  },
-  "bundledDependencies": [
-      "@sap/capire-products",
-      "@sap/capire-reviews",
-      "@sap/capire-orders",
-      "@sap/capire-media",
-      "@sap/capire-users",
-      "@sap/capire-contacts",
-      "@sap/capire-currencies"
-  ],
-  "files": [
-    "app", "srv", "db"
-  ],
-  "scripts": {
-    "start": "cds run --in-memory?",
-    "watch": "cds watch"
-  },
-  "cds": {
-    "requires": {
-      "db": {
-        "kind": "sql"
-      },
-      "sap.capire.media.MediaServer": {
-        "kind": "rest"
-      },
-      "sap.capire.reviews.ReviewsService": {
-        "model": "@sap/capire-reviews",
-        "kind": "odata"
-      }
-    }
-  }
-}

packages/bookstore/srv/_workarounds.cds

@@ -1,12 +0,0 @@
-//----------------------
-// workarounds -> should be done by @cds-compiler
-
-annotate cds.UUID with @odata.Type: 'Edm.String';
-
-using from '@sap/capire-products';
-annotate sap.capire.products.Products with { texts @odata.contained }
-annotate sap.capire.products.Categories with { texts @odata.contained }
-
-annotate sap.capire.reviews.ReviewsService with @imported;
-annotate sap.capire.reviews.Reviews with @cds.persistence.skip;
-annotate sap.capire.reviews.Likes with @cds.persistence.skip;

packages/bookstore/srv/services.cds

@@ -1,35 +0,0 @@
-namespace sap.capire.bookstore;
-
-// Service for all users to browse books
-using { sap.capire.products } from '../db/schema';
-
-service CatalogService @(path:'browse'){
-
-  @readonly entity Books as select from products.Products { *,
-    author.firstname ||' '|| author.lastname as author : String,
-    category.name as genre,
-  } excluding { createdBy, modifiedBy };
-
-  @readonly entity Genres as projection on products.Categories;
-
-}
-
-// Reuse AdminService from @sap/capire-products...
-using { sap.capire.products.AdminService } from '@sap/capire-products';
-using { sap.capire.bookstore as my } from '../db/schema';
-
-extend service AdminService with @(impl:'srv/services.js') {
-  entity Authors as projection on my.Authors;
-}
-
-// Adding reviews via @sap/capire-reviews service
-using { sap.capire.reviews.ReviewsService as external } from '@sap/capire-reviews';
-extend service CatalogService with {
-  @readonly entity Reviews as projection on external.Reviews;
-}
-
-
-// Adding images via @sap/capire-media service
-using from '@sap/capire-media';
-// using from '@sap/capire-orders';
-// using from '@sap/capire-users';

packages/bookstore/srv/services.js

@@ -1,38 +0,0 @@
-const cds = require('@sap/cds')
-module.exports['sap.capire.bookstore.CatalogService'] = cds.service.impl (async (srv) => {
-
-    const ReviewsService = await cds.connect.to ('sap.capire.reviews.ReviewsService')
-    const { Reviews } = ReviewsService.entities
-    const { Books } = srv.entities
-
-    // delegate requests to reviews service
-    srv.on('READ', 'Reviews', async (req) => {
-        const { SELECT } = cds.ql(req)
-        const results = await SELECT.from (Reviews)
-
-        // TODO: Should actually be using .where of fluent query API
-        if (req.query.SELECT.where) {
-            return results.filter (row => row.subject === req.query.SELECT.where[2].val)
-        }
-
-        return results
-    })
-
-    // react on event messages from reviews service
-    ReviewsService.on ('reviewed', (msg) => {
-        console.debug ('> received message:', msg.event, msg.data)
-        const {subject,rating} = msg.data
-        const tx = cds // cds.transaction(msg)  // TODO: how to add multi-tenancy?
-        return tx.run (UPDATE(Books).set({rating}) .where ({ID:subject})) //.then (console.log)
-    })
-
-})
-
-
-// FIXME: pls remove this...
-process.env.destinations = JSON.stringify([{
-    name: 'reviewsDest',
-    url: 'http://localhost:4005/reviews',
-    username: 'dummy',
-    password: 'dummy'
-}])

packages/bookstore/tests/books.cds

@@ -1,7 +0,0 @@
-using { sap.capire.products as my } from '../db/schema';
-
-service BooksService {
-  entity Books as SELECT from my.Products;
-}
-
-annotate cds.UUID with @odata.Type: 'Edm.String';

packages/bookstore/tests/localized-data.test.js

@@ -1,190 +0,0 @@
-const cds = require ('@sap/cds')
-
-describe('Localized data on db level', ()=>{
-
-    let db, Books
-
-    it ('should deploy the db schema to sqlite in-memory', async()=>{
-        db = await cds.deploy (__dirname+'/books') .to ('sqlite::memory:')
-        expect (db.model) .toBeDefined()
-        Books = db.entities('sap.capire.products').Products
-        expect (Books) .toBeDefined()
-    })
-
-    it ('should list all books with default language', async ()=>{
-        const books = await SELECT.from (Books, b=>b.title)
-        expect (books) .toMatchObject([
-            { title: 'Wuthering Heights' },
-            { title: 'Jane Eyre' },
-            { title: 'The Raven' },
-            { title: 'Eleonora' },
-            { title: 'Catweazle' }
-        ])
-    })
-
-
-    it ('should read translated texts from Books_texts', async ()=>{
-        const texts = await SELECT ('locale','title').from (Books+'_texts')
-        expect (texts) .toMatchObject ([
-            { locale: 'de', title: 'Sturmhöhe' },
-            { locale: 'de', title: 'Jane Eyre' },
-            { locale: 'de', title: 'Eleonora' }
-        ])
-    })
-
-    it ('should read translated texts from Books.texts', async ()=>{
-        const book = await SELECT.one.from (Books, b=>{
-            b.ID, b.title, b.texts(t=> {
-                t.locale, t.title
-            })
-        }) .where ({title:'Wuthering Heights'})
-        expect (book) .toMatchObject ({
-            title: 'Wuthering Heights', texts:[
-                {locale:'de',title:'Sturmhöhe'}
-            ]
-        })
-    })
-
-    it ('should insert books with translated texts', async ()=>{
-        const n = await INSERT.into (Books) .entries ({ ID:444, title:'A New Book', texts:[
-            {locale:'de', title:'Ein Neues Buch'},
-            {locale:'fr', title:'Un Nouveau Livre'},
-        ]})
-        expect(n).toBe(3)
-    })
-
-    it ('should delete books w/ cascaded delete to texts', async()=>{
-        const n = await DELETE.from(Books) .where ({ID:444})
-        expect(n).toBe(3)
-    })
-
-})
-
-
-describe('Localized data on service level', ()=>{
-
-    let srv, Books
-
-    it ('should serve BooksService', async()=>{
-        srv = await cds.serve('BooksService').from(__dirname+'/books')
-        expect (srv.model) .toBeDefined()
-        Books = srv.entities.Books
-        expect (Books) .toBeDefined()
-    })
-
-    it ('should list all books with default language', async ()=>{
-        const books = await srv.read (Books, b=>b.title)
-        expect (books) .toMatchObject([
-            { title: 'Wuthering Heights' },
-            { title: 'Jane Eyre' },
-            { title: 'The Raven' },
-            { title: 'Eleonora' },
-            { title: 'Catweazle' }
-        ])
-    })
-
-    it ('should read Books with translated texts', async ()=>{
-        const book = await srv.run (
-            SELECT.from (Books, b=>{ b.ID, b.title, b.texts(t=> {
-                t.locale, t.title
-            })}) .where ({title:'Wuthering Heights'})
-        )
-        expect (book) .toMatchObject ([{
-            title: 'Wuthering Heights', texts:[
-                {locale:'de',title:'Sturmhöhe'}
-            ]
-        }])
-    })
-
-    it ('should do the same with convenient method', async ()=>{
-        const book = await srv.read (Books, b=>{ b.ID, b.title, b.texts(t=> {
-            t.locale, t.title
-        })}) .where ({title:'Wuthering Heights'})
-        expect (book) .toMatchObject ([{
-            title: 'Wuthering Heights', texts:[
-                {locale:'de',title:'Sturmhöhe'}
-            ]
-        }])
-    })
-
-    it ('should read single Book with translated texts', async ()=>{
-        const book = await srv.run (
-            SELECT.one.from (Books, b=>{ b.ID, b.title, b.texts(t=> {
-                t.locale, t.title
-            })}) .where ({title:'Wuthering Heights'})
-        )
-        expect (book) .toMatchObject ({
-            title: 'Wuthering Heights', texts:[
-                {locale:'de',title:'Sturmhöhe'}
-            ]
-        })
-    })
-
-    it ('should insert books with translated texts', async ()=>{
-        const book = { ID:444, title:'A New Book', texts:[
-            {locale:'de', title:'Ein Neues Buch'},
-            {locale:'fr', title:'Un Nouveau Livre'},
-        ]}
-        const response = await srv.create (Books) .entries (book)
-        expect(response).toMatchObject(book)
-    })
-
-    it ('should delete books w/ cascaded delete to texts', async()=>{
-        await srv.delete('Books') .where ({ID:444})
-    })
-})
-
-
-describe('Localized data on OData level', () => {
-
-    const app = require('express')()
-    const srv = require('supertest')(app)
-
-    it ('should serve BooksService', async ()=>{
-        await cds.serve('BooksService').from(__dirname+'/books') .in (app)
-    })
-
-    it('should list all books with default language', async () => {
-      const books = await srv.get('/books/Books/201/title')
-      expect(books.body).toMatchObject({'value': 'Wuthering Heights'})
-    })
-
-    it('should read books with translated texts', async () => {
-      const books = await srv.get('/books/Books/201/title'). set('Accept-Language', 'de')
-      expect(books.body).toMatchObject({value: 'Sturmhöhe'})
-    })
-
-    it('should expand translated texts in Book', async () => {
-      const books = await srv. get('/books/Books/201?$select=title&$expand=texts($select=locale,title)')
-      expect(books.body).toMatchObject({
-        title: 'Wuthering Heights',
-        texts: [
-            { locale: 'de', title: 'Sturmhöhe', },
-        ],
-      })
-    })
-
-    const book = {
-        title: 'New Book', descr: 'Lorem Ipsum',
-        texts: [
-            { locale: 'de', title: 'Neues Buch', descr: 'Dolor sit amet' },
-            { locale: 'fr', title: 'Nouveau Livre', descr: 'consetetur sadipscing elitr' }
-        ],
-    }
-
-    it('should insert books with translated texts', async () => {
-        const {body} = await srv.post('/books/Books').send(book)
-        expect(body).toMatchObject(book)
-        book.ID = body.ID
-    })
-
-    it ('should read the newly created book', async()=>{
-        const {body} = await srv.get('/books/Books/'+book.ID+'?$expand=texts').send(book)
-        expect(body).toMatchObject(book)
-    })
-
-    it ('should delete books w/ cascaded delete to texts', async()=>{
-        await srv.delete('/books/Books/'+book.ID)
-        .expect(204)
-    })
-})

packages/common-contacts/db/code-lists.cds

@@ -1,37 +0,0 @@
-using { sap.capire.contacts.PostalAddress } from './schema';
-using { sap } from '@sap/cds/common';
-namespace sap.capire.contacts;
-
-/**
- * The Code Lists below are designed as optional extensions to
- * the base schema. Switch them on by adding an Association to
- * one of the code list entities in your models or by:
- * annotate sap.common.Countries with @cds.persistence.skip:false;
- */
-
-entity Countries as select from sap.common.Countries;
-extend sap.common.Countries {
-  regions   : Composition of many Regions on regions._parent = $self.code;
-}
-entity Regions : sap.common.CodeList {
-  key code : String(5); // ISO 3166-2 alpha5 codes, e.g. DE-BW
-  children  : Composition of many Regions on children._parent = $self.code;
-  cities    : Composition of many Cities on cities.region = $self;
-  _parent   : String(11);
-}
-entity Cities : sap.common.CodeList {
-  key code  : String(11);
-  region    : Association to Regions;
-  districts : Composition of many Districts on districts.city = $self;
-}
-entity Districts : sap.common.CodeList {
-  key code  : String(11);
-  city      : Association to Cities;
-}
-
-annotate PostalAddress with {
-  district @ref: sap.capire.contacts.Districts;
-  city @ref: sap.capire.contacts.Cities;
-  region @ref: sap.capire.contacts.Regions;
-  country @ref: sap.capire.contacts.Countries;
-}

packages/common-contacts/db/data/sap.capire.contacts-Countries.csv

@@ -1,12 +0,0 @@
-code;name;descr
-AU;Australia;Commonwealth of Australia
-CA;Canada;Canada
-CN;China;People's Republic of China (PRC)
-FR;France;French Republic
-DE;Germany;Federal Republic of Germany
-IN;India;Republic of India
-IL;Israel;State of Israel
-MM;Myanmar;Republic of the Union of Myanmar
-GB;United Kingdom;United Kingdom of Great Britain and Northern Ireland
-US;United States;United States of America (USA)
-EU;European Union;European Union