Play with db constraints

2021-04-14 19:38:38 +02:00
85 changed files with 399 additions and 1705 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -10,12 +10,8 @@ target/
 .DS_Store
 *.log
 *.mtar
 *mta-op*/
 connection.properties
 default-env.json
 packages/messageBox
 reviews/msg-box
 reviews/db/test.db
 package-lock.json
 *log*.txt
--- a/bookshop/db/data/sap.capire.bookshop-Authors.csv
+++ b/bookshop/db/data/sap.capire.bookshop-Authors.csv
@@ -1,5 +1,5 @@
-ID;name;dateOfBirth;placeOfBirth;dateOfDeath;placeOfDeath
+ID;name
-101;Emily Brontë;1818-07-30;Thornton, Yorkshire;1848-12-19;Haworth, Yorkshire
+101;Emily Brontë
-107;Charlotte Brontë;1818-04-21;Thornton, Yorkshire;1855-03-31;Haworth, Yorkshire
+107;Charlotte Brontë
-150;Edgar Allen Poe;1809-01-19;Boston, Massachusetts;1849-10-07;Baltimore, Maryland
+150;Edgar Allen Poe
-170;Richard Carpenter;1929-08-14;King’s Lynn, Norfolk;2012-02-26;Hertfordshire, England
+170;Richard Carpenter
--- a/bookshop/db/data/sap.capire.bookshop-Books.csv
+++ b/bookshop/db/data/sap.capire.bookshop-Books.csv
@@ -1,6 +1,6 @@
-ID;title;descr;author_ID;stock;price;currency_code;genre_ID
+ID;title;author_ID;genre_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;11
+201;Wuthering Heights;101;11
-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;11
+207;Jane Eyre;107;11
-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;16
+251;The Raven;150;16
-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;16
+252;Eleonora;150;16
-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;13
+271;Catweazle;170;13
--- a/bookshop/db/data/sap.capire.bookshop-Books_texts.csv
+++ b/bookshop/db/data/sap.capire.bookshop-Books_texts.csv
@@ -1,5 +1,5 @@
-ID;locale;title;descr
+ID;locale;title
-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.
+201;de;Sturmhöhe
-201;fr;Les Hauts de Hurlevent;Les Hauts de Hurlevent (titre original : Wuthering Heights), parfois orthographié Les Hauts de Hurle-Vent, est l'unique roman d'Emily Brontë, publié pour la première fois en 1847 sous le pseudonyme d’Ellis Bell. Loin d'être un récit moralisateur, Emily Brontë achève néanmoins le roman dans une atmosphère sereine, suggérant le triomphe de la paix et du Bien sur la vengeance et le Mal.
+201;fr;Les Hauts de Hurlevent
-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
+207;de;Jane Eyre
-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.
+252;de;Eleonora
--- a/bookshop/db/data/sap.capire.bookshop-Genres.csv
+++ b/bookshop/db/data/sap.capire.bookshop-Genres.csv
@@ -14,3 +14,8 @@ ID;parent_ID;name
 22;21;Autobiography
 23;20;Essay
 24;20;Speech
 30;;Others
 31;30;Other-A
 32;30;Other-A
 33;30;Other-A
 34;30;Other-A
--- a/bookshop/db/schema.cds
+++ b/bookshop/db/schema.cds
@@ -1,29 +1,19 @@
 using { Currency, managed, sap } from '@sap/cds/common';
 namespace sap.capire.bookshop;
