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

* Bump to cds 4 * Cosmetics in handler code * await and cds.run([...]) instead of Promise.all Co-authored-by: Christian Georgi <christian.georgi@sap.com>
Add app/ dir to also also include annotations
2020-09-18 10:49:46 +02:00 · 2020-06-03 10:15:10 +02:00 · 2020-04-07 11:20:55 +02:00 · 2020-04-02 16:02:32 +02:00 · 2020-03-25 18:19:52 +01:00 · 2020-03-25 16:06:17 +01:00
155 changed files with 1751 additions and 16112 deletions
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,11 +1,9 @@
 {
    "extends": "eslint:recommended",
    "env": {
        "browser": true,
        "node": true,
        "es6": true,
-        "jest": true,
+        "jest": true
        "mocha": true
    },
    "parserOptions": {
        "ecmaVersion": 2018
@@ -21,7 +19,6 @@
    },
    "rules": {
        "no-console": "off",
-        "require-atomic-updates": "off",
+        "require-atomic-updates": "off"
        "require-await":"warn"
    }
-}
+}
--- a/.github/ISSUE_TEMPLATE/question--feedback-or-bug-.md
+++ b/.github/ISSUE_TEMPLATE/question--feedback-or-bug-.md
@@ -1,10 +0,0 @@
 ---
 name: This channel is CLOSED. 
 about: Use our community at  https://answers.sap.com/tags/9f13aee1-834c-4105-8e43-ee442775e5ce
 title: ''
 labels: ''
 assignees: ''
 ---
 Please use our community on https://answers.sap.com/tags/9f13aee1-834c-4105-8e43-ee442775e5ce
--- a/.github/workflows/node.js.yml
+++ b/.github/workflows/node.js.yml
@@ -1,28 +0,0 @@
 # This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
 name: CI
 on:
  push:
    branches: [ main ]
  pull_request:
    branches: [ main ]
 jobs:
  build:
    runs-on: ubuntu-latest
    strategy:
      matrix:
        node-version: [12.x, 14.x]
    steps:
    - uses: actions/checkout@v2
    - name: Use Node.js ${{ matrix.node-version }}
      uses: actions/setup-node@v1
      with:
        node-version: ${{ matrix.node-version }}
    - run: npm ci
    - run: npm test
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,3 @@ target/
 connection.properties
 default-env.json
 packages/messageBox
 reviews/msg-box
 reviews/db/test.db
 *.openapi3.json
--- a/.npmrc
+++ b/.npmrc
@@ -1,3 +1 @@
-# Ensure we always use public packages, i.e. avoid using local registries from ~/.npmrc
+registry=https://registry.npmjs.org
@sap:registry=https://registry.npmjs.org/
 registry=https://registry.npmjs.org/
--- a/.registry/.gitignore
+++ b/.registry/.gitignore
@@ -1 +0,0 @@
 *.tgz
--- a/.registry/server.js
+++ b/.registry/server.js
@@ -1,80 +0,0 @@
 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})
 app.use('/-/:tarball', (req,res,next) => {
  console.debug ('GET', req.params)
  try {
    const { tarball } = req.params
    const [, pkg ] = /^\w+-(\w+)/.exec(tarball)
    fs.lstat(tarball,(err => {
      if (err) console.debug (`npm pack ../${pkg}`)
      if (err) exec(`npm pack ../${pkg}`,{cwd},next)
      else next()
    }))
  } catch (e) {
    console.error(e)
    res.sendStatus(500)
  }
 })
 app.use('/-', express.static(__dirname))
 app.get('/*', (req,res)=>{
  const urlRegex = /^\/(@\w+)\/(\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`
    // https://github.com/npm/registry/blob/master/docs/responses/package-metadata.md
    res.json({
      "name": package.name,
      "dist-tags": {
        "latest": package.version
      },
      "versions": {
        [package.version]: {
          "name": package.name,
          "version": package.version,
          "dist": {
            "tarball": `${server.url}/-/${tarball}`
          },
        }
      },
    })
  } catch (e) {
    if (e.code === 'MODULE_NOT_FOUND')  return res.sendStatus(404)
    console.error(e);  throw e
  }
 })
 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}`)
 })
 const _exit = ()=>{
  server.close()
  exec(`npm conf rm "${scope}:registry"`, ()=> { process.exit() })
 }
 process.on ('SIGTERM',_exit)
 process.on ('SIGHUP',_exit)
 process.on ('SIGINT',_exit)
 process.on ('SIGUSR2',_exit)
--- a/.reuse/dep5
+++ b/.reuse/dep5
@@ -1,29 +0,0 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: cloud-cap-samples
 Upstream-Contact: <Christian Georgi (christian.georgi@sap.com)>
 Source: https://github.com/SAP-samples/cloud-cap-samples
 Disclaimer: The code in this project may include calls to APIs (“API Calls”) of
 SAP or third-party products or services developed outside of this project
 (“External Products”).
 “APIs” means application programming interfaces, as well as their respective
 specifications and implementing code that allows software to communicate with
 other software.
 API Calls to External Products are not licensed under the open source license
 that governs this project. The use of such API Calls and related External
 Products are subject to applicable additional agreements with the relevant
 provider of the External Products. In no event shall the open source license
 that governs this project grant any rights in or to any External Products,or
 alter, expand or supersede any terms of the applicable additional agreements.
 If you have a valid license agreement with SAP for the use of a particular SAP
 External Product, then you may make use of any API Calls included in this
 project’s code for that SAP External Product, subject to the terms of such
 license agreement. If you do not have a valid license agreement for the use of
 a particular SAP External Product, then you may only make use of any API Calls
 in this project for that SAP External Product for your internal, non-productive
 and non-commercial test and evaluation of such API Calls. Nothing herein grants
 you any rights to use or access any SAP External Product, or provide any third
 parties the right to use of access any SAP External Product, through API Calls.
 Files: *
 Copyright: 2019-2020 SAP SE or an SAP affiliate company and cap-cloud-samples
 License: Apache-2.0
--- a/.tours/db-native.tour
+++ b/.tours/db-native.tour
@@ -1,117 +0,0 @@
 {
  "$schema": "https://aka.ms/codetour-schema",
  "title": "Database Functions",
  "steps": [
    {
      "title": "Introduction",
      "description": "### Database Functions in CDS Models\n\nIn this tour, you'll learn how to add database-specific functions to CDS models in your application."
    },
    {
      "file": "bookshop/db/schema.cds",
      "description": "#### Basic Schema\n\nWe want to add two fields to the `Authors` entity, one for the author's age and one for the span of years that she or he lived.\n\nThese two fields can be computed out of the existing `dateOfBirth` and `dateOfDeath` fields.",
      "selection": {
        "start": {
          "line": 19,
          "character": 1
        },
        "end": {
          "line": 21,
          "character": 1
        }
      },
      "title": "Base fields in Author"
    },
    {
      "file": "bookshop/srv/admin-service.cds",
      "description": "This is how the `Authors` entity gets exposed in an OData or REST service.\n\nIn the next step, you'll see how we extend this projection.",
      "selection": {
        "start": {
          "line": 4,
          "character": 1
        },
        "end": {
          "line": 5,
          "character": 1
        }
      },
      "title": "Authors service"
    },
    {
      "file": "fiori/db/sqlite/index.cds",
      "description": "#### SQLite Implementation\n\nHere's the first implementation for SQLite.  It computes the two fields `age` and `lifetime` through SQLite's [strftime](https://sqlite.org/lang_datefunc.html) function.\n\nThrough the [`extend projection`](https://cap.cloud.sap/docs/cds/cdl#extend-view) clause you can add additional fields to projection entities.  These are deployed as database views, which is why we can integrate the database functions in the first place.\n",
      "selection": {
        "start": {
          "line": 7,
          "character": 1
        },
        "end": {
          "line": 11,
          "character": 1
        }
      },
      "title": "SQLite implementation"
    },
    {
      "file": "fiori/db/hana/index.cds",
      "description": "#### SAP HANA Implementation\n\nThis is the second implementation for SAP HANA.  It computes the same two fields `age` and `lifetime` through the [YEARS_BETWEEN](https://help.sap.com/viewer/7c78579ce9b14a669c1f3295b0d8ca16/Cloud/en-US/7c0d2c161ea34def86de3f5eadd6a0af.html) and [YEAR](https://help.sap.com/viewer/7c78579ce9b14a669c1f3295b0d8ca16/Cloud/en-US/20f5fac6751910148dabd3c6821f907d.html) functions of SAP HANA.\n\n#### File Layout and Code Structure\n\nNote the path of the `.cds` file we are in: it's in a subfolder of `db`, so that it's _not_ automatically picked up when we start the application.  The same is true for the SQLite implementation: it's in a separate `db/sqlite/` folder as well.  In the next step, you'll see how these files are loaded.\n\nAlso, we choose to implement all of that as an extension of the original bookshop here in the _fiori_ package.  See the first [CAP Samples] code tour for more details on the different packages of this repository.",
      "selection": {
        "start": {
          "line": 7,
          "character": 1
        },
        "end": {
          "line": 11,
          "character": 1
        }
      },
      "title": "SAP HANA implementation"
    },
    {
      "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
        }
      },
      "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,
      "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,
      "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,
      "selection": {
        "start": {
          "line": 67,
          "character": 1
        },
        "end": {
          "line": 73,
          "character": 1
        }
      },
      "title": "Add Data"
    },
    {
      "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."
    }
  ]
 }
--- a/.tours/samples.tour
+++ b/.tours/samples.tour
@@ -1,139 +0,0 @@
 {
  "$schema": "https://aka.ms/codetour-schema",
  "title": "CAP Samples",
  "steps": [
    {
      "title": "Welcome",
      "file": "README.md",
      "description": "### Welcome to CAP Samples!\n\nThis tour leads you through a collection of samples for the [SAP Cloud Application Programming Model (CAP)](https://cap.cloud.sap).\nYou will learn which features of the programming model are demonstrated in which sample.\n\nLet's start!",
      "line": 2,
      "selection": {
        "start": {
          "line": 1,
          "character": 1
        },
        "end": {
          "line": 3,
          "character": 108
        }
      }
    },
    {
      "file": "hello/srv/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": {
        "start": {
          "line": 1,
          "character": 1
        },
        "end": {
          "line": 4,
          "character": 1
        }
      },
      "title": "Hello World!"
    },
    {
      "file": "bookshop/db/schema.cds",
      "description": "### A Bookshop!\n\nIntroduces:\n- [Project Setup](https://cap.cloud.sap/docs/get-started/) and [Layouts](https://cap.cloud.sap/docs/get-started/projects)\n- [Domain Modeling](https://cap.cloud.sap/docs/guides/domain-models)\n- [Defining Services](https://cap.cloud.sap/docs/guides/providing-services)\n- [Generic Providers](https://cap.cloud.sap/docs/guides/generic-providers)\n- [Adding Custom Logic](https://cap.cloud.sap/docs/guides/service-impl)\n- [Using Databases](https://cap.cloud.sap/docs/guides/databases)\n",
      "line": 1,
      "selection": {
        "start": {
          "line": 1,
          "character": 1
        },
        "end": {
          "line": 32,
          "character": 1
        }
      },
      "title": "Bookshop"
    },
    {
      "file": "common/index.cds",
      "description": "### Extend and Reuse\n\nShowcases how to extend [@sap/cds/common](https://cap.cloud.sap/docs/cds/common) thereby covering:\n- Building [extension packages](https://cap.cloud.sap/docs/guides/domain-models#aspects-extensibility)\n- Providing [reuse packages](https://cap.cloud.sap/docs/get-started/projects#sharing-and-reusing-content)\n- [Verticalization](https://cap.cloud.sap/docs/cds/common#adapting-to-your-needs)\n- Using [Aspects](https://cap.cloud.sap/docs/cds/cdl#aspects)\n- Used in the [fiori app sample](#fiori)\n",
      "line": 1,
      "selection": {
        "start": {
          "line": 1,
          "character": 1
        },
        "end": {
          "line": 46,
          "character": 1
        }
      },
      "title": "Common"
    },
    {
      "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",
      "line": 1,
      "selection": {
        "start": {
          "line": 1,
          "character": 1
        },
        "end": {
          "line": 27,
          "character": 1
        }
      },
      "title": "Orders"
    },
    {
      "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",
      "line": 1,
      "selection": {
        "start": {
          "line": 1,
          "character": 1
        },
        "end": {
          "line": 39,
          "character": 1
        }
      },
      "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",
      "line": 1,
      "selection": {
        "start": {
          "line": 1,
          "character": 1
        },
        "end": {
          "line": 13,
          "character": 1
        }
      },
      "title": "Fiori"
    },
    {
      "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",
      "selection": {
        "start": {
          "line": 8,
          "character": 1
        },
        "end": {
          "line": 16,
          "character": 1
        }
      },
      "title": "Packages"
    }
  ],
  "isPrimary": true,
  "description": "Overview of CAP Samples for Node.js"
 }
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,21 +0,0 @@
 {
 	// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
 	// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
 	// List of extensions which should be recommended for users of this workspace.
 	"recommendations": [
 		"sapse.vscode-cds",
 		"dbaeumer.vscode-eslint",
 		"esbenp.prettier-vscode",
 		"mechatroner.rainbow-csv",
 		"humao.rest-client",
 		"alexcvzz.vscode-sqlite",
 		"hbenl.vscode-mocha-test-adapter",
 		"sdras.night-owl",
 		"vsls-contrib.codetour"
 	],
 	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
 	"unwantedRecommendations": [
 	]
 }
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -6,38 +6,59 @@
  "configurations": [
    {
      "name": "bookshop",
      "command": "npx cds watch bookshop",
      "type": "node-terminal",
      "request": "launch",
      "type": "node",
      "runtimeExecutable": "npx",
      "runtimeArgs": [
        "-n"
      ],
      "args": [
        "--",
        "cds",
        "run",
        "--in-memory"
      ],
      "cwd": "${workspaceFolder}/packages/bookshop",
      "console": "integratedTerminal",
      "skipFiles": [
-        "<node_internals>/**",
+        "<node_internals>/**"
        "**/node_modules/**",
        "**/cds/lib/lazy.js",
        "**/cds/lib/req/cls.js",
        "**/odata-v4/okra/**"
      ]
    },
    {
-      "name": "Fiori App",
+      "name": "cds run ...",
      "command": "npx cds watch fiori",
      "type": "node-terminal",
      "request": "launch",
      "type": "node",
      "runtimeExecutable": "npx",
      "runtimeArgs": [
        "-n"
      ],
      "args": [
        "--",
        "cds",
        "run",
        "--with-mocks",
        "--in-memory?"
      ],
      "cwd": "${workspaceFolder}/packages/${input:service}",
      "console": "integratedTerminal",
      "skipFiles": [
-        "<node_internals>/**",
+        "<node_internals>/**"
        "**/node_modules/**",
        "**/cds/lib/lazy.js",
        "**/cds/lib/req/cls.js",
        "**/odata-v4/okra/**"
      ]
    }
  ],
  "inputs": [
    {
      "type": "pickString",
-      "id": "sample",
+      "id": "service",
-      "description": "Which sample do you want to start?",
+      "description": "Which service do you want to start?",
-      "options": [ "bookshop", "fiori", "reviews", "reviews" ],
+      "options": [
        "bookshop",
        "bookstore",
        "media-server",
        "office-supplies",
        "reviews-service"
      ],
      "default": "bookshop"
    }
  ]
