Play with db constraints

2021-04-14 19:38:38 +02:00
112 changed files with 1078 additions and 15936 deletions
--- a/.eslintrc
+++ b/.eslintrc
@@ -8,7 +8,7 @@
        "mocha": true
    },
    "parserOptions": {
-        "ecmaVersion": 2020
+        "ecmaVersion": 2018
    },
    "globals": {
        "SELECT": true,
@@ -22,7 +22,6 @@
    "rules": {
        "no-console": "off",
        "require-atomic-updates": "off",
-        "require-await":"warn",
-        "no-unused-vars": ["warn", { "argsIgnorePattern": "_" }]
+        "require-await":"warn"
    }
 }
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,8 +0,0 @@
-version: 2
-
-updates:
- package-ecosystem: npm
-  directory: /
-  versioning-strategy: increase-if-necessary
-  schedule:
-    interval: daily
--- a/.github/workflows/node.js.yml
+++ b/.github/workflows/node.js.yml
@@ -5,9 +5,9 @@ name: CI

 on:
  push:
-    branches: [ main ]
+    branches: [ master ]
  pull_request:
-    branches: [ main ]
+    branches: [ master ]

 jobs:
  build:
@@ -16,7 +16,7 @@ jobs:

    strategy:
      matrix:
-        node-version: [16.x, 14.x, 12.x]
+        node-version: [12.x, 14.x]

    steps:
    - uses: actions/checkout@v2
@@ -24,5 +24,5 @@ jobs:
      uses: actions/setup-node@v1
      with:
        node-version: ${{ matrix.node-version }}
-    - run: npm ci
+    - run: npm install
    - run: npm test
--- a/.gitignore
+++ b/.gitignore
@@ -15,5 +15,3 @@ default-env.json
 packages/messageBox
 reviews/msg-box
 reviews/db/test.db
-
-*.openapi3.json
--- a/.npmrc
+++ b/.npmrc
@@ -1,3 +0,0 @@
-# Ensure we always use public packages, i.e. avoid using local registries from ~/.npmrc
-@sap:registry=https://registry.npmjs.org/
-registry=https://registry.npmjs.org/
--- a/.registry/server.js
+++ b/.registry/server.js
@@ -1,26 +1,19 @@
 const { exec } = require ('child_process')
-const isWin = process.platform === 'win32'
 const express = require ('express')
 const fs = require ('fs')
 const app = express()

 const { PORT=4444 } = process.env