-entity Books : managed {
+entity Books {
  key ID : Integer;
  title  : localized String(111);
  descr  : localized String(1111);
  author : Association to Authors;
  genre  : Association to Genres;
  stock  : Integer;
  price  : Decimal;
  currency : Currency;
  image : LargeBinary @Core.MediaType : 'image/png';
 }
-entity Authors : managed {
+entity Authors {
  key ID : Integer;
  name   : String(111);
  dateOfBirth  : Date;
  dateOfDeath  : Date;
  placeOfBirth : String;
  placeOfDeath : String;
  books  : Association to many Books on books.author = $self;
 }
 /** Hierarchically organized Code List for Genres */
 entity Genres : sap.common.CodeList {
  key ID   : Integer;
  parent   : Association to Genres;
--- a/bookshop/index.cds
+++ b/bookshop/index.cds
@@ -1,4 +1,3 @@
 namespace sap.capire.bookshop; //> important for reflection
 using from './db/schema';
 using from './srv/cat-service';
 using from './srv/admin-service';
--- a/bookshop/index.js
+++ b/bookshop/index.js
@@ -1 +0,0 @@
 exports.CatalogService = require('./srv/cat-service')
--- a/bookshop/package.json
+++ b/bookshop/package.json
@@ -3,20 +3,42 @@
  "version": "1.0.0",
  "description": "A simple self-contained bookshop service.",
  "dependencies": {
    "@capire/common": "*",
    "@sap/cds": "^5.0.4",
    "express": "^4.17.1",
-    "passport": "0.4.1"
+    "passport": "0.4.1",
    "@sap/hana-client": "^2.7.21"
  },
  "scripts": {
    "genres": "cds serve test/genres.cds",
    "start": "cds run",
    "watch": "cds watch"
  },
  "cds": {
    "requires": {
      "db": {
-        "kind": "sql"
+        "kind": "sql",
        "xxx-model": "*",
        "xxx-credentials": {
            "database": "localSqlite.db"
        }
      },
      "[production]": {
          "db": {
              "kind": "hana",
              "model": [
                  "db",
                  "srv"
              ]
          }
      }
    },
    "features": {
      "assert_integrity": false
    },
    "hana": {
        "deploy-format": "hdbtable"
    },
    "cdsc": {
      "beta": {
        "foreignKeyConstraints": true
      }
    }
  }
--- a/bookshop/readme.md
+++ b/bookshop/readme.md
@@ -1,31 +1,126 @@
-# Bookshop Getting Started Sample
+# Foreign key constraints on DB
-This stand-alone sample introduces the essential tasks in the development of CAP-based services as also covered in the [Getting Started guide in capire](https://cap.cloud.sap/docs/get-started/in-a-nutshell).
+As model we use a simplified version of the bookshop scenario, we work with nodejs runtime.
 ## Hypothetical Use Cases
-1. Build a service that allows to browse _Books_ and _Authors_.
+## Preparation
 2. Books have assigned _Genres_, which are organized hierarchically.
 3. All users may browse books without login.
 4. All entries are maintained by Administrators.
 5. End users may order books (the actual order mgmt being out of scope).
-## Running the Sample
+As we want to see the effects of the database constaints, we first need to switch off the integrity checks done by the node runtime. In the `package.json`:
-
+```json
-```sh
+"cds": {
-npm run watch
+  ...,
  "features": {
    "assert_integrity": false
  }
 }
 ```
-## Content & Best Practices
+Then switch on constraint generation. In the `package.json`:
 ```json
 "cds": {
  ...,
  "cdsc": {
    "beta": {
      "foreignKeyConstraints": true
    }
  }
 }
 ```
-| Links to capire                                                                                           | Sample files / folders               |
+## SQLite
-| --------------------------------------------------------------------------------------------------------- | ------------------------------------ |
+
-| [Project Setup & Layouts](https://cap.cloud.sap/docs/get-started/projects#sharing-and-reusing-content)    | [`./`](./)                           |
+In SQLite, FK constraints can only be specified during the creation of a table. They cannot be altered for an existing table. So here we at least don't have issues with existing data.
-| [Domain Modeling with CDS](https://cap.cloud.sap/docs/guides/domain-models)                               | [`./db/schema.cds`](./db/schema.cds) |
+
-| [Defining Services](https://cap.cloud.sap/docs/guides/services#defining-services)                         | [`./srv/*.cds`](./srv)               |
+For SQLite, constraint checks need to be enabled by application at runtime for each db connection with the command
-| [Single-purposed Services](https://cap.cloud.sap/docs/guides/services#single-purposed-services)           | [`./srv/*.cds`](./srv)               |
+```sql
-| [Providing & Consuming Providers](https://cap.cloud.sap/docs/guides/providing-services)                   | http://localhost:4004                |
+PRAGMA foreign_keys = ON;
-| [Using Databases](https://cap.cloud.sap/docs/guides/databases)                                            | [`./db/data/*.csv`](./db/data)       |
+```
-| [Adding Custom Logic](https://cap.cloud.sap/docs/guides/service-impl)                                     | [`./srv/*.js`](./srv)                |
+We do this via a custom handler in `admin-service.js`.
-| Adding Tests                                                                                              | [`./test`](./test)                   |
+
-| [Sharing for Reuse](https://cap.cloud.sap/docs/guides/reuse-and-compose)                                  | [`./index.cds`](./index.cds)         |
+Now run the requests in `requests.http` (use `http://localhost:4004` as server URL). They behave as expected.
 But the error messages are not providing any details. They say "constraint violation", but they don't say which table/constraint is violated:
 ```
 HTTP/1.1 500 Internal Server Error
 ...
 {
  "error": {
    "code": "SQLITE_CONSTRAINT",
    "message": "SQLITE_CONSTRAINT: FOREIGN KEY constraint failed in: \nCOMMIT"
  }
 }
 ```
 The runtime constraint checks do provide the name of the restricting association (but not the name of the entity where the association lives).
 ## HANA
 Preparation:
 * logon to cf account (e.g. trial)
 * create HANA service instance: `cf create-service hanatrial hdi-shared bookshop-db`
 First make the deplyoment without constraints (switch off constraint generation in `package.json`).
 * Run `cds build --production`. No constraints are generated.
 * Deploy db model: `cf push -f gen/db`
 * Deploy nodejs app: `cf push -f gen/srv --random-route`. Take note of the app URL.
 Run the requests in `request.http` (use the URL from the previous step as server URL, prepend with `https://`).
 Make sure to introduce some data that violates the constraints. No errors are reported - as expected.
 Now switch on constraint generation in `package.json`. 
 * Run `cds build --production`. The constraints are placed in separate `hdbconstraint` files in `gen\db\src\gen`. They are generated with `VALIDATED ON`.
 * Re-deploy db model: `cf push -f gen/db`. It fails, as the existing data violates the constraints.
 * Check logs: `cf logs bookshop-db-deployer --recent`.
 ```
 Error: com.sap.hana.di.constraint: Could not create the database object [8250005]
  at "src/gen/sap.capire.bookshop.Books_author.hdbconstraint" (1:1)
 Error: com.sap.hana.di.constraint: Database error 7: : feature not supported: referential constraint violated by existing value [8201003]
   at "src/gen/sap.capire.bookshop.Books_author.hdbconstraint" (1:1)
 ```
 You can see which constraint is violated, but there is no info about the offensive entries.
 Now use the requests from `request.http` to fix the entries that have been broken above.
 * Re-deploy db model: `cf push -f gen/db`. It should succeed.
 Again run the requests from `request.http`. This time all changes that would lead to a
 constraint violation fail.
 Inserting a book with non-existing author ID or changing a book's author ID to an invalid value yields
 the message
 ```
 HTTP/1.1 500 Internal Server Error
 ...
 {
  "error": {
    "code": "500",
    "message": "Internal Server Error"
  }
 }
 ```
 When trying to delete a genre that is still referenced in a book we get
 ```
 HTTP/1.1 462 status code 462
 ...
 {
  "error": {
    "code": "462",
    "message": "failed on update or delete by foreign key constraint violation: TrexColumnUpdate failed on table '21F87859727E470E94917B690908A09D:SAP_CAPIRE_BOOKSHOP_GENRES' with error: DELETE on 21F87859727E470E94917B690908A09D:SAP_CAPIRE_BOOKSHOP_GENRES(ID) failed, because 1 rows with corresponding foreign keys still exist in 21F87859727E470E94917B690908A09D:SAP_CAPIRE_BOOKSHOP_BOOKS(GENRE_ID), rc=1536"
  }
 }
 ```
 Note: when using `cdsc` to generate the constraints
 ```
 cdsc Q --beta foreignKeyConstraints -d hana -s hdi -o dbstuff db\schema.cds srv\admin-service.cds
 ```
 there will be constraints for e.g. `sap_common_Currencies_texts`. This cannot be deplyoed, as the corresponding table is removed from `cds` via the tree-shaking mechanism. These constraints need to be removed manually before deployment.
 ## Todo
 * Provide a way to control parameters `VALIDATED` and `ENFORCED` of the constraints (only interesting for HANA, as in SQLite changing constraints after table generation is not possible).
 * Provide some tool to identify existing entries that violate constraints. We can generate a list of `SELECT` statements that find these entries, but how do we run it and show the results to the user?
 * Can runtimes improve the error messages?
--- a/bookshop/srv/admin-service.cds
+++ b/bookshop/srv/admin-service.cds
@@ -1,5 +1,6 @@
 using { sap.capire.bookshop as my } from '../db/schema';
-service AdminService @(requires:'admin') {
+service AdminService {
  entity Books as projection on my.Books;
  entity Authors as projection on my.Authors;
  entity Genres as projection on my.Genres;
 }
--- a/bookshop/srv/admin-service.js
+++ b/bookshop/srv/admin-service.js
@@ -1,12 +1,15 @@
 // sqlite: FK constraint checks need to be enabled by application at runtime
 // for each db connection
 const cds = require('@sap/cds')
 module.exports = cds.service.impl (async function(){ 
-module.exports = cds.service.impl (function(){
+  const db = await cds.connect.to('db')
-  this.before ('NEW','Authors', genid)
+
-  this.before ('NEW','Books', genid)
+  if (db.kind === 'sqlite')
  {
    db.before('BEGIN', function (req) { 
      //console.log('--- PRAGMA foreign_keys = ON ---')
      return this.dbc.run('PRAGMA foreign_keys = ON;')
    })
 /** Generate primary keys for target entity in request */
 async function genid (req) {
  const {ID} = await cds.tx(req).run (SELECT.one.from(req.target).columns('max(ID) as ID'))
  req.data.ID = ID - ID % 100 + 100 + 1
  }
 })
--- a/bookshop/srv/cat-service.cds
+++ b/bookshop/srv/cat-service.cds
@@ -1,16 +0,0 @@
 using { sap.capire.bookshop as my } from '../db/schema';
 service CatalogService @(path:'/browse') {
  /** For displaying lists of Books */
  @readonly entity ListOfBooks as projection on Books
  excluding { descr };
  /** For display in details pages */
  @readonly entity Books as projection on my.Books { *,
    author.name as author
  } excluding { createdBy, modifiedBy };
  @requires: 'authenticated-user'
  action submitOrder ( book: Books:ID, amount: Integer ) returns { stock: Integer };
  event OrderedBook : { book: Books:ID; amount: Integer; buyer: String };
 }
--- a/bookshop/srv/cat-service.js
+++ b/bookshop/srv/cat-service.js
@@ -1,26 +0,0 @@
 const cds = require('@sap/cds')
 const { Books } = cds.entities ('sap.capire.bookshop')
 class CatalogService extends cds.ApplicationService { init(){
  // Reduce stock of ordered books if available stock suffices
  this.on ('submitOrder', async req => {
    const {book,amount} = req.data
    let {stock} = await SELECT `stock` .from (Books,book)
    if (stock >= amount) {
      await UPDATE (Books,book) .with (`stock -=`, amount)
      await this.emit ('OrderedBook', { book, amount, buyer:req.user.id })
      return { stock }
    }
    else return req.error (409,`${amount} exceeds stock for book #${book}`)
  })
  // Add some discount for overstocked books
  this.after ('READ','ListOfBooks', each => {
    if (each.stock > 111) each.title += ` -- 11% discount!`
  })
  return super.init()
 }}
 module.exports = { CatalogService }
--- a/bookshop/test/genres.cds
+++ b/bookshop/test/genres.cds
@@ -1,4 +0,0 @@
 using { sap.capire.bookshop as my } from '../db/schema';
 service TestService {
  entity Genres as projection on my.Genres;
 }
--- a/bookshop/test/genres.http
+++ b/bookshop/test/genres.http
@@ -1,38 +0,0 @@
 #################################################
 #
 #   Genres
 #
 GET http://localhost:4004/test/Genres?
 ###
 GET http://localhost:4004/test/Genres?
 &$filter=parent_ID eq null&$select=name
 &$expand=children($select=name)
 ###
 POST http://localhost:4004/test/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/test/Genres(100)?
 # &$expand=children
 # &$expand=children($expand=children($expand=children($expand=children)))
 ###
 DELETE http://localhost:4004/test/Genres(103)
 ###
 DELETE http://localhost:4004/test/Genres(100)
 ###
--- a/bookshop/test/requests.http
+++ b/bookshop/test/requests.http
@@ -1,82 +1,68 @@
 # running locally
@server = http://localhost:4004
-@me = Authorization: Basic {{$processEnv USER}}:
+
 # running on cf
 #@server = https://bookshop-srv-....hana.ondemand.com
 ### get all books
 GET {{server}}/admin/Books
 ### get all authors
 GET {{server}}/admin/Authors
 ### get all genres
 GET {{server}}/admin/Genres
-### ------------------------------------------------------------------------
+### create book with wrong author ID -> should fail
 # Get service info
 GET {{server}}/browse
 {{me}}
 ### ------------------------------------------------------------------------
 # Get $metadata document
 GET {{server}}/browse/$metadata
 {{me}}
 ### ------------------------------------------------------------------------
 # Browse Books as any user
 GET {{server}}/browse/Books?
  # &$select=title,stock
  # &$expand=currency
  # &sap-language=de
 {{me}}
 ### ------------------------------------------------------------------------
 # Fetch Authors as admin
 GET {{server}}/admin/Authors?
  # &$select=name,dateOfBirth,placeOfBirth
  # &$expand=books($select=title;$expand=currency)
  # &$filter=ID eq 101
  # &sap-language=de
 Authorization: Basic alice:
 ### ------------------------------------------------------------------------
 # Create book
 POST {{server}}/admin/Books
-Content-Type: application/json;IEEE754Compatible=true
+Content-Type: application/json
 Authorization: Basic alice:
 {
-  "ID": 2,
+  "ID": 701,
-  "title": "Poems : Pocket Poets",
+  "title": "XXX",
-  "descr": "The Everyman's Library Pocket Poets hardcover series is popular for its compact size and reasonable price which does not compromise content. Poems: Bronte contains poems that demonstrate a sensibility elemental in its force with an imaginative discipline and flexibility of the highest order. Also included are an Editor's Note and an index of first lines.",
+  "author": { "ID": 9999 }
  "author": { "ID": 101 },
  "genre": { "ID": 12 },
  "stock": 5,
  "price": "12.05",
  "currency": { "code": "USD" }
 }
 ### create book with correct author ID -> should work
 POST {{server}}/admin/Books
 Content-Type: application/json;IEEE754Compatible=true
-### ------------------------------------------------------------------------
+{
-# Put image to books
+  "ID": 702,
-PUT {{server}}/admin/Books(2)/image
+  "title": "Poems : Pocket Poets",
-Content-Type: image/png
+  "author": { "ID": 101 }
-Authorization: Basic alice:
+}
-data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAANwAAADcCAYAAAAbWs+BAAAGwElEQVR4Ae3cwZFbNxBFUY5rkrDTmKAUk5QT03Aa44U22KC7NHptw+DRikVAXf8fzC3u8Hj4R4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAgZzAW26USQT+e4HPx+Mz+RRvj0e0kT+SD2cWAQK1gOBqH6sEogKCi3IaRqAWEFztY5VAVEBwUU7DCNQCgqt9rBKICgguymkYgVpAcLWPVQJRAcFFOQ0jUAsIrvaxSiAqILgop2EEagHB1T5WCUQFBBflNIxALSC42scqgaiA4KKchhGoBQRX+1glEBUQXJTTMAK1gOBqH6sEogKCi3IaRqAWeK+Xb1z9iN558fHxcSPS9p2ezx/ROz4e4TtIHt+3j/61hW9f+2+7/+UXbifjewIDAoIbQDWSwE5AcDsZ3xMYEBDcAKqRBHYCgtvJ+J7AgIDgBlCNJLATENxOxvcEBgQEN4BqJIGdgOB2Mr4nMCAguAFUIwnsBAS3k/E9gQEBwQ2gGklgJyC4nYzvCQwICG4A1UgCOwHB7WR8T2BAQHADqEYS2AkIbifjewIDAoIbQDWSwE5AcDsZ3xMYEEjfTzHwiK91B8npd6Q8n8/oGQ/ckRJ9vvQwv3BpUfMIFAKCK3AsEUgLCC4tah6BQkBwBY4lAmkBwaVFzSNQCAiuwLFEIC0guLSoeQQKAcEVOJYIpAUElxY1j0AhILgCxxKBtIDg0qLmESgEBFfgWCKQFhBcWtQ8AoWA4AocSwTSAoJLi5pHoBAQXIFjiUBaQHBpUfMIFAKCK3AsEUgLCC4tah6BQmDgTpPsHSTFs39p6fQ7Q770UsV/Ov19X+2OFL9wxR+rJQJpAcGlRc0jUAgIrsCxRCAtILi0qHkECgHBFTiWCKQFBJcWNY9AISC4AscSgbSA4NKi5hEoBARX4FgikBYQXFrUPAKFgOAKHEsE0gKCS4uaR6AQEFyBY4lAWkBwaVHzCBQCgitwLBFICwguLWoegUJAcAWOJQJpAcGlRc0jUAgIrsCxRCAt8J4eePq89B0ar3ZnyOnve/rfn1+400/I810lILirjtPLnC4guNNPyPNdJSC4q47Ty5wuILjTT8jzXSUguKuO08ucLiC400/I810lILirjtPLnC4guNNPyPNdJSC4q47Ty5wuILjTT8jzXSUguKuO08ucLiC400/I810lILirjtPLnC4guNNPyPNdJSC4q47Ty5wuILjTT8jzXSUguKuO08ucLiC400/I810l8JZ/m78+szP/zI47fJo7Q37vgJ7PHwN/07/3TOv/9gu3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhg4P6H9J0maYHXuiMlrXf+vOfA33Turf3C5SxNItAKCK4lsoFATkBwOUuTCLQCgmuJbCCQExBcztIkAq2A4FoiGwjkBASXszSJQCsguJbIBgI5AcHlLE0i0AoIriWygUBOQHA5S5MItAKCa4lsIJATEFzO0iQCrYDgWiIbCOQEBJezNIlAKyC4lsgGAjkBweUsTSLQCgiuJbKBQE5AcDlLkwi0Akff//Dz6U+/I6U1/sUNr3bnytl3kPzi4bXb/cK1RDYQyAkILmdpEoFWQHAtkQ0EcgKCy1maRKAVEFxLZAOBnIDgcpYmEWgFBNcS2UAgJyC4nKVJBFoBwbVENhDICQguZ2kSgVZAcC2RDQRyAoLLWZpEoBUQXEtkA4GcgOByliYRaAUE1xLZQCAnILicpUkEWgHBtUQ2EMgJCC5naRKBVkBwLZENBHIC/4M7TXIv+3PS22d24qvdQfL3C/7N5P5i/MLlLE0i0AoIriWygUBOQHA5S5MItAKCa4lsIJATEFzO0iQCrYDgWiIbCOQEBJezNIlAKyC4lsgGAjkBweUsTSLQCgiuJbKBQE5AcDlLkwi0AoJriWwgkBMQXM7SJAKtgOBaIhsI5AQEl7M0iUArILiWyAYCOQHB5SxNItAKCK4lsoFATkBwOUuTCBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIDAvyrwDySEJ2VQgUSoAAAAAElFTkSuQmCC
+### delete book
 DELETE {{server}}/admin/Books(ID=701)
 ### change book to wrong author ID -> should fail
-### ------------------------------------------------------------------------
+PATCH {{server}}/admin/Books(ID=207)
 # Reading image from from the server directly
 GET {{server}}/browse/Books(2)/image
 ### ------------------------------------------------------------------------
 # Submit Order as authenticated user
 # (send that three times to get out-of-stock message)
 POST {{server}}/browse/submitOrder
 Content-Type:application/json
 {{me}}
-{ "book":201, "amount":5 }
+{"author_ID": 9999}
 ### change book to correct author ID -> should work
 PATCH {{server}}/admin/Books(ID=207)
 Content-Type:application/json
 {"author_ID": 170}
-### ------------------------------------------------------------------------
+
-# Browse Genres
+### delete "leaf" genre that is used in a book -> should not work
-GET {{server}}/browse/Genres?
+DELETE {{server}}/admin/Genres(ID=13)
-# &$filter=parent_ID eq null&$select=name
+
-# &$expand=children($select=name)
+### delete "leaf" genre that is not used in a book -> should work
-{{me}}
+DELETE {{server}}/admin/Genres(ID=14)
 ### delete "header" genre where leaves are used in a book -> should not work
 DELETE {{server}}/admin/Genres(ID=10)
 ### delete "header" genre where leaves are not used in a book -> should work and delete all leaves
 DELETE {{server}}/admin/Genres(ID=30)
--- a/fiori/.env
+++ b/fiori/.env
@@ -0,0 +1,2 @@
 # cds.requires.messaging.kind = file-based-messaging
 PORT = 4004
--- a/multitenancy/app/_i18n/i18n.properties
+++ b/multitenancy/app/_i18n/i18n.properties
--- a/multitenancy/app/_i18n/i18n_de.properties
+++ b/multitenancy/app/_i18n/i18n_de.properties
--- a/multitenancy/app/admin-fiori.html
+++ b/multitenancy/app/admin-fiori.html
--- a/multitenancy/app/admin/fiori-service.cds
+++ b/multitenancy/app/admin/fiori-service.cds
--- a/multitenancy/app/admin/webapp/Component.js
+++ b/multitenancy/app/admin/webapp/Component.js
--- a/multitenancy/app/admin/webapp/i18n/i18n.properties
+++ b/multitenancy/app/admin/webapp/i18n/i18n.properties
--- a/multitenancy/app/admin/webapp/manifest.json
+++ b/multitenancy/app/admin/webapp/manifest.json
--- a/multitenancy/app/bookshop.html
+++ b/multitenancy/app/bookshop.html
--- a/multitenancy/app/browse/fiori-service.cds
+++ b/multitenancy/app/browse/fiori-service.cds
@@ -1,4 +1,4 @@
-using CatalogService from '../../srv/cat-service';
+using CatalogService from '@capire/bookshop';
 ////////////////////////////////////////////////////////////////////////////
 //
--- a/multitenancy/app/browse/webapp/Component.js
+++ b/multitenancy/app/browse/webapp/Component.js
--- a/multitenancy/app/browse/webapp/i18n/i18n.properties
+++ b/multitenancy/app/browse/webapp/i18n/i18n.properties
--- a/multitenancy/app/browse/webapp/manifest.json
+++ b/multitenancy/app/browse/webapp/manifest.json
--- a/multitenancy/app/common.cds
+++ b/multitenancy/app/common.cds
@@ -2,8 +2,8 @@
 	Common Annotations shared by all apps
 */
-using { sap.capire.bookshop as my } from '../db/schema';
+using { sap.capire.bookshop as my } from '@capire/bookshop';
-using { sap.common } from '../db/capire_common';
+using { sap.common } from '@capire/common';
 ////////////////////////////////////////////////////////////////////////////
 //
--- a/multitenancy/app/reviews.html
+++ b/multitenancy/app/reviews.html
--- a/multitenancy/app/services.cds
+++ b/multitenancy/app/services.cds
@@ -4,8 +4,9 @@
 using from './admin/fiori-service';
 using from './browse/fiori-service';
 using from './orders/fiori-service';
 using from './common';
-using from '../db/capire_common';
+using from '@capire/common';
 // only works in case of embedded orders service
 using from '@capire/orders/app/orders/fiori-service';
--- a/fiori/db/hana/index.cds
+++ b/fiori/db/hana/index.cds
@@ -0,0 +1,10 @@
 //
 //  Add Author.age and .lifetime with a DB-specific function
 //
 using { AdminService } from '../schema';
 extend projection AdminService.Authors with {
  YEARS_BETWEEN(dateOfBirth, dateOfDeath)         as age: Integer,
  YEAR(dateOfBirth) || ' – ' || YEAR(dateOfDeath) as lifetime : String
 }
--- a/fiori/db/schema.cds
+++ b/fiori/db/schema.cds
@@ -0,0 +1,8 @@
 using { sap.capire.bookshop } from '@capire/bookshop';
 // Forward-declare calculated fields to be filled in database-specific ways
 // TODO find a better way to have 'default' fields that still can be overwritten.
 extend bookshop.Authors with {
 	virtual age: Integer;
 	virtual lifetime: String;
 }
--- a/fiori/db/sqlite/index.cds
+++ b/fiori/db/sqlite/index.cds
@@ -0,0 +1,10 @@
 //
 //  Add Author.age and .lifetime with a DB-specific function
 //
 using { AdminService } from '../schema';
 extend projection AdminService.Authors with {
  strftime('%Y',dateOfDeath)-strftime('%Y',dateOfBirth)              as age: Integer,
  strftime('%Y',dateOfBirth) || ' – ' || strftime('%Y',dateOfDeath)  as lifetime : String
 }
--- a/fiori/package.json
+++ b/fiori/package.json
@@ -0,0 +1,44 @@
 {
  "name": "@capire/fiori",
  "version": "1.0.0",
  "dependencies": {
    "@capire/bookshop": "*",
    "@capire/reviews": "*",
    "@capire/orders": "*",
    "@capire/common": "*",
    "@sap/cds": ">=4",
    "express": "^4.17.1",
    "passport": "^0.4.1"
  },
  "scripts": {
    "start": "cds run --in-memory?",
    "watch": "cds watch"
  },
  "cds": {
    "hana": {
      "deploy-format": "hdbtable"
    },
    "requires": {
      "auth": {
        "strategy": "dummy"
      },
      "ReviewsService": {
        "kind": "odata",
        "model": "@capire/reviews"
      },
      "OrdersService": {
        "kind": "odata",
        "model": "@capire/orders"
      },
      "db": {
        "kind": "sql",
        "[development]": {
          "model": "db/sqlite"
        },
        "[production]": {
          "model": "db/hana"
        }
      }
    }
  }
 }
--- a/multitenancy/server.js
+++ b/multitenancy/server.js
@@ -1,9 +1,9 @@
 const cds = require ('@sap/cds')
 cds.once('bootstrap',(app)=>{
-  //app.use ('/orders/webapp', _from('./app/orders/webapp/manifest.json'))
+  app.use ('/orders/webapp', _from('@capire/orders/app/orders/webapp/manifest.json'))
-  //app.use ('/bookshop', _from('@capire/bookshop/app/vue/index.html'))
+  app.use ('/bookshop', _from('@capire/bookshop/app/vue/index.html'))
-  //app.use ('/reviews', _from('@capire/reviews/app/vue/index.html'))
+  app.use ('/reviews', _from('@capire/reviews/app/vue/index.html'))
 })
 cds.once('served', require('./srv/mashup'))
--- a/multitenancy/srv/mashup.cds
+++ b/multitenancy/srv/mashup.cds
@@ -3,25 +3,23 @@
 //    Mashing up imported models...
 //
-using { sap.capire.bookshop.Books } from '../db/schema';
+using { sap.capire.bookshop.Books } from '@capire/bookshop';
 //
 //  Extend Books with access to Reviews and average ratings
 //
 /*
 using { ReviewsService.Reviews } from '@capire/reviews';
 extend Books with {
  reviews : Composition of many Reviews on reviews.subject = $self.ID;
  rating  : Decimal;
 }
 */
 //
 //  Extend Orders with Books as Products
 //
-using { sap.capire.orders.Orders_Items } from '../db/schema';
+using { sap.capire.orders.Orders_Items } from '@capire/orders';
 extend Orders_Items with {
  book : Association to Books on product.ID = book.ID
 }
--- a/multitenancy/srv/mashup.js
+++ b/multitenancy/srv/mashup.js
@@ -6,7 +6,7 @@ module.exports = async()=>{ // called by server.js
  const cds = require('@sap/cds')
  const CatalogService = await cds.connect.to ('CatalogService')
-  //const ReviewsService = await cds.connect.to ('ReviewsService')
+  const ReviewsService = await cds.connect.to ('ReviewsService')
  const OrdersService = await cds.connect.to ('OrdersService')
  const db = await cds.connect.to ('db')
@@ -39,14 +39,12 @@ module.exports = async()=>{ // called by server.js
  //
  // Update Books' average ratings when ReviewsService signals updatd reviews
  //
  /*
  ReviewsService.on ('reviewed', (msg) => {
    console.debug ('> received:', msg.event, msg.data)
    const { subject, rating } = msg.data
    return UPDATE(Books,subject).with({rating})
    // ^ Note: the framework will execute this and take care for db.tx
  })
  */
  //
  // Reduce stock of ordered books for orders are created from Orders admin UI
--- a/fiori/test/requests.http
+++ b/fiori/test/requests.http
@@ -0,0 +1,77 @@
@bookshop = http://localhost:4004
@reviews-service = {{bookshop}}/reviews
 # Uncomment this when running a separate reviews service
@reviews-service = http://localhost:4005/reviews
 #################################################
 #
 #   Reviews Service
 #
 GET {{reviews-service}}/Reviews
 ###
 POST {{reviews-service}}/Reviews
 Authorization: Basic {{$processEnv USER}}:
 Content-Type: application/json
 {"subject":"201", "title":"boo", "rating":3 }
 #################################################
 #
 #   Bookshop Services
 #
 GET {{bookshop}}/browse/Books/201/reviews?
 &$select=rating,date,title
 &$top=3
 ###
 GET {{bookshop}}/browse/Books(201)?
 &$select=ID,title,rating
 &$expand=reviews
 #################################################
 #
 #   Orders Service, incl. draft choreography
 #
@newOrderID = e939604c-ab83-4d4f-bdb6-95fe30b3773e
 GET {{bookshop}}/orders/Orders
 ### Create order, still inactive
 POST {{bookshop}}/orders/Orders
 Content-Type: application/json
 {"ID": "{{newOrderID}}"}
 ### Get inactive order.  We have to specify `IsActiveEntity`.
 GET {{bookshop}}/orders/Orders(ID={{newOrderID}},IsActiveEntity=false)
 ### Activate order using `.../<servicename>.draftActivate`
 POST {{bookshop}}/orders/Orders(ID={{newOrderID}},IsActiveEntity=false)/OrdersService.draftActivate
 Content-Type: application/json
 ### Get active order
 GET {{bookshop}}/orders/Orders(ID={{newOrderID}},IsActiveEntity=true)
 ### Create author
 POST {{bookshop}}/admin/Authors
 Content-Type: application/json
 Authorization: Basic alice:
 {
  "ID": 200,
  "name": "William Shakespeare",
  "dateOfBirth": "1564-04-26",
  "dateOfDeath": "1616-04-23"
 }
--- a/multitenancy/.cdsrc.json
+++ b/multitenancy/.cdsrc.json
@@ -1 +0,0 @@
 {}
--- a/multitenancy/.gitignore
+++ b/multitenancy/.gitignore
@@ -1,33 +0,0 @@
 # CAP multitenancy
 _out
 *.db
 connection.properties
 default-*.json
 gen/
 node_modules/
 target/
 # Web IDE, App Studio
 .che/
 .gen/
 # MTA
 *_mta_build_tmp
 *.mtar
 *.mta
 mta_archives/
 *mta-op*/
 # Other
 .DS_Store
 *.orig
 *.log
 *.iml
 *.flattened-pom.xml
 *log*.txt
 # IDEs
 # .vscode
 # .idea
--- a/multitenancy/.vscode/extensions.json
+++ b/multitenancy/.vscode/extensions.json
@@ -1,20 +0,0 @@
 {
 	// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
 	// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
 	// List of extensions which should be recommended for users of this workspace.
 	"recommendations": [
 		// >>>>>>>> Add CDS Editor here as soon it is available of vscode marketplace!,
 		"dbaeumer.vscode-eslint",
 		"esbenp.prettier-vscode",
 		"mechatroner.rainbow-csv",
 		"humao.rest-client",
 		"alexcvzz.vscode-sqlite",
 		"hbenl.vscode-mocha-test-adapter",
 		"sdras.night-owl"
 	],
 	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
 	"unwantedRecommendations": [
 	]
 }
--- a/multitenancy/.vscode/launch.json
+++ b/multitenancy/.vscode/launch.json
@@ -1,15 +0,0 @@
 {
  // Use IntelliSense to learn about possible attributes.
  // Hover to view descriptions of existing attributes.
  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
  "version": "0.2.0",
  "configurations": [
    {
      "command": "cds run --with-mocks --in-memory?",
      "name": "cds run",
      "request": "launch",
      "type": "node-terminal",
      "skipFiles": [ "<node_internals>/**" ]
    }
  ]
 }
--- a/multitenancy/.vscode/settings.json
+++ b/multitenancy/.vscode/settings.json
@@ -1,7 +0,0 @@
 {
  "files.exclude": {
    "**/.gitignore": true,
    "**/.git": true,
    "**/.vscode": true
  }
 }
--- a/multitenancy/.vscode/tasks.json
+++ b/multitenancy/.vscode/tasks.json
@@ -1,25 +0,0 @@
 {
  // See https://go.microsoft.com/fwlink/?LinkId=733558
  // for the documentation about the tasks.json format
  "version": "2.0.0",
  "tasks": [
    {
      "type": "shell",
      "label": "cds watch",
      "command": "cds",
      "args": ["watch"],
      "group": {
        "kind": "build",
        "isDefault": true
      },
      "problemMatcher": []
    },
    {
      "type": "shell",
      "label": "cds run",
      "command": "cds",
      "args": ["run", "--with-mocks", "--in-memory?"],
      "problemMatcher": []
    }
  ]
 }
--- a/multitenancy/README.md
+++ b/multitenancy/README.md
@@ -1,25 +0,0 @@
 # Getting Started
 Welcome to your new project.
 It contains these folders and files, following our recommended project layout:
 File or Folder | Purpose
 ---------|----------
 `app/` | content for UI frontends goes here
 `db/` | your domain models and data go here
 `srv/` | your service models and code go here
 `package.json` | project metadata and configuration
 `readme.md` | this getting started guide
 ## Next Steps
 - Open a new terminal and run `cds watch` 
 - (in VS Code simply choose _**Terminal** > Run Task > cds watch_)
 - Start adding content, for example, a [db/schema.cds](db/schema.cds).
 ## Learn More
 Learn more at https://cap.cloud.sap/docs/get-started/.
--- a/multitenancy/app/orders/fiori-service.cds
+++ b/multitenancy/app/orders/fiori-service.cds
@@ -1,92 +0,0 @@
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Note: this is designed for the OrdersService being co-located with
 //	bookshop. It does not work if OrdersService is run as a separate
 // 	process, and is not intended to do so.
 //
 ////////////////////////////////////////////////////////////////////////////
 using { OrdersService } from '../../srv/orders-service';
@odata.draft.enabled
 annotate OrdersService.Orders with @(
 	UI: {
 		SelectionFields: [ createdAt, createdBy ],
 		LineItem: [
 			{Value: OrderNo, Label:'OrderNo'},
 			// {Value: buyer, Label:'Customer'}, we do not need this, because we want extend it later
 			{Value: createdAt, Label:'Date'}
 		],
 		HeaderInfo: {
 			TypeName: 'Order', TypeNamePlural: 'Orders',
 			Title: {
 				Label: 'Order number ', //A label is possible but it is not considered on the ObjectPage yet
 				Value: OrderNo
 			},
 			Description: {Value: createdBy}
 		},
 		Identification: [ //Is the main field group
 			{Value: createdBy, Label:'Customer'},
 			{Value: createdAt, Label:'Date'},
 			{Value: OrderNo },
 		],
 		HeaderFacets: [
 			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Created}', Target: '@UI.FieldGroup#Created'},
 			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Modified}', Target: '@UI.FieldGroup#Modified'},
 		],
 		Facets: [
 			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Details'},
 			{$Type: 'UI.ReferenceFacet', Label: '{i18n>OrderItems}', Target: 'Items/@UI.LineItem'},
 		],
 		FieldGroup#Details: {
 			Data: [
 				{Value: currency_code, Label:'Currency'}
 			]
 		},
 		FieldGroup#Created: {
 			Data: [
 				{Value: createdBy},
 				{Value: createdAt},
 			]
 		},
 		FieldGroup#Modified: {
 			Data: [
 				{Value: modifiedBy},
 				{Value: modifiedAt},
 			]
 		},
 	},
 ) {
 	createdAt @UI.HiddenFilter:false;
 	createdBy @UI.HiddenFilter:false;
 };
 annotate OrdersService.Orders_Items with @(
 	UI: {
 		LineItem: [
 			{Value: product_ID, Label:'Product ID'},
 			{Value: title, Label:'Product Title'},
 			{Value: price, Label:'Unit Price'},
 			{Value: amount, Label:'Quantity'},
 		],
 		Identification: [ //Is the main field group
 			{Value: amount, Label:'Amount'},
 			{Value: title, Label:'Product'},
 			{Value: price, Label:'Unit Price'},
 		],
 		Facets: [
 			{$Type: 'UI.ReferenceFacet', Label: '{i18n>OrderItems}', Target: '@UI.Identification'},
 		],
 	},
 ) {
 	amount @(
 		Common.FieldControl: #Mandatory
 	);
 };