-}
+}
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,17 +1,6 @@
 {
  "files.exclude": {
    ".reuse/**": true,
    "**/.gitignore": true,
-    "**/.vscode": true,
+    "**/.vscode": true
    "LICENSES/**": true
  },
  "debug.javascript.terminalOptions": {
    "skipFiles": [
      "<node_internals>/**",
      "**/node_modules/**",
      "**/cds/lib/lazy.js",
      "**/cds/lib/req/cls.js",
      "**/odata-v4/okra/**"
    ]
  }
 }
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -1,15 +1,17 @@
 {
-  // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
-  // for the documentation about the tasks.json format
+    // for the documentation about the tasks.json format
-  "version": "2.0.0",
+    "version": "2.0.0",
-  "tasks": [
+    "tasks": [
-    {
+        {
-      "type": "npm",
+            "type": "npm", "script": "watch", "path": "packages/bookshop/",
-      "script": "jest",
+            "options": { "env": { "PORT": "4004" }},
-      "group": {
+            "presentation": { "group": "A" }
-        "kind": "test",
+        },
-        "isDefault": true
+        {
-      }
+            "type": "npm", "script": "watch", "path": "packages/reviews-service/",
-    }
+            "options": { "env": { "PORT": "5005" }},
-  ]
+            "presentation": { "group": "A" }
        }
    ]
 }