-const [,,port=PORT,scope='@capire'] = process.argv
-const cwd = __dirname
-
-// clean up on start (exit handler might not complete on Windows)
-exec(isWin ? 'del *.tgz' : 'rm *.tgz', {cwd})
-
+const [,,port=PORT] = process.argv
+process.chdir(__dirname)

 app.use('/-/:tarball', (req,res,next) => {
  console.debug ('GET', req.params)
  try {
    const { tarball } = req.params
-    const pkgFull = tarball.substring(0, tarball.lastIndexOf('-'))
-    const [, pkg ] = /^\w+-(.+)/.exec(pkgFull)
+    const [, pkg ] = /^capire-(\w+)/.exec(tarball)
    fs.lstat(tarball,(err => {
-      if (err) console.debug (`npm pack ../${pkg}`)
-      if (err) exec(`npm pack ../${pkg}`,{cwd},next)
+      if (err) exec(`npm pack ../${pkg}`,next)
      else next()
    }))
  } catch (e) {
@@ -32,14 +25,12 @@ app.use('/-/:tarball', (req,res,next) => {
 app.use('/-', express.static(__dirname))

 app.get('/*', (req,res)=>{
-  const urlRegex = /^\/(@[\w-]+)\/(.+)/
  const url = decodeURIComponent(req.url)
  console.debug ('GET',url)
  try {
-    if (!urlRegex.test(url))  return res.sendStatus(404)
-    const [, scpe, pkg ] = urlRegex.exec(url)
-    const package = require (`${scpe}/${pkg}/package.json`)
-    const tarball = `${scpe.slice(1)}-${pkg}-${package.version}.tgz`
+    const [, capire, pkg ] = /^\/(@capire)\/(\w+)/.exec(url)
+    const package = require (`${capire}/${pkg}/package.json`)
+    const tarball = `capire-${pkg}-${package.version}.tgz`
    // https://github.com/npm/registry/blob/master/docs/responses/package-metadata.md
    res.json({
      "name": package.name,
@@ -51,30 +42,29 @@ app.get('/*', (req,res)=>{
          "name": package.name,
          "version": package.version,
          "dist": {
-            "tarball": `${server.url}/-/${tarball}`
+            "tarball": `http://localhost:${port}/-/${tarball}`
          },
        }
      },
    })
  } catch (e) {
-    if (e.code === 'MODULE_NOT_FOUND')  return res.sendStatus(404)
-    console.error(e);  throw e
+    console.error(e)
+    res.sendStatus(404)
  }
 })

-const server = app.listen(port, ()=>{
-  const url = server.url = `http://localhost:${server.address().port}`
-  console.log (`npm set ${scope}:registry=${url}`)
-  exec(`npm set ${scope}:registry=${url}`)
-  console.log (`${scope} registry listening on ${url}`)
+app.listen(port, ()=>{
+  console.log (`npm set @capire:registry=http://localhost:${port}`)
+  console.log (`@capire registry listening on http://localhost:${port}`)
+  exec(`npm set @capire:registry=http://localhost:${port}`)
 })

-
 const _exit = ()=>{
-  server.close()
-  exec(`npm conf rm "${scope}:registry"`, ()=> { process.exit() })
+  console.log ('\nnpm conf rm @capire:registry')
+  exec('npm conf rm @capire:registry')
+  exec('rm *.tgz')
+  process.exit()
 }
-
 process.on ('SIGTERM',_exit)
 process.on ('SIGHUP',_exit)
 process.on ('SIGINT',_exit)
--- a/.tours/db-native.tour
+++ b/.tours/db-native.tour
@@ -68,35 +68,26 @@
    },
    {
      "file": "fiori/package.json",
-      "description": "#### Configuration\n\nThe `cds.requires` section in `package.json` is a place to configure which of the `db/sqlite` and `db/hana` folders are used for which database.\n\nWe use [Node.js profiles](https://cap.cloud.sap/docs/node.js/cds-env#profiles) to separate the configuration.\nIn the `development` profile, you can see that `db/sqlite` is set as the model, while the `db/hana` folder is configured in the `production` profile.  `db-ext` is a pseudo datasource, its name doesn't matter.\n\nSee [`cds.resolve`](https://cap.cloud.sap/docs/node.js/cds-compile#cds-resolve) to learn more about how models are found.",
-      "selection": {
-        "start": {
-          "line": 41,
-          "character": 1
-        },
-        "end": {
-          "line": 48,
-          "character": 1
-        }
-      },
+      "description": "#### Configuration\n\nThe `cds` section in `package.json` is a place to configure which of the `db/sqlite` and `db/hana` folders are used for which database.\nWe use [Node.js profiles](https://cap.cloud.sap/docs/node.js/cds-env#profiles) to separate the configuration.\nIn the `development` profile, you can see that `db/sqlite` is set as the model, while the `db/hana` folder is configured in the `production` profile.",
+      "line": 17,
      "title": "Configuration"
    },
    {
      "file": "fiori/package.json",
      "description": "#### Run with SQLite\n\nTo run with `development` and an in-memory SQLite database, you don't need to do anything special, because it's activated by default.  Just run:\n\n>> cds watch fiori\n\nThen open [http://localhost:4004/admin/Authors](http://localhost:4004/admin/Authors) to see the two new fields.\n",
-      "line": 43,
+      "line": 28,
      "title": "Run with SQLite"
    },
    {
      "file": "fiori/package.json",
      "description": "#### Deploy the CDS Model to SAP HANA\n\nTo 'activate' SAP HANA through the `production` profile, you can use the global `--production` flag:\n\n>> cd fiori; cds deploy --to hana --production\n\n[Learn more about SAP HANA deployment](https://cap.cloud.sap/docs/guides/databases#get-hana)\n\n#### Run the Application\n\n>> cd fiori; cds watch --production\n\nThe service on [http://localhost:4004/admin/Authors](http://localhost:4004/admin/Authors) is the same as before, but this time the `Authors` entity is backed by a database view with an SAP HANA function.\n\n#### More\n\nIf you don't see data, you can add some in the next step.",
-      "line": 46,
+      "line": 31,
      "title": "Run with SAP HANA"
    },
    {
      "file": "fiori/test/requests.http",
      "description": "### Add More Data\n\nOptionally you can add some `Authors` data by clicking on the _Send Request_ link (provided by the [REST client](https://marketplace.visualstudio.com/items?itemName=humao.rest-client) extension).",
-      "line": 72,
+      "line": 68,
      "selection": {
        "start": {
          "line": 67,
@@ -113,5 +104,6 @@
      "title": "Wrap-up",
      "description": "### Summary\n\nThat's it!  You have seen: \n- How to integrate database-specific functions in a CDS model.\n- How to switch between the two implementations for SQLite and SAP HANA."
    }
-  ]
+  ],
+  "ref": "master"
 }
--- a/.tours/samples.tour
+++ b/.tours/samples.tour
@@ -19,7 +19,7 @@
      }
    },
    {
-      "file": "hello/srv/world.cds",
+      "file": "hello/world.cds",
      "description": "### Hello World!\n\nThis is a simplistic [Hello World](https://cap.cloud.sap/docs/get-started/hello-world) service using [CDS](https://cap.cloud.sap/docs/cds/) and [cds.services](https://cap.cloud.sap/docs/node.js/api#services-api).",
      "line": 2,
      "selection": {
@@ -68,7 +68,7 @@
    },
    {
      "file": "orders/db/schema.cds",
-      "description": "### Orders - Compositions and Serving Documents\n\nA standalone orders management service, demonstrating:\n- Using [Compositions](https://cap.cloud.sap/docs/cds/cdl#compositions) in [Domain Models](https://cap.cloud.sap/docs/guides/domain-models), along with\n- [Serving deeply nested documents](https://cap.cloud.sap/docs/guides/generic-providers#serving-structured-data)\n",
+      "description": "### Compositions and Serving Documents\n\nA standalone orders management service, demonstrating:\n- Using [Compositions](https://cap.cloud.sap/docs/cds/cdl#compositions) in [Domain Models](https://cap.cloud.sap/docs/guides/domain-models), along with\n- [Serving deeply nested documents](https://cap.cloud.sap/docs/guides/generic-providers#serving-structured-data)\n",
      "line": 1,
      "selection": {
        "start": {
@@ -84,7 +84,7 @@
    },
    {
      "file": "reviews/db/schema.cds",
-      "description": "### Reviews - More Modularity\n\nShows how to implement a modular service to manage product reviews, including:\n- Consuming other services synchronously and asynchronously\n- Serving requests synchronously\n- Emitting events asynchronously\n- Grow as you go, with:\n- Mocking app services\n- Running service meshes\n- Late-cut Micro Services\n- As well as managed data, input validations, and authorization\n",
+      "description": "### More Modularity\n\nShows how to implement a modular service to manage product reviews, including:\n- Consuming other services synchronously and asynchronously\n- Serving requests synchronously\n- Emitting events asynchronously\n- Grow as you go, with:\n- Mocking app services\n- Running service meshes\n- Late-cut Micro Services\n- As well as managed data, input validations, and authorization\n",
      "line": 1,
      "selection": {
        "start": {
@@ -99,12 +99,8 @@
      "title": "Reviews"
    },
    {
-      "title": "Bookstore",
-      "description": "### Bookstore - Reuse and UI\n\n- A [composite app, reusing and combining](https://cap.cloud.sap/docs/guides/reuse-and-compose) these packages:\n  - [@capire/bookshop](bookshop)\n  - [@capire/reviews](reviews)\n  - [@capire/orders](orders)\n  - [@capire/common](common)\n- [The Vue.js app](bookshop/app/vue) imported from bookshop is served as well\n- [The Vue.js app](reviews/app/vue) imported from reviews is served as well\n- [The Fiori app](orders/app) imported from orders is served as well\n- [OpenAPI export + Swagger UI](https://cap.cloud.sap/docs/advanced/openapi)"
-    },
-    {
-      "file": "fiori/app/services.cds",
-      "description": "### Annotations for SAP Fiori Elements\n\n- [Adds an SAP Fiori elements application](https://cap.cloud.sap/docs/guides/fiori/) to bookstore, thereby introducing to:\n- [OData Annotations](https://cap.cloud.sap/docs/guides/fiori#adding-odata-annotations) in `.cds` files\n- Support for [Fiori Draft](https://cap.cloud.sap/docs/guides/fiori#draft)\n- Support for [Value Helps](https://cap.cloud.sap/docs/guides/fiori#value-help)\n- Serving SAP Fiori apps locally\n",
+      "file": "fiori/app/index.cds",
+      "description": "### Annotations for SAP Fiori Elements\n\nA [composite app, reusing and combining](https://cap.cloud.sap/docs/guides/verticalize) these packages:\n  - [@capire/bookshop](bookshop)\n  - [@capire/reviews](reviews)\n  - [@capire/orders](orders)\n  - [@capire/common](common)\n\n[Adds a SAP Fiori elements application](https://cap.cloud.sap/docs/guides/fiori/) to bookshop, thereby introducing to:\n  - [OData Annotations](https://cap.cloud.sap/docs/guides/fiori#adding-odata-annotations) in `.cds` files\n  - Support for [Fiori Draft](https://cap.cloud.sap/docs/guides/fiori#draft)\n  - Support for [Value Helps](https://cap.cloud.sap/docs/guides/fiori#value-help)\n  - Serving SAP Fiori apps locally\n\n[The Vue.js app](bookshop/app/vue) imported from bookshop is served as well.\n",
      "line": 1,
      "selection": {
        "start": {
@@ -121,13 +117,14 @@
    {
      "file": "package.json",
      "description": "### All-in-one Monorepo\n\nEach sample sub directory essentially is a standard npm package, some with standard npm dependencies to other samples. The root folder's [package.json](package.json) has local links to the sub folders, such that an `npm install` populates a local `node_modules` folder acts like a local npm registry to the individual sample packages.\n",
+      "line": 8,
      "selection": {
        "start": {
          "line": 8,
          "character": 1
        },
        "end": {
-          "line": 16,
+          "line": 15,
          "character": 1
        }
      },
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -14,5 +14,4 @@
      "**/odata-v4/okra/**"
    ]
  },
-  "mochaExplorer.parallel": true
 }
--- a/LICENSE.txt
+++ b/LICENSE.txt
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Find here a collection of samples for the [SAP Cloud Application Programming Mod

 ### Download

-If you've [Git](https://git-scm.com/downloads) installed, clone this repo as shown below, otherwise [download as ZIP file](archive/main.zip).
+If you've [Git](https://git-scm.com/downloads) installed, clone this repo as shown below, otherwise [download as ZIP file](archive/master.zip).

 ```sh
 git clone https://github.com/sap-samples/cloud-cap-samples samples
@@ -83,4 +83,4 @@ In case you've a question, find a bug, or otherwise need support, use our [commu

 ## License

-Copyright (c) 2022 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, version 2.0 except as noted otherwise in the [LICENSE](LICENSE) file.
+Copyright (c) 2021 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, version 2.0 except as noted otherwise in the [LICENSE](LICENSE.txt) file.
--- a/bookshop/app/index.cds
+++ b/bookshop/app/index.cds
@@ -0,0 +1,2 @@
+// Incorporate pre-build extensions from...
+using from '@capire/common';
--- a/bookshop/app/vue/app.js
+++ b/bookshop/app/vue/app.js
@@ -3,15 +3,14 @@ const $ = sel => document.querySelector(sel)
 const GET = (url) => axios.get('/browse'+url)
 const POST = (cmd,data) => axios.post('/browse'+cmd,data)

-const books = Vue.createApp ({
+const books = new Vue ({

-    data() {
-      return {
+    el:'#app',
+
+    data: {
        list: [],
        book: undefined,
-        order: { quantity:1, succeeded:'', failed:'' },
-        user: undefined
-      }
+        order: { amount:1, succeeded:'', failed:'' }
    },

    methods: {
@@ -27,41 +26,23 @@ const books = Vue.createApp ({
            const book = books.book = books.list [eve.currentTarget.rowIndex-1]
            const res = await GET(`/Books/${book.ID}?$select=descr,stock,image`)
            Object.assign (book, res.data)
-            books.order = { quantity:1 }
+            books.order = { amount:1 }
            setTimeout (()=> $('form > input').focus(), 111)
        },

        async submitOrder () {
-            const {book,order} = books, quantity = parseInt (order.quantity) || 1 // REVISIT: Okra should be less strict
+            const {book,order} = books, amount = parseInt (order.amount) || 1 // REVISIT: Okra should be less strict
            try {
-                const res = await POST(`/submitOrder`, { quantity, book: book.ID })
+                const res = await POST(`/submitOrder`, { amount, book: book.ID })
                book.stock = res.data.stock
-                books.order = { quantity, succeeded: `Successfully ordered ${quantity} item(s).` }
+                books.order = { amount, succeeded: `Successfully orderd ${amount} item(s).` }
            } catch (e) {
-                books.order = { quantity, failed: e.response.data.error ? e.response.data.error.message : e.response.data }
+                books.order = { amount, failed: e.response.data.error.message }
            }
-        },
+        }

-        async login() {
-            try {
-                const { data:user } = await axios.post('/user/login',{})
-                if (user.id !== 'anonymous') books.user = user
-            } catch (err) { books.user = { id: err.message } }
-        },
-
-        async getUserInfo() {
-            try {
-                const { data:user } = await axios.get('/user/me')
-                if (user.id !== 'anonymous') books.user = user
-            } catch (err) { books.user = { id: err.message } }
-        },
    }
-}).mount("#app")
-
-books.getUserInfo()
-books.fetch() // initially fill list of books
-
-document.addEventListener('keydown', (event) => {
-    // hide user info on request
-    if (event.key === 'u')  books.user = undefined
 })
+
+// initially fill list of books
+books.fetch()
--- a/bookshop/app/vue/index.html
+++ b/bookshop/app/vue/index.html
@@ -5,32 +5,19 @@
    <title> Capire Books </title>
    <link rel="stylesheet" href="https://unpkg.com/primitive-ui/dist/css/main.css">
    <script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/vue@3/dist/vue.global.prod.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/vue"></script>
    <style>
        .hovering tr:hover td { color:cyan; background: #123; cursor: pointer; }
        .rating-stars { color:teal }
        .succeeded { color:teal }
        .failed { color:red }
-        .user {text-align: end; color: grey;}
    </style>
 </head>

 <body class="small-container", style="margin-top: 70px;">
 <div id='app'>

-    <form class="user" @submit.prevent="login">
-        <div v-if="user">
-            <div v-if="user.tenant">Tenant: {{ user.tenant }}</div>
-            <div> User: {{ user.id }}</div>
-            <div>Locale: {{ user.locale }}</div>
-        </div>
-        <div v-else>
-            <input type="submit" value="Login" class="muted-button">
-            <!-- <a href="/user/login()">Login</a> -->
-        </div>
-    </form>
-
-    <h1> Capire Books </h1>
+    <h1> {{ document.title }} </h1>

    <input type="text" placeholder="Search..." @input="search">

@@ -47,7 +34,7 @@
            <td>{{ book.author }}</td>
            <td>{{ book.genre.name }}</td>
            <td class="rating-stars">
-                {{ ('★'.repeat(Math.round(book.rating))+'☆☆☆☆☆').slice(0,5) }} ({{ book.numberOfReviews }})
+                {{ ('★'.repeat(Math.round(book.rating))+'☆☆☆☆☆').slice(0,5) }}
            </td>
            <td>{{ book.currency && book.currency.symbol }} {{ book.price }}</td>
        </tr>
@@ -61,7 +48,7 @@
            &nbsp;&nbsp; {{ book.stock }} in stock
        </label>
        <form @submit.prevent="submitOrder" style="float:right; display:flex; flex-direction:row-reverse">
-            <input type="number" v-model="order.quantity" v-bind:class="{ failed: order.failed }" style="width:5em">
+            <input type="number" v-model="order.amount" v-bind:class="{ failed: order.failed }" style="width:5em">
            <input type="submit" value="Order:" class="muted-button">
        </form>
        <h4> {{ book.title }} </h4>
--- 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
-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
+ID;name
+101;Emily Brontë
+107;Charlotte Brontë
+150;Edgar Allen Poe
+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
-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;150;JPY;13
+ID;title;author_ID;genre_ID
+201;Wuthering Heights;101;11
+207;Jane Eyre;107;11
+251;The Raven;150;16
+252;Eleonora;150;16
+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
-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;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.
-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.
+ID;locale;title
+201;de;Sturmhöhe
+201;fr;Les Hauts de Hurlevent
+207;de;Jane Eyre
+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/init.js
+++ b/bookshop/db/init.js
@@ -1,24 +0,0 @@
-/**
- * In order to keep basic bookshop sample as simple as possible, we don't add
- * reuse dependencies. This db/init.js ensures we still have a minimum set of
- * currencies, if not obtained through @capire/common.
- */
-
-export default async (db)=>{
-
-  const has_common = db.model.definitions['sap.common.Currencies'].elements.numcode
-  if (has_common) return
-
-  const already_filled = await db.exists('sap.common.Currencies',{code:'EUR'})
-  if (already_filled) return
-
-  await INSERT.into ('sap.common.Currencies') .columns (
-    'code','symbol','name'
-  ) .rows (
-    [ 'EUR','€','Euro' ],
-    [ 'USD','$','US Dollar' ],
-    [ 'GBP','£','British Pound' ],
-    [ 'ILS','₪','Shekel' ],
-    [ 'JPY','¥','Yen' ],
-  )
-}
--- 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,2 +0,0 @@
-import { CatalogService } from './srv/cat-service.js'
-export { CatalogService }
--- a/bookshop/package.json
+++ b/bookshop/package.json
@@ -2,28 +2,43 @@
  "name": "@capire/bookshop",
  "version": "1.0.0",
  "description": "A simple self-contained bookshop service.",
-  "type": "module",
-  "files": [
-    "app",
-    "srv",
-    "db",
-    "index.cds",
-    "index.js"
-  ],
  "dependencies": {
-    "@sap/cds": ">=5.9",
+    "@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_.
-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).
+## Preparation

-## Running the Sample
-
-```sh
-npm run watch
+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
+"cds": {
+  ...,
+  "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               |
-| --------------------------------------------------------------------------------------------------------- | ------------------------------------ |
-| [Project Setup & Layouts](https://cap.cloud.sap/docs/get-started/projects#sharing-and-reusing-content)    | [`./`](./)                           |
-| [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)               |
-| [Single-purposed Services](https://cap.cloud.sap/docs/guides/services#single-purposed-services)           | [`./srv/*.cds`](./srv)               |
-| [Providing & Consuming Providers](https://cap.cloud.sap/docs/guides/providing-services)                   | http://localhost:4004                |
-| [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)                |
-| Adding Tests                                                                                              | [`./test`](./test)                   |
-| [Sharing for Reuse](https://cap.cloud.sap/docs/guides/reuse-and-compose)                                  | [`./index.cds`](./index.cds)         |
+## SQLite
+
+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.
+
+For SQLite, constraint checks need to be enabled by application at runtime for each db connection with the command
+```sql
+PRAGMA foreign_keys = ON;
+```
+We do this via a custom handler in `admin-service.js`.
+
+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 @@
-import cds from '@sap/cds'
+// 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(){ 

-export default cds.service.impl (function(){
-  this.before ('NEW','Authors', genid)
-  this.before ('NEW','Books', genid)
+  const db = await cds.connect.to('db')
+
+  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, quantity: Integer ) returns { stock: Integer };
-  event OrderedBook : { book: Books:ID; quantity: Integer; buyer: String };
-}
--- a/bookshop/srv/cat-service.js
+++ b/bookshop/srv/cat-service.js
@@ -1,26 +0,0 @@
-import cds from '@sap/cds'
-
-export class CatalogService extends cds.ApplicationService { init(){
-
-  const { Books } = this.entities ('sap.capire.bookshop')
-
-  // Reduce stock of ordered books if available stock suffices
-  this.on ('submitOrder', async req => {
-    const {book,quantity} = req.data
-    if (quantity < 1) return req.reject (400,`quantity has to be 1 or more`)
-    let b = await SELECT `stock` .from (Books,book)
-    if (!b) return req.error (404,`Book #${book} doesn't exist`)
-    let {stock} = b
-    if (quantity > stock) return req.reject (409,`${quantity} exceeds stock for book #${book}`)
-    await UPDATE (Books,book) .with ({ stock: stock -= quantity })
-    await this.emit ('OrderedBook', { book, quantity, buyer:req.user.id })
-    return { stock }
-  })
-
-  // Add some discount for overstocked books
-  this.after ('READ','ListOfBooks', each => {
-    if (each.stock > 111) each.title += ` -- 11% discount!`
-  })
-
-  return super.init()
-}}
--- a/bookshop/srv/user-service.cds
+++ b/bookshop/srv/user-service.cds
@@ -1,15 +0,0 @@
-/**
- * Exposes user information
- */
-service UserService {
-  /**
-   * The current user
-   */
-  @odata.singleton entity me {
-    id     : String; // user id
-    locale : String;
-    tenant : String;
-  }
-
-  action login() returns me;
-}
--- a/bookshop/srv/user-service.js
+++ b/bookshop/srv/user-service.js
@@ -1,10 +0,0 @@
-import cds from '@sap/cds'
-
-export default class UserService extends cds.Service { init(){
-  this.on('READ', 'me', ({ tenant, user, locale }) => ({ id: user.id, locale, tenant }))
-  this.on('login', (req) => {
-    if (req.user._is_anonymous)
-      req._.res.set('WWW-Authenticate','Basic realm="Users"').sendStatus(401)
-    else return this.read('me')
-  })
-}}
--- 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,95 +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


-### ------------------------------------------------------------------------
-# Get service info
-GET {{server}}/browse
-{{me}}
-
-
-### ------------------------------------------------------------------------
-# Get $metadata document
-GET {{server}}/browse/$metadata
-{{me}}
-
-
-### ------------------------------------------------------------------------
-# Browse Books as any user
-GET {{server}}/browse/ListOfBooks?
-  # &$select=title,stock
-  &$expand=genre
-  # &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 Author
-POST {{server}}/admin/Authors
-Content-Type: application/json;IEEE754Compatible=true
-Authorization: Basic alice:
+### create book with wrong author ID -> should fail
+POST {{server}}/admin/Books
+Content-Type: application/json

 {
-  "ID": 112,
-  "name": "Shakespeeeeere",
-  "age": 22
+  "ID": 701,
+  "title": "XXX",
+  "author": { "ID": 9999 }
 }

-
-### ------------------------------------------------------------------------
-# Create book
+### create book with correct author ID -> should work
 POST {{server}}/admin/Books
 Content-Type: application/json;IEEE754Compatible=true
-Authorization: Basic alice:

 {
-  "ID": 2,
+  "ID": 702,
  "title": "Poems : Pocket Poets",
-  "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": 101 },
-  "genre": { "ID": 12 },
-  "stock": 5,
-  "price": "12.05",
-  "currency": { "code": "USD" }
+  "author": { "ID": 101 }
 }

+### delete book
+DELETE {{server}}/admin/Books(ID=701)

-### ------------------------------------------------------------------------
-# Put image to books
-PUT {{server}}/admin/Books(2)/image
-Content-Type: image/png
-Authorization: Basic alice:
+### change book to wrong author ID -> should fail

-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
+PATCH {{server}}/admin/Books(ID=207)
+Content-Type:application/json
+
+{"author_ID": 9999}
+
+### change book to correct author ID -> should work
+
+PATCH {{server}}/admin/Books(ID=207)
+Content-Type:application/json
+
+{"author_ID": 170}


-### ------------------------------------------------------------------------
-# Reading image from from the server directly
-GET {{server}}/browse/Books(2)/image
+
+### delete "leaf" genre that is used in a book -> should not work
+DELETE {{server}}/admin/Genres(ID=13)
+
+### delete "leaf" genre that is not used in a book -> should work
+DELETE {{server}}/admin/Genres(ID=14)


-### ------------------------------------------------------------------------
-# 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, "quantity":5 }
+### delete "header" genre where leaves are used in a book -> should not work
+DELETE {{server}}/admin/Genres(ID=10)


-### ------------------------------------------------------------------------
-# Browse Genres
-GET {{server}}/browse/Genres?
-# &$filter=parent_ID eq null&$select=name
-# &$expand=children($select=name)
-{{me}}
+### delete "header" genre where leaves are not used in a book -> should work and delete all leaves
+DELETE {{server}}/admin/Genres(ID=30)
--- a/bookstore/index.cds
+++ b/bookstore/index.cds
@@ -1,2 +0,0 @@
-namespace sap.capire.bookshop; //> important for reflection
-using from './srv/mashup';
--- a/bookstore/package.json
+++ b/bookstore/package.json
@@ -1,34 +0,0 @@
-{
-  "name": "@capire/bookstore",
-  "version": "1.0.0",
-  "dependencies": {
-    "@capire/bookshop": "*",
-    "@capire/reviews": "*",
-    "@capire/orders": "*",
-    "@capire/common": "*",
-    "@capire/data-viewer": "*",
-    "@sap/cds": ">=5",
-    "express": "^4.17.1"
-  },
-  "cds": {
-    "requires": {
-      "ReviewsService": {
-        "kind": "odata",
-        "model": "@capire/reviews"
-      },
-      "OrdersService": {
-        "kind": "odata",
-        "model": "@capire/orders"
-      },
-      "messaging": {
-        "[development]": { "kind": "file-based-messaging" },
-        "[hybrid]": { "kind": "enterprise-messaging-shared" },
-        "[production]": { "kind": "enterprise-messaging" }
-      },
-      "db": {
-        "kind": "sql"
-      }
-    },
-    "log": { "service": true }
-  }
-}
--- a/bookstore/server.js
+++ b/bookstore/server.js
@@ -1,22 +0,0 @@
-const cds = require ('@sap/cds')
-
-// Add mashup logic
-cds.once('served', require('./srv/mashup'))
-
-// Add routes to UIs from imported packages
-cds.once('bootstrap',(app)=>{
-  app.serve ('/bookshop') .from ('@capire/bookshop','app/vue')
-  app.serve ('/reviews') .from ('@capire/reviews','app/vue')
-  app.serve ('/orders') .from('@capire/orders','app/orders')
-  app.serve ('/data') .from('@capire/data-viewer','app/viewer')
-})
-
-// Add Swagger UI
-require('./srv/swagger-ui')
-
-// Returning cds.server
-module.exports = cds.server
-
-// For didactic reasons in capire
-const { ReviewsService, OrdersService } = cds.requires
-if (!ReviewsService.credentials && !OrdersService.credentials) cds.requires.messaging = false
--- a/bookstore/srv/mashup.cds
+++ b/bookstore/srv/mashup.cds
@@ -1,38 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-//
-//    Enhancing bookshop with Reviews and Orders provided through
-//    respective reuse packages and services
-//
-
-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;
-  numberOfReviews : Integer;
-}
-
-
-//
-//  Extend Orders with Books as Products
-//
-using { sap.capire.orders.Orders } from '@capire/orders';
-extend Orders with {
-  extend Items with {
-    book : Association to Books on product.ID = book.ID
-  }
-}
-
-
-// Add orders fiori app (in case of embedded orders service)
-using from '@capire/orders/app/fiori';
-
-// Add data browser
-using from '@capire/data-viewer';
-
-// Incorporate pre-build extensions from...
-using from '@capire/common';
--- a/bookstore/srv/swagger-ui.js
+++ b/bookstore/srv/swagger-ui.js
@@ -1,10 +0,0 @@
-
-// -----------------------------------------------------------------------
-// Adding Swagger UI - see https://cap.cloud.sap/docs/advanced/openapi
-const cds = require ('@sap/cds')
-try {
-  const cds_swagger = require ('cds-swagger-ui-express')
-  cds.once ('bootstrap', app => app.use (cds_swagger()) )
-} catch (err) {
-  if (err.code !== 'MODULE_NOT_FOUND')  throw err
-}
--- a/common/data/sap.common-Currencies_texts.csv
+++ b/common/data/sap.common-Currencies_texts.csv
@@ -5,11 +5,9 @@ CAD;de;Kanadischer Dollar;Kanadischer Dollar
 AUD;de;Australischer Dollar;Australischer Dollar
 GBP;de;Pfund;Britische Pfund
 ILS;de;Schekel;Israelische Schekel
-JPY;de;Yen;Japanische Yen
 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
-JPY;fr;Yen;Yen japonais
--- a/common/index.cds
+++ b/common/index.cds
@@ -20,7 +20,7 @@ extend sap.common.Currencies with {
 * annotate sap.common.Countries with @cds.persistence.skip:false;
 */

-context sap.common.countries {
+context sap.common_countries {

  extend sap.common.Countries {
    regions   : Composition of many Regions on regions._parent = $self.code;
--- a/data-viewer/app/viewer/app.js
+++ b/data-viewer/app/viewer/app.js
@@ -1,119 +0,0 @@
-/* global Vue axios */ //> from vue.html
-const GET = (url) => axios.get('/-data'+url)
-const storageGet = (key, def) => localStorage.getItem('data-viewer:'+key) || def
-const storageSet = (key, val) => localStorage.setItem('data-viewer:'+key, val)
-const columnKeysFirst = (c1, c2) => {
-  if (c1.isKey  && !c2.isKey) return -1
-  if (!c1.isKey && c2.isKey) return 1
-  if (c1.isKey && c2.isKey) return c1.name.localeCompare(c2.name)
-  return 0 // retain natural order of normal columns
-}
-
-const vue = Vue.createApp ({
-
-  data() { return {
-    error: undefined,
-    dataSource: storageGet('data-source', 'db'),
-    skip: storageGet('skip', 0),
-    top: storageGet('top', 20),
-    entity: storageGet('entity') ? JSON.parse(storageGet('entity')) : undefined,
-    entities: [],
-    columns: [],
-    data: [],
-    rowDetails: {},
-    rowKey: storageGet('rowKey')
-  }},
-
-  watch: {
-    dataSource: (v) => { storageSet('data-source', v);  vue.fetchEntities() },
-    skip: (v) => { storageSet('skip', v); if (vue.entity)  vue.fetchData() },
-    top:  (v) => { storageSet('top',  v); if (vue.entity)  vue.fetchData() },
-  },
-
-  methods: {
-
-    async fetchEntities () {
-      let url = `/Entities`
-      if (vue.dataSource === 'db')  url += `?dataSource=db`
-      const {data} = await GET(url)
-      vue.entities = data.value
-      vue.entities.forEach(entity => entity.columns.sort(columnKeysFirst))
-      const entity = vue.entity && vue.entities.find(e => e.name === vue.entity.name)
-      if (entity) { // restore selection from previous fetch
-        vue.columns = entity.columns
-        await vue.fetchData(entity)
-      } else {
-        vue.entity = undefined
-        vue.columns = []
-        vue.data = []
-        vue.rowDetails = {}
-      }
-    },
-
-    async inspectEntity (eve) {
-      const entity = vue.entity = vue.entities [eve.currentTarget.rowIndex-1]
-      storageSet('entity', JSON.stringify(entity))
-      vue.columns = vue.entities.find(e => e.name === entity.name).columns
-      return await this.fetchData()
-    },
-
-    async fetchData () {
-      let url = `/Data?entity=${vue.entity.name}&$skip=${vue.skip}&$top=${vue.top}`
-      if (vue.dataSource === 'db')  url += `&dataSource=db`
-
-      try {
-        const {data} = await GET(url)
-        // sort data along column order
-        const columnIndexes = {}
-        vue.columns.forEach((col, i) => columnIndexes[col.name] = i)
-        vue.data = data.value.map(d => d.record
-          .sort((r1, r2) => columnIndexes[r1.column] - columnIndexes[r2.column])
-          .map(r => r.data)
-        )
-        const row = vue.data.find(data => vue._makeRowKey(data) === vue.rowKey)
-        if (row)  vue._setRowDetails(row)
-        else vue.rowDetails = {}
-        vue.error = undefined
-      } catch (err) {
-        vue.data = []
-        vue.rowDetails = {}
-        if (err.response?.data?.error) {
-          vue.error = err.response.data.error
-        } else {
-          vue.error = { code:err.code, message:err.message }
-        }
-      }
-
-    },
-
-    inspectRow (eve) {
-      vue.rowDetails = {}
-      const selectedRow = eve.currentTarget.rowIndex-1
-      vue.rowKey = vue._makeRowKey(vue.data[selectedRow])
-      storageSet('rowKey', vue.rowKey)
-      vue._setRowDetails(vue.data[selectedRow])
-    },
-
-    _setRowDetails(row) {
-      vue.rowDetails = {}
-      row.forEach((line, colIndex) => {
-        vue.rowDetails[vue.columns[colIndex].name] = line
-      })
-    },
-
-    _makeRowKey(row) {
-      // to identify a row, build a key string out of all key columns' values
-      return row
-        .filter((_, colIndex) => vue.columns[colIndex] && vue.columns[colIndex].isKey)
-        .reduce(((prev, next) => prev += next), '')
-    },
-
-    isActiveRow(row) {
-      return vue._makeRowKey(row) === vue.rowKey
-    }
-
-  }
-})
-.mount('#app')
-
-vue.fetchEntities()
--- a/data-viewer/app/viewer/index.html
+++ b/data-viewer/app/viewer/index.html
@@ -1,95 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-  <title>Data Browser</title>
-  <link rel="stylesheet" href="https://unpkg.com/primitive-ui/dist/css/main.css">
-  <script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/vue@3/dist/vue.global.prod.js"></script>
-  <script src="app.js" defer></script>
-
-  <style>
-    th { position: sticky; top:0; z-index: 2; background-color: white; }
-    .noscroll { overflow: hidden; }
-    .hovering tr:hover td { background: #ebeefc; cursor: pointer; }
-    .highlight { background: #ebeefc !important; }
-    .rating-stars { color:teal }
-    .succeeded { color:teal }
-    .failed { color:red }
-    .condensed { max-width: 100px; text-overflow: ellipsis; white-space: nowrap; }
-    .key { font-weight: bold }
-    .not-key { font-weight: lighter;}
-    .with-sidebar { display: flex; flex-wrap: wrap; gap: 1rem; }
-    .sidebar    { flex-basis: 20rem; flex-grow: 1; }
-    .sidebar-main { height: 100vh; overflow-y: scroll; }
-    .not-sidebar  { flex-basis: 0; flex-grow: 999; min-inline-size: 50%; align-items: stretch;}
-    .not-sidebar-main { max-height: 40vh; overflow-y: scroll; }
-    .not-sidebar-sub {  max-height: 40vh; overflow-y: scroll; }
-    .horizontal label { display: inline; }
-    .horizontal input { width: initial; display: inline; }
-    .error { color: red; }
-  </style>
-</head>
-
-<body class="noscroll">
-<div id='app' class="full-container">
-
-  <h1>Data Browser &ndash; {{ entity ? entity.name : '' }}</h1>
-
-  <div class="with-sidebar">
-    <div class="sidebar">
-      <div class="horizontal" style="padding: 0.75rem 0;">
-        <label>Datasource:</label>
-        <input type="radio" id="dataSource-db" value="db" v-model="dataSource">
-        <label for="dataSource-db">Database</label>
-        <input type="radio" id="dataSource-srv" value="service" v-model="dataSource">
-        <label for="dataSource-srv">Service</label>
-      </div>
-      <div class="sidebar-main">
-        <table id='entities' class="hovering">
-          <thead>
-            <th>Entity Name</th>
-          </thead>
-          <tr v-for="e in entities" :key="e.name" @click="inspectEntity" :class="{'highlight': (entity && e.name === entity.name)}">
-            <td>{{ e.name }}</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-
-    <div class="not-sidebar">
-      <div class="horizontal">
-        <label for="skip">Skip:</label>
-        <input id="skip" v-model.lazy="skip" title="No. of entries to skip" type="number" min="0">
-        <label for="top">Top:</label>
-        <input id="top" v-model.lazy="top" title="No. of entries to read" type="number" min="0">
-      </div>
-      <div v-if="data" class="not-sidebar-main">
-        <table id='data' class="hovering striped-table condensed">
-          <thead>
-            <th v-for="col in columns" :title="col.type" :class="[col.isKey ? 'key' : 'not-key']">{{ col.name }} </th>
-          </thead>
-          <tr v-for="row in data" @click="inspectRow" :class="{'highlight': isActiveRow(row)}">
-            <td v-for="d in row" :title="d">{{ d }}</td>
-          </tr>
-        </table>
-      </div>
-      <div v-if="error" class="not-sidebar-main error">
-        Error: {{ error.code ? error.code + ' &ndash; ' + error.message : error.message }}
-      </div>
-      <p></p>
-      <div v-if="rowDetails"  class="not-sidebar-sub">
-        <table id='rowDetails'>
-          <tr v-for="(key, value) in rowDetails" >
-            <td class="key">{{ value }}</td>
-            <td>{{ key }}</td>
-          </tr>
-        </table>
-      </div>
-    </div>
-  </div>
-
-</div>
-</body>
-
-</html>
--- a/data-viewer/index.cds
+++ b/data-viewer/index.cds
@@ -1 +0,0 @@
-using from './srv/data-service';
--- a/data-viewer/package.json
+++ b/data-viewer/package.json
@@ -1,13 +0,0 @@
-{
-  "name": "@capire/data-viewer",
-  "version": "0.1.0",
-  "description": "A generic browser for data",
-  "dependencies": {
-    "@sap/cds": ">=5.0.4"
-  },
-  "files": [
-    "app",
-    "srv",
-    "index.cds"
-  ]
-}
--- a/data-viewer/srv/data-service.cds
+++ b/data-viewer/srv/data-service.cds
@@ -1,29 +0,0 @@
-/**
- * Exposes data + entity metadata
- */
-@requires:'authenticated-user'
-service DataService @( path:'-data' ) {
-
-  /**
-   * Metadata like name and columns/elements
-   */
-  entity Entities {
-    key name : String;
-    columns: Composition of many {
-      name :  String;
-      type :  String;
-      isKey:  Boolean;
-    }
-  }
-
-  /**
-   * The actual data, organized by column name
-   */
-  entity Data {
-    record   : array of {
-      column : String;
-      data   : String;
-    }
-  }
-
-}
--- a/data-viewer/srv/data-service.js
+++ b/data-viewer/srv/data-service.js
@@ -1,58 +0,0 @@
-const cds = require('@sap/cds')
-const log = cds.log('data')
-
-class DataService extends cds.ApplicationService { init(){
-
-  this.on ('READ', 'Entities', req => {
-    const { dataSource } = req.req.query
-    const srvPrefixes = cds.db.model.all('service').map(srv => srv.name+'.')
-    const dataSourceFilter = dataSource === 'db'
-      ? e => e['@cds.persistence.skip'] !== true // for DB, excl. entities w/o persistence
-      : e => !!srvPrefixes.find(srvName => e.name.startsWith(srvName)) // only entities reachable from a service
-
-    return cds.db.model.all('entity')
-      .filter (e => req.data && req.data.name ? e.name === req.data.name : true)  // honor name filter from request, if any
-      .filter (e => !e.name.startsWith('DRAFT.'))  // exclude synthetic stuff
-      .filter (e => !e.name.startsWith('DataService.'))  // exclude this service
-      .filter (dataSourceFilter)
-      .sort((e1, e2) => e1.name.localeCompare(e2.name))
-      .map(e => {
-        const columns = Object.entries(e.elements)
-          .filter(([_, el]) => !(el instanceof cds.Association)) // exclude assocs+compositions
-          .map(([name, el]) => { return { name, type: el.type, isKey:!!el.key }})
-        return { name: e.name, columns }
-      })
-    })
-
-  this.on ('READ', 'Data', async req => {
-    const { entity: entityName, dataSource: dataSourceName } = req.req.query
-    if (!entityName)  return req.reject(400, `Must provide 'entity' query`)
-    const entity = cds.db.model.definitions[entityName]
-    if (!entity)  return req.reject(404, 'No such entity: ' + entityName)
-
-    const query = SELECT.from(entity)
-    query.SELECT.limit = req.query.SELECT.limit  // forward $skip / $top
-
-    const dataSource = findDataSource(dataSourceName, entityName)
-    const res = await dataSource.run(query)
-    return res.map((line) => {
-      const record = Object.entries(line).map(([column, data]) => {return {column, data}})
-      return { record }
-    })
-  })
-
-  return super.init()
-}}
-
-module.exports = { DataService }
-
-function findDataSource(dataSourceName, entityName) {
-  for (let srv of Object.values(cds.services)) { // all connected services
-    if (!srv.name)  continue // FIXME intermediate/pending in cds.services ?
-    if (dataSourceName === srv.name || entityName.startsWith(srv.name+'.')) {
-      log._debug && log.debug(`using ${srv.name} as data source`)
-      return srv
-    }
-  }
-  return cds.services.db // fallback
-}
--- a/etc/bookshop.drawio.svg
+++ b/etc/bookshop.drawio.svg
--- a/etc/dark.drawio.svg
+++ b/etc/dark.drawio.svg
@@ -1,172 +0,0 @@
-<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="347px" height="279px" viewBox="-0.5 -0.5 347 279" content="&lt;mxfile&gt;&lt;diagram id=&quot;QQJxv4aCTC7ZgE7HHOvM&quot; name=&quot;Page-1&quot;&gt;7Vlbb+I4FP41vCLfL4/T7szuy0oj9WGfczEkasCRMYXur98TEufeqpoBCtUGCezv+Hq+z/bBWdDHzfFPF5XZ3zY1xYKg9LigfywI0QLBdwW81oDUrAbWLk9rCHXAU/6vqUEc0H2eml2D1ZC3tvB5OQQTu92axA+wyDl7GBZb2SIdAGW0NoNhVMBTEhVmUuyfPPVZjSoiO/wvk6+z0DMWurbEUfK8dna/bfpbEIq/VZ/avIlCW02/uyxK7aEH0e8L+uis9XVqc3w0ReXaodt+vGFtx+3M1n+kAqkrvETFvpn6gqEkKnNnqkpERJtyQR+28a76gXwBzT7EDlJr30cCEFv7vMtsGQzQStwVPk3ZvwY3w+zLKpmZY7S2WyhSGpdvjDeuQ38GCJzzcMhyb57KKKmqHUB7gGV+U0AOQ3KVH02QU5XfPRufVB5HJ2NRPNrCulPndLUyIkmqQt7ZZ9OzpFLHCLWWoADSTuHFOG+Ob7oct0TC+jAWBu9eoUhTgcimSrM2KG9UdeiUpht5ZD2RqQaLGm2v25Y7fiHRUDxPNz033avcuvwOuFaJmec6Vpzxq3FNrsg1OzfXzrzkBnbWm2c75UalbI5tRWIqxKXYppwPVza6Htv83GwndrMB4m6e7BWvPhVut76H18+cCMTpuZQIsFIDEbArikCcWwTWpcbdw4qPjFrN7u8iUSZeXY5s+WkrXk7JHnNitum3KhqGXFJEu12eDF08cOnUQVC98b882SPnB/mRq3+cntaxJg0x9ltuhbHavUvMYAeDXtbG96LTqfN7zuUzzg2YM0Xk85fhIOY83vTw0+YwvI5bCOuH5AayQxv16Jtq/SB70pIYtURHLdWTnrR0kkA78Q+pQn0xVYipKuhnqoJIueSKtk8Y4Gtn7lknRH9UMkTjJcOifSQbdqPEsmcVgl5KT/qL6Yncl54ofZ/oM+mJkvdlez49hRueLyModl+CYtcRFLueoPBUUL8X9O72ZVnk/8e978a9o2MvLOsrxL145s5yTOETNAKCRLfPoMEpN7P7khaSRpf7m4rQkEFBrsfgzDXkXZ8BQZL9QwC/4f+bOAXGYUXYvS8cVoRRXOAUmLnt/HKSEp+pKAxUS6Q4QVhqKtv7h7B/aAZKkIghypVk7FfDCqSWIComtSJIgIrpsBfFQNZEcy0YJpxfLqqYuU+9bz2F16i3EqdiTWELUlWoqDUS46tzSpYQm3KOGYJgQ5NflZOADQhLySVCmrJxJ3oJOyFjimuFKVJnUhNkuze4dfHuLTn9/h8=&lt;/diagram&gt;&lt;/mxfile&gt;" style="background-color: rgb(26, 26, 26);">
-    <defs/>
-    <g>
-        <path d="M 192 148 L 242 148 L 262 188 L 242 228 L 192 228 L 172 188 Z" fill="#ffe6cc" stroke="#d79b00" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 188px; margin-left: 173px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
-                                @capire/
-                                <br/>
-                                <b>
-                                    bookshop
-                                </b>
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="217" y="192" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    @capire/...
-                </text>
-            </switch>
-        </g>
-        <path d="M 192 48 L 242 48 L 262 88 L 242 128 L 192 128 L 172 88 Z" fill="#f8cecc" stroke="#b85450" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 88px; margin-left: 173px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
-                                @capire/
-                                <br/>
-                                <b>
-                                    fiori
-                                </b>
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="217" y="92" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    @capire/...
-                </text>
-            </switch>
-        </g>
-        <path d="M 276 98 L 326 98 L 346 138 L 326 178 L 276 178 L 256 138 Z" fill="#d5e8d4" stroke="#82b366" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 138px; margin-left: 257px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
-                                @capire/
-                                <br/>
-                                <b>
-                                    reviews
-                                </b>
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="301" y="142" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    @capire/...
-                </text>
-            </switch>
-        </g>
-        <path d="M 109 198 L 159 198 L 179 238 L 159 278 L 109 278 L 89 238 Z" fill="#f5f5f5" stroke="#666666" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 238px; margin-left: 90px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #333333; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
-                                @capire/
-                                <br/>
-                                <b>
-                                    common
-                                </b>
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="134" y="242" fill="#333333" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    @capire/...
-                </text>
-            </switch>
-        </g>
-        <path d="M 108 98 L 158 98 L 178 138 L 158 178 L 108 178 L 88 138 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 138px; margin-left: 89px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
-                                @capire/
-                                <br/>
-                                <b>
-                                    orders
-                                </b>
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="133" y="142" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    @capire/...
-                </text>
-            </switch>
-        </g>
-        <path d="M 168.58 217.17 L 174.72 213.47" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 180.5 209.99 L 175.11 218.49 L 174.72 213.47 L 170.47 210.78 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 167.68 117.36 L 174.6 113.24" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 180.4 109.79 L 174.97 118.26 L 174.6 113.24 L 170.36 110.52 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 217 148 L 217 136.99" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 217 130.24 L 221.5 139.24 L 217 136.99 L 212.5 139.24 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 266.32 117.36 L 259.4 113.24" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 253.6 109.79 L 263.64 110.52 L 259.4 113.24 L 259.03 118.26 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 107 1 L 157 1 L 177 41 L 157 81 L 107 81 L 87 41 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 41px; margin-left: 88px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
-                                @capire/
-                                <br/>
-                                <b>
-                                    suppliers
-                                </b>
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="132" y="45" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    @capire/...
-                </text>
-            </switch>
-        </g>
-        <path d="M 21 53 L 71 53 L 91 93 L 71 133 L 21 133 L 1 93 Z" fill="#e1d5e7" stroke="#9673a6" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 93px; margin-left: 2px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
-                                <b>
-                                    S/4
-                                </b>
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="46" y="97" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    S/4
-                </text>
-            </switch>
-        </g>
-        <path d="M 80.55 72.11 L 89.76 66.54" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 95.53 63.05 L 90.16 71.56 L 89.76 66.54 L 85.5 63.86 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 81.75 111.49 L 89.27 115.38" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 95.26 118.48 L 85.2 118.34 L 89.27 115.38 L 89.33 110.35 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 167.25 60.49 L 173.88 64.16" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 179.79 67.42 L 169.74 67.01 L 173.88 64.16 L 174.09 59.13 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-    </g>
-    <switch>
-        <g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/>
-        <a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank">
-            <text text-anchor="middle" font-size="10px" x="50%" y="100%">
-                Viewer does not support full SVG 1.1
-            </text>
-        </a>
-    </switch>
-</svg>
--- a/etc/incidents.drawio.svg
+++ b/etc/incidents.drawio.svg
@@ -1,281 +0,0 @@
-<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="569px" height="428px" viewBox="-0.5 -0.5 569 428" content="&lt;mxfile&gt;&lt;diagram id=&quot;QQJxv4aCTC7ZgE7HHOvM&quot; name=&quot;Page-1&quot;&gt;7Vpdd9o4EP01PJZjWf7SY8jHds9pd3tKt30WtjDayBZHFknor18ployNDCXEELbtyUPsQRpLvndmrgZG8Lp4+kPg5eIjzwgb+V72NII3I98HMPLUP21Z15YYBbUhFzQzgzaGKf1OjNHMy1c0I1VnoOScSbrsGlNeliSVHRsWgj92h8056z51iXPzRG9jmKaYEWfYN5rJRW1N/Hhjf09ovrBPBhGqPymwHWwcVwuc8ceWCd6O4LXgXNZXxdM1Yfrl2fdSz7vb8WmzMEFKecgEv57wgNnK7G2qBis0vPdXf12ZNcq13bjgqzIjeq43gpPHBZVkusSp/vRRQa1sC1kwdQfUZcoLmpqh1T2R6cLc/Evz/NljoG7mvJR3uKBMc+E9YQ9E0hTrKVLw++b9qjczwYzmpboW9audPBChx7IrY5dcr6BSC6Jlru7Dxss1Z1w8bwEmvv7TK+WCflcPx8yusZ742QAXm8VNzfaBuW/5Cm70n7Kbt6jWQ552IgEafFVgEF4QKdZqiJnwDtioMEEBLEceNxQDKKxtiza9LIrY0DpvnG+QVxcG/H4iQIcIk1VFS1JVI72OiOkXPhPqKtdXn7CQJRF7CALORJAWHLMkDEKvlzpzylhr5DxJSZoOBRxIxmEXuhC50Fk429CF3uuRCxzkGrgsWn+WqUqYaju+9zEvZAtR5bwZ5aJ8+yRJWVFeqhlXy+WFpgNG5odkA7Q3G5wwsg+IaxjELjlggF7PjtBhhyVDdVnBG6UJmc0PCd4Mk2Q+UPD6YdwFB/lu5IKepDtE5EY9kbsFCSmzKy1Y1F1GccHL7MuCKnZP1Ad3lFkw1J1RSSDqwnRSACqpyoBd3+3nApdrazWL8+y9WR5qYCOZ1Vi7QFMvgq9EakeZl6Oc5cSC0I9tGzsbfIIwLOlD95F94Bl3nzh9zpc2hoMOTQIQ2pRvfdRrNdPaimvLU5Owd7uqt+i4eqZTs82DGBY7DLteVVJ5EBcW/VmMZt5hpXtOoqFKN+pC0Rv8pyrbiQPNdJWmSm/d4VTyvfj8/7V3j9R25Phbam8/ilwmoGjcUwh8bwD1jRwyfOPifs519uuV3yqAtSq7pBC+GPUNPXi+MLYtiRZ0t8WS8TXpR+4LLUi1IET+Bq8fvKQn8k4GHniRApsxnt6rnWdYIWiB2ggxryvE/GOF2NG18KWSCrqKKj6fouoK7xDEx+qpHzgaTk1ZCdqiy0dVsHFOLkxNXcZZCnrADeVTnaWA28DaF8qXephqHZMOO1wdF/nhW0a+H8MuTyA8MvQB2u9owNB3u2xTIh7oDn2m1duldUcv4oh1Xm3mNr9+pfKO3CCvaXyWKAfbwg5GxxZ4tOUqCrdWM2Ccv6wnV/KS7CPJxdQPviTlYNXDJsO3acWByB97CYp0Uw6EHoJ+hxx+hI7jGYjgOAAejGMYJgHyoqTrF5yuuLhtOltAemrL1QOmDM8oo3L9u8K4FeasB0i3i/crVRjb/OiUmPMJSeDUmODIGgO8YL+jAYPd7fVNcHqvcFdGoynd46Rtt37AM8I+8YpK/a2sYhSXkhcaavtDEq/NL6/VuU0VkiqldDi1o4vr0EZ5X+qVFE+5/kXPuFA8Xi3HBRb6X7oSbD0Rz2lmT2vplelGcInNrr09bak5o8uvZnsDZJd3YOv7mtDryS8QuPnFHyC/+G538R/db1Cmr5Q8/lQ8abLWaXliM97APEm2G5nn5YnbyGz/duMGS/wzUaVRxyelSqOsB6aKH6A3ZIrbw3SYYaFJ14wqNSngj6XkrNadH2aNQdW0/FmN/r2Syg0x9qoWN/4YQRSiGIIwgJEPwTaAu085h5+UBsAKJF2sAIpdrJALFQhfDJW63fzusxYWm1/Pwtv/AA==&lt;/diagram&gt;&lt;/mxfile&gt;">
-    <defs/>
-    <g>
-        <rect x="1" y="1" width="195" height="122" fill="#ffffff" stroke="#828282" stroke-width="2" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)rotate(-90 11 13)">
-            <switch>
-                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe flex-end; width: 107px; height: 1px; padding-top: 13px; margin-left: -96px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: right; ">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #4D4D4D; line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; word-wrap: normal; ">
-                                S/4 HANA
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="11" y="25" fill="#4D4D4D" font-family="Helvetica" font-size="12px" text-anchor="end" font-weight="bold">
-                    S/4 HANA
-                </text>
-            </switch>
-        </g>
-        <rect x="42.5" y="40" width="120" height="50" rx="7.5" ry="7.5" fill="#f8cecc" stroke="#b85450" stroke-width="2" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 65px; margin-left: 44px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
-                                Business
-                                <br/>
-                                Partner
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="103" y="69" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    Business...
-                </text>
-            </switch>
-        </g>
-        <rect x="221" y="1" width="347" height="349" fill="#ffffff" stroke="#828282" stroke-width="2" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe flex-start; width: 331px; height: 1px; padding-top: 15px; margin-left: 230px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: left; ">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #4D4D4D; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
-                                <b>
-                                    Incident Mgmt
-                                </b>
-                                <br/>
-                                Extension App
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="230" y="27" fill="#4D4D4D" font-family="Helvetica" font-size="12px">
-                    Incident Mgmt...
-                </text>
-            </switch>
-        </g>
-        <rect x="418" y="73" width="115" height="50" rx="7.5" ry="7.5" fill="#dae8fc" stroke="#6c8ebf" stroke-width="2" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 113px; height: 1px; padding-top: 98px; margin-left: 419px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
-                                Incidents
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="476" y="102" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    Incidents
-                </text>
-            </switch>
-        </g>
-        <path d="M 475.5 182 L 475.5 142.97" fill="none" stroke="#6c8ebf" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 481.5 182 L 475.5 170 L 469.5 182" fill="none" stroke="#6c8ebf" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 475.5 124.97 L 480.79 133.97 L 475.5 142.97 L 470.21 133.97 Z" fill="#6c8ebf" stroke="#6c8ebf" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <rect x="255" y="73" width="120" height="50" rx="7.5" ry="7.5" fill="#ffe6cc" stroke="#d79b00" stroke-width="2" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 98px; margin-left: 256px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
-                                Customers
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="315" y="102" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    Customers
-                </text>
-            </switch>
-        </g>
-        <rect x="1" y="147" width="196.5" height="202" fill="#ffffff" stroke="#828282" stroke-width="2" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)rotate(-90 11 159)">
-            <switch>
-                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe flex-end; width: 187px; height: 1px; padding-top: 159px; margin-left: -176px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: right; ">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #4D4D4D; line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; word-wrap: normal; ">
-                                SuccessFactors
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="11" y="171" fill="#4D4D4D" font-family="Helvetica" font-size="12px" text-anchor="end" font-weight="bold">
-                    SuccessFactors
-                </text>
-            </switch>
-        </g>
-        <rect x="42.5" y="184" width="120" height="50" rx="7.5" ry="7.5" fill="#f8cecc" stroke="#b85450" stroke-width="2" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 209px; margin-left: 44px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
-                                Workforce
-                                <br/>
-                                Person
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="103" y="213" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    Workforce...
-                </text>
-            </switch>
-        </g>
-        <rect x="42.5" y="267" width="120" height="50" rx="7.5" ry="7.5" fill="#f8cecc" stroke="#b85450" stroke-width="2" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 292px; margin-left: 44px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
-                                Employee
-                                <br/>
-                                Timesheet
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="103" y="296" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    Employee...
-                </text>
-            </switch>
-        </g>
-        <path d="M 162.5 74.32 L 238.96 86.19" fill="none" stroke="#d79b00" stroke-width="2" stroke-miterlimit="10" stroke-dasharray="6 6" pointer-events="stroke"/>
-        <path d="M 252.79 88.34 L 237.88 93.11 L 240.03 79.27 Z" fill="none" stroke="#d79b00" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <rect x="418" y="182" width="115" height="50" rx="7.5" ry="7.5" fill="#dae8fc" stroke="#6c8ebf" stroke-width="2" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 113px; height: 1px; padding-top: 207px; margin-left: 419px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
-                                Messages
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="476" y="211" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    Messages
-                </text>
-            </switch>
-        </g>
-        <path d="M 418 98 L 394.97 98" fill="none" stroke="#6c8ebf" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 418 92 L 406 98 L 418 104" fill="none" stroke="#6c8ebf" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 376.97 98 L 385.97 92.71 L 394.97 98 L 385.97 103.29 Z" fill="#6c8ebf" stroke="#6c8ebf" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <rect x="255" y="184" width="120" height="50" rx="7.5" ry="7.5" fill="#ffe6cc" stroke="#d79b00" stroke-width="2" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 209px; margin-left: 256px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
-                                Service
-                                <br/>
-                                Worker
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="315" y="213" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    Service...
-                </text>
-            </switch>
-        </g>
-        <path d="M 162.5 209 L 238.76 209" fill="none" stroke="#d79b00" stroke-width="2" stroke-miterlimit="10" stroke-dasharray="6 6" pointer-events="stroke"/>
-        <path d="M 252.76 209 L 238.76 216 L 238.76 202 Z" fill="none" stroke="#d79b00" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 354.83 181.46 L 439.35 123" fill="none" stroke="#6c8ebf" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 358.91 171.95 L 352.99 182.73 L 365.16 180.99" fill="none" stroke="#6c8ebf" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <rect x="255" y="267" width="120" height="50" rx="7.5" ry="7.5" fill="#ffe6cc" stroke="#d79b00" stroke-width="2" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 292px; margin-left: 256px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
-                                Worker
-                                <br/>
-                                Availability
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="315" y="296" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    Worker...
-                </text>
-            </switch>
-        </g>
-        <path d="M 162.5 292 L 238.76 292" fill="none" stroke="#d79b00" stroke-width="2" stroke-miterlimit="10" stroke-dasharray="6 6" pointer-events="stroke"/>
-        <path d="M 252.76 292 L 238.76 299 L 238.76 285 Z" fill="none" stroke="#d79b00" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 37 407 C 37 401.48 41.48 397 47 397 L 92.5 397 C 98.02 397 102.5 392.52 102.5 387 C 102.5 392.52 106.98 397 112.5 397 L 158 397 C 163.52 397 168 401.48 168 407" fill="none" stroke="#b85450" stroke-width="2" stroke-miterlimit="10" transform="translate(0,397)scale(1,-1)translate(0,-397)" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 414px; margin-left: 103px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: nowrap; ">
-                                Backend Services
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="103" y="426" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    Backend Services
-                </text>
-            </switch>
-        </g>
-        <path d="M 249.5 407 C 249.5 401.48 253.98 397 259.5 397 L 305 397 C 310.52 397 315 392.52 315 387 C 315 392.52 319.48 397 325 397 L 370.5 397 C 376.02 397 380.5 401.48 380.5 407" fill="none" stroke="#d79b00" stroke-width="2" stroke-miterlimit="10" transform="translate(0,397)scale(1,-1)translate(0,-397)" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 414px; margin-left: 315px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: nowrap; ">
-                                Usage Views
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="315" y="426" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    Usage Views
-                </text>
-            </switch>
-        </g>
-        <path d="M 410 407 C 410 401.48 414.48 397 420 397 L 465.5 397 C 471.02 397 475.5 392.52 475.5 387 C 475.5 392.52 479.98 397 485.5 397 L 531 397 C 536.52 397 541 401.48 541 407" fill="none" stroke="#6c8ebf" stroke-width="2" stroke-miterlimit="10" transform="translate(0,397)scale(1,-1)translate(0,-397)" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 414px; margin-left: 476px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: nowrap; ">
-                                Extension Data
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="476" y="426" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    Extension Data
-                </text>
-            </switch>
-        </g>
-        <path d="M 350 80.94 C 350 79.32 354.25 78 359.5 78 C 362.02 78 364.44 78.31 366.22 78.86 C 368 79.41 369 80.16 369 80.94 L 369 90.06 C 369 91.68 364.75 93 359.5 93 C 354.25 93 350 91.68 350 90.06 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 369 80.94 C 369 82.56 364.75 83.88 359.5 83.88 C 354.25 83.88 350 82.56 350 80.94" fill="none" stroke="#6c8ebf" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-    </g>
-    <switch>
-        <g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/>
-        <a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank">
-            <text text-anchor="middle" font-size="10px" x="50%" y="100%">
-                Viewer does not support full SVG 1.1
-            </text>
-        </a>
-    </switch>
-</svg>
--- a/etc/samples.drawio.svg
+++ b/etc/samples.drawio.svg
--- a/fiori/.env
+++ b/fiori/.env
@@ -0,0 +1,2 @@
+# cds.requires.messaging.kind = file-based-messaging
+PORT = 4004
--- a/fiori/app/admin-authors/fiori-service.cds
+++ b/fiori/app/admin-authors/fiori-service.cds
@@ -1,47 +0,0 @@
-using {AdminService} from '@capire/bookshop';
-
-annotate AdminService.Authors with @odata.draft.enabled;
-
-////////////////////////////////////////////////////////////////////////////
-//
-//	Authors Object Page
-//
-annotate AdminService.Authors with @(UI : {
-  HeaderInfo : {
-    TypeName : 'Author',
-    TypeNamePlural : 'Authors',
-    Description : {Value : lifetime}
-  },
-  Facets : [
-    {
-      $Type : 'UI.ReferenceFacet',
-      Label : '{i18n>Details}',
-      Target : '@UI.FieldGroup#Details'
-    },
-    {
-      $Type : 'UI.ReferenceFacet',
-      Label : '{i18n>Books}',
-      Target : 'books/@UI.LineItem'
-    },
-  ],
-  FieldGroup #Details : {Data : [
-    {Value : placeOfBirth},
-    {Value : placeOfDeath},
-    {Value : dateOfBirth},
-    {Value : dateOfDeath},
-    {
-      Value : age,
-      Label : '{i18n>Age}'
-    },
-  ]},
-});
-
-
-// Workaround to avoid errors for unknown db-specific calculated fields above
-extend sap.capire.bookshop.Authors with {
-  virtual age      : Integer;
-  virtual lifetime : String;
-}
-
-// Workaround for Fiori popup for asking user to enter a new UUID on Create
-annotate AdminService.Authors with { ID @Core.Computed; }
--- a/fiori/app/admin-authors/webapp/Component.js
+++ b/fiori/app/admin-authors/webapp/Component.js
@@ -1,7 +0,0 @@
-sap.ui.define(["sap/fe/core/AppComponent"], function (AppComponent) {
-  "use strict";
-  return AppComponent.extend("authors.Component", {
-    metadata: { manifest: "json" },
-  });
-});
-/* eslint no-undef:0 */
--- a/fiori/app/admin-authors/webapp/i18n/i18n.properties
+++ b/fiori/app/admin-authors/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 Authors
-
-# JCI app descriptor contains lower case DESCRIPTION
-appSubTitle=Bookshop Authors
-
-# JCI app descriptor contains lower case DESCRIPTION
-appDescription=Bookshop Authors
--- a/fiori/app/admin-authors/webapp/manifest.json
+++ b/fiori/app/admin-authors/webapp/manifest.json
@@ -1,141 +0,0 @@
-{
-  "_version": "1.28.0",
-  "sap.app": {
-    "id": "authors",
-    "type": "application",
-    "title": "Manage Authors",
-    "description": "Sample Application",
-    "i18n": "i18n/i18n.properties",
-    "applicationVersion": {
-      "version": "1.0.0"
-    },
-    "dataSources": {
-      "AdminService": {
-        "uri": "admin/",
-        "type": "OData",
-        "settings": {
-          "odataVersion": "4.0"
-        }
-      }
-    },
-    "sourceTemplate": {
-      "id": "ui5template.basicSAPUI5ApplicationProject",
-      "-id": "ui5template.smartTemplate",
-      "version": "1.40.12"
-    },
-    "crossNavigation": {
-      "inbounds": {
-        "intent1": {
-          "signature": {
-            "parameters": {
-              "Books.author.ID":{
-                "renameTo": "ID"
-              }
-            },
-            "additionalParameters": "ignored"
-          },
-          "semanticObject": "Authors",
-          "action": "display",
-          "title": "{{appTitle}}",
-          "info": "{{appInfo}}",
-          "subTitle": "{{appSubTitle}}",
-          "icon": "sap-icon://SAP-icons-TNT/user",
-          "indicatorDataSource": {
-            "dataSource": "AdminService",
-            "path": "Authors/$count",
-            "refresh": 1800
-          }
-        }
-      }
-    }
-  },
-  "sap.ui5": {
-    "dependencies": {
-      "minUI5Version": "1.81.0",
-      "libs": {
-        "sap.fe.templates": {}
-      }
-    },
-    "models": {
-      "i18n": {
-        "type": "sap.ui.model.resource.ResourceModel",
-        "uri": "i18n/i18n.properties"
-      },
-      "": {
-        "dataSource": "AdminService",
-        "settings": {
-          "synchronizationMode": "None",
-          "operationMode": "Server",
-          "autoExpandSelect": true,
-          "earlyRequests": true,
-          "groupProperties": {
-            "default": {
-              "submit": "Auto"
-            }
-          }
-        }
-      }
-    },
-    "routing": {
-      "routes": [
-        {
-          "pattern": ":?query:",
-          "name": "AuthorsList",
-          "target": "AuthorsList"
-        },
-        {
-          "pattern": "Authors({key}):?query:",
-          "name": "AuthorsDetails",
-          "target": "AuthorsDetails"
-        }
-      ],
-      "targets": {
-        "AuthorsList": {
-          "type": "Component",
-          "id": "AuthorsList",
-          "name": "sap.fe.templates.ListReport",
-          "options": {
-            "settings": {
-              "entitySet": "Authors",
-              "initialLoad": true,
-              "navigation": {
-                "Authors": {
-                  "detail": {
-                    "route": "AuthorsDetails"
-                  }
-                }
-              }
-            }
-          }
-        },
-        "AuthorsDetails": {
-          "type": "Component",
-          "id": "AuthorsDetailsList",
-          "name": "sap.fe.templates.ObjectPage",
-          "options": {
-            "settings": {
-              "entitySet": "Authors"
-            }
-          }
-        }
-      }
-    },
-    "contentDensities": {
-      "compact": true,
-      "cozy": true
-    }
-  },
-  "sap.ui": {
-    "technology": "UI5",
-    "fullWidth": false,
-    "deviceTypes":{
-      "desktop": true,
-      "tablet": true,
-      "phone": true
-    }
-  },
-  "sap.fiori": {
-    "registrationIds": [],
-    "archeType": "transactional"
-  }
-}
--- a/fiori/app/admin-fiori.html
+++ b/fiori/app/admin-fiori.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<html>
+<head>
+
+	<meta http-equiv="X-UA-Compatible" content="IE=edge" />
+	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+	<title>Bookshop</title>
+
+	<script>
+		window["sap-ushell-config"] = {
+			defaultRenderer: "fiori2",
+			applications: {
+				"browse-books": {
+					title: "Browse Books",
+					description: "w/ SAP Fiori Elements",
+					additionalInformation: "SAPUI5.Component=bookshop",
+					applicationType : "URL",
+					url: "/browse/webapp",
+					navigationMode: "embedded"
+				},
+				"manage-books": {
+					title: "Manage Books",
+					description: "w/ SAP Fiori Elements",
+					additionalInformation: "SAPUI5.Component=admin",
+					applicationType : "URL",
+					url: "/admin/webapp",
+					navigationMode: "embedded"
+				},
+				"manage-orders": {
+					title: "Manage Orders",
+					description: "w/ SAP Fiori Elements",
+					additionalInformation: "SAPUI5.Component=orders",
+					applicationType : "URL",
+					url: "/orders/webapp",
+					navigationMode: "embedded"
+				}
+			}
+		};
+	</script>
+
+	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
+	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/resources/sap-ui-core.js"
+    	data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
+    	data-sap-ui-compatVersion="edge"
+    	data-sap-ui-theme="sap_fiori_3"
+    	data-sap-ui-frameOptions="allow"
+	></script>
+	<script>
+		sap.ui.getCore().attachInit(()=> sap.ushell.Container.createRenderer().placeAt("content"))
+	</script>
+
+</head>
+<body class="sapUiBody" id="content"></body>
+</html>
--- a/fiori/app/admin-books/fiori-service.cds
+++ b/fiori/app/admin-books/fiori-service.cds
@@ -1,5 +1,4 @@
-using { AdminService } from '@capire/bookstore';
-using from '../common'; // to help UI linter get the complete annotations
+using { AdminService } from '../../db/schema';

 ////////////////////////////////////////////////////////////////////////////
 //
@@ -40,6 +39,27 @@ annotate AdminService.Books with @(
 	}
 );

+annotate AdminService.Authors with @(
+	UI: {
+		HeaderInfo: {
+			Description: {Value: lifetime}
+		},
+		Facets: [
+			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Details'},
+			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Books}', Target: 'books/@UI.LineItem'},
+		],
+		FieldGroup#Details: {
+			Data: [
+				{Value: placeOfBirth},
+				{Value: placeOfDeath},
+				{Value: dateOfBirth},
+				{Value: dateOfDeath},
+				{Value: age, Label: '{i18n>Age}'},
+			]
+		},
+	}
+);
+


 ////////////////////////////////////////////////////////////
@@ -50,7 +70,7 @@ annotate AdminService.Books with @(
 annotate sap.capire.bookshop.Books with @fiori.draft.enabled;
 annotate AdminService.Books with @odata.draft.enabled;

-annotate AdminService.Books.texts with @(
+annotate AdminService.Books_texts with @(
 	UI: {
 		Identification: [{Value:title}],
 		SelectionFields: [ locale, title ],
@@ -63,16 +83,11 @@ annotate AdminService.Books.texts with @(
 );

 // Add Value Help for Locales
-annotate AdminService.Books.texts {
-	locale @(
-		ValueList.entity:'Languages', Common.ValueListWithFixedValues, //show as drop down, not a dialog
-	)
+annotate AdminService.Books_texts {
+	locale @ValueList:{entity:'Languages',type:#fixed}
 }
-// In addition we need to expose Languages through AdminService as a target for ValueList
+// In addition we need to expose Languages through AdminService
 using { sap } from '@sap/cds/common';
 extend service AdminService {
-	@readonly entity Languages as projection on sap.common.Languages;
+	entity Languages as projection on sap.common.Languages;
 }
-
-// Workaround for Fiori popup for asking user to enter a new UUID on Create
-annotate AdminService.Books with { ID @Core.Computed; }
--- a/fiori/app/admin-books/webapp/Component.js
+++ b/fiori/app/admin-books/webapp/Component.js
@@ -1,6 +1,6 @@
 sap.ui.define(["sap/fe/core/AppComponent"], function(AppComponent) {
 	"use strict";
-	return AppComponent.extend("books.Component", {
+	return AppComponent.extend("admin.Component", {
 		metadata: { manifest: "json" }
 	});
 });
--- a/fiori/app/admin-books/webapp/i18n/i18n.properties
+++ b/fiori/app/admin-books/webapp/i18n/i18n.properties
--- a/fiori/app/admin-books/webapp/manifest.json
+++ b/fiori/app/admin-books/webapp/manifest.json
@@ -1,14 +1,14 @@
 {
    "_version": "1.8.0",
    "sap.app": {
-        "id": "books",
+        "id": "admin",
        "type": "application",
        "title": "Manage Books",
        "description": "Sample Application",
        "i18n": "i18n/i18n.properties",
        "dataSources": {
            "AdminService": {
-                "uri": "admin/",
+                "uri": "/admin/",
                "type": "OData",
                "settings": {
                    "odataVersion": "4.0"
@@ -73,7 +73,6 @@
                    "options": {
                        "settings" : {
                            "entitySet" : "Books",
-                            "initialLoad": true,
                            "navigation" : {
                                "Books" : {
                                    "detail" : {
--- a/fiori/app/appconfig/fioriSandboxConfig.json
+++ b/fiori/app/appconfig/fioriSandboxConfig.json
@@ -1,142 +0,0 @@
-{
-  "services": {
-    "LaunchPage": {
-      "adapter": {
-        "config": {
-          "catalogs": [],
-          "groups": [
-            {
-              "id": "Bookshop",
-              "title": "Bookshop",
-              "isPreset": true,
-              "isVisible": true,
-              "isGroupLocked": false,
-              "tiles": [
-                {
-                  "id": "BrowseBooks",
-                  "tileType": "sap.ushell.ui.tile.StaticTile",
-                  "properties": {
-                    "title": "Browse Books",
-                    "targetURL": "#Books-display"
-                  }
-                }
-              ]
-            },
-            {
-              "id": "Administration",
-              "title": "Administration",
-              "isPreset": true,
-              "isVisible": true,
-              "isGroupLocked": false,
-              "tiles": [
-                {
-                  "id": "ManageBooks",
-                  "tileType": "sap.ushell.ui.tile.StaticTile",
-                  "properties": {
-                    "title": "Manage Books",
-                    "targetURL": "#Books-manage"
-                  }
-                },
-                {
-                  "id": "ManageAuthors",
-                  "tileType": "sap.ushell.ui.tile.StaticTile",
-                  "properties": {
-                    "title": "Manage Authors",
-                    "targetURL": "#Authors-display"
-                  }
-                },
-                {
-                  "id": "ManageOrders",
-                  "tileType": "sap.ushell.ui.tile.StaticTile",
-                  "properties": {
-                    "title": "Manage Orders",
-                    "targetURL": "#Orders-manage"
-                  }
-                }
-              ]
-            }
-          ]
-        }
-      }
-    },
-    "NavTargetResolution": {
-      "config": {
-        "enableClientSideTargetResolution": true
-      }
-    },
-    "ClientSideTargetResolution": {
-      "adapter": {
-        "config": {
-          "inbounds": {
-            "BrowseBooks": {
-              "semanticObject": "Books",
-              "action": "display",
-              "title": "Browse Books",
-              "signature": {
-                "parameters": {
-                  "Books.ID": {
-                    "renameTo": "ID"
-                  },
-                  "Authors.books.ID": {
-                    "renameTo": "ID"
-                  }
-                },
-                "additionalParameters": "ignored"
-              },
-              "resolutionResult": {
-                "applicationType": "SAPUI5",
-                "additionalInformation": "SAPUI5.Component=bookshop",
-                "url": "/browse/webapp"
-              }
-            },
-            "BrowseAuthors": {
-              "semanticObject": "Authors",
-              "action": "display",
-              "title": "Browse Authors",
-              "signature": {
-                "parameters": {
-                  "Books.author.ID":{
-                    "renameTo": "ID"
-                  }
-                },
-                "additionalParameters": "ignored"
-              },
-              "resolutionResult": {
-                "applicationType": "SAPUI5",
-                "additionalInformation": "SAPUI5.Component=authors",
-                "url": "/admin-authors/webapp"
-              }
-            },
-            "ManageBooks": {
-              "semanticObject": "Books",
-              "action": "manage",
-              "title": "Manage Books",
-              "signature": {
-                "parameters": {},
-                "additionalParameters": "allowed"
-              },
-              "resolutionResult": {
-                "applicationType": "SAPUI5",
-                "additionalInformation": "SAPUI5.Component=books",
-                "url": "/admin-books/webapp"
-              }
-            },
-            "ManageOrders": {
-              "semanticObject": "Orders",
-              "action": "manage",
-              "signature": {
-                "parameters": {},
-                "additionalParameters": "allowed"
-              },
-              "resolutionResult": {
-                "applicationType": "SAPUI5",
-                "additionalInformation": "SAPUI5.Component=orders",
-                "url": "/orders/webapp"
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
--- a/fiori/app/bookshop.html
+++ b/fiori/app/bookshop.html
@@ -0,0 +1,3 @@
+<head>
+  <meta http-equiv="refresh" content="0;url=bookshop/index.html">
+</head>
--- a/fiori/app/browse/fiori-service.cds
+++ b/fiori/app/browse/fiori-service.cds
@@ -1,60 +1,50 @@
-using CatalogService from '@capire/bookstore';
+using CatalogService from '@capire/bookshop';

 ////////////////////////////////////////////////////////////////////////////
 //
 //	Books Object Page
 //
-annotate CatalogService.Books with @(UI : {
-    HeaderInfo        : {
-        TypeName       : 'Book',
-        TypeNamePlural : 'Books',
-        Description    : {Value : author}
-    },
-    HeaderFacets      : [{
-        $Type  : 'UI.ReferenceFacet',
-        Label  : '{i18n>Description}',
-        Target : '@UI.FieldGroup#Descr'
-    }, ],
-    Facets            : [{
-        $Type  : 'UI.ReferenceFacet',
-        Label  : '{i18n>Details}',
-        Target : '@UI.FieldGroup#Price'
-    }, ],
-    FieldGroup #Descr : {Data : [{Value : descr}, ]},
-    FieldGroup #Price : {Data : [
-        {Value : price},
-        {
-            Value : currency.symbol,
-            Label : '{i18n>Currency}'
-        },
-    ]},
-});
+annotate CatalogService.Books with @(
+	UI: {
+  	HeaderInfo: {
+			TypeName: 'Book',
+			TypeNamePlural: 'Books',
+  		Description: {Value: author}
+  	},
+		HeaderFacets: [
+			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Description}', Target: '@UI.FieldGroup#Descr'},
+		],
+		Facets: [
+			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Price'},
+		],
+		FieldGroup#Descr: {
+			Data: [
+				{Value: descr},
+			]
+		},
+		FieldGroup#Price: {
+			Data: [
+				{Value: price},
+				{Value: currency.symbol, Label: '{i18n>Currency}'},
+			]
+		},
+	}
+);


 ////////////////////////////////////////////////////////////////////////////
 //
 //	Books Object Page
 //
-annotate CatalogService.Books with @(UI : {
-    SelectionFields : [
-        ID,
-        price,
-        currency_code
-    ],
-    LineItem        : [
-        {
-            Value : ID,
-            Label : '{i18n>Title}'
-        },
-        {
-            Value : author,
-            Label : '{i18n>Author}'
-        },
-        {Value : genre.name},
-        {Value : price},
-        {
-            Value : currency.symbol,
-            Label : ' '
-        },
-    ]
-}, );
+annotate CatalogService.Books with @(
+	UI: {
+	  SelectionFields: [ ID, price, currency_code ],
+		LineItem: [
+			{Value: title},
+			{Value: author, Label:'{i18n>Author}'},
+			{Value: genre.name},
+			{Value: price},
+			{Value: currency.symbol, Label:' '},
+		]
+	},
+);
--- a/fiori/app/browse/webapp/manifest.json
+++ b/fiori/app/browse/webapp/manifest.json
@@ -1,60 +1,28 @@
 {
-  "_version": "1.28.0",
+  "_version": "1.8.0",
  "sap.app": {
    "id": "bookshop",
    "type": "application",
    "title": "Browse Books",
    "description": "Sample Application",
    "i18n": "i18n/i18n.properties",
-    "applicationVersion": {
-      "version": "1.0.0"
-    },
    "dataSources": {
      "CatalogService": {
-        "uri": "browse/",
+        "uri": "/browse/",
        "type": "OData",
        "settings": {
          "odataVersion": "4.0"
        }
      }
    },
-    "sourceTemplate": {
+    "-sourceTemplate": {
      "id": "ui5template.basicSAPUI5ApplicationProject",
      "-id": "ui5template.smartTemplate",
-      "version": "1.40.12"
-    },
-    "crossNavigation": {
-      "inbounds": {
-        "intent1": {
-          "signature": {
-            "parameters": {
-              "Books.ID":{
-                "renameTo": "ID"
-              },
-              "Authors.books.ID": {
-                "renameTo": "ID"
-              }
-            },
-            "additionalParameters": "ignored"
-          },
-          "semanticObject": "Books",
-          "action": "display",
-          "title": "{{appTitle}}",
-          "info": "{{appInfo}}",
-          "subTitle": "{{appSubTitle}}",
-          "icon": "sap-icon://course-book",
-          "indicatorDataSource": {
-            "dataSource": "CatalogService",
-            "path": "Books/$count",
-            "refresh": 1800
-          }
-        }
-      }
+      "-version": "1.40.12"
    }
  },
  "sap.ui5": {
    "dependencies": {
-      "minUI5Version": "1.81.0",
      "libs": {
        "sap.fe.templates": {}
      }
@@ -100,7 +68,6 @@
          "options": {
            "settings": {
              "entitySet": "Books",
-              "initialLoad": true,
              "navigation": {
                "Books": {
                  "detail": {
@@ -130,12 +97,7 @@
  },
  "sap.ui": {
    "technology": "UI5",
-    "fullWidth": false,
-    "deviceTypes":{
-      "desktop": true,
-      "tablet": true,
-      "phone": true
-    }
+    "fullWidth": false
  },
  "sap.fiori": {
    "registrationIds": [],
--- a/fiori/app/common.cds
+++ b/fiori/app/common.cds
@@ -1,8 +1,8 @@
 /*
- Common Annotations shared by all apps
+	Common Annotations shared by all apps
 */

-using { sap.capire.bookshop as my } from '@capire/bookstore';
+using { sap.capire.bookshop as my } from '@capire/bookshop';
 using { sap.common } from '@capire/common';

 ////////////////////////////////////////////////////////////////////////////
@@ -10,52 +10,39 @@ using { sap.common } from '@capire/common';
 //	Books Lists
 //
 annotate my.Books with @(
-    Common.SemanticKey : [ID],
-    UI                 : {
-        Identification  : [{Value : title}],
-        SelectionFields : [
-            ID,
-            author_ID,
-            price,
-            currency_code
-        ],
-        LineItem        : [
-            {
-                Value : ID,
-                Label : '{i18n>Title}'
-            },
-            {
-                Value : author.ID,
-                Label : '{i18n>Author}'
-            },
-            {Value : genre.name},
-            {Value : stock},
-            {Value : price},
-            {
-                Value : currency.symbol,
-                Label : ' '
-            },
-        ]
-    }
+	Common.SemanticKey: [title],
+	UI: {
+		Identification: [{Value:title}],
+		SelectionFields: [ ID, author_ID, price, currency_code ],
+		LineItem: [
+			{Value: ID},
+			{Value: title},
+			{Value: author.name, Label:'{i18n>Author}'},
+			{Value: genre.name},
+			{Value: stock},
+			{Value: price},
+			{Value: currency.symbol, Label:' '},
+		]
+	}
 ) {
-    ID  @Common: {
-        SemanticObject : 'Books',
-        Text: title,
-        TextArrangement : #TextOnly
-    };
-    author @ValueList.entity      : 'Authors';
+	author @ValueList.entity:'Authors';
 };

 ////////////////////////////////////////////////////////////////////////////
 //
 //	Books Details
 //
-annotate my.Books with @(UI : {HeaderInfo : {
-    TypeName       : '{i18n>Book}',
-    TypeNamePlural : '{i18n>Books}',
-    Title          : {Value : title},
-    Description    : {Value : author.name}
-}, });
+annotate my.Books with @(
+	UI: {
+		HeaderInfo: {
+			TypeName: '{i18n>Book}',
+			TypeNamePlural: '{i18n>Books}',
+			Title: {Value: title},
+			Description: {Value: author.name}
+		},
+	}
+);
+


 ////////////////////////////////////////////////////////////////////////////
@@ -63,19 +50,13 @@ annotate my.Books with @(UI : {HeaderInfo : {
 //	Books Elements
 //
 annotate my.Books with {
-    ID     @title : '{i18n>ID}';
-    title  @title : '{i18n>Title}';
-    genre  @title : '{i18n>Genre}'  @Common               : {
-        Text            : genre.name,
-        TextArrangement : #TextOnly
-    };
-    author @title : '{i18n>Author}'  @Common              : {
-        Text            : author.name,
-        TextArrangement : #TextOnly
-    };
-    price  @title : '{i18n>Price}'  @Measures.ISOCurrency : currency_code;
-    stock  @title : '{i18n>Stock}';
-    descr  @UI.MultiLineText;
+	ID @title:'{i18n>ID}' @UI.HiddenFilter;
+	title @title:'{i18n>Title}';
+	genre  @title:'{i18n>Genre}'  @Common: { Text: genre.name,  TextArrangement: #TextOnly };
+	author @title:'{i18n>Author}' @Common: { Text: author.name, TextArrangement: #TextOnly };
+	price @title:'{i18n>Price}';
+	stock @title:'{i18n>Stock}';
+	descr @UI.MultiLineText;
 }

 ////////////////////////////////////////////////////////////////////////////
@@ -83,45 +64,42 @@ annotate my.Books with {
 //	Genres List
 //
 annotate my.Genres with @(
-    Common.SemanticKey : [name],
-    UI                 : {
-        SelectionFields : [name],
-        LineItem        : [
-            {Value : name},
-            {
-                Value : parent.name,
-                Label : 'Main Genre'
-            },
-        ],
-    }
+	Common.SemanticKey: [name],
+	UI: {
+		SelectionFields: [ name ],
+		LineItem:[
+			{Value: name},
+			{Value: parent.name, Label: 'Main Genre'},
+		],
+	}
 );

 ////////////////////////////////////////////////////////////////////////////
 //
 //	Genre Details
 //
-annotate my.Genres with @(UI : {
-    Identification : [{Value : name}],
-    HeaderInfo     : {
-        TypeName       : '{i18n>Genre}',
-        TypeNamePlural : '{i18n>Genres}',
-        Title          : {Value : name},
-        Description    : {Value : ID}
-    },
-    Facets         : [{
-        $Type  : 'UI.ReferenceFacet',
-        Label  : '{i18n>SubGenres}',
-        Target : 'children/@UI.LineItem'
-    }, ],
-});
+annotate my.Genres with @(
+	UI: {
+		Identification: [{Value:name}],
+		HeaderInfo: {
+			TypeName: '{i18n>Genre}',
+			TypeNamePlural: '{i18n>Genres}',
+			Title: {Value: name},
+			Description: {Value: ID}
+		},
+		Facets: [
+			{$Type: 'UI.ReferenceFacet', Label: '{i18n>SubGenres}', Target: 'children/@UI.LineItem'},
+		],
+	}
+);

 ////////////////////////////////////////////////////////////////////////////
 //
 //	Genres Elements
 //
 annotate my.Genres with {
-    ID   @title : '{i18n>ID}';
-    name @title : '{i18n>Genre}';
+	ID  @title: '{i18n>ID}';
+	name  @title: '{i18n>Genre}';
 }

 ////////////////////////////////////////////////////////////////////////////
@@ -129,42 +107,38 @@ annotate my.Genres with {
 //	Authors List
 //
 annotate my.Authors with @(
-    Common.SemanticKey : [ID],
-    UI                 : {
-        Identification  : [{Value : name}],
-        SelectionFields : [name],
-        LineItem        : [
-            {Value : ID},
-            {Value : dateOfBirth},
-            {Value : dateOfDeath},
-            {Value : placeOfBirth},
-            {Value : placeOfDeath},
-        ],
-    }
-) {
-    ID  @Common: {
-        SemanticObject : 'Authors',
-        Text: name,
-        TextArrangement : #TextOnly,
-    };
-};
+	Common.SemanticKey: [name],
+	UI: {
+		Identification: [{Value:name}],
+		SelectionFields: [ name ],
+		LineItem:[
+			{Value: ID},
+			{Value: name},
+			{Value: dateOfBirth},
+			{Value: dateOfDeath},
+			{Value: placeOfBirth},
+			{Value: placeOfDeath},
+		],
+	}
+);

 ////////////////////////////////////////////////////////////////////////////
 //
 //	Author Details
 //
-annotate my.Authors with @(UI : {
-    HeaderInfo : {
-        TypeName       : '{i18n>Author}',
-        TypeNamePlural : '{i18n>Authors}',
-        Title          : {Value : name},
-        Description    : {Value : dateOfBirth}
-    },
-    Facets     : [{
-        $Type  : 'UI.ReferenceFacet',
-        Target : 'books/@UI.LineItem'
-    }, ],
-});
+annotate my.Authors with @(
+	UI: {
+		HeaderInfo: {
+			TypeName: '{i18n>Author}',
+			TypeNamePlural: '{i18n>Authors}',
+			Title: {Value: name},
+			Description: {Value: dateOfBirth}
+		},
+		Facets: [
+			{$Type: 'UI.ReferenceFacet', Target: 'books/@UI.LineItem'},
+		],
+	}
+);


 ////////////////////////////////////////////////////////////////////////////
@@ -172,12 +146,12 @@ annotate my.Authors with @(UI : {
 //	Authors Elements
 //
 annotate my.Authors with {
-    ID           @title : '{i18n>ID}';
-    name         @title : '{i18n>Name}';
-    dateOfBirth  @title : '{i18n>DateOfBirth}';
-    dateOfDeath  @title : '{i18n>DateOfDeath}';
-    placeOfBirth @title : '{i18n>PlaceOfBirth}';
-    placeOfDeath @title : '{i18n>PlaceOfDeath}';
+	ID @title:'{i18n>ID}' @UI.HiddenFilter;
+	name @title:'{i18n>Name}';
+	dateOfBirth @title:'{i18n>DateOfBirth}';
+	dateOfDeath @title:'{i18n>DateOfDeath}';
+	placeOfBirth @title:'{i18n>PlaceOfBirth}';
+	placeOfDeath @title:'{i18n>PlaceOfDeath}';
 }

 ////////////////////////////////////////////////////////////////////////////
@@ -185,105 +159,99 @@ annotate my.Authors with {
 //	Languages List
 //
 annotate common.Languages with @(
-    Common.SemanticKey : [code],
-    Identification     : [{Value : code}],
-    UI                 : {
-        SelectionFields : [
-            name,
-            descr
-        ],
-        LineItem        : [
-            {Value : code},
-            {Value : name},
-        ],
-    }
+	Common.SemanticKey: [code],
+	Identification: [{Value:code}],
+	UI: {
+		SelectionFields: [ name, descr ],
+		LineItem:[
+			{Value: code},
+			{Value: name},
+		],
+	}
 );

 ////////////////////////////////////////////////////////////////////////////
 //
 //	Language Details
 //
-annotate common.Languages with @(UI : {
-    HeaderInfo          : {
-        TypeName       : '{i18n>Language}',
-        TypeNamePlural : '{i18n>Languages}',
-        Title          : {Value : name},
-        Description    : {Value : descr}
-    },
-    Facets              : [{
-        $Type  : 'UI.ReferenceFacet',
-        Label  : '{i18n>Details}',
-        Target : '@UI.FieldGroup#Details'
-    }, ],
-    FieldGroup #Details : {Data : [
-        {Value : code},
-        {Value : name},
-        {Value : descr}
-    ]},
-});
+annotate common.Languages with @(
+	UI: {
+		HeaderInfo: {
+			TypeName: '{i18n>Language}',
+			TypeNamePlural: '{i18n>Languages}',
+			Title: {Value: name},
+			Description: {Value: descr}
+		},
+		Facets: [
+			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Details'},
+		],
+		FieldGroup#Details: {
+			Data: [
+				{Value: code},
+				{Value: name},
+				{Value: descr}
+			]
+		},
+	}
+);

 ////////////////////////////////////////////////////////////////////////////
 //
 //	Currencies List
 //
 annotate common.Currencies with @(
-    Common.SemanticKey : [code],
-    Identification     : [{Value : code}],
-    UI                 : {
-        SelectionFields : [
-            name,
-            descr
-        ],
-        LineItem        : [
-            {Value : descr},
-            {Value : symbol},
-            {Value : code},
-        ],
-    }
+	Common.SemanticKey: [code],
+	Identification: [{Value:code}],
+	UI: {
+		SelectionFields: [ name, descr ],
+		LineItem:[
+			{Value: descr},
+			{Value: symbol},
+			{Value: code},
+		],
+	}
 );

 ////////////////////////////////////////////////////////////////////////////
 //
 //	Currency Details
 //
-annotate common.Currencies with @(UI : {
-    HeaderInfo           : {
-        TypeName       : '{i18n>Currency}',
-        TypeNamePlural : '{i18n>Currencies}',
-        Title          : {Value : descr},
-        Description    : {Value : code}
-    },
-    Facets               : [
-        {
-            $Type  : 'UI.ReferenceFacet',
-            Label  : '{i18n>Details}',
-            Target : '@UI.FieldGroup#Details'
-        },
-        {
-            $Type  : 'UI.ReferenceFacet',
-            Label  : '{i18n>Extended}',
-            Target : '@UI.FieldGroup#Extended'
-        },
-    ],
-    FieldGroup #Details  : {Data : [
-        {Value : name},
-        {Value : symbol},
-        {Value : code},
-        {Value : descr}
-    ]},
-    FieldGroup #Extended : {Data : [
-        {Value : numcode},
-        {Value : minor},
-        {Value : exponent}
-    ]},
-});
+annotate common.Currencies with @(
+	UI: {
+		HeaderInfo: {
+			TypeName: '{i18n>Currency}',
+			TypeNamePlural: '{i18n>Currencies}',
+			Title: {Value: descr},
+			Description: {Value: code}
+		},
+		Facets: [
+			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Details'},
+			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Extended}', Target: '@UI.FieldGroup#Extended'},
+		],
+		FieldGroup#Details: {
+			Data: [
+				{Value: name},
+				{Value: symbol},
+				{Value: code},
+				{Value: descr}
+			]
+		},
+		FieldGroup#Extended: {
+			Data: [
+				{Value: numcode},
+				{Value: minor},
+				{Value: exponent}
+			]
+		},
+	}
+);

 ////////////////////////////////////////////////////////////////////////////
 //
 //	Currencies Elements
 //
 annotate common.Currencies with {
-    numcode  @title : '{i18n>NumCode}';
-    minor    @title : '{i18n>MinorUnit}';
-    exponent @title : '{i18n>Exponent}';
+	numcode @title:'{i18n>NumCode}';
+	minor @title:'{i18n>MinorUnit}';
+	exponent @title:'{i18n>Exponent}';
 }
--- a/fiori/app/fiori-apps.html
+++ b/fiori/app/fiori-apps.html
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-
-	<meta http-equiv="X-UA-Compatible" content="IE=edge" />
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
-	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-	<title>Bookshop</title>
-
-	<script>
-		window["sap-ushell-config"] = {
-			defaultRenderer: "fiori2",
-			applications: {}
-		};
-	</script>
-
-	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/resources/sap-ui-core.js"
-			data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
-			data-sap-ui-compatVersion="edge"
-			data-sap-ui-theme="sap_horizon"
-			data-sap-ui-frameOptions="allow"
-	></script>
-	<script>
-		sap.ui.getCore().attachInit(()=> sap.ushell.Container.createRenderer().placeAt("content"))
-	</script>
-
-</head>
-<body class="sapUiBody" id="content"></body>
-</html>
--- a/fiori/app/reviews.html
+++ b/fiori/app/reviews.html
@@ -0,0 +1,3 @@
+<head>
+  <meta http-equiv="refresh" content="0;url=reviews/index.html">
+</head>
--- a/fiori/app/services.cds
+++ b/fiori/app/services.cds
@@ -2,8 +2,11 @@
  This model controls what gets served to Fiori frontends...
 */

-using from './admin-authors/fiori-service';
-using from './admin-books/fiori-service';
+using from './admin/fiori-service';
 using from './browse/fiori-service';
 using from './common';
-using from '@capire/bookstore/srv/mashup';
+
+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
@@ -2,7 +2,7 @@
 //  Add Author.age and .lifetime with a DB-specific function
 //

-using { AdminService } from '@capire/bookshop';
+using { AdminService } from '../schema';

 extend projection AdminService.Authors with {
  YEARS_BETWEEN(dateOfBirth, dateOfDeath)         as age: Integer,
--- 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
@@ -2,7 +2,7 @@
 //  Add Author.age and .lifetime with a DB-specific function
 //

-using { AdminService } from '@capire/bookshop';
+using { AdminService } from '../schema';

 extend projection AdminService.Authors with {
  strftime('%Y',dateOfDeath)-strftime('%Y',dateOfBirth)              as age: Integer,
--- a/fiori/package.json
+++ b/fiori/package.json
@@ -2,19 +2,25 @@
  "name": "@capire/fiori",
  "version": "1.0.0",
  "dependencies": {
-    "@capire/bookstore": "*",
-    "@sap/cds": ">=5",
+    "@capire/bookshop": "*",
+    "@capire/reviews": "*",
+    "@capire/orders": "*",
+    "@capire/common": "*",
+    "@sap/cds": ">=4",
    "express": "^4.17.1",
-    "passport": ">=0.4.1"
+    "passport": "^0.4.1"
  },
  "scripts": {
    "start": "cds run --in-memory?",
    "watch": "cds watch"
  },
  "cds": {
+    "hana": {
+      "deploy-format": "hdbtable"
+    },
    "requires": {
      "auth": {
-        "kind": "dummy-auth"
+        "strategy": "dummy"
      },
      "ReviewsService": {
        "kind": "odata",
@@ -24,30 +30,14 @@
        "kind": "odata",
        "model": "@capire/orders"
      },
-      "messaging": {
-        "[production]": {
-          "kind": "enterprise-messaging"
-        },
-        "[development]": {
-          "kind": "file-based-messaging"
-        },
-        "[hybrid!]": {
-          "kind": "enterprise-messaging-shared"
-        }
-      },
      "db": {
-        "kind": "sql"
-      },
-      "db-ext": {
+        "kind": "sql",
        "[development]": {
          "model": "db/sqlite"
        },
        "[production]": {
          "model": "db/hana"
        }
-      },
-      "hana": {
-        "deploy-format": "hdbtable"
      }
    }
  }
--- a/fiori/server.js
+++ b/fiori/server.js
@@ -1 +1,18 @@
-module.exports = require('@capire/bookstore/server.js')
+const cds = require ('@sap/cds')
+
+cds.once('bootstrap',(app)=>{
+  app.use ('/orders/webapp', _from('@capire/orders/app/orders/webapp/manifest.json'))
+  app.use ('/bookshop', _from('@capire/bookshop/app/vue/index.html'))
+  app.use ('/reviews', _from('@capire/reviews/app/vue/index.html'))
+})
+
+cds.once('served', require('./srv/mashup'))
+
+module.exports = cds.server
+
+
+// -----------------------------------------------------------------------
+// Helper for serving static content from npm-installed packages
+const {static} = require('express')
+const {dirname} = require('path')
+const _from = target => static (dirname (require.resolve(target)))
--- a/fiori/srv/mashup.cds
+++ b/fiori/srv/mashup.cds
@@ -0,0 +1,25 @@
+////////////////////////////////////////////////////////////////////////////
+//
+//    Mashing up imported models...
+//
+
+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 '@capire/orders';
+extend Orders_Items with {
+  book : Association to Books on product.ID = book.ID
+}
--- a/bookstore/srv/mashup.js
+++ b/bookstore/srv/mashup.js
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////
 //
-//    Mashing up bookshop services with required services...
+//    Mashing up provided and required services...
 //
 module.exports = async()=>{ // called by server.js

@@ -20,29 +20,30 @@ module.exports = async()=>{ // called by server.js
  CatalogService.prepend (srv => srv.on ('READ', 'Books/reviews', (req) => {
    console.debug ('> delegating request to ReviewsService')
    const [id] = req.params, { columns, limit } = req.query.SELECT
-    return ReviewsService.read ('Reviews',columns).limit(limit).where({subject:String(id)})
+    return ReviewsService.tx(req).read ('Reviews',columns).limit(limit).where({subject:String(id)})
  }))

  //
  // Create an order with the OrdersService when CatalogService signals a new order
  //
  CatalogService.on ('OrderedBook', async (msg) => {
-    const { book, quantity, buyer } = msg.data
+    const { book, amount, buyer } = msg.data
    const { title, price } = await db.tx(msg).read (Books, book, b => { b.title, b.price })
    return OrdersService.tx(msg).create ('Orders').entries({
      OrderNo: 'Order at '+ (new Date).toLocaleString(),
-      Items: [{ product:{ID:`${book}`}, title, price, quantity }],
+      Items: [{ product:{ID:`${book}`}, title, price, amount }],
      buyer, createdBy: buyer
    })
  })

  //
-  // Update Books' average ratings when ReviewsService signals updated reviews
+  // Update Books' average ratings when ReviewsService signals updatd reviews
  //
  ReviewsService.on ('reviewed', (msg) => {
    console.debug ('> received:', msg.event, msg.data)
-    const { subject, count, rating } = msg.data
-    return UPDATE(Books,subject).with({ numberOfReviews:count, rating })
+    const { subject, rating } = msg.data
+    return UPDATE(Books,subject).with({rating})
+    // ^ Note: the framework will execute this and take care for db.tx
  })

  //
@@ -50,9 +51,9 @@ module.exports = async()=>{ // called by server.js
  //
  OrdersService.on ('OrderChanged', (msg) => {
    console.debug ('> received:', msg.event, msg.data)
-    const { product, deltaQuantity } = msg.data
+    const { product, deltaAmount } = msg.data
    return UPDATE (Books) .where ('ID =', product)
-    .and ('stock >=', deltaQuantity)
-    .set ('stock -=', deltaQuantity)
+    .and ('stock >=', deltaAmount)
+    .set ('stock -=', deltaAmount)
  })
 }
--- a/bookstore/test/requests.http
+++ b/bookstore/test/requests.http
@@ -2,7 +2,7 @@
@bookshop = http://localhost:4004
@reviews-service = {{bookshop}}/reviews
 # Uncomment this when running a separate reviews service
-# @reviews-service = http://localhost:4005/reviews
+@reviews-service = http://localhost:4005/reviews



@@ -38,11 +38,7 @@ GET {{bookshop}}/browse/Books(201)?
 &$select=ID,title,rating
 &$expand=reviews

-###

-GET {{bookshop}}/browse/Books?
-  &$select=title,author&$expand=currency
-Accept-Language: de

 #################################################
 #
--- a/hello/README.md
+++ b/hello/README.md
@@ -1,15 +0,0 @@
-# Hello World Getting Started Sample
-
-## Next Steps
-
- To run the JavaScript implementation, open a new terminal and run `cds watch`.
- To run the TypeScript implementation, open a new terminal and run `cds-ts watch`.
-
-Then call the service at: http://localhost:4004/say/hello(to='world')
-
-## Learn More
-
-Learn more about:
-
- [Hello World!](https://cap.cloud.sap/docs/get-started/hello-world)
- [Using TypeScript](https://cap.cloud.sap/docs/get-started/using-typescript)
--- a/hello/package.json
+++ b/hello/package.json
@@ -2,56 +2,6 @@
  "name": "@capire/hello-world",
  "version": "1.0.0",
  "scripts": {
-    "test": "npx jest --silent",
-    "start": "cds serve srv/world.cds",
-    "start:ts": "cds-ts serve srv/world.cds"
-  },
-  "dependencies": {
-    "@sap/cds": ">=5.0.4"
-  },
-  "devDependencies": {
-    "@types/jest": "*",
-    "@types/node": "*",
-    "ts-jest": "^27.0.2",
-    "typescript": "^4.3.5"
-  },
-  "jest": {
-    "testEnvironment": "node",
-    "preset": "ts-jest",
-    "globals": {
-      "ts-jest": {
-        "diagnostics": {
-          "_comment": "see https://githubmemory.com/repo/kulshekhar/ts-jest/issues/2722",
-          "ignoreCodes": [
-            151001
-          ]
-        }
-      }
-    }
-  },
-  "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"
-    }
+    "watch": "cds serve world.cds"
  }
 }
--- a/hello/srv/world.ts
+++ b/hello/srv/world.ts
@@ -1,7 +0,0 @@
-import type { Request } from "@sap/cds/apis/services"
-
-module.exports = class say {
-    hello(req: Request) {
-        return `Hello ${req.data.to} from a TypeScript file!`
-    }
-}
--- a/hello/test/test.http
+++ b/hello/test/test.http
--- a/hello/test/hello-world-ts.test.ts
+++ b/hello/test/hello-world-ts.test.ts
@@ -1,15 +0,0 @@
-process.env.CDS_TYPESCRIPT = 'true';
-import * as cds from '@sap/cds';
-
-//@ts-ignore
-const {GET} = cds.test.in(__dirname,'../srv').run('serve', 'world.cds');
-
-describe('Hello world!', () => {
-    afterAll(() => { delete process.env.CDS_TYPESCRIPT; });
-
-    it('should say hello with class impl from a typescript file', async () => {
-        const {data} = await GET`/say/hello(to='world')`
-        expect(data.value).toMatch(/Hello world.*typescript.*/i)
-    })
-
-})
--- a/hello/srv/world.cds
+++ b/hello/srv/world.cds
--- a/hello/srv/world.js
+++ b/hello/srv/world.js
--- a/orders/app/orders/index.html
+++ b/orders/app/orders/index.html
@@ -25,10 +25,10 @@

 	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
 	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/resources/sap-ui-core.js"
-			data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
-			data-sap-ui-compatVersion="edge"
-			data-sap-ui-theme="sap_horizon"
-			data-sap-ui-frameOptions="allow"
+    	data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
+    	data-sap-ui-compatVersion="edge"
+    	data-sap-ui-theme="sap_fiori_3"
+    	data-sap-ui-frameOptions="allow"
 	></script>
 	<script>
 		sap.ui.getCore().attachInit(()=> sap.ushell.Container.createRenderer().placeAt("content"))
--- a/orders/app/index.cds
+++ b/orders/app/index.cds
@@ -0,0 +1,5 @@
+/*
+  This model controls what gets served to Fiori frontends...
+*/
+
+using from './orders/fiori-service';
--- a/orders/app/orders/fiori-service.cds
+++ b/orders/app/orders/fiori-service.cds
@@ -10,7 +10,7 @@



-using { OrdersService } from '../srv/orders-service';
+using { OrdersService } from '../../srv/orders-service';


@odata.draft.enabled
@@ -68,16 +68,16 @@ annotate OrdersService.Orders with @(



-annotate OrdersService.Orders.Items with @(
+annotate OrdersService.Orders_Items with @(
 	UI: {
 		LineItem: [
 			{Value: product_ID, Label:'Product ID'},
 			{Value: title, Label:'Product Title'},
 			{Value: price, Label:'Unit Price'},
-			{Value: quantity, Label:'Quantity'},
+			{Value: amount, Label:'Quantity'},
 		],
 		Identification: [ //Is the main field group
-			{Value: quantity, Label:'Quantity'},
+			{Value: amount, Label:'Amount'},
 			{Value: title, Label:'Product'},
 			{Value: price, Label:'Unit Price'},
 		],
@@ -86,7 +86,7 @@ annotate OrdersService.Orders.Items with @(
 		],
 	},
 ) {
-	quantity @(
+	amount @(
 		Common.FieldControl: #Mandatory
 	);
 };
--- a/orders/db/data/sap.capire.orders-Orders_Items.csv
+++ b/orders/db/data/sap.capire.orders-Orders_Items.csv
@@ -1,4 +1,4 @@
-ID;up__ID;quantity;product_ID;title;price
+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/orders/db/schema.cds
+++ b/orders/db/schema.cds
@@ -3,22 +3,21 @@ namespace sap.capire.orders;

 entity Orders : cuid, managed {
  OrderNo  : String @title:'Order Number'; //> readable key
-  Items    : Composition of many {
-    key ID    : UUID;
-    product   : Association to Products;
-    quantity  : Integer;
-    title     : String; //> intentionally replicated as snapshot from product.title
-    price     : Double; //> materialized calculated field
-  };
+  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;
 }
-
-
-// this is to ensure we have filled-in currencies
-using from '@capire/common';
--- a/orders/package.json
+++ b/orders/package.json
@@ -2,7 +2,6 @@
  "name": "@capire/orders",
  "version": "1.0.0",
  "dependencies": {
-    "@capire/common": "*",
-    "@sap/cds": ">=5"
+    "@sap/cds": ">=4.3.0"
  }
 }
--- a/orders/srv/orders-service.js
+++ b/orders/srv/orders-service.js
@@ -3,34 +3,34 @@ class OrdersService extends cds.ApplicationService {

  /** register custom handlers */
  init(){
-    const { 'Orders.Items':OrderItems } = this.entities
+    const { Orders_Items:OrderItems } = this.entities

    this.before ('UPDATE', 'Orders', async function(req) {
      const { ID, Items } = req.data
-      if (Items) for (let { product_ID, quantity } of Items) {
-        const { quantity:before } = await cds.tx(req).run (
-          SELECT.one.from (OrderItems, oi => oi.quantity) .where ({up__ID:ID, product_ID})
+      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 (quantity != before) await this.orderChanged (product_ID, quantity-before)
+        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.quantity }) .where ({up__ID:ID})
+        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.quantity)))
+      if (Items) await Promise.all (Items.map(it => this.orderChanged (it.product_ID, -it.amount)))
    })

    return super.init()
  }

  /** order changed -> broadcast event */
-  orderChanged (product, deltaQuantity) {
+  orderChanged (product, deltaAmount) {
    // Emit events to inform subscribers about changes in orders
-    console.log ('> emitting:', 'OrderChanged', { product, deltaQuantity })
-    return this.emit ('OrderChanged', { product, deltaQuantity })
+    console.log ('> emitting:', 'OrderChanged', { product, deltaAmount })
+    return this.emit ('OrderChanged', { product, deltaAmount })
  }

 }
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -5,48 +5,36 @@
  "repository": "https://github.com/sap-samples/cloud-cap-samples.git",
  "author": "daniel.hutzel@sap.com",
  "dependencies": {
-    "@capire/bookstore": "./bookstore",
    "@capire/bookshop": "./bookshop",
    "@capire/common": "./common",
-    "@capire/data-viewer": "./data-viewer",
    "@capire/fiori": "./fiori",
    "@capire/hello": "./hello",
    "@capire/media": "./media",
    "@capire/orders": "./orders",
-    "@capire/reviews": "./reviews",
-    "@sap/cds": ">=5.5.3"
+    "@capire/reviews": "./reviews"
  },
  "devDependencies": {
-    "chai": "^4.3.4",
+    "chai": "^4.2.0",
    "chai-as-promised": "^7.1.1",
    "chai-subset": "^1.6.0",
-    "semver": "^7",
-    "sqlite3": "^5"
+    "sqlite3": "^5.0.0"
  },
  "scripts": {
    "cleanup": "rm -rf node_modules && rm -rf */node_modules && rm -rf */*/node_modules",
    "registry": "node .registry/server.js",
    "bookshop": "cds watch bookshop",
    "fiori": "cds watch fiori",
-    "hello": "cds watch hello",
    "media": "cds watch media",
    "mocha": "npx mocha || echo",
    "jest": "npx jest",
-    "start": "cds watch fiori",
-    "test": "npm run jest -- --silent",
-    "test:hello": "cd hello && npm test"
-  },
-  "jest": {
-    "testEnvironment": "node",
-    "testTimeout": 20000,
-    "testMatch": [
-      "**/*.test.js"
-    ]
+    "test": "npm run jest --silent"
  },
  "mocha": {
-    "recursive": true,
    "parallel": true
  },
+  "jest": {
+    "testEnvironment": "node"
+  },
  "license": "SAP SAMPLE CODE LICENSE",
  "private": true
 }
--- a/reviews/.env
+++ b/reviews/.env
@@ -1,2 +1,2 @@
-# cds.requires.messaging.kind = file-based-messaging
+cds.requires.messaging.kind = file-based-messaging
 PORT = 4005
--- a/reviews/app/vue/app.js
+++ b/reviews/app/vue/app.js
@@ -4,21 +4,21 @@ const GET = (url) => axios.get('/reviews'+url)
 const PUT = (cmd,data) => axios.patch('/reviews'+cmd,data)
 const POST = (cmd,data) => axios.post('/reviews'+cmd,data)

-const reviews = Vue.createApp ({
+const reviews = new Vue ({

-    data() {
-        return {
-          list: [],
-          review: undefined,
-          message: {},
-          Ratings: Object.entries({
+    el:'#app',
+
+    data: {
+        list: [],
+        review: undefined,
+        message: {},
+        Ratings: Object.entries({
            5 : '★★★★★',
            4 : '★★★★',
            3 : '★★★',
            2 : '★★',
            1 : '★',
-          }).reverse()
-        }
+        }).reverse()
    },

    methods: {
@@ -66,7 +66,7 @@ const reviews = Vue.createApp ({
        datetime: (d) => d && new Date(d).toLocaleString(),
    },

-}).mount("#app")
+})

 // initially fill list of my reviews
 reviews.fetch()
--- a/reviews/app/vue/index.html
+++ b/reviews/app/vue/index.html
@@ -5,7 +5,7 @@
    <title> Capire Reviews </title>
    <link rel="stylesheet" href="https://unpkg.com/primitive-ui/dist/css/main.css">
    <script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/vue@3/dist/vue.global.prod.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/vue"></script>
    <style>
        .hovering tr:hover td { color:cyan; background: #123; cursor: pointer; }
        .rating-stars { color:teal }
@@ -18,7 +18,7 @@
 <body class="small-container", style="margin-top: 70px;">
 <div id='app'>

-    <h1> Capire Reviews </h1>
+    <h1> {{ document.title }} </h1>

    <input type="text" placeholder="Search..." @input="search">

--- a/reviews/db/data/sap.capire.reviews-Reviews.csv
+++ b/reviews/db/data/sap.capire.reviews-Reviews.csv
@@ -1,5 +1,5 @@
-subject;rating;reviewer;title;text
-201;5;bob;Intriguing;Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
-201;4;bob;Fascinating;Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Id diam maecenas ultricies mi eget mauris pharetra et. Risus at ultrices mi tempus imperdiet nulla malesuada pellentesque. Pulvinar mattis nunc sed blandit libero. Facilisis magna etiam tempor orci eu. Nec sagittis aliquam malesuada bibendum arcu. Eu consequat ac felis donec. Ultricies tristique nulla aliquet enim tortor at auctor urna nunc. Tortor posuere ac ut consequat semper viverra nam libero. Amet nisl suscipit adipiscing bibendum est ultricies integer quis auctor. Scelerisque purus semper eget duis at tellus. Elementum tempus egestas sed sed risus pretium. Arcu dictum varius duis at. Amet luctus venenatis lectus magna fringilla urna. Eget velit aliquet sagittis id consectetur purus ut faucibus. Vitae auctor eu augue ut lectus. Fermentum iaculis eu non diam phasellus vestibulum.
-207;2;bob;What is this?;Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Libero justo laoreet sit amet cursus sit amet dictum. Nunc faucibus a pellentesque sit. Dis parturient montes nascetur ridiculus mus mauris vitae ultricies. Enim nunc faucibus a pellentesque. Commodo quis imperdiet massa tincidunt nunc pulvinar sapien. Cras ornare arcu dui vivamus. Facilisi etiam dignissim diam quis enim lobortis. Et molestie ac feugiat sed. Urna neque viverra justo nec ultrices dui. Ullamcorper a lacus vestibulum sed arcu non. Volutpat ac tincidunt vitae semper quis. Dignissim sodales ut eu sem. Feugiat in fermentum posuere urna nec. At augue eget arcu dictum varius.
-251;3;bob;It's dark...;Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Suscipit tellus mauris a diam. Velit aliquet sagittis id consectetur purus ut. Viverra adipiscing at in tellus integer. Vitae elementum curabitur vitae nunc. Mattis ullamcorper velit sed ullamcorper morbi. Diam quis enim lobortis scelerisque. Auctor neque vitae tempus quam pellentesque nec nam aliquam. Semper auctor neque vitae tempus. Quis eleifend quam adipiscing vitae proin. Neque convallis a cras semper auctor neque vitae. Imperdiet massa tincidunt nunc pulvinar sapien et ligula. Sit amet consectetur adipiscing elit ut aliquam purus. Pretium quam vulputate dignissim suspendisse.
+subject;rating;title;text
+201;5;Intriguing;Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+201;4;Fascinating;Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Id diam maecenas ultricies mi eget mauris pharetra et. Risus at ultrices mi tempus imperdiet nulla malesuada pellentesque. Pulvinar mattis nunc sed blandit libero. Facilisis magna etiam tempor orci eu. Nec sagittis aliquam malesuada bibendum arcu. Eu consequat ac felis donec. Ultricies tristique nulla aliquet enim tortor at auctor urna nunc. Tortor posuere ac ut consequat semper viverra nam libero. Amet nisl suscipit adipiscing bibendum est ultricies integer quis auctor. Scelerisque purus semper eget duis at tellus. Elementum tempus egestas sed sed risus pretium. Arcu dictum varius duis at. Amet luctus venenatis lectus magna fringilla urna. Eget velit aliquet sagittis id consectetur purus ut faucibus. Vitae auctor eu augue ut lectus. Fermentum iaculis eu non diam phasellus vestibulum.
+207;2;What is this?;Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Libero justo laoreet sit amet cursus sit amet dictum. Nunc faucibus a pellentesque sit. Dis parturient montes nascetur ridiculus mus mauris vitae ultricies. Enim nunc faucibus a pellentesque. Commodo quis imperdiet massa tincidunt nunc pulvinar sapien. Cras ornare arcu dui vivamus. Facilisi etiam dignissim diam quis enim lobortis. Et molestie ac feugiat sed. Urna neque viverra justo nec ultrices dui. Ullamcorper a lacus vestibulum sed arcu non. Volutpat ac tincidunt vitae semper quis. Dignissim sodales ut eu sem. Feugiat in fermentum posuere urna nec. At augue eget arcu dictum varius.
+251;3;It's dark...;Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Suscipit tellus mauris a diam. Velit aliquet sagittis id consectetur purus ut. Viverra adipiscing at in tellus integer. Vitae elementum curabitur vitae nunc. Mattis ullamcorper velit sed ullamcorper morbi. Diam quis enim lobortis scelerisque. Auctor neque vitae tempus quam pellentesque nec nam aliquam. Semper auctor neque vitae tempus. Quis eleifend quam adipiscing vitae proin. Neque convallis a cras semper auctor neque vitae. Imperdiet massa tincidunt nunc pulvinar sapien et ligula. Sit amet consectetur adipiscing elit ut aliquam purus. Pretium quam vulputate dignissim suspendisse.
--- a/reviews/db/schema.cds
+++ b/reviews/db/schema.cds
@@ -32,6 +32,7 @@ entity Likes {

 // Auto-fill reviewers and review dates
 annotate Reviews with {
-  reviewer @cds.on:{insert:$user};
-  date     @cds.on:{insert:$now,update:$now};
+  reviewer @cds.on.insert:$user;
+  date     @cds.on.insert:$now;
+  date     @cds.on.update:$now;
 }
--- a/reviews/package.json
+++ b/reviews/package.json
@@ -7,17 +7,18 @@
    "index.cds"
  ],
  "dependencies": {
-    "@sap/cds": ">=5",
+    "@sap/cds": ">=4",
    "express": "^4.17.1"
  },
+  "scripts": {
+    "reviews-service": "cds watch",
+    "books-reviewed": "cds watch ../reviewed"
+  },
  "cds": {
    "requires": {
-      "messaging": {
-        "[development]": { "kind": "file-based-messaging" },
-        "[hybrid]": { "kind": "enterprise-messaging-shared" },
-        "[production]": { "kind": "enterprise-messaging" }
-      },
-      "db": { "kind": "sql" }
+      "db": {
+        "kind": "sql"
+      }
    }
  }
 }
--- a/reviews/srv/reviews-service.cds
+++ b/reviews/srv/reviews-service.cds
@@ -8,11 +8,10 @@ service ReviewsService {
  action unlike (review: type of Reviews:ID);

  // Async API
-  event reviewed : {
-    subject : type of Reviews:subject;
-    count   : Integer;
-    rating  : Decimal;
-  }
+   event reviewed : {
+     subject: type of Reviews:subject;
+     rating: Decimal(2,1)
+   }

  // Input validation
  annotate Reviews with {
@@ -28,7 +27,14 @@ service ReviewsService {
 annotate ReviewsService.Reviews with @restrict:[
  { grant:'READ',   to:'any' },                 // everybody can read reviews
  { grant:'CREATE', to:'authenticated-user' },  // users must login to add reviews
-  { grant:'UPDATE', to:'authenticated-user', where:'reviewer=$user' },
+  /////////////////////////////////////////////////
+  //
+  // Temporarily disabling this due to glitch in CAP Node.js runtime:
+  // { grant:'UPDATE', to:'authenticated-user', where:'reviewer=$user' },
+  // -> reenable it when the issue is fixed
+     { grant:'UPDATE', to:'authenticated-user' },
+  //
+  ////////////////////////////////////////////////////
  { grant:'DELETE', to:'admin' },
 ];

--- a/reviews/srv/reviews-service.js
+++ b/reviews/srv/reviews-service.js
@@ -12,11 +12,11 @@ module.exports = cds.service.impl (function(){
  // Emit an event to inform subscribers about new avg ratings for reviewed subjects
  this.after (['CREATE','UPDATE','DELETE'], 'Reviews', async function(_,req) {
    const {subject} = req.data
-    const { count, rating } = await cds.tx(req) .run (
-      SELECT.one `round(avg(rating),2) as rating, count(*) as count` .from (Reviews) .where ({subject})
+    const {rating} = await cds.tx(req) .run (
+      SELECT.one (['round(avg(rating),2) as rating']) .from (Reviews) .where ({subject})
    )
-    global.it || console.log ('< emitting:', 'reviewed', { subject, count, rating })
-    await this.emit ('reviewed', { subject, count, rating })
+    global.it || console.log ('< emitting:', 'reviewed', { subject, rating })
+    await this.emit ('reviewed', { subject, rating })
  })

  // Increment counter for reviews considered helpful
--- a/Show More
+++ b/Show More