--- a/multitenancy/app/orders/webapp/Component.js
+++ b/multitenancy/app/orders/webapp/Component.js
@@ -1,8 +0,0 @@
 sap.ui.define(["sap/fe/core/AppComponent"], function(AppComponent) {
 	"use strict";
 	return AppComponent.extend("orders.Component", {
 		metadata: { manifest: "json" }
 	});
 });
 /* eslint no-undef:0 */
--- a/multitenancy/app/orders/webapp/i18n/i18n.properties
+++ b/multitenancy/app/orders/webapp/i18n/i18n.properties
@@ -1,11 +0,0 @@
 # This is the resource bundle of itelo
 # __ldi.translation.uuid=c3431418-9caf-11e8-98d0-529269fb1459
 # JCI app descriptor contains lower case TITLE
 appTitle=Bookshop Sample
 # JCI app descriptor contains lower case DESCRIPTION
 appSubTitle=CAP Sample Application
 # JCI app descriptor contains lower case DESCRIPTION
 appDescription=CDS Sample Service
--- a/multitenancy/app/orders/webapp/manifest.json
+++ b/multitenancy/app/orders/webapp/manifest.json
@@ -1,170 +0,0 @@
 {
 	"_version": "1.8.0",
 	"sap.app": {
 		"id": "orders",
 		"type": "application",
 		"title": "Order Books",
 		"description": "Sample Application",
 		"i18n": "i18n/i18n.properties",
 		"dataSources": {
 			"OrdersService": {
 				"uri": "/orders/",
 				"type": "OData",
 				"settings": {
 					"odataVersion": "4.0"
 				}
 			}
 		},
        "-sourceTemplate": {
            "id": "ui5template.basicSAPUI5ApplicationProject",
 			"-id": "ui5template.smartTemplate",
 			"-version": "1.40.12"
 		}
 	},
 	"sap.ui5": {
        "dependencies": {
            "libs": {
                "sap.fe.templates": {}
            }
        },
 		"models": {
 			"i18n": {
 				"type": "sap.ui.model.resource.ResourceModel",
 				"uri": "i18n/i18n.properties"
 			},
 			"": {
 				"dataSource": "OrdersService",
 				"settings": {
                    "synchronizationMode": "None",
                    "operationMode": "Server",
                    "autoExpandSelect" : true,
                    "earlyRequests": true,
                    "groupProperties": {
                        "default": {
                          "submit": "Auto"
                        }
                    }
 				}
 			}
 		},
        "routing": {
            "routes": [
                {
                    "pattern": ":?query:",
                    "name": "OrdersList",
                    "target": "OrdersList"
                },
                {
                    "pattern": "Orders({key}):?query:",
                    "name": "OrdersDetails",
                    "target": "OrdersDetails"
                },
                {
                    "pattern": "Orders({boo})/Items({boo2}):?query:",
                    "name": "OrderItemsDetails",
                    "target": "OrderItemsDetails"
                },
                {
                    "pattern": "Books({key}):?query:",
                    "name": "BooksDetails",
                    "target": "BooksDetails"
                }
            ],
            "targets": {
                "OrdersList": {
                    "type": "Component",
                    "id": "OrdersList",
                    "name": "sap.fe.templates.ListReport",
                    "options": {
 						"settings" : {
 							"entitySet" : "Orders",
 							"navigation" : {
 								"Orders" : {
 									"detail" : {
 										"route" : "OrdersDetails"
 										}
 								}
 							}
 						}
 					}
                },
                "OrdersDetails": {
                    "type": "Component",
                    "id": "OrdersDetails",
                    "name": "sap.fe.templates.ObjectPage",
                    "options": {
                        "settings" : {
                            "entitySet": "Orders",
 							"navigation" : {
 								"Items": {
                                    "detail": {
                                        "route": "OrderItemsDetails"
                                    }
                                },
                                "book": {
                                    "detail": {
                                        "route": "BooksDetails"
                                    }
                                },
                                "dummy": {
                                    "detail": {
                                        "route": "BooksDetails"
                                    }
                                }
 							}
 						}
 					}
                },
                "OrderItemsDetails": {
                    "type": "Component",
                    "id": "OrderItemsDetails",
                    "name": "sap.fe.templates.ObjectPage",
                    "options": {
                        "settings" : {
                            "entitySet": "Orders_Items"
                        }
                    }
                },
                "BooksDetails": {
                    "type": "Component",
                    "id": "BooksDetails",
                    "name": "sap.fe.templates.ObjectPage",
                    "options": {
                        "settings" : {
                            "entitySet": "Books",
                            "navigation": {
                                "author": {
                                    "detail": {
                                        "route": "AuthorsDetails"
                                    }
                                }
                            }
                        }
                    }
                },
                "AuthorsDetails": {
                    "type": "Component",
                    "id": "AuthorsDetails",
                    "name": "sap.fe.templates.ObjectPage",
                    "options": {
                        "settings" : {
                            "entitySet": "Authors"
                        }
                    }
                }
            }
        },
 		"contentDensities": {
 			"compact": true,
 			"cozy": true
 		}
 	},
 	"sap.ui": {
 		"technology": "UI5",
 		"fullWidth": false
 	},
 	"sap.fiori": {
 		"registrationIds": [],
 		"archeType": "transactional"
 	}
 }