--- a/190
+++ b/190
@@ -0,0 +1,190 @@
 SAP SAMPLE CODE LICENSE AGREEMENT
 Please scroll down and read the following SAP Sample Code License Agreement
 carefully ("Agreement"). By downloading, installing, or otherwise using the
 SAP sample code or any materials that accompany the sample code documentation
 (collectively, the "Sample Code"), You agree that this Agreement forms a legally
 binding agreement between You ("You" or "Your") and SAP SE, for and on behalf
 of itself and its subsidiaries and affiliates (as defined in Section 15 of the
 German Stock Corporation Act), and You agree to be bound by all of the terms
 and conditions stated in this Agreement. If You are trying to access or download
 the Sample Code on behalf of Your employer or as a consultant or agent of a
 third party (either "Your Company"), You represent and warrant that You have
 the authority to act on behalf of and bind Your Company to the terms of this
 Agreement and everywhere in this Agreement that refers to 'You' or 'Your' shall
 also include Your Company. If You do not agree to these terms, do not attempt
 to access or use the Sample Code.
 1. LICENSE: Subject to the terms of this Agreement, SAP grants You a nonexclusive,
 non-transferable, non-sublicensable, revocable, royalty-free,
 limited license to use, copy, and modify the Sample Code solely for Your internal
 business purposes.
 2. RESTRICTIONS: You must not use the Sample Code to: (a) impair, degrade or
 reduce the performance or security of any SAP products, services or related
 technology (collectively, "SAP Products"); (b) enable the bypassing or
 circumventing of SAP's license restrictions and/or provide users with access to
 the SAP Products to which such users are not licensed; or (c) permit mass data
 extraction from an SAP Product to a non-SAP Product, including use,
 modification, saving or other processing of such data in the non-SAP Product.
 Further, You must not: (i) provide or make the Sample Code available to any
 third party other than your authorized employees, contractors and agents
 (collectively, “Representatives”) and solely to be used by Your Representatives
 for Your own internal business purposes; ii) remove or modify any marks or
 proprietary notices from the Sample Code; iii) assign this Agreement, or any
 interest therein, to any third party; (iv) use any SAP name, trademark or logo
 without the prior written authorization of SAP; or (v) use the Sample Code to
 modify an SAP Product or decompile, disassemble or reverse engineer an SAP
 Product (except to the extent permitted by applicable law). You are responsible
 for any breach of the terms of this Agreement by You or Your Representatives.
 3. INTELLECTUAL PROPERTY: SAP or its licensors retain all ownership and
 intellectual property rights in and to the Sample Code and SAP Products. In
 exchange for the right to use, copy and modify the Sample Code provided under
 this Agreement, You covenant not to assert any intellectual property rights in
 or to any of Your products, services, or related technology that are based on
 or incorporate the Sample Code against any individual or entity in respect of
 any current or future SAP Products.
 4. SAP AND THIRD PARTY APIS: The Sample Code may include API (application
 programming interface) calls to SAP and third-party products or services. The
 access or use of the third-party products and services to which the API calls
 are directed may be subject to additional terms and conditions between you and
 SAP or such third parties. You (and not SAP) are solely responsible for
 understanding and complying with any additional terms and conditions that apply
 to the access or use of those APIs and/or third-party products and services.
 SAP does not grant You any rights in or to these APIs, products or services
 under this Agreement.
 5. FREE AND OPEN SOURCE COMPONENTS: The Sample Code may include third party
 free or open source components ("FOSS Components"). You may have additional
 rights in such FOSS Components that are provided by the third party licensors
 of those components.
 6. THIRD PARTY DEPENDENCIES: The Sample Code may require third party software
 dependencies ("Dependencies") for the use or operation of the Sample Code. These
 Dependencies may be identified by SAP in Maven POM files, documentation or by
 other means. SAP does not grant You any rights in or to such Dependencies under
 this Agreement. You are solely responsible for the acquisition, installation
 and use of such Dependencies.
 7. WARRANTY:
 a) If You are located outside the US or Canada: AS THE SAMPLE CODE IS PROVIDED
 TO YOU FREE OF CHARGE, SAP DOES NOT GUARANTEE OR WARRANT ANY FEATURES OR
 QUALITIES OF THE SAMPLE CODE OR GIVE ANY UNDERTAKING WITH REGARD TO ANY OTHER
 QUALITY. NO SUCH WARRANTY OR UNDERTAKING SHALL BE IMPLIED BY YOU FROM ANY
 DESCRIPTION IN THE SAMPLE CODE OR ANY OTHER MATERIALS, COMMUNICATION OR
 ADVERTISEMENT. IN PARTICULAR, SAP DOES NOT WARRANT THAT THE SAMPLE CODE WILL BE
 AVAILABLE UNINTERRUPTED, ERROR FREE, OR PERMANENTLY AVAILABLE. ALL WARRANTY
 CLAIMS RESPECTING THE SAMPLE CODE ARE SUBJECT TO THE LIMITATION OF LIABILITY
 STIPULATED IN SECTION 8 BELOW.
 b) If You are located in the US or Canada: THE SAMPLE CODE IS LICENSED TO YOU
 "AS IS", WITHOUT ANY WARRANTY, ESCROW, TRAINING, MAINTENANCE, OR SERVICE
 OBLIGATIONS WHATSOEVER ON THE PART OF SAP. SAP MAKES NO EXPRESS OR IMPLIED
 WARRANTIES OR CONDITIONS OF SALE OF ANY TYPE WHATSOEVER, INCLUDING BUT NOT
 LIMITED TO IMPLIED WARRANTIES OF MERCHANTABILITY AND OF FITNESS FOR A PARTICULAR
 PURPOSE. IN PARTICULAR, SAP DOES NOT WARRANT THAT THE SAMPLE CODE WILL BE
 AVAILABLE UNINTERRUPTED, ERROR FREE, OR PERMANENTLY AVAILABLE. YOU ASSUME ALL
 RISKS ASSOCIATED WITH THE USE OF THE SAMPLE CODE, INCLUDING WITHOUT LIMITATION
 RISKS RELATING TO QUALITY, AVAILABILITY, PERFORMANCE, DATA LOSS, AND UTILITY IN
 A PRODUCTION ENVIRONMENT.
 c) For all locations: SAP DOES NOT MAKE ANY REPRESENTATIONS OR WARRANTIES IN
 RESPECT OF THIRD PARTY DEPENDENCIES, APIS, PRODUCTS AND SERVICES, INCLUDING BUT
 NOT LIMITED TO IMPLIED WARRANTIES OF MERCHANTABILITY AND OF FITNESS FOR A
 PARTICULAR PURPOSE. IN PARTICULAR, SAP DOES NOT WARRANT THAT THIRDPARTY
 DEPENDENCIES, APIS, PRODUCTS AND SERVICES WILL BE AVAILABLE, ERROR FREE,
 INTEROPERABLE WITH THE SAMPLE CODE, SUITABLE FOR ANY PARTICULAR PURPOSE OR NONINFRINGING.
 YOU ASSUME ALL RISKS ASSOCIATED WITH THE USE OF THIRD
 PARTY DEPENDENCIES, APIS, PRODUCTS AND SERVICES, INCLUDING WITHOUT LIMITATION
 RISKS RELATING TO QUALITY, AVAILABILITY, PERFORMANCE, DATA LOSS, UTILITY IN A
 PRODUCTION ENVIRONMENT, AND NON-INFRINGEMENT. IN NO EVENT WILL SAP BE LIABLE
 DIRECTLY OR INDIRECTLY IN RESPECT OF ANY USE OF THIRD PARTY DEPENDENCIES, APIS,
 PRODUCTS AND SERVICES BY YOU.
 8. LIMITATION OF LIABILITY:
 a) If You are located outside the US or Canada: IRRESPECTIVE OF THE LEGAL
 REASONS, SAP SHALL ONLY BE LIABLE FOR DAMAGES UNDER THIS AGREEMENT IF SUCH
 DAMAGE (I) CAN BE CLAIMED UNDER THE GERMAN PRODUCT LIABILITY ACT OR (II) IS
 CAUSED BY INTENTIONAL MISCONDUCT OF SAP OR (III) CONSISTS OF PERSONAL INJURY.
 IN ALL OTHER CASES, NEITHER SAP NOR ITS EMPLOYEES, AGENTS AND SUBCONTRACTORS
 SHALL BE LIABLE FOR ANY KIND OF DAMAGE OR CLAIMS HEREUNDER.
 b) If You are located in the US or Canada: IN NO EVENT SHALL SAP BE LIABLE TO
 YOU, YOUR COMPANY OR TO ANY THIRD PARTY FOR ANY DAMAGES IN AN AMOUNT IN EXCESS
 OF $100 ARISING IN CONNECTION WITH YOUR USE OF OR INABILITY TO USE THE SAMPLE
 CODE OR IN CONNECTION WITH SAP'S PROVISION OF OR FAILURE TO PROVIDE SERVICES 
 PERTAINING TO THE SAMPLE CODE, OR AS A RESULT OF ANY DEFECT IN THE SAMPLE COED.
 THIS DISCLAIMER OF LIABILITY SHALL APPLY REGARDLESS OF THE FORM OF ACTION THAT
 MAY BE BROUGHT AGAINST SAP, WHETHER IN CONTRACT OR TORT, INCLUDING WITHOUT
 LIMITATION ANY ACTION FOR NEGLIGENCE. YOUR SOLE REMEDY IN THE EVENT OF BREACH
 OF THIS AGREEMENT BY SAP OR FOR ANY OTHER CLAIM RELATED TO THE SAMPLE CODE SHALL
 BE TERMINATION OF THIS AGREEMENT. NOTWITHSTANDING ANYTHING TO THE CONTRARY
 HEREIN, UNDER NO CIRCUMSTANCES SHALL SAP OR ITS LICENSORS BE LIABLE TO YOU OR
 ANY OTHER PERSON OR ENTITY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, OR
 INDIRECT DAMAGES, LOSS OF GOOD WILL OR BUSINESS PROFITS, WORK STOPPAGE, DATA
 LOSS, COMPUTER FAILURE OR MALFUNCTION, ANY AND ALL OTHER COMMERCIAL DAMAGES OR
 LOSS, OR EXEMPLARY OR PUNITIVE DAMAGES.
 9. INDEMNITY: You will fully indemnify, hold harmless and defend SAP against
 law suits based on any claim: (a) that any of Your products, services or related
 technology that are based on or incorporate the Sample Code infringes or
 misappropriates any patent, copyright, trademark, trade secrets, or other
 proprietary rights of a third party, or (b) related to Your alleged violation
 of the terms of this Agreement.
 10. EXPORT: The Sample Code is subject to German, EU and US export control
 regulations. You confirm that: a) You will not use the Sample Code for, and
 will not allow the Sample Code to be used for, any purposes prohibited by
 German, EU and US law, including, without limitation, for the development,
 design, manufacture or production of nuclear, chemical or biological weapons of
 mass destruction; b) You are not located in Cuba, Iran, Sudan, Iraq, North
 Korea, Syria, nor any other country to which the United States has prohibited
 export or that has been designated by the U.S. Government as a "terrorist
 supporting" country (any, an "US Embargoed Country"); c) You are not a citizen,
 national or resident of, and are not under the control of, a US Embargoed
 Country; d) You will not download or otherwise export or re-export the Sample
 Code, directly or indirectly, to a US Embargoed Country nor to citizens,
 nationals or residents of a US Embargoed Country; e) You are not listed on the
 United States Department of Treasury lists of Specially Designated Nationals,
 Specially Designated Terrorists, and Specially Designated Narcotic Traffickers,
 nor listed on the United States Department of Commerce Table of Denial Orders
 or any other U.S. government list of prohibited or restricted parties and f)
 You will not download or otherwise export or re-export the Sample Code, directly
 or indirectly, to persons on the above-mentioned lists.
 11. SUPPORT: SAP does not offer support for the Sample Code.
 12. TERM AND TERMINATION: You may terminate this Agreement by destroying all
 copies of the Sample Code in Your possession or control. SAP may terminate Your
 license to use the Sample Code immediately if You fail to comply with any of
 the terms of this Agreement, or, for SAP's convenience by providing you with
 ten (10) days written notice of termination. In case of termination or
 expiration of this Agreement, You must immediately destroy all copies of the
 Sample Code in your possession or control. In the event Your Company is acquired
 (by merger, purchase of stock, assets or intellectual property or exclusive
 license), or You become employed, by a direct competitor of SAP, then this
 Agreement and all licenses granted to You in this Agreement shall immediately
 terminate upon the date of such acquisition or change of employment.
 13. LAW/VENUE:
 a) If You are located outside the US or Canada: This Agreement is governed by
 and construed in accordance with the laws of Germany without reference to its
 conflicts of law principles. You and SAP agree to submit to the exclusive 
 jurisdiction of, and venue in, the courts located in Karlsruhe, Germany in any
 dispute arising out of or relating to this Agreement or the Sample Code. The
 United Nations Convention on Contracts for the International Sale of Goods shall
 not apply to this Agreement.
 b) If You are located in the US or Canada: This Agreement shall be governed by
 and construed in accordance with the laws of the State of New York, USA without
 reference to its conflicts of law principles. You and SAP agree to submit to
 the exclusive jurisdiction of, and venue in, the courts located in New York,
 New York, USA in any dispute arising out of or relating to this Agreement or
 the Sample Code. The United Nations Convention on Contracts for the
 International Sale of Goods shall not apply to this Agreement.
 14. MISCELLANEOUS: This Agreement is the complete agreement between the parties
 respecting the Sample Code. This Agreement supersedes all prior or
 contemporaneous agreements or representations with regards to the Sample Code.
 If any term of this Agreement is found to be invalid or unenforceable, the
 surviving provisions shall remain effective. SAP's failure to enforce any right
 or provisions stipulated in this Agreement will not constitute a waiver of such
 provision, or any other provision of this Agreement.
 v1.0-071618 
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,201 +0,0 @@
                                  Apache License
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/
   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
   1. Definitions.
      "License" shall mean the terms and conditions for use, reproduction,
      and distribution as defined by Sections 1 through 9 of this document.
      "Licensor" shall mean the copyright owner or entity authorized by
      the copyright owner that is granting the License.
      "Legal Entity" shall mean the union of the acting entity and all
      other entities that control, are controlled by, or are under common
      control with that entity. For the purposes of this definition,
      "control" means (i) the power, direct or indirect, to cause the
      direction or management of such entity, whether by contract or
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
      outstanding shares, or (iii) beneficial ownership of such entity.
      "You" (or "Your") shall mean an individual or Legal Entity
      exercising permissions granted by this License.
      "Source" form shall mean the preferred form for making modifications,
      including but not limited to software source code, documentation
      source, and configuration files.
      "Object" form shall mean any form resulting from mechanical
      transformation or translation of a Source form, including but
      not limited to compiled object code, generated documentation,
      and conversions to other media types.
      "Work" shall mean the work of authorship, whether in Source or
      Object form, made available under the License, as indicated by a
      copyright notice that is included in or attached to the work
      (an example is provided in the Appendix below).
      "Derivative Works" shall mean any work, whether in Source or Object
      form, that is based on (or derived from) the Work and for which the
      editorial revisions, annotations, elaborations, or other modifications
      represent, as a whole, an original work of authorship. For the purposes
      of this License, Derivative Works shall not include works that remain
      separable from, or merely link (or bind by name) to the interfaces of,
      the Work and Derivative Works thereof.
      "Contribution" shall mean any work of authorship, including
      the original version of the Work and any modifications or additions
      to that Work or Derivative Works thereof, that is intentionally
      submitted to Licensor for inclusion in the Work by the copyright owner
      or by an individual or Legal Entity authorized to submit on behalf of
      the copyright owner. For the purposes of this definition, "submitted"
      means any form of electronic, verbal, or written communication sent
      to the Licensor or its representatives, including but not limited to
      communication on electronic mailing lists, source code control systems,
      and issue tracking systems that are managed by, or on behalf of, the
      Licensor for the purpose of discussing and improving the Work, but
      excluding communication that is conspicuously marked or otherwise
      designated in writing by the copyright owner as "Not a Contribution."
      "Contributor" shall mean Licensor and any individual or Legal Entity
      on behalf of whom a Contribution has been received by Licensor and
      subsequently incorporated within the Work.
   2. Grant of Copyright License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      copyright license to reproduce, prepare Derivative Works of,
      publicly display, publicly perform, sublicense, and distribute the
      Work and such Derivative Works in Source or Object form.
   3. Grant of Patent License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      (except as stated in this section) patent license to make, have made,
      use, offer to sell, sell, import, and otherwise transfer the Work,
      where such license applies only to those patent claims licensable
      by such Contributor that are necessarily infringed by their
      Contribution(s) alone or by combination of their Contribution(s)
      with the Work to which such Contribution(s) was submitted. If You
      institute patent litigation against any entity (including a
      cross-claim or counterclaim in a lawsuit) alleging that the Work
      or a Contribution incorporated within the Work constitutes direct
      or contributory patent infringement, then any patent licenses
      granted to You under this License for that Work shall terminate
      as of the date such litigation is filed.
   4. Redistribution. You may reproduce and distribute copies of the
      Work or Derivative Works thereof in any medium, with or without
      modifications, and in Source or Object form, provided that You
      meet the following conditions:
      (a) You must give any other recipients of the Work or
          Derivative Works a copy of this License; and
      (b) You must cause any modified files to carry prominent notices
          stating that You changed the files; and
      (c) You must retain, in the Source form of any Derivative Works
          that You distribute, all copyright, patent, trademark, and
          attribution notices from the Source form of the Work,
          excluding those notices that do not pertain to any part of
          the Derivative Works; and
      (d) If the Work includes a "NOTICE" text file as part of its
          distribution, then any Derivative Works that You distribute must
          include a readable copy of the attribution notices contained
          within such NOTICE file, excluding those notices that do not
          pertain to any part of the Derivative Works, in at least one
          of the following places: within a NOTICE text file distributed
          as part of the Derivative Works; within the Source form or
          documentation, if provided along with the Derivative Works; or,
          within a display generated by the Derivative Works, if and
          wherever such third-party notices normally appear. The contents
          of the NOTICE file are for informational purposes only and
          do not modify the License. You may add Your own attribution
          notices within Derivative Works that You distribute, alongside
          or as an addendum to the NOTICE text from the Work, provided
          that such additional attribution notices cannot be construed
          as modifying the License.
      You may add Your own copyright statement to Your modifications and
      may provide additional or different license terms and conditions
      for use, reproduction, or distribution of Your modifications, or
      for any such Derivative Works as a whole, provided Your use,
      reproduction, and distribution of the Work otherwise complies with
      the conditions stated in this License.
   5. Submission of Contributions. Unless You explicitly state otherwise,
      any Contribution intentionally submitted for inclusion in the Work
      by You to the Licensor shall be under the terms and conditions of
      this License, without any additional terms or conditions.
      Notwithstanding the above, nothing herein shall supersede or modify
      the terms of any separate license agreement you may have executed
      with Licensor regarding such Contributions.
   6. Trademarks. This License does not grant permission to use the trade
      names, trademarks, service marks, or product names of the Licensor,
      except as required for reasonable and customary use in describing the
      origin of the Work and reproducing the content of the NOTICE file.
   7. Disclaimer of Warranty. Unless required by applicable law or
      agreed to in writing, Licensor provides the Work (and each
      Contributor provides its Contributions) on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
      implied, including, without limitation, any warranties or conditions
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
      PARTICULAR PURPOSE. You are solely responsible for determining the
      appropriateness of using or redistributing the Work and assume any
      risks associated with Your exercise of permissions under this License.
   8. Limitation of Liability. In no event and under no legal theory,
      whether in tort (including negligence), contract, or otherwise,
      unless required by applicable law (such as deliberate and grossly
      negligent acts) or agreed to in writing, shall any Contributor be
      liable to You for damages, including any direct, indirect, special,
      incidental, or consequential damages of any character arising as a
      result of this License or out of the use or inability to use the
      Work (including but not limited to damages for loss of goodwill,
      work stoppage, computer failure or malfunction, or any and all
      other commercial damages or losses), even if such Contributor
      has been advised of the possibility of such damages.
   9. Accepting Warranty or Additional Liability. While redistributing
      the Work or Derivative Works thereof, You may choose to offer,
      and charge a fee for, acceptance of support, warranty, indemnity,
      or other liability obligations and/or rights consistent with this
      License. However, in accepting such obligations, You may act only
      on Your own behalf and on Your sole responsibility, not on behalf
      of any other Contributor, and only if You agree to indemnify,
      defend, and hold each Contributor harmless for any liability
      incurred by, or claims asserted against, such Contributor by reason
      of your accepting any such warranty or additional liability.
   END OF TERMS AND CONDITIONS
   APPENDIX: How to apply the Apache License to your work.
      To apply the Apache License to your work, attach the following
      boilerplate notice, with the fields enclosed by brackets "[]"
      replaced with your own identifying information. (Don't include
      the brackets!)  The text should be enclosed in the appropriate
      comment syntax for the file format. We also recommend that a
      file or class name and description of purpose be included on the
      same "printed page" as the copyright notice for easier
      identification within third-party archives.
   Copyright [yyyy] [name of copyright owner]
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
       http://www.apache.org/licenses/LICENSE-2.0
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
--- a/1
+++ b/1
@@ -0,0 +1 @@
 Copyright (c) 2019 SAP SE or an SAP affiliate company. All rights reserved.