--- a/multitenancy/app/package.json
+++ b/multitenancy/app/package.json
@@ -1,19 +0,0 @@
 {
    "name": "approuter",
    "version": "1.0.0",
    "description": "",
    "main": "index.js",
    "devDependencies": {},
    "engines": {
        "node": "^12.0.0"
    },
    "scripts": {
        "start": "node node_modules/@sap/approuter/approuter.js"
    },
    "keywords": [],
    "author": "",
    "license": "ISC",
    "dependencies": {
        "@sap/approuter": ">=9.0.2"
    }
 }
--- a/multitenancy/app/xs-app.json
+++ b/multitenancy/app/xs-app.json
@@ -1,28 +0,0 @@
 {
    "welcomeFile": "/admin-fiori.html",
    "authenticationMethod": "route",
    "sessionTimeout": 30,
    "logout": {
        "logoutEndpoint": "/do/logout",
        "logoutPage": "/"
    },
    "routes": [
        {
            "source": "^/((admin|browse|orders)/webapp/.*)$",
            "target": "$1",
            "localDir": ".",
            "authenticationType": "xsuaa"
        },
        {
            "source": "^(/[^/]+\\.html(\\?.*)?)$",
            "target": "$1",
            "localDir": ".",
            "authenticationType": "xsuaa"
        },
        {
            "source": "^.*$",
            "destination": "srv-api",
            "authenticationType": "xsuaa"
        }
     ]
 }