--- a/README.md
+++ b/README.md
@@ -1,86 +1,118 @@
-# Welcome to cap/samples
+# Welcome to SAP Cloud Application Programming model samples
-Find here a collection of samples for the [SAP Cloud Application Programming Model](https://cap.cloud.sap) organized in a simplistic [monorepo setup](samples.md#all-in-one-monorepo). &rarr; See [**Overview** of contained samples](samples.md)
+Find here the samples for the openSAP course [Building Applications with the SAP Cloud Application Programming Model](https://open.sap.com/courses/cp7).
-![](https://github.com/SAP-samples/cloud-cap-samples/workflows/CI/badge.svg)
+## Get Access to SAP Business Application Studio
-[![REUSE status](https://api.reuse.software/badge/github.com/SAP-samples/cloud-cap-samples)](https://api.reuse.software/info/github.com/SAP-samples/cloud-cap-samples)
+The recommended environment for the course is SAP Business Application Studio.  Watch [unit 2 of week 1](https://open.sap.com/courses/cp7/items/51pzQUzbXHr2kdbOmVs6jI) for how to get access.
-### Preliminaries
+## Setup
-1. Install [**@sap/cds-dk**](https://cap.cloud.sap/docs/get-started/) globally:
+In SAP Business Application Studio, open a terminal.
-
+Then clone the repo with this specific branch:
   ```sh
   npm i -g @sap/cds-dk
   ```
 2. _Optional:_ [Use Visual Studio Code](https://cap.cloud.sap/docs/get-started/tools#vscode)
 ### 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).
 ```sh
-git clone https://github.com/sap-samples/cloud-cap-samples samples
+git clone https://github.com/sap-samples/cloud-cap-samples projects/cloud-cap-samples -b openSAP-week3-unit5
-cd samples
+cd projects/cloud-cap-samples
 ```
-### Setup
+In the `cloud-cap-samples` folder run:
 In the samples folder run:
 ```sh
 npm install
 ```
-### Run
+## Run
 With that you're ready to run the samples, for example:
 Now you're ready to run the samples, for example:
 ```sh
-cds watch bookshop
+cd packages/bookshop
 cds deploy
 cds watch
 ```
-After that open this link in your browser: [http://localhost:4004](http://localhost:4004)
+After that, watch out for the little popup in the lower right corner of SAP Business Application Studio that asks you to open the application in your browser.
-When asked to log in, type `alice` as user and leave the password field blank, which is the [default user](https://cap.cloud.sap/docs/node.js/authentication#mocked).
+## Hints
-
+- If your demo user logon window does not show up:  clear the browsers login data
-### Testing
+- If your port is still in use run in your terminal:
 Run the provided tests with [_jest_](http://jestjs.io) or [_mocha_](http://mochajs.org), for example:
 ```sh
 npx jest
 ```
-> While mocha is a bit smaller and faster, jest runs tests in parallel and isolation, which allows to run all tests.
+> pkill node      //kill running node proceses
 ### Serve `npm`
 We've included a simple npm registry mock, which allows you to do an `npm install @capire/<package>` locally. Use it as follows:
 1. Start the @capire registry:
 ```sh
 npm run registry
 ```
 > While running this will have `@capire:registry=http://localhost:4444` set with npmrc.
 2. Install one of the @capire packages wherever you like, for example:
 ```sh
 npm add @capire/common @capire/bookshop
 ```
 ## Deploy to Cloud Foundry
-## Code Tours
+Clean-up the CF space in your trial account if you already used it before. Make sure that there are no services or applications deployed.
-Take one of the [guided tours](.tours) in VS Code through our CAP samples and learn which CAP features are showcased by the different parts of the repository. Just install the [CodeTour extension](https://marketplace.visualstudio.com/items?itemName=vsls-contrib.codetour) for VS Code. We'll add more code tours in the future. Stay tuned!
+Generation of the XSUAA service configuration file xs-security.json:
 ```sh
 cds compile srv/ --to xsuaa > xs-security.json
 ```
 In this unit we use  [MTA](https://sap.github.io/cloud-mta-build-tool/) to do the deployment to CF
 ```sh
 npm install -g mbt
 ```
 You can generate the MTA.yaml from CDS and do manual modifications or simply use the already generated and adapted  mta.yaml in the branch and directly generate the .mtar file
 #### BEGIN OPTIONAL PART
 If you want to generate the MTA.YAML yourself please do the following:
 - Generate the mta.yaml with the HANA dependency
 ```sh
 cds add hana --force
 cds add mta
 ```
 - Add the path to the generated xs-security.json in the MTA.YAML
 ```
    parameters:
         path: ./xs-security.json
         service:xsuaa
         service-plan: application
         ....
 ```
 - Add the application block in the MTA.YAML
 ```
     ##############    APP   #########################
     - name: capire-bookshop-app
       type: nodejs
       path: gen/app
       parameters:
          memory: 256M
       build-parameters:
         requires:
           - name: capire-bookshop-srv
       requires:
        - name: capire-bookshop-uaa
        - name: srv-binding
          group: destinations
          properties:
             forwardAuthToken: true
             name: srv-binding
             url: ~{srv-url}
 ```
 - Make sure to use service hanatrial instead of hana in the MTA.YAML
 ```
   parameters:
     service: hanatrial
 ```
 #### END OPTIONAL PART
 Generate the .mtar file for the deployment and deploy to cloud foundry:
 ```sh
 mbt build -t ./
 cf login -a https://api.cf.eu10.hana.ondemand.com
 cf deploy sap.capire-bookshop_1.0.0.mtar
 ```
 ## Get Support
-Check out the documentation at [https://cap.cloud.sap](https://cap.cloud.sap). <br>
+Check out the cap docs at https://cap.cloud.sap. <br>
-In case you've a question, find a bug, or otherwise need support, use our [community](https://answers.sap.com/tags/9f13aee1-834c-4105-8e43-ee442775e5ce) to get more visibility.
+In case you find a bug or need support, please [open an issue in here](https://github.com/SAP-samples/cloud-cap-samples/issues/new).
 ## License
-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.
+Copyright (c) 2020 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under SAP Sample Code License Agreement, except as noted otherwise in the [LICENSE](/LICENSE) file.
--- a/bookshop/.vscode/launch.json
+++ b/bookshop/.vscode/launch.json
@@ -1,25 +0,0 @@
 {
  // Use IntelliSense to learn about possible attributes.
  // Hover to view descriptions of existing attributes.
  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
  "version": "0.2.0",
  "configurations": [
    {
      "name": "Attach to...",
      "type": "node",
      "request": "attach",
      "processId": "${command:PickProcess}",
      "skipFiles": ["<node_internals>/**"]
    },
    {
      "name": "cds run",
      "type": "node",
      "request": "launch",
      "runtimeExecutable": "npx",
      "runtimeArgs": ["-n"],
      "args": ["--", "cds", "run", "--with-mocks", "--in-memory?"],
      "console": "integratedTerminal",
      "skipFiles": ["<node_internals>/**"]
    }
  ]
 }
--- a/bookshop/app/services.cds
+++ b/bookshop/app/services.cds
@@ -1,2 +0,0 @@
 // Incorporate pre-build extensions from...
 using from '@capire/common';
--- a/bookshop/app/vue/app.js
+++ b/bookshop/app/vue/app.js
@@ -1,48 +0,0 @@
 /* global Vue axios */ //> from vue.html
 const $ = sel => document.querySelector(sel)
 const GET = (url) => axios.get('/browse'+url)
 const POST = (cmd,data) => axios.post('/browse'+cmd,data)
 const books = new Vue ({
    el:'#app',
    data: {
        list: [],
        book: undefined,
        order: { quantity:1, succeeded:'', failed:'' }
    },
    methods: {
        search: ({target:{value:v}}) => books.fetch(v && '&$search='+v),
        async fetch (etc='') {
            const {data} = await GET(`/ListOfBooks?$expand=genre,currency${etc}`)
            books.list = data.value
        },
        async inspect (eve) {
            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 }
            setTimeout (()=> $('form > input').focus(), 111)
        },
        async submitOrder () {
            const {book,order} = books, quantity = parseInt (order.quantity) || 1 // REVISIT: Okra should be less strict
            try {
                const res = await POST(`/submitOrder`, { quantity, book: book.ID })
                book.stock = res.data.stock
                books.order = { quantity, succeeded: `Successfully ordered ${quantity} item(s).` }
            } catch (e) {
                books.order = { quantity, failed: e.response.data.error.message }
            }
        }
    }
 })
 // initially fill list of books
 books.fetch()
--- a/bookshop/app/vue/index.html
+++ b/bookshop/app/vue/index.html
@@ -1,65 +0,0 @@
 <!DOCTYPE html>
 <html>
 <head>
    <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"></script>
    <style>
        .hovering tr:hover td { color:cyan; background: #123; cursor: pointer; }
        .rating-stars { color:teal }
        .succeeded { color:teal }
        .failed { color:red }
    </style>
 </head>
 <body class="small-container", style="margin-top: 70px;">
 <div id='app'>
    <h1> {{ document.title }} </h1>
    <input type="text" placeholder="Search..." @input="search">
    <table id='books' class="hovering">
        <thead>
            <th> Book </th>
            <th> Author </th>
            <th> Genre </th>
            <th> Rating </th>
            <th> Price </th>
        </thead>
        <tr v-for="book in list" v-bind:id="book.ID" v-on:click="inspect">
            <td>{{ book.title }}</td>
            <td>{{ book.author }}</td>
            <td>{{ book.genre.name }}</td>
            <td class="rating-stars">
                {{ ('★'.repeat(Math.round(book.rating))+'☆☆☆☆☆').slice(0,5) }} ({{ book.numberOfReviews }})
            </td>
            <td>{{ book.currency && book.currency.symbol }} {{ book.price }}</td>
        </tr>
    </table>
    <div v-if="book">
        <img v-bind:src="book.image" alt=""/>
        <label style="text-align:right">
            <span class="succeeded"> {{ order.succeeded }} </span>
            <span class="failed"> {{ order.failed }} </span>
            &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="submit" value="Order:" class="muted-button">
        </form>
        <h4> {{ book.title }} </h4>
        <p> {{ book.descr }} </p>
    </div>
    <div v-else>
        ( click on a row to see details... )
    </div>
 </div>
 </body>
 <script src="app.js"></script>
 </html>
--- a/bookshop/db/data/sap.capire.bookshop-Genres.csv
+++ b/bookshop/db/data/sap.capire.bookshop-Genres.csv
@@ -1,16 +0,0 @@
 ID;parent_ID;name
 10;;Fiction
 11;10;Drama
 12;10;Poetry
 13;10;Fantasy
 14;10;Science Fiction
 15;10;Romance
 16;10;Mystery
 17;10;Thriller
 18;10;Dystopia
 19;10;Fairy Tale
 20;;Non-Fiction
 21;20;Biography
 22;21;Autobiography
 23;20;Essay
 24;20;Speech
--- a/bookshop/db/schema.cds
+++ b/bookshop/db/schema.cds
@@ -1,31 +0,0 @@
 using { Currency, managed, sap, extensible } from '@sap/cds/common';
 namespace sap.capire.bookshop;
 entity Books : managed, extensible {
  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, extensible {
  key ID : Integer;
  name   : String(111);
  dateOfBirth  : Date;
  dateOfDeath  : Date;
  placeOfBirth : String;
  placeOfDeath : String;
  books  : Association to many Books on books.author = $self;
 }
 /** Hierarchically organized Code List for Genres */
 entity Genres : sap.common.CodeList {
  key ID   : Integer;
  parent   : Association to Genres;
  children : Composition of many Genres on children.parent = $self;
 }
--- a/bookshop/index.cds
+++ b/bookshop/index.cds
@@ -1,4 +0,0 @@
 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 @@
 const { CatalogService } = require('./srv/cat-service')
 module.exports = { CatalogService }
--- a/bookshop/package.json
+++ b/bookshop/package.json
@@ -1,23 +0,0 @@
 {
  "name": "@capire/bookshop",
  "version": "1.0.0",
  "description": "A simple self-contained bookshop service.",
  "dependencies": {
    "@capire/common": "*",
    "@sap/cds": "^5.0.4",
    "express": "^4.17.1",
    "passport": "0.4.1"
  },
  "scripts": {
    "genres": "cds serve test/genres.cds",
    "start": "cds run",
    "watch": "cds watch"
  },
  "cds": {
    "requires": {
      "db": {
        "kind": "sql"
      }
    }
  }
 }
--- a/bookshop/readme.md
+++ b/bookshop/readme.md
@@ -1,31 +0,0 @@
 # Bookshop Getting Started Sample
 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).
 ## 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).
 ## Running the Sample
 ```sh
 npm run watch
 ```
 ## Content & Best Practices
 | 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)         |
--- a/bookshop/srv/admin-service.cds
+++ b/bookshop/srv/admin-service.cds
@@ -1,5 +0,0 @@
 using { sap.capire.bookshop as my } from '../db/schema';
 service AdminService @(requires:'admin') {
  entity Books as projection on my.Books;
  entity Authors as projection on my.Authors;
 }
--- a/bookshop/srv/admin-service.js
+++ b/bookshop/srv/admin-service.js
@@ -1,12 +0,0 @@
 const cds = require('@sap/cds')
 module.exports = cds.service.impl (function(){
  this.before ('NEW','Authors', genid)
  this.before ('NEW','Books', genid)
 })
 /** Generate primary keys for target entity in request */
 async function genid (req) {
  const {ID} = await cds.tx(req).run (SELECT.one.from(req.target).columns('max(ID) as ID'))
  req.data.ID = ID - ID % 100 + 100 + 1
 }
--- a/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 @@
 const cds = require('@sap/cds')
 class CatalogService extends cds.ApplicationService { init(){
  const { Books } = cds.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 {stock} = await SELECT `stock` .from (Books,book)
    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()
 }}
 module.exports = { CatalogService }
--- a/bookshop/test/genres.cds
+++ b/bookshop/test/genres.cds
@@ -1,4 +0,0 @@
 using { sap.capire.bookshop as my } from '../db/schema';
 service TestService {
  entity Genres as projection on my.Genres;
 }
--- a/bookshop/test/genres.http
+++ b/bookshop/test/genres.http
@@ -1,38 +0,0 @@
 #################################################
 #
 #   Genres
 #
 GET http://localhost:4004/test/Genres?
 ###
 GET http://localhost:4004/test/Genres?
 &$filter=parent_ID eq null&$select=name
 &$expand=children($select=name)
 ###
 POST http://localhost:4004/test/Genres?
 Content-Type: application/json
 { "ID":100, "name":"Some Sample Genres...", "children":[
    { "ID":101, "name":"Cat", "children":[
        { "ID":102, "name":"Kitty", "children":[
            { "ID":103, "name":"Kitty Cat", "children":[
                { "ID":104, "name":"Aristocat" } ]},
            { "ID":105, "name":"Kitty Bat" } ]},
        { "ID":106, "name":"Catwoman", "children":[
            { "ID":107, "name":"Catalina" } ]} ]},
    { "ID":108, "name":"Catweazle" }
 ]}
 ###
 GET http://localhost:4004/test/Genres(100)?
 # &$expand=children
 # &$expand=children($expand=children($expand=children($expand=children)))
 ###
 DELETE http://localhost:4004/test/Genres(103)
 ###
 DELETE http://localhost:4004/test/Genres(100)
 ###
--- a/bookshop/test/requests.http
+++ b/bookshop/test/requests.http
@@ -1,95 +0,0 @@
@server = http://localhost:4004
@me = Authorization: Basic {{$processEnv USER}}:
 ### ------------------------------------------------------------------------
 # Get service info
 GET {{server}}/browse
 {{me}}
 ### ------------------------------------------------------------------------
 # Get $metadata document
 GET {{server}}/browse/$metadata
 {{me}}
 ### ------------------------------------------------------------------------
 # Browse Books as any user
 GET {{server}}/browse/Books?
  # &$select=title,stock
  # &$expand=currency
  # &sap-language=de
 {{me}}
 ### ------------------------------------------------------------------------
 # Fetch Authors as admin
 GET {{server}}/admin/Authors?
  # &$select=name,dateOfBirth,placeOfBirth
  # &$expand=books($select=title;$expand=currency)
  # &$filter=ID eq 101
  # &sap-language=de
 Authorization: Basic alice:
 ### ------------------------------------------------------------------------
 # Create Author
 POST {{server}}/admin/Authors
 Content-Type: application/json;IEEE754Compatible=true
 Authorization: Basic alice:
 {
  "ID": 112,
  "name": "Shakespeeeeere",
  "age": 22
 }
 ### ------------------------------------------------------------------------
 # Create book
 POST {{server}}/admin/Books
 Content-Type: application/json;IEEE754Compatible=true
 Authorization: Basic alice:
 {
  "ID": 2,
  "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" }
 }
 ### ------------------------------------------------------------------------
 # Put image to books
 PUT {{server}}/admin/Books(2)/image
 Content-Type: image/png
 Authorization: Basic alice:
 data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAANwAAADcCAYAAAAbWs+BAAAGwElEQVR4Ae3cwZFbNxBFUY5rkrDTmKAUk5QT03Aa44U22KC7NHptw+DRikVAXf8fzC3u8Hj4R4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAgZzAW26USQT+e4HPx+Mz+RRvj0e0kT+SD2cWAQK1gOBqH6sEogKCi3IaRqAWEFztY5VAVEBwUU7DCNQCgqt9rBKICgguymkYgVpAcLWPVQJRAcFFOQ0jUAsIrvaxSiAqILgop2EEagHB1T5WCUQFBBflNIxALSC42scqgaiA4KKchhGoBQRX+1glEBUQXJTTMAK1gOBqH6sEogKCi3IaRqAWeK+Xb1z9iN558fHxcSPS9p2ezx/ROz4e4TtIHt+3j/61hW9f+2+7/+UXbifjewIDAoIbQDWSwE5AcDsZ3xMYEBDcAKqRBHYCgtvJ+J7AgIDgBlCNJLATENxOxvcEBgQEN4BqJIGdgOB2Mr4nMCAguAFUIwnsBAS3k/E9gQEBwQ2gGklgJyC4nYzvCQwICG4A1UgCOwHB7WR8T2BAQHADqEYS2AkIbifjewIDAoIbQDWSwE5AcDsZ3xMYEEjfTzHwiK91B8npd6Q8n8/oGQ/ckRJ9vvQwv3BpUfMIFAKCK3AsEUgLCC4tah6BQkBwBY4lAmkBwaVFzSNQCAiuwLFEIC0guLSoeQQKAcEVOJYIpAUElxY1j0AhILgCxxKBtIDg0qLmESgEBFfgWCKQFhBcWtQ8AoWA4AocSwTSAoJLi5pHoBAQXIFjiUBaQHBpUfMIFAKCK3AsEUgLCC4tah6BQmDgTpPsHSTFs39p6fQ7Q770UsV/Ov19X+2OFL9wxR+rJQJpAcGlRc0jUAgIrsCxRCAtILi0qHkECgHBFTiWCKQFBJcWNY9AISC4AscSgbSA4NKi5hEoBARX4FgikBYQXFrUPAKFgOAKHEsE0gKCS4uaR6AQEFyBY4lAWkBwaVHzCBQCgitwLBFICwguLWoegUJAcAWOJQJpAcGlRc0jUAgIrsCxRCAt8J4eePq89B0ar3ZnyOnve/rfn1+400/I810lILirjtPLnC4guNNPyPNdJSC4q47Ty5wuILjTT8jzXSUguKuO08ucLiC400/I810lILirjtPLnC4guNNPyPNdJSC4q47Ty5wuILjTT8jzXSUguKuO08ucLiC400/I810lILirjtPLnC4guNNPyPNdJSC4q47Ty5wuILjTT8jzXSUguKuO08ucLiC400/I810l8JZ/m78+szP/zI47fJo7Q37vgJ7PHwN/07/3TOv/9gu3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhg4P6H9J0maYHXuiMlrXf+vOfA33Turf3C5SxNItAKCK4lsoFATkBwOUuTCLQCgmuJbCCQExBcztIkAq2A4FoiGwjkBASXszSJQCsguJbIBgI5AcHlLE0i0AoIriWygUBOQHA5S5MItAKCa4lsIJATEFzO0iQCrYDgWiIbCOQEBJezNIlAKyC4lsgGAjkBweUsTSLQCgiuJbKBQE5AcDlLkwi0Akff//Dz6U+/I6U1/sUNr3bnytl3kPzi4bXb/cK1RDYQyAkILmdpEoFWQHAtkQ0EcgKCy1maRKAVEFxLZAOBnIDgcpYmEWgFBNcS2UAgJyC4nKVJBFoBwbVENhDICQguZ2kSgVZAcC2RDQRyAoLLWZpEoBUQXEtkA4GcgOByliYRaAUE1xLZQCAnILicpUkEWgHBtUQ2EMgJCC5naRKBVkBwLZENBHIC/4M7TXIv+3PS22d24qvdQfL3C/7N5P5i/MLlLE0i0AoIriWygUBOQHA5S5MItAKCa4lsIJATEFzO0iQCrYDgWiIbCOQEBJezNIlAKyC4lsgGAjkBweUsTSLQCgiuJbKBQE5AcDlLkwi0AoJriWwgkBMQXM7SJAKtgOBaIhsI5AQEl7M0iUArILiWyAYCOQHB5SxNItAKCK4lsoFATkBwOUuTCBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIDAvyrwDySEJ2VQgUSoAAAAAElFTkSuQmCC
 ### ------------------------------------------------------------------------
 # Reading image from from the server directly
 GET {{server}}/browse/Books(2)/image
 ### ------------------------------------------------------------------------
 # Submit Order as authenticated user
 # (send that three times to get out-of-stock message)
 POST {{server}}/browse/submitOrder
 Content-Type: application/json
 {{me}}
 { "book":201, "quantity":5 }
 ### ------------------------------------------------------------------------
 # Browse Genres
 GET {{server}}/browse/Genres?
 # &$filter=parent_ID eq null&$select=name
 # &$expand=children($select=name)
 {{me}}
--- 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,33 +0,0 @@
 {
  "name": "@capire/bookstore",
  "version": "1.0.0",
  "dependencies": {
    "@capire/bookshop": "*",
    "@capire/reviews": "*",
    "@capire/orders": "*",
    "@capire/common": "*",
    "@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,21 +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')
 })
 // 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,32 +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';
--- a/bookstore/srv/mashup.js
+++ b/bookstore/srv/mashup.js
@@ -1,58 +0,0 @@
 ////////////////////////////////////////////////////////////////////////////
 //
 //    Mashing up bookshop services with required services...
 //
 module.exports = async()=>{ // called by server.js
  const cds = require('@sap/cds')
  const CatalogService = await cds.connect.to ('CatalogService')
  const ReviewsService = await cds.connect.to ('ReviewsService')
  const OrdersService = await cds.connect.to ('OrdersService')
  const db = await cds.connect.to ('db')
  // reflect entity definitions used below...
  const { Books } = db.entities ('sap.capire.bookshop')
  //
  // Delegate requests to read reviews to the ReviewsService
  // Note: prepend is neccessary to intercept generic default handler
  //
  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)})
  }))
  //
  // Create an order with the OrdersService when CatalogService signals a new order
  //
  CatalogService.on ('OrderedBook', async (msg) => {
    const { book, quantity, 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 }],
      buyer, createdBy: buyer
    })
  })
  //
  // Update Books' average ratings when ReviewsService signals updated 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 })
  })
  //
  // Reduce stock of ordered books for orders are created from Orders admin UI
  //
  OrdersService.on ('OrderChanged', (msg) => {
    console.debug ('> received:', msg.event, msg.data)
    const { product, deltaQuantity } = msg.data
    return UPDATE (Books) .where ('ID =', product)
    .and ('stock >=', deltaQuantity)
    .set ('stock -=', deltaQuantity)
  })
 }
--- 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/bookstore/test/requests.http
+++ b/bookstore/test/requests.http
@@ -1,81 +0,0 @@
@bookshop = http://localhost:4004
@reviews-service = {{bookshop}}/reviews
 # Uncomment this when running a separate reviews service
 # @reviews-service = http://localhost:4005/reviews
 #################################################
 #
 #   Reviews Service
 #
 GET {{reviews-service}}/Reviews
 ###
 POST {{reviews-service}}/Reviews
 Authorization: Basic {{$processEnv USER}}:
 Content-Type: application/json
 {"subject":"201", "title":"boo", "rating":3 }
 #################################################
 #
 #   Bookshop Services
 #
 GET {{bookshop}}/browse/Books/201/reviews?
 &$select=rating,date,title
 &$top=3
 ###
 GET {{bookshop}}/browse/Books(201)?
 &$select=ID,title,rating
 &$expand=reviews
 ###
 GET {{bookshop}}/browse/Books?
  &$select=title,author&$expand=currency
 Accept-Language: de
 #################################################
 #
 #   Orders Service, incl. draft choreography
 #
@newOrderID = e939604c-ab83-4d4f-bdb6-95fe30b3773e
 GET {{bookshop}}/orders/Orders
 ### Create order, still inactive
 POST {{bookshop}}/orders/Orders
 Content-Type: application/json
 {"ID": "{{newOrderID}}"}
 ### Get inactive order.  We have to specify `IsActiveEntity`.
 GET {{bookshop}}/orders/Orders(ID={{newOrderID}},IsActiveEntity=false)
 ### Activate order using `.../<servicename>.draftActivate`
 POST {{bookshop}}/orders/Orders(ID={{newOrderID}},IsActiveEntity=false)/OrdersService.draftActivate
 Content-Type: application/json
 ### Get active order
 GET {{bookshop}}/orders/Orders(ID={{newOrderID}},IsActiveEntity=true)
 ### Create author
 POST {{bookshop}}/admin/Authors
 Content-Type: application/json
 Authorization: Basic alice:
 {
  "ID": 200,
  "name": "William Shakespeare",
  "dateOfBirth": "1564-04-26",
  "dateOfDeath": "1616-04-23"
 }
--- a/common/data/sap.common-Countries.csv
+++ b/common/data/sap.common-Countries.csv
@@ -1,12 +0,0 @@
 code;name;descr
 AU;Australia;Commonwealth of Australia
 CA;Canada;Canada
 CN;China;People's Republic of China (PRC)
 FR;France;French Republic
 DE;Germany;Federal Republic of Germany
 IN;India;Republic of India
 IL;Israel;State of Israel
 MM;Myanmar;Republic of the Union of Myanmar
 GB;United Kingdom;United Kingdom of Great Britain and Northern Ireland
 US;United States;United States of America (USA)
 EU;European Union;European Union
--- a/common/data/sap.common-Countries_texts.csv
+++ b/common/data/sap.common-Countries_texts.csv
@@ -1,12 +0,0 @@
 code;locale;name;descr
 AU;de;Australien;Commonwealth Australien
 CA;de;Kanada;Canada
 CN;de;China;Volksrepublik China
 FR;de;Frankreich;Republik Frankreich
 DE;de;Deutschland;Bundesrepublik Deutschland
 IN;de;Indien;Republik Indien
 IL;de;Israel;Staat Israel
 MM;de;Myanmar;Republik der Union Myanmar
 GB;de;Vereinigtes Königreich;Vereinigtes Königreich Großbritannien und Nordirland
 US;de;Vereinigte Staaten;Vereinigte Staaten von Amerika
 EU;de;Europäische Union;Europäische Union
--- a/common/data/sap.common-Currencies.csv
+++ b/common/data/sap.common-Currencies.csv
@@ -1,12 +0,0 @@
 code;symbol;name;descr;numcode;minor;exponent
 EUR;€;Euro;European Euro;978;Cent;2
 USD;$;US Dollar;United States Dollar;840;Cent;2
 CAD;$;Canadian Dollar;Canadian Dollar;124;Cent;2
 AUD;$;Australian Dollar;Australian Dollar;036;Cent;2
 GBP;£;British Pound;Great Britain Pound;826;Penny;2
 ILS;₪;Shekel;Israeli New Shekel;376;Agorat;2
 INR;₹;Rupee;Indian Rupee;356;Paise;2
 QAR;﷼;Riyal;Katar Riyal;356;Dirham;2
 SAR;﷼;Riyal;Saudi Riyal;682;Halala;2
 JPY;¥;Yen;Japanese Yen;392;Sen;2
 CNY;¥;Yuan;Chinese Yuan Renminbi;156;Jiao;1
--- a/common/data/sap.common-Languages.csv
+++ b/common/data/sap.common-Languages.csv
@@ -1,5 +0,0 @@
 code;name
 de;German
 fr;French
 en;English
 en_GB;British English
--- a/common/data/sap.common-Languages_texts.csv
+++ b/common/data/sap.common-Languages_texts.csv
@@ -1,10 +0,0 @@
 code;locale;name
 de;en;German
 de;de;Deutsch
 de;fr;Allemande
 fr;en;French
 fr;de;Französisch
 fr;fr;Francais
 en;en;English
 en;de;Englisch
 en;fr;Anglais
--- a/common/index.cds
+++ b/common/index.cds
@@ -1,45 +0,0 @@
 using { sap } from '@sap/cds/common';
 extend sap.common.Currencies with {
  // Currencies.code = ISO 4217 alphabetic three-letter code
  // with the first two letters being equal to ISO 3166 alphabetic country codes
  // See also:
  // [1] https://www.iso.org/iso-4217-currency-codes.html
  // [2] https://www.currency-iso.org/en/home/tables/table-a1.html
  // [3] https://www.ibm.com/support/knowledgecenter/en/SSZLC2_7.0.0/com.ibm.commerce.payments.developer.doc/refs/rpylerl2mst97.htm
  numcode  : Integer;
  exponent : Integer; //> e.g. 2 --> 1 Dollar = 10^2 Cent
  minor    : String; //> e.g. 'Cent'
 }
 /**
 * The Code Lists below are designed as optional extensions to
 * the base schema. Switch them on by adding an Association to
 * one of the code list entities in your models or by:
 * annotate sap.common.Countries with @cds.persistence.skip:false;
 */
 context sap.common_countries {
  extend sap.common.Countries {
    regions   : Composition of many Regions on regions._parent = $self.code;
  }
  entity Regions : sap.common.CodeList {
    key code : String(5); // ISO 3166-2 alpha5 codes, e.g. DE-BW
    children  : Composition of many Regions on children._parent = $self.code;
    cities    : Composition of many Cities on cities.region = $self;
    _parent   : String(11);
  }
  entity Cities : sap.common.CodeList {
    key code  : String(11);
    region    : Association to Regions;
    districts : Composition of many Districts on districts.city = $self;
  }
  entity Districts : sap.common.CodeList {
    key code  : String(11);
    city      : Association to Cities;
  }
 }
--- a/common/package.json
+++ b/common/package.json
@@ -1,8 +0,0 @@
 {
  "name": "@capire/common",
  "description": "Provides a pre-built extension package for std @sap/cds/common",
  "version": "1.0.0",
  "dependencies": {
    "@sap/cds": "*"
  }
 }
--- a/db/package.json
+++ b/db/package.json
@@ -0,0 +1,12 @@
 {
  "name": "deploy",
  "dependencies": {
    "@sap/hdi-deploy": "^3.8.2"
  },
  "engines": {
    "node": "^8"
  },
  "scripts": {
    "start": "node node_modules/@sap/hdi-deploy/deploy.js"
  }
 }
--- a/fiori/app/_i18n/i18n.properties
+++ b/fiori/app/_i18n/i18n.properties
@@ -1,26 +0,0 @@
 Books = Books
 Book = Book
 ID = ID
 Title = Title
 Author = Author
 AuthorID = Author ID
 Stock = Stock
 Name = Name
 AuthorName = Author's Name
 DateOfBirth = Date of Birth
 DateOfDeath = Date of Death
 PlaceOfBirth = Place of Birth
 PlaceOfDeath = Place of Death
 Age = Age
 Authors = Authors
 Order = Order
 Orders = Orders
 Price = Price
 Genre = Genre
 Genres = Genres
 SubGenres = Sub Genres
 NumCode = Numeric Code
 MinorUnit = Minor Unit
 Exponent = Exponent
--- 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,145 +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": {
    "flexEnabled": true,
        "config": {   
            "experimentalCAPScenario": true
        },
    "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-books/fiori-service.cds
+++ b/fiori/app/admin-books/fiori-service.cds
@@ -1,77 +0,0 @@
 using { AdminService } from '@capire/bookstore';
 using from '../common'; // to help UI linter get the complete annotations
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Books Object Page
 //
 annotate AdminService.Books with @(
 	UI: {
 		Facets: [
 			{$Type: 'UI.ReferenceFacet', Label: '{i18n>General}', Target: '@UI.FieldGroup#General'},
 			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Translations}', Target:  'texts/@UI.LineItem'},
 			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Details'},
 			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Admin}', Target: '@UI.FieldGroup#Admin'},
 		],
 		FieldGroup#General: {
 			Data: [
 				{Value: title},
 				{Value: author_ID},
 				{Value: genre_ID},
 				{Value: descr},
 			]
 		},
 		FieldGroup#Details: {
 			Data: [
 				{Value: stock},
 				{Value: price},
 				{Value: currency_code, Label: '{i18n>Currency}'},
 			]
 		},
 		FieldGroup#Admin: {
 			Data: [
 				{Value: createdBy},
 				{Value: createdAt},
 				{Value: modifiedBy},
 				{Value: modifiedAt}
 			]
 		}
 	}
 );
 ////////////////////////////////////////////////////////////
 //
 //  Draft for Localized Data
 //
 annotate sap.capire.bookshop.Books with @fiori.draft.enabled;
 annotate AdminService.Books with @odata.draft.enabled;
 annotate AdminService.Books.texts with @(
 	UI: {
 		Identification: [{Value:title}],
 		SelectionFields: [ locale, title ],
 		LineItem: [
 			{Value: locale, Label: 'Locale'},
 			{Value: title, Label: 'Title'},
 			{Value: descr, Label: 'Description'},
 		]
 	}
 );
 // Add Value Help for Locales
 annotate AdminService.Books.texts {
 	locale @ValueList:{entity:'Languages'};
 	locale @Common.ValueListWithFixedValues:true; //show as drop down, not a dialog
 }
 // In addition we need to expose Languages through AdminService as a target for ValueList
 using { sap } from '@sap/cds/common';
 extend service AdminService {
 	@readonly 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,8 +0,0 @@
 sap.ui.define(["sap/fe/core/AppComponent"], function(AppComponent) {
 	"use strict";
 	return AppComponent.extend("books.Component", {
 		metadata: { manifest: "json" }
 	});
 });
 /* eslint no-undef:0 */
--- 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/browse/fiori-service.cds
+++ b/fiori/app/browse/fiori-service.cds
@@ -1,60 +0,0 @@
 using CatalogService from '@capire/bookstore';
 ////////////////////////////////////////////////////////////////////////////
 //
 //	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}'
        },
    ]},
 });
 ////////////////////////////////////////////////////////////////////////////
 //
 //	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 : ' '
        },
    ]
 }, );