--- a/multitenancy/db/capire_common.cds
+++ b/multitenancy/db/capire_common.cds
@@ -1,45 +0,0 @@
 using { sap } from '@sap/cds/common';
 extend sap.common.Currencies with {
  // Currencies.code = ISO 4217 alphabetic three-letter code
  // with the first two letters being equal to ISO 3166 alphabetic country codes
  // See also:
  // [1] https://www.iso.org/iso-4217-currency-codes.html
  // [2] https://www.currency-iso.org/en/home/tables/table-a1.html
  // [3] https://www.ibm.com/support/knowledgecenter/en/SSZLC2_7.0.0/com.ibm.commerce.payments.developer.doc/refs/rpylerl2mst97.htm
  numcode  : Integer;
  exponent : Integer; //> e.g. 2 --> 1 Dollar = 10^2 Cent
  minor    : String; //> e.g. 'Cent'
 }
 /**
 * 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;
 */
 context 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;
  }
 }
--- a/multitenancy/db/data/sap.capire.bookshop-Authors.csv
+++ b/multitenancy/db/data/sap.capire.bookshop-Authors.csv
@@ -1,5 +0,0 @@
 ID;name;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
--- a/multitenancy/db/data/sap.capire.bookshop-Books.csv
+++ b/multitenancy/db/data/sap.capire.bookshop-Books.csv
@@ -1,6 +0,0 @@
 ID;title;descr;author_ID;stock;price;currency_code;genre_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;11
 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;11
 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;16
 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;16
 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;13
--- a/multitenancy/db/data/sap.capire.bookshop-Books_texts.csv
+++ b/multitenancy/db/data/sap.capire.bookshop-Books_texts.csv
@@ -1,5 +0,0 @@
 ID_TEXTS;ID;locale;title;descr
 80adb8af-0f12-495e-9380-bbfa92704c36;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.
 d8c5e249-3df7-49e3-a3d9-4b16bfbbee52;201;fr;Les Hauts de Hurlevent;Les Hauts de Hurlevent (titre original : Wuthering Heights), parfois orthographié Les Hauts de Hurle-Vent, est l'unique roman d'Emily Brontë, publié pour la première fois en 1847 sous le pseudonyme d’Ellis Bell. Loin d'être un récit moralisateur, Emily Brontë achève néanmoins le roman dans une atmosphère sereine, suggérant le triomphe de la paix et du Bien sur la vengeance et le Mal.
 bbc2bd6e-89f7-45f2-86c7-f52b8e857ad6;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
 ca6f51d2-dec9-4261-baec-607dd5e9fc1d;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.
--- a/multitenancy/db/data/sap.capire.bookshop-Genres.csv
+++ b/multitenancy/db/data/sap.capire.bookshop-Genres.csv
@@ -1,16 +0,0 @@
 ID;parent_ID;name
 10;;Fiction
 11;10;Drama
 12;10;Poetry
 13;10;Fantasy
 14;10;Science Fiction
 15;10;Romance
 16;10;Mystery
 17;10;Thriller
 18;10;Dystopia
 19;10;Fairy Tale
 20;;Non-Fiction
 21;20;Biography
 22;21;Autobiography
 23;20;Essay
 24;20;Speech
--- a/multitenancy/db/data/sap.capire.orders-Orders.csv
+++ b/multitenancy/db/data/sap.capire.orders-Orders.csv
@@ -1,3 +0,0 @@
 ID;createdAt;createdBy;buyer;OrderNo;currency_code
 7e2f2640-6866-4dcf-8f4d-3027aa831cad;2019-01-31;john.doe@test.com;john.doe@test.com;1;EUR
 64e718c9-ff99-47f1-8ca3-950c850777d4;2019-01-30;jane.doe@test.com;jane.doe@test.com;2;EUR
--- a/multitenancy/db/data/sap.capire.orders-Orders_Items.csv
+++ b/multitenancy/db/data/sap.capire.orders-Orders_Items.csv
@@ -1,4 +0,0 @@
 ID;up__ID;amount;product_ID;title;price
 58040e66-1dcd-4ffb-ab10-fdce32028b79;7e2f2640-6866-4dcf-8f4d-3027aa831cad;1;201;Wuthering Heights;11.11
 64e718c9-ff99-47f1-8ca3-950c850777d4;7e2f2640-6866-4dcf-8f4d-3027aa831cad;1;271;Catweazle;15
 e9641166-e050-4261-bfee-d1e797e6cb7f;64e718c9-ff99-47f1-8ca3-950c850777d4;2;252;Eleonora;28
--- a/multitenancy/db/data/sap.common-Countries.csv
+++ b/multitenancy/db/data/sap.common-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
--- a/multitenancy/db/data/sap.common-Countries_texts._csv
+++ b/multitenancy/db/data/sap.common-Countries_texts._csv
@@ -1,12 +0,0 @@
 code;locale;name;descr
 AU;de;Australien;Commonwealth Australien
 CA;de;Kanada;Canada
 CN;de;China;Volksrepublik China
 FR;de;Frankreich;Republik Frankreich
 DE;de;Deutschland;Bundesrepublik Deutschland
 IN;de;Indien;Republik Indien
 IL;de;Israel;Staat Israel
 MM;de;Myanmar;Republik der Union Myanmar
 GB;de;Vereinigtes Königreich;Vereinigtes Königreich Großbritannien und Nordirland
 US;de;Vereinigte Staaten;Vereinigte Staaten von Amerika
 EU;de;Europäische Union;Europäische Union
--- a/multitenancy/db/data/sap.common-Currencies.csv
+++ b/multitenancy/db/data/sap.common-Currencies.csv
@@ -1,12 +0,0 @@
 code;symbol;name;descr;numcode;minor;exponent
 EUR;€;Euro;European Euro;978;Cent;2
 USD;$;US Dollar;United States Dollar;840;Cent;2
 CAD;$;Canadian Dollar;Canadian Dollar;124;Cent;2
 AUD;$;Australian Dollar;Australian Dollar;036;Cent;2
 GBP;£;British Pound;Great Britain Pound;826;Penny;2
 ILS;₪;Shekel;Israeli New Shekel;376;Agorat;2
 INR;₹;Rupee;Indian Rupee;356;Paise;2
 QAR;﷼;Riyal;Katar Riyal;356;Dirham;2
 SAR;﷼;Riyal;Saudi Riyal;682;Halala;2
 JPY;¥;Yen;Japanese Yen;392;Sen;2
 CNY;¥;Yuan;Chinese Yuan Renminbi;156;Jiao;1
--- a/multitenancy/db/data/sap.common-Currencies_texts._csv
+++ b/multitenancy/db/data/sap.common-Currencies_texts._csv
@@ -1,13 +0,0 @@
 code;locale;name;descr
 EUR;de;Euro;European Euro
 USD;de;US-Dollar;United States Dollar
 CAD;de;Kanadischer Dollar;Kanadischer Dollar
 AUD;de;Australischer Dollar;Australischer Dollar
 GBP;de;Pfund;Britische Pfund
 ILS;de;Schekel;Israelische Schekel
 EUR;fr;euro;de la Zone euro
 USD;fr;dollar;dollar des États-Unis
 CAD;fr;dollar canadien;dollar canadien
 AUD;fr;dollar australien;dollar australien
 GBP;fr;livre sterling;pound sterling
 ILS;fr;Shekel;shekel israelien
--- a/multitenancy/db/data/sap.common-Languages.csv
+++ b/multitenancy/db/data/sap.common-Languages.csv
@@ -1,5 +0,0 @@
 code;name
 de;German
 fr;French
 en;English
 en_GB;British English
--- a/multitenancy/db/data/sap.common-Languages_texts._csv
+++ b/multitenancy/db/data/sap.common-Languages_texts._csv
@@ -1,10 +0,0 @@
 code;locale;name
 de;en;German
 de;de;Deutsch
 de;fr;Allemande
 fr;en;French
 fr;de;Französisch
 fr;fr;Francais
 en;en;English
 en;de;Englisch
 en;fr;Anglais
--- a/multitenancy/db/schema.cds
+++ b/multitenancy/db/schema.cds
@@ -1,4 +0,0 @@
 using   from './schema_bookshop';
 using   from './schema_orders';
 annotate cds.UUID with @(Core.Computed : true);
--- a/multitenancy/db/schema_bookshop.cds
+++ b/multitenancy/db/schema_bookshop.cds
@@ -1,31 +0,0 @@
 using { Currency, managed, sap } from '@sap/cds/common';
 namespace sap.capire.bookshop;
 entity Books : managed {
  key ID : Integer;
  title  : localized String(111);
  descr  : localized String(1111);
  author : Association to Authors;
  genre  : Association to Genres;
  stock  : Integer;
  price  : Decimal;
  currency : Currency;
  image : LargeBinary @Core.MediaType : 'image/png';
 }
 entity Authors : managed {
  key ID : Integer;
  name   : String(111);
  dateOfBirth  : Date;
  dateOfDeath  : Date;
  placeOfBirth : String;
  placeOfDeath : String;
  books  : Association to many Books on books.author = $self;
 }
 /** Hierarchically organized Code List for Genres */
 entity Genres : sap.common.CodeList {
  key ID   : Integer;
  parent   : Association to Genres;
  children : Composition of many Genres on children.parent = $self;
 }
--- a/multitenancy/db/schema_orders.cds
+++ b/multitenancy/db/schema_orders.cds
@@ -1,23 +0,0 @@
 using { Currency, User, managed, cuid } from '@sap/cds/common';
 namespace sap.capire.orders;
 entity Orders : cuid, managed {
  OrderNo  : String @title:'Order Number'; //> readable key
  Items    : Composition of many Orders_Items on Items.up_ = $self;
  buyer    : User;
  currency : Currency;
 }
 entity Orders_Items {
  key ID    : UUID;
  up_       : Association to Orders;
  product   : Association to Products @assert.integrity:false; // REVISIT: this is a temporary workaround for a glitch in cds-runtime
  amount    : Integer;
  title     : String; //> intentionally replicated as snapshot from product.title
  price     : Double;
 }
 /** This is a stand-in for arbitrary ordered Products */
 entity Products @(cds.persistence.skip:'always') {
  key ID : String;
 }
--- a/multitenancy/db/src/.hdiconfig
+++ b/multitenancy/db/src/.hdiconfig
@@ -1,136 +0,0 @@
 {
    "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"
        }
    }
 }
--- a/multitenancy/map-route.sh
+++ b/multitenancy/map-route.sh
@@ -1,8 +0,0 @@
 #!/bin/bash
 SUBDOMAIN=mtx-extend-bookshop
 SAAS_HOST_SUFFIX="$(cf env multitenancy-approuter | grep TENANT_HOST_PATTERN | sed 's/.*(..)//' | sed 's/\..*//')"
 SAAS_DOMAIN="$(cf env multitenancy-approuter | grep TENANT_HOST_PATTERN | sed 's/.*(..)//' | sed 's/[^.]*\.//')"
 cf map-route multitenancy-approuter $SAAS_DOMAIN --hostname $SUBDOMAIN$SAAS_HOST_SUFFIX