--- a/fiori/app/browse/webapp/Component.js
+++ b/fiori/app/browse/webapp/Component.js
@@ -1,7 +0,0 @@
 sap.ui.define(["sap/fe/core/AppComponent"], function(AppComponent) {
 	"use strict";
 	return AppComponent.extend("bookshop.Component", {
 		metadata: { manifest: "json" }
 	});
 });
 /* eslint no-undef:0 */
--- a/fiori/app/common.cds
+++ b/fiori/app/common.cds
@@ -1,289 +0,0 @@
 /*
 Common Annotations shared by all apps
 */
 using { sap.capire.bookshop as my } from '@capire/bookstore';
 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 : ' '
            },
        ]
    }
 ) {
    ID  @Common: {
        SemanticObject : 'Books',
        Text: title,
        TextArrangement : #TextOnly
    };
    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}
 }, });
 ////////////////////////////////////////////////////////////////////////////
 //
 //	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;
 }
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Genres List
 //
 annotate my.Genres with @(
    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'
    }, ],
 });
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Genres Elements
 //
 annotate my.Genres with {
    ID   @title : '{i18n>ID}';
    name @title : '{i18n>Genre}';
 }
 ////////////////////////////////////////////////////////////////////////////
 //
 //	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,
    };
 };
 ////////////////////////////////////////////////////////////////////////////
 //
 //	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'
    }, ],
 });
 ////////////////////////////////////////////////////////////////////////////
 //
 //	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}';
 }
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Languages List
 //
 annotate common.Languages with @(
    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}
    ]},
 });
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Currencies List
 //
 annotate common.Currencies with @(
    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}
    ]},
 });
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Currencies Elements
 //
 annotate common.Currencies with {
    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,49 +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: {},
 			bootstrapPlugins: {
          RuntimeAuthoringPlugin: {
            component: "sap.ushell.plugins.rta",
            config: {
              validateAppVersion: false,
            },
          },
          PersonalizePlugin: {
            component: "sap.ushell.plugins.rta-personalize",
            config: {
              validateAppVersion: false,
            },
          },
        }
 		};
 	</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"));
 		sap.ui
        .getCore()
        .getConfiguration()
        .setFlexibilityServices([{ connector: "SessionStorageConnector" }]);
 				sap.ui.getCore().getConfiguration().setLanguage("en");
 </script>
 </head>
 <body class="sapUiBody" id="content"></body>
 </html>