--- a/multitenancy/mta.yaml
+++ b/multitenancy/mta.yaml
@@ -1,113 +0,0 @@
 ## Generated mta.yaml based on template version 0.4.0
 ## appName = multitenancy
 ## language=nodejs; multitenant=true
 ## approuter=
 _schema-version: '3.1'
 ID: multitenancy
 version: 1.0.0
 description: "A simple CAP project."
 parameters:
  enable-parallel-deployments: true
 build-parameters:
  before-all:
   - builder: custom
     commands:
      - npm install --production
      - npx -p @sap/cds-dk cds build --production
 modules:
 - name: multitenancy-approuter
   type: nodejs
   path: app
   build-parameters:
      ignore: ["node_modules/"]
   parameters:
      # Keep existing URLs for this application ("routes")
      keep-existing-routes: true
   properties:
      TENANT_HOST_PATTERN: "^(.*)-${default-host}.${default-domain}"
   requires:
    - name: multitenancy-registry
    - name: multitenancy-uaa-mt
    - name: srv-api
      group: destinations
      properties:
        forwardAuthToken: true
        strictSSL: true
        name: srv-api
        url: ~{srv-url}
 # --------------------- SERVER MODULE ------------------------
 - name: multitenancy-srv
 # ------------------------------------------------------------
   type: nodejs
   path: gen/srv
 #  build-parameters:
 #    ignore: ["node_modules/"]
   properties:
     SAP_JWT_TRUST_ACL: [{"clientid":"*","identityzone":"sap-provisioning"}]  # Trust between server and SaaS Manager
   requires:
    # Resources extracted from CAP configuration
    - name: multitenancy-db-mt
    - name: multitenancy-uaa-mt
    - name: multitenancy-registry
   provides:
    - name: srv-api      # required by consumers of CAP services (e.g. approuter)
      properties:
        srv-url: ${default-url}
    - name: mtx-api      # potentially required by approuter
      properties:
        mtx-url: ${default-url}
 resources:
 # services extracted from CAP configuration
 # 'service-plan' can be configured via 'cds.requires.<name>.vcap.plan'
 # ------------------------------------------------------------
 - name: multitenancy-db-mt
 # ------------------------------------------------------------
   type: org.cloudfoundry.managed-service
   parameters:
     service: service-manager
     service-plan: container
   properties:
     hdi-service-name: ${service-name}
 # ------------------------------------------------------------
 - name: multitenancy-uaa-mt
 # ------------------------------------------------------------
   type: org.cloudfoundry.managed-service
   parameters:
     service: xsuaa
     service-plan: application
     path: ./xs-security.json
     config:
       xsappname: multitenancy-${space}    #  name + space dependency
       tenant-mode: shared
 - name: multitenancy-registry
   type: org.cloudfoundry.managed-service
   requires:
      - name: multitenancy-uaa-mt
      - name: mtx-api
        properties:
           prop: ~{mtx-url}
        parameters:
           param: ~{mtx-url}
   parameters:
      service: saas-registry
      service-plan: application
      config:
         xsappname: multitenancy-${space}
         appName: multitenancy
         displayName: multitenancy
         description: A simple CAP project.
         #category: 'Category'
         appUrls:
            onSubscription: ~{mtx-api/mtx-url}/mtx/v1/provisioning/tenant/{tenantId}
            onSubscriptionAsync: false
            onUnSubscriptionAsync: false
            callbackTimeoutMillis: 300000
--- a/multitenancy/package.json
+++ b/multitenancy/package.json
@@ -1,107 +0,0 @@
 {
  "name": "multitenancy",
  "version": "1.0.0",
  "description": "A simple CAP project.",
  "repository": "<Add your repository here>",
  "license": "UNLICENSED",
  "private": true,
  "dependencies": {
    "@sap/cds": "^5",
    "@sap/cds-mtx": "^2",
    "@sap/hana-client": "^2",
    "@sap/hdi-deploy": "^4",
    "@sap/instance-manager": "^2",
    "@sap/xssec": "^3",
    "express": "^4",
    "passport": "^0"
  },
  "devDependencies": {
    "sqlite3": "^5.0.2"
  },
  "engines": {
    "node": "^14"
  },
  "scripts": {
    "start": "cds run",
    "watch": "cds watch"
  },
  "eslintConfig": {
    "extends": "eslint:recommended",
    "env": {
      "es2020": true,
      "node": true,
      "jest": true,
      "mocha": true
    },
    "globals": {
      "SELECT": true,
      "INSERT": true,
      "UPDATE": true,
      "DELETE": true,
      "CREATE": true,
      "DROP": true,
      "CDL": true,
      "CQL": true,
      "CXL": true,
      "cds": true
    },
    "rules": {
      "no-console": "off",
      "require-atomic-updates": "off"
    }
  },
  "cds": {
    "[production]": {
      "features": {
        "fiori_preview": true
      },
      "requires": {
        "multitenancy": true,
        "auth": {
          "strategy": "JWT"
        },
        "db": {
          "kind": "hana",
          "vcap": {
            "label": "service-manager"
          }
        },
        "uaa": {
          "kind": "xsuaa"
        }
      },
      "hana": {
        "deploy-format": "hdbtable"
      },
      "mtx": {
        "element-prefix": [
          "Z_",
          "ZZ_"
        ],
        "namespace-blocklist": [
          "com.sap.",
          "sap."
        ],
        "extension-allowlist": [
          {
            "for": [
              "sap.capire.orders.Orders"
            ],
            "new-fields": 77
          },
          {
            "for": [
              "OrdersService"
            ],
            "new-entities": 88
          }
        ]
      },
      "auth": {
        "passport": {
          "strategy": "JWT"
        }
      }
    }
  }
 }
--- a/multitenancy/srv/admin-service.cds
+++ b/multitenancy/srv/admin-service.cds
@@ -1,7 +0,0 @@
 using { sap.capire.bookshop as my } from '../db/schema';
 //service AdminService @(requires:'admin') {
 service AdminService {
  entity Books as projection on my.Books;
  entity Authors as projection on my.Authors;
 }
--- a/multitenancy/srv/admin-service.js
+++ b/multitenancy/srv/admin-service.js
@@ -1,12 +0,0 @@
 const cds = require('@sap/cds')
 module.exports = cds.service.impl (function(){
  this.before ('NEW','Authors', genid)
  this.before ('NEW','Books', genid)
 })
 /** Generate primary keys for target entity in request */
 async function genid (req) {
  const {ID} = await cds.tx(req).run (SELECT.one.from(req.target).columns('max(ID) as ID'))
  req.data.ID = ID - ID % 100 + 100 + 1
 }
--- a/multitenancy/srv/cat-service.cds
+++ b/multitenancy/srv/cat-service.cds
@@ -1,16 +0,0 @@
 using { sap.capire.bookshop as my } from '../db/schema';
 service CatalogService @(path:'/browse') {
  /** For displaying lists of Books */
  @readonly entity ListOfBooks as projection on Books
  excluding { descr };
  /** For display in details pages */
  @readonly entity Books as projection on my.Books { *,
    author.name as author
  } excluding { createdBy, modifiedBy };
  //@__requires: 'authenticated-user'
  action submitOrder ( book: Books:ID, amount: Integer ) returns { stock: Integer };
  event OrderedBook : { book: Books:ID; amount: Integer; buyer: String };
 }
--- a/multitenancy/srv/cat-service.js
+++ b/multitenancy/srv/cat-service.js
@@ -1,26 +0,0 @@
 const cds = require('@sap/cds')
 const { Books } = cds.entities ('sap.capire.bookshop')
 class CatalogService extends cds.ApplicationService { init(){
  // Reduce stock of ordered books if available stock suffices
  this.on ('submitOrder', async req => {
    const {book,amount} = req.data
    let {stock} = await SELECT `stock` .from (Books,book)
    if (stock >= amount) {
      await UPDATE (Books,book) .with (`stock -=`, amount)
      await this.emit ('OrderedBook', { book, amount, buyer:req.user.id })
      return { stock }
    }
    else return req.error (409,`${amount} exceeds stock for book #${book}`)
  })
  // Add some discount for overstocked books
  this.after ('READ','ListOfBooks', each => {
    if (each.stock > 111) each.title += ` -- 11% discount!`
  })
  return super.init()
 }}
 module.exports = { CatalogService }
--- a/multitenancy/srv/orders-service.cds
+++ b/multitenancy/srv/orders-service.cds
@@ -1,7 +0,0 @@
 using { sap.capire.orders as my } from '../db/schema';
 service OrdersService
@(requires:['authenticated-user', 'system-user'])
 {
  entity Orders as projection on my.Orders;
 }
--- a/multitenancy/srv/orders-service.js
+++ b/multitenancy/srv/orders-service.js
@@ -1,42 +0,0 @@
 const cds = require ('@sap/cds')
 class OrdersService extends cds.ApplicationService {
  /** register custom handlers */
  init(){
    const { Orders_Items:OrderItems } = this.entities
    /** 
    this.before ('UPDATE', 'Orders', async function(req) {
      const { ID, Items } = req.data
      if (Items) for (let { product_ID, amount } of Items) {
        const { amount:before } = await cds.tx(req).run (
          SELECT.one.from (OrderItems, oi => oi.amount) .where ({up__ID:ID, product_ID})
        )
        if (amount != before) await this.orderChanged (product_ID, amount-before)
      }
    })
   **/
    /** 
    this.before ('DELETE', 'Orders', async function(req) {
      const { ID } = req.data
      const Items = await cds.tx(req).run (
        SELECT.from (OrderItems, oi => { oi.product_ID, oi.amount }) .where ({up__ID:ID})
      )
      if (Items) await Promise.all (Items.map(it => this.orderChanged (it.product_ID, -it.amount)))
    })
    **/
    return super.init()
  }
  /** order changed -> broadcast event */
  orderChanged (product, deltaAmount) {
    // Emit events to inform subscribers about changes in orders
    console.log ('> emitting:', 'OrderChanged', { product, deltaAmount })
    return this.emit ('OrderChanged', { product, deltaAmount })
  }
 }
 module.exports = OrdersService
--- a/multitenancy/tpl/db/extension.cds
+++ b/multitenancy/tpl/db/extension.cds
@@ -1,60 +0,0 @@
 using {sap.capire.bookshop} from '_base/db/schema';
 using {sap.capire.orders}   from '_base/db/schema';
 using from '_base/db/capire_common';
 using {
    cuid, managed, Country, sap.common.CodeList
 } from '@sap/cds/common';
 namespace Z_bookshop.extension;
 // extend existing entity 
 extend orders.Orders with { 
  Z_Customer    : Association to one Z_Customers;  
  Z_SalesRegion : Association to one Z_SalesRegion; 
  Z_priority    : String @assert.range enum {high; medium; low} default 'medium';
  Z_Remarks     : Composition of many Z_Remarks on Z_Remarks.parent = $self;
 }  
 // new entity - as association target
 entity Z_Customers : cuid, managed 
 {
  email        : String;
  firstName    : String;
  lastName     : String; 
  creditCardNo : String;
  dateOfBirth  : Date;
  status       : String   @assert.range enum {platinum; gold; silver; bronze} default 'bronze';
  creditScore  : Decimal  @assert.range: [ 1.0, 100.0 ] default 50.0;
  PostalAddresses : Composition of many Z_CustomerPostalAddresses on PostalAddresses.Customer = $self;
 }
 // new unique constraint (secondary index)
 annotate Z_Customers with @assert.unique: { email: [ email ] }   
 {
  email @mandatory;    // mandatory check
 }
 // new entity - as composition target
 entity Z_CustomerPostalAddresses : cuid, managed 
 {
  Customer       : Association to one Z_Customers;
  description    : String;
  street         : String;
  town           : String;
  country        : Country;
 }
 // new entity - as code list
 entity Z_SalesRegion: CodeList {
  key regionCode : String(11);
 }
 // new entity - as composition target
 entity Z_Remarks : cuid, managed
 {  
  parent      : Association to one orders.Orders;  
  number      : Integer;  
  remarksLine : String; 
 }