--- a/fiori/app/services.cds
+++ b/fiori/app/services.cds
@@ -1,9 +0,0 @@
 /*
  This model controls what gets served to Fiori frontends...
 */
 using from './admin-authors/fiori-service';
 using from './admin-books/fiori-service';
 using from './browse/fiori-service';
 using from './common';
 using from '@capire/bookstore/srv/mashup';
--- a/fiori/db/hana/index.cds
+++ b/fiori/db/hana/index.cds
@@ -1,10 +0,0 @@
 //
 //  Add Author.age and .lifetime with a DB-specific function
 //
 using { AdminService } from '@capire/bookshop';
 extend projection AdminService.Authors with {
  YEARS_BETWEEN(dateOfBirth, dateOfDeath)         as age: Integer,
  YEAR(dateOfBirth) || ' – ' || YEAR(dateOfDeath) as lifetime : String
 }
--- a/fiori/db/sqlite/index.cds
+++ b/fiori/db/sqlite/index.cds
@@ -1,10 +0,0 @@
 //
 //  Add Author.age and .lifetime with a DB-specific function
 //
 using { AdminService } from '@capire/bookshop';
 extend projection AdminService.Authors with {
  strftime('%Y',dateOfDeath)-strftime('%Y',dateOfBirth)              as age: Integer,
  strftime('%Y',dateOfBirth) || ' – ' || strftime('%Y',dateOfDeath)  as lifetime : String
 }