--- a/multitenancy/tpl/srv/extension_service.cds
+++ b/multitenancy/tpl/srv/extension_service.cds
@@ -1,12 +0,0 @@
 using from '_base/srv/admin-service';
 using from '_base/srv/cat-service';
 using from '_base/srv/orders-service';
 using { Z_bookshop.extension as ext } from '../db/extension';
 extend service OrdersService with {
   entity Z_Customers   as projection on ext.Z_Customers;
   entity Z_SalesRegion as projection on ext.Z_SalesRegion;
 }
--- a/multitenancy/tpl/srv/extension_service_ui.cds
+++ b/multitenancy/tpl/srv/extension_service_ui.cds
@@ -1,212 +0,0 @@
 using from '_base/app/services';
 using OrdersService from './extension_service';
 // new entity -- draft enabled
 annotate OrdersService.Z_Customers   with @odata.draft.enabled;
 // new entity -- titles
 annotate OrdersService.Z_Customers with {
    ID           @(     
        UI.Hidden,
        Common : {Text : email}
    );
    firstName    @title : 'First Name';
    lastName     @title : 'Last Name';
    email        @title : 'Email';
    creditCardNo @title : 'Credit Card No';
    dateOfBirth  @title : 'Date of Birth';
 	status       @title : 'Status';
 	creditScore  @title : 'Credit Score';
 }
 // new entity -- titles
 annotate OrdersService.Z_CustomerPostalAddresses with {
    ID          @(       
        UI.Hidden,
        Common : {Text : description}
    );
    description @title : 'Description';
    street      @title : 'Street';
    town        @title : 'Town';
    country     @title : 'Country';
 }
 // new entity -- titles
 annotate OrdersService.Z_SalesRegion with {
 	regionCode      @title: 'Region Code';
 }
 // new entity -- titles
 annotate OrdersService.Z_Remarks with {
    number          @title: 'Remark Number';
 	remarksLine     @title: 'Remark';
 }
 // new entity in service -- UI
 annotate OrdersService.Z_Customers with @(UI : {
    HeaderInfo       : {
        TypeName       : 'Customer',
        TypeNamePlural : 'Customers',
        Title          : {
            $Type : 'UI.DataField',
            Value : email
        }
    },
    LineItem         : [
        {Value : firstName},
        {Value : lastName},
        {Value : email},
 		{Value : status},
        {Value : creditScore}
    ],
    Facets           : [
 		{$Type: 'UI.ReferenceFacet', Label: 'Main', Target : '@UI.FieldGroup#Main'},
 		{$Type: 'UI.ReferenceFacet', Label: 'Customer Postal Addresses', Target: 'PostalAddresses/@UI.LineItem'}
 	],
    FieldGroup #Main : {Data : [
        {Value : firstName},
        {Value : lastName},
        {Value : email},
 		{Value : status},
        {Value : creditScore}
    ]}
 } ) ;
 // new entity -- UI
 annotate OrdersService.Z_CustomerPostalAddresses with @(UI : {
    HeaderInfo       : {
        TypeName       : 'CustomerPostalAddress',
        TypeNamePlural : 'CustomerPostalAddresses',
        Title          : {
            $Type : 'UI.DataField',
            Value : description
        }
    },
    LineItem         : [
        {Value : description},
        {Value : street},
        {Value : town},
 		{Value : country_code}
 	],
    Facets           : [
 		{$Type: 'UI.ReferenceFacet', Label: 'Main', Target : '@UI.FieldGroup#Main'}
 	],
    FieldGroup #Main : {Data : [
        {Value : description},
        {Value : street},
        {Value : town},
 		{Value : country_code}
    ]}
 }, ) {
 };
 // new entity -- UI
 annotate OrdersService.Z_SalesRegion with @(
 	UI: {
 		HeaderInfo: {
 			TypeName: 'Sales Region',
 			TypeNamePlural: 'Sales Regions',
 			Title          : {
                $Type : 'UI.DataField',
                Value : regionCode
            }
 		},
 		LineItem: [
 			{Value: regionCode},   
            {Value: name}, 
            {Value: descr}   
 		],
 		Facets: [
 			{$Type: 'UI.ReferenceFacet', Label: 'Main',    Target: '@UI.FieldGroup#Main'}
 		],
 		FieldGroup#Main: {
 			Data: [
 		        {Value: regionCode},   
 				{Value: name}, 
                {Value: descr}     
 			]
 		}
 	},
 ) {
 };
 // new entity -- UI
 annotate OrdersService.Z_Remarks with @(
 	UI: {
 		HeaderInfo: {
 			TypeName: 'Remark',
 			TypeNamePlural: 'Remarks',
 			Title          : {
                $Type : 'UI.DataField',
 				Value : number
            }
 		},
 		LineItem: [
 			{Value: number},
 			{Value: remarksLine}       
 		],
 		Facets: [
 			{$Type: 'UI.ReferenceFacet', Label: 'Main',    Target: '@UI.FieldGroup#Main'}
 		],
 		FieldGroup#Main: {
 			Data: [
 		        {Value: number},
 			    {Value: remarksLine}       
 			]
 		}
 	},
 ) {
 };
 // extend existing entity Orders with new extension fields and new composition
 annotate OrdersService.Orders with @(
 	UI: {
 		LineItem: [...,	
 			{Value: Z_Customer_ID,            Label:'Customer'},          // extension field
 			{Value: Z_SalesRegion_regionCode, Label:'Sales Region'},      // extension field
 			{Value: Z_priority,               Label:'Priority'}           // extension field
 		],
 		Facets: [...,
 			{$Type: 'UI.ReferenceFacet', Label: 'Remarks', Target: 'Z_Remarks/@UI.LineItem'} // new composition		
 		],
 		FieldGroup#Details: {
 			Data: [...,             
 				{Value: Z_Customer_ID,            Label:'Customer'},      // extension field
 				{Value: Z_SalesRegion_regionCode, Label:'Sales Region'},  // extension field
 				{Value: Z_priority,               Label:'Priority'}       // extension field
 			]
 		}
 	}
 );
 // new field in existing service -- exchange ID with text
 annotate OrdersService.Orders with {
 	Z_Customer @(
 		Common: {
 			//show email, not id for Customer in the context of Orders
 			Text: Z_Customer.email  , TextArrangement: #TextOnly,
 			ValueList: {
 				Label: 'Customers',
 				CollectionPath: 'Z_Customers',
 				Parameters: [
 					{ $Type: 'Common.ValueListParameterInOut',
 						LocalDataProperty: Z_Customer_ID,  
 						ValueListProperty: 'ID'            
 					},
 					{ $Type: 'Common.ValueListParameterDisplayOnly',
 						ValueListProperty: 'email'
 					}
 				]
 			}
 		} 
 	);
 } 
--- a/multitenancy/xs-security.json
+++ b/multitenancy/xs-security.json
@@ -1,46 +0,0 @@
 {
  "xsappname": "multitenancy-${space}", 
  "tenant-mode": "shared",
  "scopes": [
    { "name": "$XSAPPNAME.ExtendCDS", "description": "Extend CDS application" },
    { "name": "$XSAPPNAME.ExtendCDSdelete", "description": "Extend CDS application with undeploy" },
    { "name": "$XSAPPNAME.MtxDiagnose", "description": "Diagnose MTX sidecar" },
    { "name": "$XSAPPNAME.mtdeployment", "description": "Deploy applications" },
    {
      "name": "$XSAPPNAME.mtcallback",
      "description": "With this scope set, the callbacks for subscribe, unsubscribe and getDependencies can be called.",
      "grant-as-authority-to-apps": [
      "$XSAPPNAME(application,sap-provisioning,tenant-onboarding)"
      ]
    }
  ],
  "authorities": [
    "$XSAPPNAME.MtxDiagnose"
  ],
  "role-templates": [
    {
      "name": "ExtensionDeveloper",
      "description": "Extend application",
      "scope-references": [
        "$XSAPPNAME.ExtendCDS"
      ],
      "attribute-references": []
    },
    {
      "name": "ExtensionDeveloperUndeploy",
      "description": "Undeploy extension",
      "scope-references": [
        "$XSAPPNAME.ExtendCDSdelete"
      ],
      "attribute-references": []
    },
    {
      "name": "MultitenancyAdministrator",
      "description": "Multitenancy Administrator",
      "scope-references": [
        "$XSAPPNAME.mtcallback",
        "$XSAPPNAME.mtdeployment"
      ]
    }
  ]
 }
--- a/package.json
+++ b/package.json
@@ -11,8 +11,7 @@
    "@capire/hello": "./hello",
    "@capire/media": "./media",
    "@capire/orders": "./orders",
-    "@capire/reviews": "./reviews",
+    "@capire/reviews": "./reviews"
    "@capire/multitenancy": "./multitenancy"
  },
  "devDependencies": {
    "chai": "^4.2.0",
@@ -26,7 +25,6 @@
    "bookshop": "cds watch bookshop",
    "fiori": "cds watch fiori",
    "media": "cds watch media",
    "multitenancy": "cds watch multitenancy",
    "mocha": "npx mocha || echo",
    "jest": "npx jest",
    "test": "npm run jest --silent"
		`@@ -1 +0,0 @@`
			`exports.CatalogService = require('./srv/cat-service')`
		`@@ -0,0 +1,2 @@`
							`# cds.requires.messaging.kind = file-based-messaging`
							`PORT = 4004`