--- a/fiori/package.json
+++ b/fiori/package.json
@@ -1,57 +0,0 @@
 {
  "name": "@capire/fiori",
  "version": "1.0.0",
  "dependencies": {
    "@capire/bookstore": "*",
    "@sap/cds": "^5",
    "express": "^4.17.1",
    "passport": "^0.4.1"
  },
  "scripts": {
    "start": "cds run --in-memory?",
    "watch": "cds watch"
  },
  "cds": {
    "requires": {
      "extensibility": {
        "kind": "uiflex"
      },
      "auth": {
        "strategy": "dummy"
      },
      "ReviewsService": {
        "kind": "odata",
        "model": "@capire/reviews"
      },
      "OrdersService": {
        "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": {
        "[development]": {
          "model": "db/sqlite"
        },
        "[production]": {
          "model": "db/hana"
        }
      },
      "hana": {
        "deploy-format": "hdbtable"
      }
    }
  }
 }
--- a/fiori/server.js
+++ b/fiori/server.js
@@ -1 +0,0 @@
 module.exports = require('@capire/bookstore/server.js')
--- 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
@@ -1,54 +0,0 @@
 {
  "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"
  },
  "devDependencies": {
    "@types/jest": "^27.0.2",
    "@types/node": "^16.11.6",
    "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"
    }
  }
 }
--- a/hello/srv/world.cds
+++ b/hello/srv/world.cds
@@ -1,3 +0,0 @@
 service say {
  function hello (to:String) returns String;
 }
--- a/hello/srv/world.js
+++ b/hello/srv/world.js
@@ -1,3 +0,0 @@
 module.exports = class say {
  hello(req) { return `Hello ${req.data.to}!` }
 }
--- 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/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/test/test.http
+++ b/hello/test/test.http
@@ -1 +0,0 @@
 GET http://localhost:4004/say/hello(to='world')
--- a/lerna.json
+++ b/lerna.json
@@ -0,0 +1 @@
 {"packages":["packages/*"],"version":"1.0.0"}
--- a/media/db/data-model.cds
+++ b/media/db/data-model.cds
@@ -1,13 +0,0 @@
 namespace sap.capire.media;
 entity Media {
   key id:Integer;
   @Core.MediaType: mediaType
   content : LargeBinary ;
   @Core.IsMediaType: true
   mediaType : String;
   fileName : String;
   applicationName:String;
 }
--- a/media/index.cds
+++ b/media/index.cds
@@ -1,2 +0,0 @@
 using from './db/data-model';
 using from './srv/media-service';
--- a/media/package.json
+++ b/media/package.json
@@ -1,19 +0,0 @@
 {
  "name": "@capire/media",
  "version": "1.0.0",
  "dependencies": {
    "lokijs": "^1.5.6"
  },
  "files": [
    "db",
    "srv",
    "index.cds"
  ],
  "cds": {
    "requires": {
      "db": {
        "kind": "sql"
      }
    }
  }
 }
--- a/media/srv/media-service.cds
+++ b/media/srv/media-service.cds
@@ -1,8 +0,0 @@
 using { sap.capire.media as db } from '../db/data-model';
 namespace sap.capire.media;
 service MediaServer  {
    entity Media   as projection on db.Media ;
 }
--- a/media/srv/media-service.js
+++ b/media/srv/media-service.js
@@ -1,68 +0,0 @@
 const loki = require('lokijs')
 const db = new loki('DB')
 const mediaDB = db.addCollection('Media')
 const { Readable, PassThrough } = require('stream')
 module.exports = srv => {
  srv.before('CREATE', 'Media', req => {
    const obj = mediaDB.insert({ media: '' })
    req.data.id = obj.$loki
  })
  srv.on('UPDATE', 'Media', (req, next) => {
    const url = req._.req.path
    if (url.includes('content')) {
      const id = req.data.id
      const obj = mediaDB.get(id)
      if (!obj) {
        req.reject(404, 'No record found for the ID')
        return
      }
      const stream = new PassThrough()
      const chunks = []
      stream.on('data', chunk => {
        chunks.push(chunk)
      })
      stream.on('end', () => {
        obj.media = Buffer.concat(chunks).toString('base64')
        mediaDB.update(obj)
      })
      req.data.content.pipe(stream)
    } else return next()
  })
  srv.on('READ', 'Media', (req, next) => {
    const url = req._.req.path
    if (url.includes('content')) {
      const id = req.data.id
      const mediaObj = mediaDB.get(id)
      if (!mediaObj) {
        req.reject(404, 'Media not found for the ID')
        return
      }
      const decodedMedia = new Buffer(
        mediaObj.media.split(';base64,').pop(),
        'base64'
      )
      return _formatResult(decodedMedia)
    } else return next() //> delegate to next/default handlers
  })
  srv.on('DELETE', 'Media', (req, next) => {
    const id = req.data.id
    mediaDB
      .chain()
      .find({ $loki: id })
      .remove()
    return next() //> delegate to next/default handlers
  })
  function _formatResult (decodedMedia) {
    const readable = new Readable()
    const result = new Array()
    readable.push(decodedMedia)
    readable.push(null)
    result.push({ value: readable })
    return result
  }
 }
--- a/media/test/Test.png
+++ b/media/test/Test.png
--- a/media/test/media.http
+++ b/media/test/media.http
@@ -1,35 +0,0 @@
 ### Requires REST Client for VS Code
 ### https://marketplace.visualstudio.com/items?itemName=humao.rest-client
 ###
@protocol = http
@host = localhost
@port = 4004
 ### Read Pictures
 GET {{protocol}}://{{host}}:{{port}}/media-server/Media
 Authorization: Basic admin:
 ### Create Picture with mediatype
 POST {{protocol}}://{{host}}:{{port}}/media-server/Media
 Authorization: Basic admin:
 Accept: application/json
 Content-Type: application/json
 { 
  "id": 1,
  "mediaType": "image/png" 
 }
 ### Upload Binary PNG
 PUT {{protocol}}://{{host}}:{{port}}/media-server/Media(1)/content
 Authorization: Basic admin:
 Content-Type: image/png
 < ./Test.png
 ### Read Binary
 GET {{protocol}}://{{host}}:{{port}}/media-server/Media(1)/content
 Authorization: Basic admin:
 ### Delete Image
 DELETE {{protocol}}://{{host}}:{{port}}/media-server/Media(1)
 Authorization: Basic admin:
--- a/orders/.env
+++ b/orders/.env
@@ -1,2 +0,0 @@
 cds.requires.messaging.kind = file-based-messaging
 PORT = 4006
--- a/orders/app/orders/webapp/Component.js
+++ b/orders/app/orders/webapp/Component.js
@@ -1,8 +0,0 @@
 sap.ui.define(["sap/fe/core/AppComponent"], function(AppComponent) {
 	"use strict";
 	return AppComponent.extend("orders.Component", {
 		metadata: { manifest: "json" }
 	});
 });
 /* eslint no-undef:0 */
--- a/orders/db/data/sap.capire.orders-Orders.Items.csv
+++ b/orders/db/data/sap.capire.orders-Orders.Items.csv
@@ -1,4 +0,0 @@
 ID;up__ID;quantity;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/data/sap.capire.orders-Orders.csv
+++ b/orders/db/data/sap.capire.orders-Orders.csv
@@ -1,3 +0,0 @@
 ID;createdAt;createdBy;buyer;OrderNo;currency_code
 7e2f2640-6866-4dcf-8f4d-3027aa831cad;2019-01-31;john.doe@test.com;john.doe@test.com;1;EUR
 64e718c9-ff99-47f1-8ca3-950c850777d4;2019-01-30;jane.doe@test.com;jane.doe@test.com;2;EUR
--- a/orders/db/schema.cds
+++ b/orders/db/schema.cds
@@ -1,24 +0,0 @@
 using { Currency, User, managed, cuid } from '@sap/cds/common';
 namespace sap.capire.orders;
 entity Orders : cuid, managed {
  OrderNo  : String @title:'Order Number'; //> readable key
  Items    : Composition of many {
    key ID    : UUID;
    product   : Association to Products;
    quantity  : Integer;
    title     : String; //> intentionally replicated as snapshot from product.title
    price     : Double; //> materialized calculated field
  };
  buyer    : User;
  currency : Currency;
 }
 /** 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/index.cds
+++ b/orders/index.cds
@@ -1,6 +0,0 @@
 /*
  This model controls what gets exposed
 */
 namespace sap.capire.orders;
 using from './srv/orders-service';
 using from './db/schema';
--- a/orders/package.json
+++ b/orders/package.json
@@ -1,8 +0,0 @@
 {
  "name": "@capire/orders",
  "version": "1.0.0",
  "dependencies": {
    "@capire/common": "*",
    "@sap/cds": "^5"
  }
 }
--- a/orders/srv/orders-service.cds
+++ b/orders/srv/orders-service.cds
@@ -1,5 +0,0 @@
 using { sap.capire.orders as my } from '../db/schema';
 service OrdersService {
  entity Orders as projection on my.Orders;
 }
--- a/orders/srv/orders-service.js
+++ b/orders/srv/orders-service.js
@@ -1,37 +0,0 @@
 const cds = require ('@sap/cds')
 class OrdersService extends cds.ApplicationService {
  /** register custom handlers */
  init(){
    const { 'Orders.Items':OrderItems } = this.entities
    this.before ('UPDATE', 'Orders', async function(req) {
      const { ID, Items } = req.data
      if (Items) for (let { product_ID, 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 (quantity != before) await this.orderChanged (product_ID, quantity-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})
      )
      if (Items) await Promise.all (Items.map(it => this.orderChanged (it.product_ID, -it.quantity)))
    })
    return super.init()
  }
  /** order changed -> broadcast event */
  orderChanged (product, deltaQuantity) {
    // Emit events to inform subscribers about changes in orders
    console.log ('> emitting:', 'OrderChanged', { product, deltaQuantity })
    return this.emit ('OrderChanged', { product, deltaQuantity })
  }
 }
 module.exports = OrdersService
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,49 +1,25 @@
 {
-  "name": "@capire/samples",
+  "name": "@sap/capire-samples",
-  "version": "2.0.0",
+  "description": "The umbrella project for all samples to easily setup for local development and tests.",
-  "description": "A monorepo with several samples for CAP.",
+  "repository": "https://github.com/SAP-samples/cloud-cap-samples.git",
  "repository": "https://github.com/sap-samples/cloud-cap-samples.git",
  "author": "daniel.hutzel@sap.com",
  "private": true,
  "scripts": {
    "lerna": "npx --no-install lerna -v > /dev/null || npm i lerna --no-save",
    "install": "(npm -s run lerna) && lerna bootstrap --hoist",
    "cleanup": "lerna clean -y && rm -fr node_modules",
    "bookshop": "cds watch packages/bookshop"
  },
  "dependencies": {
-    "@capire/bookstore": "./bookstore",
+    "@sap/cds": "^4",
-    "@capire/bookshop": "./bookshop",
+    "express": "^4"
    "@capire/common": "./common",
    "@capire/fiori": "./fiori",
    "@capire/hello": "./hello",
    "@capire/media": "./media",
    "@capire/orders": "./orders",
    "@capire/reviews": "./reviews",
    "@sap/cds": "^5.5.3"
  },
  "devDependencies": {
-    "chai": "^4.3.4",
+    "sqlite3": "*"
    "chai-as-promised": "^7.1.1",
    "chai-subset": "^1.6.0",
    "sqlite3": "^5"
  },
-  "scripts": {
+  "--add-these-to-devDependencies-for-tests": {
-    "cleanup": "rm -rf node_modules && rm -rf */node_modules && rm -rf */*/node_modules",
+    "@types/jest": "*",
-    "registry": "node .registry/server.js",
+    "jest": "*"
    "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": {
+  "license": "SAP SAMPLE CODE LICENSE"
    "testEnvironment": "node",
    "testTimeout": 20000,
    "testMatch": [
      "**/*.test.js"
    ]
  },
  "mocha": {
    "parallel": true
  },
  "license": "SAP SAMPLE CODE LICENSE",
  "private": true
 }
--- a/packages/bookshop/.cdsrc.json
+++ b/packages/bookshop/.cdsrc.json
@@ -0,0 +1,67 @@
 {
    "odata": {
        "version": "v4"
    },
    "build": {
        "target": "gen",
        "tasks": [
            {
                "src": "db",
                "for": "hana",
                "options": {
                    "model": [
                        "db",
                        "srv"
                    ]
                }
            },
            {
                "src": "srv",
                "for": "node-cf",
                "options": {
                    "model": [
                        "db",
                        "srv",
                        "app"
                    ]
                }
            },
            {
                "src": "app",
                "for": "fiori",
                "options": {
                    "model": [
                        "app"
                    ]
                }
            }
        ]
    },
    "auth": {
        "passport": {
            "strategy": "mock",
            "users": {
                "alice": {
                    "password": "123",
                    "ID": "alice",
                    "roles": [
                        "admin",
                        "authenticated-user"
                    ],
                    "xs.user.attributes": {
                        "currency": [
                            "USD"
                        ]
                    }
                },
                "bob": {
                    "password": "123",
                    "ID": "bob",
                    "roles": [
                        "authenticated-user"
                    ]
                }
            }
        }
    }
 }
--- a/packages/bookshop/.vscode/launch.json
+++ b/packages/bookshop/.vscode/launch.json
@@ -0,0 +1,29 @@
 {
  "version": "0.2.0",
  "configurations": [
    {
      "name": "Run bookshop",
      "request": "launch",
      "type": "node",
      "cwd": "/home/user/projects/cloud-cap-samples/packages/bookshop",
      "runtimeExecutable": "npx",
      "runtimeArgs": [
        "-n"
      ],
      "args": [
        "--",
        "cds",
        "run",
        "--in-memory?"
      ],
      "console": "internalConsole",
      "internalConsoleOptions": "openOnSessionStart",
      "skipFiles": [
        "<node_internals>/**"
      ],
      "env": {
        "run.config": "{\"handlerId\":\"cap_run_config_handler_id\",\"runnableId\":\"/home/user/projects/cloud-cap-samples/packages/bookshop\"}"
      }
    }
  ]
 }
--- a/packages/bookshop/app/_i18n/i18n.properties
+++ b/packages/bookshop/app/_i18n/i18n.properties
@@ -0,0 +1,13 @@
 Books = Books
 Book = Book
 ID = ID
 Title = Title
 Author = Author
 AuthorID = Author ID
 Stock = Stock
 Name = Name
 AuthorName = Author's Name
 Authors = Authors
 Order = Order
 Orders = Orders
 Price = Price
--- a/packages/bookshop/app/_i18n/i18n_de.properties
+++ b/packages/bookshop/app/_i18n/i18n_de.properties
@@ -6,7 +6,6 @@ Authors = Autoren
 Author = Autor
 AuthorID = ID des Autors
 AuthorName = Name des Autors
 Age = Alter
 Name = Name
 Stock = Bestand
 Order = Bestellung
--- a/packages/bookshop/app/admin/fiori-service.cds
+++ b/packages/bookshop/app/admin/fiori-service.cds
@@ -0,0 +1,37 @@
 using AdminService from '../../srv/admin-service';
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Books Object Page
 //
 annotate AdminService.Books with @(
 	UI: {
 		Facets: [
 			{$Type: 'UI.ReferenceFacet', Label: '{i18n>General}', Target: '@UI.FieldGroup#General'},
 			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Details'},
 			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Admin}', Target: '@UI.FieldGroup#Admin'},
 		],
 		FieldGroup#General: {
 			Data: [
 				{Value: title},
 				{Value: author_ID},
 				{Value: descr},
 			]
 		},
 		FieldGroup#Details: {
 			Data: [
 				{Value: stock},
 				{Value: price},
 				{Value: currency_code, Label: '{i18n>Currency}'},
 			]
 		},
 		FieldGroup#Admin: {
 			Data: [
 				{Value: createdBy},
 				{Value: createdAt},
 				{Value: modifiedBy},
 				{Value: modifiedAt}
 			]
 		}
 	}
 );
--- a/packages/bookshop/app/admin/webapp/Component.js
+++ b/packages/bookshop/app/admin/webapp/Component.js
@@ -0,0 +1,22 @@
 sap.ui.define(["sap/fe/AppComponent"], ac => ac.extend("admin.Component", {
    metadata:{ manifest:'json' }
 }))
 // sap.ui.define (["sap/ui/core/UIComponent"], ui5 => ui5.extend("bookshop.Component", {
 //     metadata: { manifest: "json" }
 // }))
 // sap.ui.define (["sap/ui/generic/app/AppComponent"], ui5 => ui5.extend("bookshop.Component", {
 //     metadata: { manifest: "json" }
 // }))
 // jQuery.sap.declare("bookshop.Component");
 // sap.ui.getCore().loadLibrary("sap.ui.generic.app");
 // jQuery.sap.require("sap.ui.generic.app.AppComponent");
 // sap.ui.generic.app.AppComponent.extend("bookshop.Component", {
 // 	metadata: {
 // 		manifest: "json"
 // 	}
 // });
 /* eslint no-undef:0 */
--- a/packages/bookshop/app/admin/webapp/i18n/i18n.properties
+++ b/packages/bookshop/app/admin/webapp/i18n/i18n.properties
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Laszlo Kajan	99861ca588	Patch of _reduceStock() under @sap/cds 4 (#136 ) * Bump to cds 4 * Cosmetics in handler code * await and cds.run([...]) instead of Promise.all Co-authored-by: Christian Georgi <christian.georgi@sap.com>	2020-09-18 10:49:46 +02:00
Christian Georgi	b5fc3fe4fa	Add app/ dir to also also include annotations	2020-06-03 10:15:10 +02:00
Matthias Bühl	b371e10fdf	Update README.md	2020-04-07 11:20:55 +02:00
Christian Georgi	9d31d66c78	Add package-lock.json, fix readme	2020-04-02 16:02:32 +02:00
Matthias Bühl	b34b1b0a17	Merge pull request #41 from SAP-samples/remove-insertonly-annotation remove @insertonly of Orders in CatalogService	2020-03-25 18:19:52 +01:00
d045778	7d39278e79	remove @insertonly of Orders in CatalogService	2020-03-25 16:06:17 +01:00
Matthias Buehl	8395c3fbfc	typo README.md	2020-03-24 16:52:01 +01:00
Matthias Buehl	6e5c23bc22	typo README	2020-03-24 16:49:21 +01:00
Matthias Buehl	57803e8f2b	correct README	2020-03-24 16:44:28 +01:00
Matthias Buehl	7bbd4ffdb3	correct package.json	2020-03-24 16:27:29 +01:00
Matthias Buehl	ece7aa99cc	delete local package.json	2020-03-24 16:07:17 +01:00
Matthias Buehl	e8156ce08a	streamline branches	2020-03-24 15:47:03 +01:00
Matthias Buehl	2bf65fb50f	Move to standard README and package-lock file	2020-03-24 11:17:23 +01:00
Christian Georgi	23cc571d8a	Update readme	2020-03-23 17:09:18 +01:00
Matthias Buehl	50b1f1bb15	delete unused packages	2020-03-20 12:43:13 +01:00
Dominik Nehse	3b818b18c1	Added info on the usage of Windows Powershell There is a known encoding issue with Windows Powershell that leads to the xs-security.json to not be accepted when creating the xsuaa service instance.	2020-03-19 16:42:24 +01:00
Matthias Bühl	2d7630449c	README	2020-02-12 17:07:09 +01:00
Matthias Bühl	f4f41aca52	Update README	2020-02-11 16:43:20 +01:00
Matthias Bühl	a0d63890ac	Reset toplevel Package.json	2020-02-06 14:36:07 +01:00
pianocktail	c2ef8c9a69	Merge branch 'OpenSAP-week3-unit5' of https://github.com/SAP-samples/cloud-cap-samples into OpenSAP-week3-unit5	2020-02-06 09:00:58 +00:00
pianocktail	44cf281360	package.json	2020-02-06 09:00:34 +00:00
pianocktail	cfc1ebc881	package.json	2020-02-06 08:37:21 +00:00
pianocktail	fef327f344	"Enable CF Merge branch 'OpenSAP-week3-unit5' of https://github.com/SAP-samples/cloud-cap-samples into OpenSAP-week3-unit5	2020-02-06 08:33:34 +00:00
pianocktail	9932d02d57	CF enablement	2020-02-06 08:27:57 +00:00
Matthias Bühl	cad3a32c78	Add model": "srv" in package.json	2020-02-03 12:44:13 +01:00
Matthias Bühl	05a5a68463	add HANATRIAL to MTA.YAML	2020-02-03 10:30:28 +01:00
Matthias Bühl	73cf655715	instance based restriction in catalogservice	2020-02-03 09:26:33 +01:00
Matthias Bühl	3c094c201b	XSUAA	2020-01-31 15:59:43 +01:00
Matthias Bühl	a458c7bb0d	cleanup	2020-01-30 17:48:32 +01:00
Matthias Bühl	e0e330c43a	XSUAA Config 1	2020-01-30 17:32:23 +01:00
		`@@ -0,0 +1 @@`
							`Copyright (c) 2019 SAP SE or an SAP affiliate company. All rights reserved.`
		`@@ -1,2 +0,0 @@`
			`// Incorporate pre-build extensions from...`
			`using from '@capire/common';`
		`@@ -1,2 +0,0 @@`
			`const { CatalogService } = require('./srv/cat-service')`
			`module.exports = { CatalogService }`
		`@@ -1,2 +0,0 @@`
			`namespace sap.capire.bookshop; //> important for reflection`
			`using from './srv/mashup';`
		`@@ -1 +0,0 @@`
			`module.exports = require('@capire/bookstore/server.js')`
		`@@ -1 +0,0 @@`
			`GET http://localhost:4004/say/hello(to='world')`
		`@@ -0,0 +1 @@`
							`{"packages":["packages/*"],"version":"1.0.0"}`
		`@@ -1,2 +0,0 @@`
			`using from './db/data-model';`
			`using from './srv/media-service';`
		`@@ -1,2 +0,0 @@`
			`cds.requires.messaging.kind = file-based-messaging`
			`PORT = 4006`