Merge branch 'master' into preview

.env

@@ -0,0 +1,2 @@
+cds.features.snapi = y
+cds.cdsc.beta.aspectCompositions = true

.eslintrc

@@ -21,7 +21,6 @@
     },
     "rules": {
         "no-console": "off",
-        "require-atomic-updates": "off",
+        "require-atomic-updates": "off"
-        "require-await":"warn"
     }
 }

.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

.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: [ master ]
-  pull_request:
-    branches: [ master ]
-
-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 install
-    - run: npm test

.gitignore

@@ -10,12 +10,8 @@ target/
 .DS_Store
 *.log
 *.mtar
-*mta-op*/
 connection.properties
 default-env.json
 packages/messageBox
 reviews/msg-box
 reviews/db/test.db
-
-package-lock.json
-*log*.txt

.npmrc

@@ -0,0 +1 @@
+@sap:registry=https://npm.sap.com

.registry/.gitignore

@@ -1 +0,0 @@
-*.tgz

.registry/server.js

@@ -1,71 +0,0 @@
-const { exec } = require ('child_process')
-const express = require ('express')
-const fs = require ('fs')
-const app = express()
-
-const { PORT=4444 } = process.env
-const [,,port=PORT] = process.argv
-process.chdir(__dirname)
-
-app.use('/-/:tarball', (req,res,next) => {
-  console.debug ('GET', req.params)
-  try {
-    const { tarball } = req.params
-    const [, pkg ] = /^capire-(\w+)/.exec(tarball)
-    fs.lstat(tarball,(err => {
-      if (err) exec(`npm pack ../${pkg}`,next)
-      else next()
-    }))
-  } catch (e) {
-    console.error(e)
-    res.sendStatus(500)
-  }
-})
-
-app.use('/-', express.static(__dirname))
-
-app.get('/*', (req,res)=>{
-  const url = decodeURIComponent(req.url)
-  console.debug ('GET',url)
-  try {
-    const [, capire, pkg ] = /^\/(@capire)\/(\w+)/.exec(url)
-    const package = require (`${capire}/${pkg}/package.json`)
-    const tarball = `capire-${pkg}-${package.version}.tgz`
-    // https://github.com/npm/registry/blob/master/docs/responses/package-metadata.md
-    res.json({
-      "name": package.name,
-      "dist-tags": {
-        "latest": package.version
-      },
-      "versions": {
-        [package.version]: {
-          "name": package.name,
-          "version": package.version,
-          "dist": {
-            "tarball": `http://localhost:${port}/-/${tarball}`
-          },
-        }
-      },
-    })
-  } catch (e) {
-    console.error(e)
-    res.sendStatus(404)
-  }
-})
-
-app.listen(port, ()=>{
-  console.log (`npm set @capire:registry=http://localhost:${port}`)
-  console.log (`@capire registry listening on http://localhost:${port}`)
-  exec(`npm set @capire:registry=http://localhost:${port}`)
-})
-
-const _exit = ()=>{
-  console.log ('\nnpm conf rm @capire:registry')
-  exec('npm conf rm @capire:registry')
-  exec('rm *.tgz')
-  process.exit()
-}
-process.on ('SIGTERM',_exit)
-process.on ('SIGHUP',_exit)
-process.on ('SIGINT',_exit)
-process.on ('SIGUSR2',_exit)

.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

.tours/db-native.tour

@@ -1,109 +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` section in `package.json` is a place to configure which of the `db/sqlite` and `db/hana` folders are used for which database.\nWe use [Node.js profiles](https://cap.cloud.sap/docs/node.js/cds-env#profiles) to separate the configuration.\nIn the `development` profile, you can see that `db/sqlite` is set as the model, while the `db/hana` folder is configured in the `production` profile.",
-      "line": 17,
-      "title": "Configuration"
-    },
-    {
-      "file": "fiori/package.json",
-      "description": "#### Run with SQLite\n\nTo run with `development` and an in-memory SQLite database, you don't need to do anything special, because it's activated by default.  Just run:\n\n>> cds watch fiori\n\nThen open [http://localhost:4004/admin/Authors](http://localhost:4004/admin/Authors) to see the two new fields.\n",
-      "line": 28,
-      "title": "Run with SQLite"
-    },
-    {
-      "file": "fiori/package.json",
-      "description": "#### Deploy the CDS Model to SAP HANA\n\nTo 'activate' SAP HANA through the `production` profile, you can use the global `--production` flag:\n\n>> cd fiori; cds deploy --to hana --production\n\n[Learn more about SAP HANA deployment](https://cap.cloud.sap/docs/guides/databases#get-hana)\n\n#### Run the Application\n\n>> cd fiori; cds watch --production\n\nThe service on [http://localhost:4004/admin/Authors](http://localhost:4004/admin/Authors) is the same as before, but this time the `Authors` entity is backed by a database view with an SAP HANA function.\n\n#### More\n\nIf you don't see data, you can add some in the next step.",
-      "line": 31,
-      "title": "Run with SAP HANA"
-    },
-    {
-      "file": "fiori/test/requests.http",
-      "description": "### Add More Data\n\nOptionally you can add some `Authors` data by clicking on the _Send Request_ link (provided by the [REST client](https://marketplace.visualstudio.com/items?itemName=humao.rest-client) extension).",
-      "line": 68,
-      "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."
-    }
-  ],
-  "ref": "master"
-}

.tours/samples.tour

@@ -1,136 +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/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": "### 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": "### 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"
-    },
-    {
-      "file": "fiori/app/index.cds",
-      "description": "### Annotations for SAP Fiori Elements\n\nA [composite app, reusing and combining](https://cap.cloud.sap/docs/guides/verticalize) these packages:\n  - [@capire/bookshop](bookshop)\n  - [@capire/reviews](reviews)\n  - [@capire/orders](orders)\n  - [@capire/common](common)\n\n[Adds a SAP Fiori elements application](https://cap.cloud.sap/docs/guides/fiori/) to bookshop, thereby introducing to:\n  - [OData Annotations](https://cap.cloud.sap/docs/guides/fiori#adding-odata-annotations) in `.cds` files\n  - Support for [Fiori Draft](https://cap.cloud.sap/docs/guides/fiori#draft)\n  - Support for [Value Helps](https://cap.cloud.sap/docs/guides/fiori#value-help)\n  - Serving SAP Fiori apps locally\n\n[The Vue.js app](bookshop/app/vue) imported from bookshop is served as well.\n",
-      "line": 1,
-      "selection": {
-        "start": {
-          "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",
-      "line": 8,
-      "selection": {
-        "start": {
-          "line": 8,
-          "character": 1
-        },
-        "end": {
-          "line": 15,
-          "character": 1
-        }
-      },
-      "title": "Packages"
-    }
-  ],
-  "isPrimary": true,
-  "description": "Overview of CAP Samples for Node.js"
-}

.vscode/extensions.json

@@ -4,15 +4,14 @@
 
 	// List of extensions which should be recommended for users of this workspace.
 	"recommendations": [
-		"sapse.vscode-cds",
+		// "CDS Editor !",
 		"dbaeumer.vscode-eslint",
 		"esbenp.prettier-vscode",
 		"mechatroner.rainbow-csv",
 		"humao.rest-client",
 		"alexcvzz.vscode-sqlite",
 		"hbenl.vscode-mocha-test-adapter",
-		"sdras.night-owl",
+		"sdras.night-owl"
-		"vsls-contrib.codetour"
 	],
 	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
 	"unwantedRecommendations": [

.vscode/launch.json

@@ -6,29 +6,25 @@
   "configurations": [
     {
       "name": "bookshop",
-      "command": "npx cds watch bookshop",
+      "cwd": "${workspaceFolder}/bookshop",
-      "type": "node-terminal",
       "request": "launch",
-      "skipFiles": [
+      "type": "node",
-        "<node_internals>/**",
+      "runtimeExecutable": "npx",
-        "**/node_modules/**",
+      "runtimeArgs": ["-n"],
-        "**/cds/lib/lazy.js",
+      "args": ["--", "cds", "run", "--with-mocks", "--in-memory?"],
-        "**/cds/lib/req/cls.js",
+      "console": "integratedTerminal",
-        "**/odata-v4/okra/**"
+      "skipFiles": ["<node_internals>/**"]
-      ]
     },
     {
       "name": "Fiori App",
-      "command": "npx cds watch fiori",
+      "cwd": "${workspaceFolder}/fiori",
-      "type": "node-terminal",
       "request": "launch",
-      "skipFiles": [
+      "type": "node",
-        "<node_internals>/**",
+      "runtimeExecutable": "npx",
-        "**/node_modules/**",
+      "runtimeArgs": ["-n"],
-        "**/cds/lib/lazy.js",
+      "args": ["--", "cds", "run", "--with-mocks", "--in-memory?"],
-        "**/cds/lib/req/cls.js",
+      "console": "integratedTerminal",
-        "**/odata-v4/okra/**"
+      "skipFiles": ["<node_internals>/**"]
-      ]
     }
   ],
   "inputs": [
@@ -36,7 +32,7 @@
       "type": "pickString",
       "id": "sample",
       "description": "Which sample do you want to start?",
-      "options": [ "bookshop", "fiori", "reviews", "reviews" ],
+      "options": ["bookshop", "fiori", "reviews", "reviews/test/bookshop"],
       "default": "bookshop"
     }
   ]

.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/**"
-    ]
-  },
 }

LICENSE

@@ -199,3 +199,19 @@
    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.
+
+--------------------------------------------------------------------------------------------------------------------------
+APIs
+
+This project may include APIs to SAP or third-party products or services.
+The use of these APIs, products and services may be subject to additional
+agreements. In no event shall the application of the Apache Software
+License, v.2 to this project grant any rights in or to these APIs,
+products or services that would alter, expand, be inconsistent with,
+or supersede any terms of these additional agreements. “API” means
+application programming interfaces, as well as their respective
+specifications and implementing code that allows other software
+products to communicate with or call on SAP or third party products
+or services (for example, SAP Enterprise Services, BAPIs, Idocs, RFCs
+and ABAP calls or other user exits) and may be made available through
+SAP or third party products, SDKs, documentation or other media.

README.md

@@ -2,22 +2,17 @@
 
 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). → See [**Overview** of contained samples](samples.md)
 
-![](https://github.com/SAP-samples/cloud-cap-samples/workflows/CI/badge.svg)
-[![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)
 
 ### Preliminaries
 
-1. Install [**@sap/cds-dk**](https://cap.cloud.sap/docs/get-started/) globally:
+1. [Install @sap/cds-dk](https://cap.cloud.sap/docs/get-started/) as documented in [capire](https://cap.cloud.sap)
+2. _Optional:_ [Use Visual Studio Code](https://cap.cloud.sap/docs/get-started/in-vscode)
 
-   ```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/master.zip).
+Clone this repo as shown below, if you have [git](https://git-scm.com/downloads) installed,
+otherwise [download as zip file](archive/master.zip).
 
 ```sh
 git clone https://github.com/sap-samples/cloud-cap-samples samples
@@ -42,45 +37,21 @@ cds watch bookshop
 
 After that open this link in your browser: [http://localhost:4004](http://localhost:4004)
 
-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).
-
 ### Testing
 
-Run the provided tests with [_jest_](http://jestjs.io) or [_mocha_](http://mochajs.org), for example:
+Run the provided tests with [_jest_](http://jestjs.io) or [_mocha_](http://mochajs.org), e.g.:
-
 ```sh
 npx jest
 ```
-> While mocha is a bit smaller and faster, jest runs tests in parallel and isolation, which allows to run all tests.
+> While mocha is a bit smaller and faster, jest runs tests in parallel and isolation which allows to run all tests.
 
 
-### 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
-```
-
-
-## Code Tours
-
-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!
-
 ## 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](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) 2019 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, version 2.0 except as noted otherwise in the [LICENSE](/LICENSE) file.

bookshop/.env

@@ -0,0 +1 @@
+cds.features.snapi = y

bookshop/app/vue/app.js

@@ -9,36 +9,33 @@ const books = new Vue ({
 
     data: {
         list: [],
-        book: undefined,
+        book: { descr:'( click on a row to see details... )' },
         order: { amount:1, succeeded:'', failed:'' }
     },
 
     methods: {
 
-        search: ({target:{value:v}}) => books.fetch(v && '&$search='+v),
+        search: ({target:{value:v}}) => books.fetch (v && '$search='+v),
 
-        async fetch (etc='') {
+        async fetch (_filter='') {
-            const {data} = await GET(`/ListOfBooks?$expand=genre,currency${etc}`)
+            const columns = 'ID,title,author,price,stock', details = 'genre,currency'
+            const {data} = await GET(`/Books?$select=${columns}&$expand=${details}&${_filter}`)
             books.list = data.value
         },
 
-        async inspect (eve) {
+        async inspect () {
-            const book = books.book = books.list [eve.currentTarget.rowIndex-1]
+            const book = books.book = books.list [event.currentTarget.rowIndex-1]
-            const res = await GET(`/Books/${book.ID}?$select=descr,stock,image`)
+            book.descr || await GET(`/Books/${book.ID}/descr/$value`) .then (({data}) => book.descr = data)
-            Object.assign (book, res.data)
             books.order = { amount:1 }
             setTimeout (()=> $('form > input').focus(), 111)
         },
 
-        async submitOrder () {
+        submitOrder () { event.preventDefault()
-            const {book,order} = books, amount = parseInt (order.amount) || 1 // REVISIT: Okra should be less strict
+            const {book,order} = books, amount = parseInt (order.amount) || 1
-            try {
+            POST(`/submitOrder`, { amount, book: book.ID })
-                const res = await POST(`/submitOrder`, { amount, book: book.ID })
+            .then (()=> books.order = { amount, succeeded: `Successfully orderd ${amount} item(s).` })
-                book.stock = res.data.stock
+            .catch (e=> books.order = { amount, failed: e.response.data.error.message })
-                books.order = { amount, succeeded: `Successfully orderd ${amount} item(s).` }
+            GET(`/Books/${book.ID}/stock/$value`).then (res => book.stock = res.data)
-            } catch (e) {
-                books.order = { amount, failed: e.response.data.error.message }
-            }
         }
 
     }

bookshop/app/vue/index.html

@@ -7,57 +7,51 @@
     <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; }
+        #books tr:hover { background: #f2f2f2; cursor: pointer; }
-        .rating-stars { color:teal }
+        form { float:right; display:flex; flex-direction: row-reverse }
-        .succeeded { color:teal }
+        form #amount { width: 5em }
-        .failed { color:red }
+        .is-success { color: #0d920d }
+        .has-error { color: #df1010 }
     </style>
 </head>
 
 <body class="small-container", style="margin-top: 70px;">
 <div id='app'>
 
-    <h1> {{ document.title }} </h1>
+    <h1> Capire Books </h1>
 
     <input type="text" placeholder="Search..." @input="search">
 
-    <table id='books' class="hovering">
+    <table id='books'>
         <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">
+            <td>{{ book.currency.symbol }} {{ book.price }}</td>
-                {{ ('★'.repeat(Math.round(book.rating))+'☆☆☆☆☆').slice(0,5) }}
-            </td>
-            <td>{{ book.currency && book.currency.symbol }} {{ book.price }}</td>
         </tr>
     </table>
 
-    <div v-if="book">
+    <div v-if="book.title">
-        <img v-bind:src="book.image" alt=""/>
         <label style="text-align:right">
-            <span class="succeeded"> {{ order.succeeded }} </span>
+            <span class="is-success"> {{ order.succeeded }} </span>
-            <span class="failed"> {{ order.failed }} </span>
+            <span class="has-error"> {{ order.failed }} </span>
             &nbsp;&nbsp; {{ book.stock }} in stock
         </label>
-        <form @submit.prevent="submitOrder" style="float:right; display:flex; flex-direction:row-reverse">
+        <form @submit="submitOrder">
-            <input type="number" v-model="order.amount" v-bind:class="{ failed: order.failed }" style="width:5em">
+            <input type="number" id="amount" v-model="order.amount" v-bind:class="{ 'has-error': order.failed }">
             <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>
 
+    <h4> {{ book.title }} </h4>
+    <p> {{ book.descr }} </p>
+
 </div>
 </body>
 

bookshop/db/data/sap.capire.bookshop-Genres.csv

@@ -11,6 +11,6 @@ ID;parent_ID;name
 19;10;Fairy Tale
 20;;Non-Fiction
 21;20;Biography
-22;21;Autobiography
+22;20;Autobiography
 23;20;Essay
 24;20;Speech

bookshop/db/schema.cds

@@ -8,9 +8,8 @@ entity Books : managed {
   author : Association to Authors;
   genre  : Association to Genres;
   stock  : Integer;
-  price  : Decimal;
+  price  : Decimal(9,2);
   currency : Currency;
-  image : LargeBinary @Core.MediaType : 'image/png';
 }
 
 entity Authors : managed {

bookshop/package.json

@@ -3,10 +3,9 @@
   "version": "1.0.0",
   "description": "A simple self-contained bookshop service.",
   "dependencies": {
-    "@capire/common": "*",
+    "@capire/common": "../common",
-    "@sap/cds": "^5.0.4",
+    "@sap/cds": ">=3.33.1",
-    "express": "^4.17.1",
+    "express": "^4.17.1"
-    "passport": "0.4.1"
   },
   "scripts": {
     "genres": "cds serve test/genres.cds",

bookshop/readme.md

@@ -5,10 +5,10 @@ This stand-alone sample introduces the essential tasks in the development of CAP
 ## Hypothetical Use Cases
 
 1. Build a service that allows to browse _Books_ and _Authors_.
-2. Books have assigned _Genres_, which are organized hierarchically.
+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).
+5. End users may order books (the actual order mgmt being out of scope)
 
 ## Running the Sample
 
@@ -20,12 +20,12 @@ npm run watch
 
 | Links to capire                                                                                           | Sample files / folders               |
 | --------------------------------------------------------------------------------------------------------- | ------------------------------------ |
-| [Project Setup & Layouts](https://cap.cloud.sap/docs/get-started/projects#sharing-and-reusing-content)    | [`./`](./)                           |
+| [Project Setup and 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 Domain Models](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)               |
+| [Defining Services](https://cap.cloud.sap/docs/guides/providing-services)                                 | [`./srv/*.cds`](./srv)               |
-| [Single-purposed Services](https://cap.cloud.sap/docs/guides/services#single-purposed-services)           | [`./srv/*.cds`](./srv)               |
+| [Single-purposed Services](https://cap.cloud.sap/docs/guides/providing-services#single-purposed-services) | [`./srv/*.cds`](./srv)               |
-| [Providing & Consuming Providers](https://cap.cloud.sap/docs/guides/providing-services)                   | http://localhost:4004                |
+| [Generic 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)       |
+| Using Databases                                            | [`./db/data/*.csv`](./db/data)       |
 | [Adding Custom Logic](https://cap.cloud.sap/docs/guides/service-impl)                                     | [`./srv/*.js`](./srv)                |
-| Adding Tests                                                                                              | [`./test`](./test)                   |
+| Adding Tests                                                 | [`./test`](./test)                   |
-| [Sharing for Reuse](https://cap.cloud.sap/docs/guides/reuse-and-compose)                                  | [`./index.cds`](./index.cds)         |
+| [Sharing for Reuse](https://cap.cloud.sap/docs/get-started/projects#sharing-and-reusing-content)          | [`./index.cds`](./index.cds)         |

bookshop/srv/admin-service.cds

@@ -1,5 +1,5 @@
 using { sap.capire.bookshop as my } from '../db/schema';
-service AdminService @(requires:'admin') {
+service AdminService @(requires_:'admin') {
   entity Books as projection on my.Books;
   entity Authors as projection on my.Authors;
 }

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
-}

bookshop/srv/cat-service.cds

@@ -1,16 +1,10 @@
 using { sap.capire.bookshop as my } from '../db/schema';
 service CatalogService @(path:'/browse') {
 
-  /** For displaying lists of Books */
+  @readonly entity Books as SELECT from my.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'
+  @requires_: 'authenticated-user'
-  action submitOrder ( book: Books:ID, amount: Integer ) returns { stock: Integer };
+  action submitOrder (book : Books.ID, amount: Integer);
-  event OrderedBook : { book: Books:ID; amount: Integer; buyer: String };
 }

bookshop/srv/cat-service.js

@@ -1,26 +1,20 @@
 const cds = require('@sap/cds')
-const { Books } = cds.entities ('sap.capire.bookshop')
+module.exports = async function (){
 
-class CatalogService extends cds.ApplicationService { init(){
+  const db = await cds.connect.to('db') // connect to database service
+  const { Books } = db.entities         // get reflected definitions
 
   // Reduce stock of ordered books if available stock suffices
   this.on ('submitOrder', async req => {
     const {book,amount} = req.data
-    let {stock} = await SELECT `stock` .from (Books,book)
+    const n = await UPDATE (Books, book)
-    if (stock >= amount) {
+      .with ({ stock: {'-=': amount }})
-      await UPDATE (Books,book) .with (`stock -=`, amount)
+      .where ({ stock: {'>=': amount }})
-      await this.emit ('OrderedBook', { book, amount, buyer:req.user.id })
+    n > 0 || req.error (409,`${amount} exceeds stock for book #${book}`)
-      return { stock }
-    }
-    else return req.error (409,`${amount} exceeds stock for book #${book}`)
   })
 
   // Add some discount for overstocked books
-  this.after ('READ','ListOfBooks', each => {
+  this.after ('READ','Books', each => {
-    if (each.stock > 111) each.title += ` -- 11% discount!`
+    if (each.stock > 111)  each.title += ` -- 11% discount!`
   })
-
+}
-  return super.init()
-}}
-
-module.exports = { CatalogService }

bookshop/test/requests.http

@@ -32,37 +32,6 @@ GET {{server}}/admin/Authors?
   # &sap-language=de
 Authorization: Basic alice:
 
-### ------------------------------------------------------------------------
-# 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

common/data/sap.common-Currencies.csv

@@ -2,7 +2,7 @@ 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
+AUD;$;Australian Dollar;Canadian 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

common/package.json

@@ -1,8 +1,4 @@
 {
   "name": "@capire/common",
-  "description": "Provides a pre-built extension package for std @sap/cds/common",
+  "version": "1.0.0"
-  "version": "1.0.0",
-  "dependencies": {
-    "@sap/cds": "*"
-  }
 }

fiori/.env

@@ -0,0 +1 @@
+cds.features.snapi = y

fiori/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

fiori/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

fiori/app/admin/fiori-service.cds

@@ -1,4 +1,4 @@
-using { AdminService } from '../../db/schema';
+using AdminService from '@capire/bookshop';
 
 ////////////////////////////////////////////////////////////////////////////
 //
@@ -39,27 +39,6 @@ annotate AdminService.Books with @(
 	}
 );
 
-annotate AdminService.Authors with @(
-	UI: {
-		HeaderInfo: {
-			Description: {Value: lifetime}
-		},
-		Facets: [
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Details'},
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Books}', Target: 'books/@UI.LineItem'},
-		],
-		FieldGroup#Details: {
-			Data: [
-				{Value: placeOfBirth},
-				{Value: placeOfDeath},
-				{Value: dateOfBirth},
-				{Value: dateOfDeath},
-				{Value: age, Label: '{i18n>Age}'},
-			]
-		},
-	}
-);
-
 
 
 ////////////////////////////////////////////////////////////

fiori/app/admin/webapp/Component.js

@@ -0,0 +1,5 @@
+sap.ui.define(["sap/fe/core/AppComponent"], ac => ac.extend("admin.Component", {
+    metadata:{ manifest:'json' }
+}))
+
+/* eslint no-undef:0 */

fiori/app/admin/webapp/manifest.json

@@ -24,7 +24,7 @@
     "sap.ui5": {
         "dependencies": {
             "libs": {
-                "sap.fe.templates": {}
+                "sap.fe": {}
             }
         },
         "models": {

fiori/app/browse/fiori-service.cds

@@ -1,4 +1,4 @@
-using CatalogService from '../../srv/cat-service';
+using CatalogService from '@capire/bookshop';
 
 ////////////////////////////////////////////////////////////////////////////
 //
@@ -7,8 +7,6 @@ using CatalogService from '../../srv/cat-service';
 annotate CatalogService.Books with @(
 	UI: {
   	HeaderInfo: {
-			TypeName: 'Book',
-			TypeNamePlural: 'Books',
   		Description: {Value: author}
   	},
 		HeaderFacets: [

fiori/app/browse/webapp/Component.js

@@ -0,0 +1,5 @@
+sap.ui.define(["sap/fe/core/AppComponent"], ac => ac.extend("bookshop.Component", {
+    metadata:{ manifest:'json' }
+}))
+
+/* eslint no-undef:0 */

fiori/app/browse/webapp/manifest.json

@@ -24,7 +24,7 @@
   "sap.ui5": {
     "dependencies": {
       "libs": {
-        "sap.fe.templates": {}
+        "sap.fe": {}
       }
     },
     "models": {

fiori/app/common.cds

@@ -0,0 +1,80 @@
+/*
+  Common Annotations shared by all apps
+*/
+
+using { sap.capire.bookshop as my } from '@capire/bookshop';
+
+
+////////////////////////////////////////////////////////////////////////////
+//
+//	Books Lists
+//
+annotate my.Books with @(
+	Common.SemanticKey: [title],
+	UI: {
+		Identification: [{Value:title}],
+	  SelectionFields: [ ID, author_ID, price, currency_code ],
+		LineItem: [
+			{Value: ID},
+			{Value: title},
+			{Value: author.name, Label:'{i18n>Author}'},
+			{Value: genre.name},
+			{Value: stock},
+			{Value: price},
+			{Value: currency.symbol, Label:' '},
+		]
+	}
+) {
+	author @ValueList.entity:'Authors';
+};
+
+annotate my.Authors with @(
+	UI: {
+		Identification: [{Value:name}],
+	}
+);
+
+
+////////////////////////////////////////////////////////////////////////////
+//
+//	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}' @UI.HiddenFilter;
+	title @title:'{i18n>Title}';
+	genre  @title:'{i18n>Genre}'  @Common: { Text: genre.name,  TextArrangement: #TextOnly };
+	author @title:'{i18n>Author}' @Common: { Text: author.name, TextArrangement: #TextOnly };
+	price @title:'{i18n>Price}';
+	stock @title:'{i18n>Stock}';
+	descr @UI.MultiLineText;
+}
+
+annotate my.Genres with {
+  name  @title: '{i18n>Genre}';
+}
+
+////////////////////////////////////////////////////////////////////////////
+//
+//	Authors Elements
+//
+annotate my.Authors with {
+	ID @title:'{i18n>ID}' @UI.HiddenFilter;
+	name @title:'{i18n>AuthorName}';
+}

fiori/app/fiori.html

@@ -13,7 +13,7 @@
 			applications: {
 				"browse-books": {
 					title: "Browse Books",
-					description: "w/ SAP Fiori Elements",
+					description: "... testing FE v42",
 					additionalInformation: "SAPUI5.Component=bookshop",
 					applicationType : "URL",
 					url: "/browse/webapp",
@@ -21,15 +21,15 @@
 				},
 				"manage-books": {
 					title: "Manage Books",
-					description: "w/ SAP Fiori Elements",
+					description: "... testing FE v42",
 					additionalInformation: "SAPUI5.Component=admin",
 					applicationType : "URL",
 					url: "/admin/webapp",
 					navigationMode: "embedded"
 				},
 				"manage-orders": {
-					title: "Manage Orders",
+					title: "Order Books",
-					description: "w/ SAP Fiori Elements",
+					description: "... testing FE v42",
 					additionalInformation: "SAPUI5.Component=orders",
 					applicationType : "URL",
 					url: "/orders/webapp",
@@ -39,8 +39,8 @@
 		};
 	</script>
 
-	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
+	<script 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"
+	<script 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"

fiori/app/index.cds

@@ -7,5 +7,4 @@ using from './browse/fiori-service';
 using from './orders/fiori-service';
 using from './common';
 
-using from '../db/capire_common';
+using from '@capire/common';
-

fiori/app/orders/fiori-service.cds

@@ -1,27 +1,44 @@
+using OrdersService from '@capire/orders/srv/orders-service';
+
+annotate OrdersService.Books with {
+	price @Common.FieldControl: #ReadOnly;
+}
 
 
 ////////////////////////////////////////////////////////////////////////////
 //
-//	Note: this is designed for the OrdersService being co-located with
+//	Common
-//	bookshop. It does not work if OrdersService is run as a separate
-// 	process, and is not intended to do so.
 //
-////////////////////////////////////////////////////////////////////////////
+annotate OrdersService.OrderItems with {
-
+	book @(
-
+		Common: {
-
+			Text: book.title,
-using { OrdersService } from '../../srv/orders-service';
+			FieldControl: #Mandatory
+		},
+		ValueList.entity:'Books',
+	);
+	amount @(
+		Common.FieldControl: #Mandatory
+	);
+}
 
 
 @odata.draft.enabled
 annotate OrdersService.Orders with @(
 	UI: {
+		////////////////////////////////////////////////////////////////////////////
+		//
+		//	Lists of Orders
+		//
 		SelectionFields: [ createdAt, createdBy ],
 		LineItem: [
-			{Value: OrderNo, Label:'OrderNo'},
+			{Value: createdBy, Label:'Customer'},
-			// {Value: buyer, Label:'Customer'}, we do not need this, because we want extend it later
 			{Value: createdAt, Label:'Date'}
 		],
+		////////////////////////////////////////////////////////////////////////////
+		//
+		//	Order Details
+		//
 		HeaderInfo: {
 			TypeName: 'Order', TypeNamePlural: 'Orders',
 			Title: {
@@ -68,25 +85,36 @@ annotate OrdersService.Orders with @(
 
 
 
-annotate OrdersService.Orders_Items with @(
+//The enity types name is OrdersService.my_bookshop_OrderItems
+//The annotations below are not generated in edmx WHY?
+annotate OrdersService.OrderItems with @(
 	UI: {
+		HeaderInfo: {
+			TypeName: 'Order Item', TypeNamePlural: '	',
+			Title: {
+				Value: book.title
+			},
+			Description: {Value: book.descr}
+		},
+		// There is no filterbar for items so the selctionfileds is not needed
+		SelectionFields: [ book_ID ],
+		////////////////////////////////////////////////////////////////////////////
+		//
+		//	Lists of OrderItems
+		//
 		LineItem: [
-			{Value: product_ID, Label:'Product ID'},
+			{Value: book_ID, Label:'Book'},
-			{Value: title, Label:'Product Title'},
+			//The following entry is only used to have the assoication followed in the read event
-			{Value: price, Label:'Unit Price'},
+			{Value: book.price, Label:'Book Price'},
 			{Value: amount, Label:'Quantity'},
 		],
 		Identification: [ //Is the main field group
+			//{Value: ID, Label:'ID'}, //A guid shouldn't be on the UI
+			{Value: book_ID, Label:'Book'},
 			{Value: amount, Label:'Amount'},
-			{Value: title, Label:'Product'},
-			{Value: price, Label:'Unit Price'},
 		],
 		Facets: [
 			{$Type: 'UI.ReferenceFacet', Label: '{i18n>OrderItems}', Target: '@UI.Identification'},
 		],
 	},
-) {
+);
-	amount @(
-		Common.FieldControl: #Mandatory
-	);
-};

fiori/app/orders/webapp/Component.js

@@ -0,0 +1,5 @@
+sap.ui.define(["sap/fe/core/AppComponent"], ac => ac.extend("orders.Component", {
+    metadata:{ manifest:'json' }
+}))
+
+/* eslint no-undef:0 */

fiori/app/orders/webapp/manifest.json

@@ -24,7 +24,7 @@
 	"sap.ui5": {
         "dependencies": {
             "libs": {
-                "sap.fe.templates": {}
+                "sap.fe": {}
             }
         },
 		"models": {
@@ -121,7 +121,7 @@
                     "name": "sap.fe.templates.ObjectPage",
                     "options": {
                         "settings" : {
-                            "entitySet": "Orders_Items"
+                            "entitySet": "OrderItems"
                         }
                     }
                 },

fiori/db/schema.cds

@@ -0,0 +1,3 @@
+// Proxy for importing schema from bookshop sample
+using from '@capire/bookshop';
+namespace sap.capire.bookshop;

fiori/package.json

@@ -0,0 +1,22 @@
+{
+  "name": "@capire/fiori",
+  "version": "1.0.0",
+  "dependencies": {
+    "@capire/bookshop": "../bookshop",
+    "@capire/orders": "../orders",
+    "@capire/common": "../common",
+    "@sap/cds": ">=3.33.1",
+    "express": "^4.17.1"
+  },
+  "scripts": {
+    "start": "cds run --in-memory?",
+    "watch": "cds watch"
+  },
+  "cds": {
+    "requires": {
+      "db": {
+        "kind": "sql"
+      }
+    }
+  }
+}

fiori/srv/admin-service.cds

@@ -0,0 +1,3 @@
+// Proxy for importing services from bookshop sample
+using from '@capire/bookshop';
+annotate AdminService with @impl:'srv/admin-service.js';

fiori/srv/admin-service.js

@@ -0,0 +1,8 @@
+const cds = require('@sap/cds')
+
+module.exports = cds.service.impl (async function() {
+  const {Books} = cds.entities
+  const {ID} = await SELECT.one.from(Books).columns('max(ID) as ID')
+  let newID = ID - ID % 100 + 100
+  this.before ('NEW','Books', req => req.data.ID = ++newID)
+})

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:

multitenancy/.cdsrc.json

@@ -1 +0,0 @@
-{}

multitenancy/.gitignore

@@ -1,33 +0,0 @@
-# CAP multitenancy
-_out
-*.db
-connection.properties
-default-*.json
-gen/
-node_modules/
-target/
-
-# Web IDE, App Studio
-.che/
-.gen/
-
-# MTA
-*_mta_build_tmp
-*.mtar
-*.mta
-mta_archives/
-*mta-op*/
-
-
-# Other
-.DS_Store
-*.orig
-*.log
-
-*.iml
-*.flattened-pom.xml
-*log*.txt
-
-# IDEs
-# .vscode
-# .idea

multitenancy/.vscode/extensions.json

@@ -1,20 +0,0 @@
-{
-	// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
-	// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
-
-	// List of extensions which should be recommended for users of this workspace.
-	"recommendations": [
-		// >>>>>>>> Add CDS Editor here as soon it is available of vscode marketplace!,
-		"dbaeumer.vscode-eslint",
-		"esbenp.prettier-vscode",
-		"mechatroner.rainbow-csv",
-		"humao.rest-client",
-		"alexcvzz.vscode-sqlite",
-		"hbenl.vscode-mocha-test-adapter",
-		"sdras.night-owl"
-	],
-	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
-	"unwantedRecommendations": [
-
-	]
-}

multitenancy/.vscode/launch.json

@@ -1,15 +0,0 @@
-{
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "command": "cds run --with-mocks --in-memory?",
-      "name": "cds run",
-      "request": "launch",
-      "type": "node-terminal",
-      "skipFiles": [ "<node_internals>/**" ]
-    }
-  ]
-}

multitenancy/.vscode/settings.json

@@ -1,7 +0,0 @@
-{
-  "files.exclude": {
-    "**/.gitignore": true,
-    "**/.git": true,
-    "**/.vscode": true
-  }
-}

multitenancy/.vscode/tasks.json

@@ -1,25 +0,0 @@
-{
-  // See https://go.microsoft.com/fwlink/?LinkId=733558
-  // for the documentation about the tasks.json format
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "type": "shell",
-      "label": "cds watch",
-      "command": "cds",
-      "args": ["watch"],
-      "group": {
-        "kind": "build",
-        "isDefault": true
-      },
-      "problemMatcher": []
-    },
-    {
-      "type": "shell",
-      "label": "cds run",
-      "command": "cds",
-      "args": ["run", "--with-mocks", "--in-memory?"],
-      "problemMatcher": []
-    }
-  ]
-}

multitenancy/README.md

@@ -1,25 +0,0 @@
-# Getting Started
-
-Welcome to your new project.
-
-It contains these folders and files, following our recommended project layout:
-
-File or Folder | Purpose
----------|----------
-`app/` | content for UI frontends goes here
-`db/` | your domain models and data go here
-`srv/` | your service models and code go here
-`package.json` | project metadata and configuration
-`readme.md` | this getting started guide
-
-
-## Next Steps
-
-- Open a new terminal and run `cds watch` 
-- (in VS Code simply choose _**Terminal** > Run Task > cds watch_)
-- Start adding content, for example, a [db/schema.cds](db/schema.cds).
-
-
-## Learn More
-
-Learn more at https://cap.cloud.sap/docs/get-started/.

multitenancy/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

multitenancy/app/admin/webapp/Component.js

@@ -1,8 +0,0 @@
-sap.ui.define(["sap/fe/core/AppComponent"], function(AppComponent) {
-	"use strict";
-	return AppComponent.extend("admin.Component", {
-		metadata: { manifest: "json" }
-	});
-});
-
-/* eslint no-undef:0 */

multitenancy/app/bookshop.html

@@ -1,3 +0,0 @@
-<head>
-  <meta http-equiv="refresh" content="0;url=bookshop/index.html">
-</head>

multitenancy/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 */

multitenancy/app/common.cds

@@ -1,257 +0,0 @@
-/*
-	Common Annotations shared by all apps
-*/
-
-using { sap.capire.bookshop as my } from '../db/schema';
-using { sap.common } from '../db/capire_common';
-
-////////////////////////////////////////////////////////////////////////////
-//
-//	Books Lists
-//
-annotate my.Books with @(
-	Common.SemanticKey: [title],
-	UI: {
-		Identification: [{Value:title}],
-		SelectionFields: [ ID, author_ID, price, currency_code ],
-		LineItem: [
-			{Value: ID},
-			{Value: title},
-			{Value: author.name, Label:'{i18n>Author}'},
-			{Value: genre.name},
-			{Value: stock},
-			{Value: price},
-			{Value: currency.symbol, Label:' '},
-		]
-	}
-) {
-	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}' @UI.HiddenFilter;
-	title @title:'{i18n>Title}';
-	genre  @title:'{i18n>Genre}'  @Common: { Text: genre.name,  TextArrangement: #TextOnly };
-	author @title:'{i18n>Author}' @Common: { Text: author.name, TextArrangement: #TextOnly };
-	price @title:'{i18n>Price}';
-	stock @title:'{i18n>Stock}';
-	descr @UI.MultiLineText;
-}
-
-////////////////////////////////////////////////////////////////////////////
-//
-//	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: [name],
-	UI: {
-		Identification: [{Value:name}],
-		SelectionFields: [ name ],
-		LineItem:[
-			{Value: ID},
-			{Value: name},
-			{Value: dateOfBirth},
-			{Value: dateOfDeath},
-			{Value: placeOfBirth},
-			{Value: placeOfDeath},
-		],
-	}
-);
-
-////////////////////////////////////////////////////////////////////////////
-//
-//	Author Details
-//
-annotate my.Authors with @(
-	UI: {
-		HeaderInfo: {
-			TypeName: '{i18n>Author}',
-			TypeNamePlural: '{i18n>Authors}',
-			Title: {Value: name},
-			Description: {Value: dateOfBirth}
-		},
-		Facets: [
-			{$Type: 'UI.ReferenceFacet', Target: 'books/@UI.LineItem'},
-		],
-	}
-);
-
-
-////////////////////////////////////////////////////////////////////////////
-//
-//	Authors Elements
-//
-annotate my.Authors with {
-	ID @title:'{i18n>ID}' @UI.HiddenFilter;
-	name @title:'{i18n>Name}';
-	dateOfBirth @title:'{i18n>DateOfBirth}';
-	dateOfDeath @title:'{i18n>DateOfDeath}';
-	placeOfBirth @title:'{i18n>PlaceOfBirth}';
-	placeOfDeath @title:'{i18n>PlaceOfDeath}';
-}
-
-////////////////////////////////////////////////////////////////////////////
-//
-//	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}';
-}

multitenancy/app/orders/webapp/Component.js

@@ -1,8 +0,0 @@
-sap.ui.define(["sap/fe/core/AppComponent"], function(AppComponent) {
-	"use strict";
-	return AppComponent.extend("orders.Component", {
-		metadata: { manifest: "json" }
-	});
-});
-
-/* eslint no-undef:0 */

multitenancy/app/orders/webapp/manifest.json

@@ -1,170 +0,0 @@
-{
-	"_version": "1.8.0",
-	"sap.app": {
-		"id": "orders",
-		"type": "application",
-		"title": "Order Books",
-		"description": "Sample Application",
-		"i18n": "i18n/i18n.properties",
-		"dataSources": {
-			"OrdersService": {
-				"uri": "/orders/",
-				"type": "OData",
-				"settings": {
-					"odataVersion": "4.0"
-				}
-			}
-		},
-        "-sourceTemplate": {
-            "id": "ui5template.basicSAPUI5ApplicationProject",
-			"-id": "ui5template.smartTemplate",
-			"-version": "1.40.12"
-		}
-	},
-	"sap.ui5": {
-        "dependencies": {
-            "libs": {
-                "sap.fe.templates": {}
-            }
-        },
-		"models": {
-			"i18n": {
-				"type": "sap.ui.model.resource.ResourceModel",
-				"uri": "i18n/i18n.properties"
-			},
-			"": {
-				"dataSource": "OrdersService",
-				"settings": {
-                    "synchronizationMode": "None",
-                    "operationMode": "Server",
-                    "autoExpandSelect" : true,
-                    "earlyRequests": true,
-                    "groupProperties": {
-                        "default": {
-                          "submit": "Auto"
-                        }
-                    }
-				}
-			}
-		},
-        "routing": {
-            "routes": [
-                {
-                    "pattern": ":?query:",
-                    "name": "OrdersList",
-                    "target": "OrdersList"
-                },
-                {
-                    "pattern": "Orders({key}):?query:",
-                    "name": "OrdersDetails",
-                    "target": "OrdersDetails"
-                },
-                {
-                    "pattern": "Orders({boo})/Items({boo2}):?query:",
-                    "name": "OrderItemsDetails",
-                    "target": "OrderItemsDetails"
-                },
-                {
-                    "pattern": "Books({key}):?query:",
-                    "name": "BooksDetails",
-                    "target": "BooksDetails"
-                }
-            ],
-            "targets": {
-                "OrdersList": {
-                    "type": "Component",
-                    "id": "OrdersList",
-                    "name": "sap.fe.templates.ListReport",
-                    "options": {
-						"settings" : {
-							"entitySet" : "Orders",
-							"navigation" : {
-								"Orders" : {
-									"detail" : {
-										"route" : "OrdersDetails"
-										}
-								}
-							}
-						}
-					}
-                },
-                "OrdersDetails": {
-                    "type": "Component",
-                    "id": "OrdersDetails",
-                    "name": "sap.fe.templates.ObjectPage",
-                    "options": {
-                        "settings" : {
-                            "entitySet": "Orders",
-							"navigation" : {
-								"Items": {
-                                    "detail": {
-                                        "route": "OrderItemsDetails"
-                                    }
-                                },
-                                "book": {
-                                    "detail": {
-                                        "route": "BooksDetails"
-                                    }
-                                },
-                                "dummy": {
-                                    "detail": {
-                                        "route": "BooksDetails"
-                                    }
-                                }
-							}
-						}
-					}
-                },
-                "OrderItemsDetails": {
-                    "type": "Component",
-                    "id": "OrderItemsDetails",
-                    "name": "sap.fe.templates.ObjectPage",
-                    "options": {
-                        "settings" : {
-                            "entitySet": "Orders_Items"
-                        }
-                    }
-                },
-                "BooksDetails": {
-                    "type": "Component",
-                    "id": "BooksDetails",
-                    "name": "sap.fe.templates.ObjectPage",
-                    "options": {
-                        "settings" : {
-                            "entitySet": "Books",
-                            "navigation": {
-                                "author": {
-                                    "detail": {
-                                        "route": "AuthorsDetails"
-                                    }
-                                }
-                            }
-                        }
-                    }
-                },
-                "AuthorsDetails": {
-                    "type": "Component",
-                    "id": "AuthorsDetails",
-                    "name": "sap.fe.templates.ObjectPage",
-                    "options": {
-                        "settings" : {
-                            "entitySet": "Authors"
-                        }
-                    }
-                }
-            }
-        },
-		"contentDensities": {
-			"compact": true,
-			"cozy": true
-		}
-	},
-	"sap.ui": {
-		"technology": "UI5",
-		"fullWidth": false
-	},
-	"sap.fiori": {
-		"registrationIds": [],
-		"archeType": "transactional"
-	}
-}

multitenancy/app/package.json

@@ -1,19 +0,0 @@
-{
-    "name": "approuter",
-    "version": "1.0.0",
-    "description": "",
-    "main": "index.js",
-    "devDependencies": {},
-    "engines": {
-        "node": "^12.0.0"
-    },
-    "scripts": {
-        "start": "node node_modules/@sap/approuter/approuter.js"
-    },
-    "keywords": [],
-    "author": "",
-    "license": "ISC",
-    "dependencies": {
-        "@sap/approuter": ">=9.0.2"
-    }
-}

multitenancy/app/reviews.html

@@ -1,3 +0,0 @@
-<head>
-  <meta http-equiv="refresh" content="0;url=reviews/index.html">
-</head>

multitenancy/app/xs-app.json

@@ -1,28 +0,0 @@
-{
-    "welcomeFile": "/admin-fiori.html",
-    "authenticationMethod": "route",
-    "sessionTimeout": 30,
-    "logout": {
-        "logoutEndpoint": "/do/logout",
-        "logoutPage": "/"
-    },
-    "routes": [
-        {
-            "source": "^/((admin|browse|orders)/webapp/.*)$",
-            "target": "$1",
-            "localDir": ".",
-            "authenticationType": "xsuaa"
-        },
-        {
-            "source": "^(/[^/]+\\.html(\\?.*)?)$",
-            "target": "$1",
-            "localDir": ".",
-            "authenticationType": "xsuaa"
-        },
-        {
-            "source": "^.*$",
-            "destination": "srv-api",
-            "authenticationType": "xsuaa"
-        }
-     ]
-}

multitenancy/db/capire_common.cds

@@ -1,45 +0,0 @@
-using { sap } from '@sap/cds/common';
-
-extend sap.common.Currencies with {
-  // Currencies.code = ISO 4217 alphabetic three-letter code
-  // with the first two letters being equal to ISO 3166 alphabetic country codes
-  // See also:
-  // [1] https://www.iso.org/iso-4217-currency-codes.html
-  // [2] https://www.currency-iso.org/en/home/tables/table-a1.html
-  // [3] https://www.ibm.com/support/knowledgecenter/en/SSZLC2_7.0.0/com.ibm.commerce.payments.developer.doc/refs/rpylerl2mst97.htm
-  numcode  : Integer;
-  exponent : Integer; //> e.g. 2 --> 1 Dollar = 10^2 Cent
-  minor    : String; //> e.g. 'Cent'
-}
-
-
-/**
- * The Code Lists below are designed as optional extensions to
- * the base schema. Switch them on by adding an Association to
- * one of the code list entities in your models or by:
- * annotate sap.common.Countries with @cds.persistence.skip:false;
- */
-
-context sap.common_countries {
-
-  extend sap.common.Countries {
-    regions   : Composition of many Regions on regions._parent = $self.code;
-  }
-
-  entity Regions : sap.common.CodeList {
-    key code : String(5); // ISO 3166-2 alpha5 codes, e.g. DE-BW
-    children  : Composition of many Regions on children._parent = $self.code;
-    cities    : Composition of many Cities on cities.region = $self;
-    _parent   : String(11);
-  }
-  entity Cities : sap.common.CodeList {
-    key code  : String(11);
-    region    : Association to Regions;
-    districts : Composition of many Districts on districts.city = $self;
-  }
-  entity Districts : sap.common.CodeList {
-    key code  : String(11);
-    city      : Association to Cities;
-  }
-
-}

multitenancy/db/data/sap.capire.bookshop-Authors.csv

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

multitenancy/db/data/sap.capire.bookshop-Books.csv

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

multitenancy/db/data/sap.capire.bookshop-Books_texts.csv

@@ -1,5 +0,0 @@
-ID_TEXTS;ID;locale;title;descr
-80adb8af-0f12-495e-9380-bbfa92704c36;201;de;Sturmhöhe;Sturmhöhe (Originaltitel: Wuthering Heights) ist der einzige Roman der englischen Schriftstellerin Emily Brontë (1818–1848). Der 1847 unter dem Pseudonym Ellis Bell veröffentlichte Roman wurde vom viktorianischen Publikum weitgehend abgelehnt, heute gilt er als ein Klassiker der britischen Romanliteratur des 19. Jahrhunderts.
-d8c5e249-3df7-49e3-a3d9-4b16bfbbee52;201;fr;Les Hauts de Hurlevent;Les Hauts de Hurlevent (titre original : Wuthering Heights), parfois orthographié Les Hauts de Hurle-Vent, est l'unique roman d'Emily Brontë, publié pour la première fois en 1847 sous le pseudonyme d’Ellis Bell. Loin d'être un récit moralisateur, Emily Brontë achève néanmoins le roman dans une atmosphère sereine, suggérant le triomphe de la paix et du Bien sur la vengeance et le Mal.
-bbc2bd6e-89f7-45f2-86c7-f52b8e857ad6;207;de;Jane Eyre;Jane Eyre. Eine Autobiographie (Originaltitel: Jane Eyre. An Autobiography), erstmals erschienen im Jahr 1847 unter dem Pseudonym Currer Bell, ist der erste veröffentlichte Roman der britischen Autorin Charlotte Brontë und ein Klassiker der viktorianischen Romanliteratur des 19. Jahrhunderts. Der Roman erzählt in Form einer Ich-Erzählung die Lebensgeschichte von Jane Eyre (ausgesprochen /ˌdʒeɪn ˈɛə/), die nach einer schweren Kindheit eine Stelle als Gouvernante annimmt und sich in ihren Arbeitgeber verliebt, jedoch immer wieder um ihre Freiheit und Selbstbestimmung kämpfen muss. Als klein, dünn, blass, stets schlicht dunkel gekleidet und mit strengem Mittelscheitel beschrieben, gilt die Heldin des Romans Jane Eyre nicht zuletzt aufgrund der Kino- und Fernsehversionen der melodramatischen Romanvorlage als die bekannteste englische Gouvernante der Literaturgeschichte
-ca6f51d2-dec9-4261-baec-607dd5e9fc1d;252;de;Eleonora;“Eleonora” ist eine Erzählung von Edgar Allan Poe. Sie wurde 1841 erstveröffentlicht. In ihr geht es um das Paradox der Treue in der Treulosigkeit.

multitenancy/db/data/sap.capire.bookshop-Genres.csv

@@ -1,16 +0,0 @@
-ID;parent_ID;name
-10;;Fiction
-11;10;Drama
-12;10;Poetry
-13;10;Fantasy
-14;10;Science Fiction
-15;10;Romance
-16;10;Mystery
-17;10;Thriller
-18;10;Dystopia
-19;10;Fairy Tale
-20;;Non-Fiction
-21;20;Biography
-22;21;Autobiography
-23;20;Essay
-24;20;Speech

multitenancy/db/data/sap.capire.orders-Orders.csv

@@ -1,3 +0,0 @@
-ID;createdAt;createdBy;buyer;OrderNo;currency_code
-7e2f2640-6866-4dcf-8f4d-3027aa831cad;2019-01-31;john.doe@test.com;john.doe@test.com;1;EUR
-64e718c9-ff99-47f1-8ca3-950c850777d4;2019-01-30;jane.doe@test.com;jane.doe@test.com;2;EUR

multitenancy/db/data/sap.capire.orders-Orders_Items.csv

@@ -1,4 +0,0 @@
-ID;up__ID;amount;product_ID;title;price
-58040e66-1dcd-4ffb-ab10-fdce32028b79;7e2f2640-6866-4dcf-8f4d-3027aa831cad;1;201;Wuthering Heights;11.11
-64e718c9-ff99-47f1-8ca3-950c850777d4;7e2f2640-6866-4dcf-8f4d-3027aa831cad;1;271;Catweazle;15
-e9641166-e050-4261-bfee-d1e797e6cb7f;64e718c9-ff99-47f1-8ca3-950c850777d4;2;252;Eleonora;28

multitenancy/db/data/sap.common-Countries.csv

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

multitenancy/db/data/sap.common-Countries_texts._csv

@@ -1,12 +0,0 @@
-code;locale;name;descr
-AU;de;Australien;Commonwealth Australien
-CA;de;Kanada;Canada
-CN;de;China;Volksrepublik China
-FR;de;Frankreich;Republik Frankreich
-DE;de;Deutschland;Bundesrepublik Deutschland
-IN;de;Indien;Republik Indien
-IL;de;Israel;Staat Israel
-MM;de;Myanmar;Republik der Union Myanmar
-GB;de;Vereinigtes Königreich;Vereinigtes Königreich Großbritannien und Nordirland
-US;de;Vereinigte Staaten;Vereinigte Staaten von Amerika
-EU;de;Europäische Union;Europäische Union

multitenancy/db/data/sap.common-Currencies.csv

@@ -1,12 +0,0 @@
-code;symbol;name;descr;numcode;minor;exponent
-EUR;€;Euro;European Euro;978;Cent;2
-USD;$;US Dollar;United States Dollar;840;Cent;2
-CAD;$;Canadian Dollar;Canadian Dollar;124;Cent;2
-AUD;$;Australian Dollar;Australian Dollar;036;Cent;2
-GBP;£;British Pound;Great Britain Pound;826;Penny;2
-ILS;₪;Shekel;Israeli New Shekel;376;Agorat;2
-INR;₹;Rupee;Indian Rupee;356;Paise;2
-QAR;﷼;Riyal;Katar Riyal;356;Dirham;2
-SAR;﷼;Riyal;Saudi Riyal;682;Halala;2
-JPY;¥;Yen;Japanese Yen;392;Sen;2
-CNY;¥;Yuan;Chinese Yuan Renminbi;156;Jiao;1

multitenancy/db/data/sap.common-Currencies_texts._csv

@@ -1,13 +0,0 @@
-code;locale;name;descr
-EUR;de;Euro;European Euro
-USD;de;US-Dollar;United States Dollar
-CAD;de;Kanadischer Dollar;Kanadischer Dollar
-AUD;de;Australischer Dollar;Australischer Dollar
-GBP;de;Pfund;Britische Pfund
-ILS;de;Schekel;Israelische Schekel
-EUR;fr;euro;de la Zone euro
-USD;fr;dollar;dollar des États-Unis
-CAD;fr;dollar canadien;dollar canadien
-AUD;fr;dollar australien;dollar australien
-GBP;fr;livre sterling;pound sterling
-ILS;fr;Shekel;shekel israelien

multitenancy/db/data/sap.common-Languages.csv

@@ -1,5 +0,0 @@
-code;name
-de;German
-fr;French
-en;English
-en_GB;British English

multitenancy/db/data/sap.common-Languages_texts._csv

@@ -1,10 +0,0 @@
-code;locale;name
-de;en;German
-de;de;Deutsch
-de;fr;Allemande
-fr;en;French
-fr;de;Französisch
-fr;fr;Francais
-en;en;English
-en;de;Englisch
-en;fr;Anglais

multitenancy/db/schema.cds

@@ -1,4 +0,0 @@
-using   from './schema_bookshop';
-using   from './schema_orders';
-
-annotate cds.UUID with @(Core.Computed : true);

multitenancy/db/schema_bookshop.cds

@@ -1,31 +0,0 @@
-using { Currency, managed, sap } from '@sap/cds/common';
-namespace sap.capire.bookshop;
-
-entity Books : managed {
-  key ID : Integer;
-  title  : localized String(111);
-  descr  : localized String(1111);
-  author : Association to Authors;
-  genre  : Association to Genres;
-  stock  : Integer;
-  price  : Decimal;
-  currency : Currency;
-  image : LargeBinary @Core.MediaType : 'image/png';
-}
-
-entity Authors : managed {
-  key ID : Integer;
-  name   : String(111);
-  dateOfBirth  : Date;
-  dateOfDeath  : Date;
-  placeOfBirth : String;
-  placeOfDeath : String;
-  books  : Association to many Books on books.author = $self;
-}
-
-/** Hierarchically organized Code List for Genres */
-entity Genres : sap.common.CodeList {
-  key ID   : Integer;
-  parent   : Association to Genres;
-  children : Composition of many Genres on children.parent = $self;
-}

multitenancy/db/schema_orders.cds

@@ -1,23 +0,0 @@
-using { Currency, User, managed, cuid } from '@sap/cds/common';
-namespace sap.capire.orders;
-
-entity Orders : cuid, managed {
-  OrderNo  : String @title:'Order Number'; //> readable key
-  Items    : Composition of many Orders_Items on Items.up_ = $self;
-  buyer    : User;
-  currency : Currency;
-}
-
-entity Orders_Items {
-  key ID    : UUID;
-  up_       : Association to Orders;
-  product   : Association to Products @assert.integrity:false; // REVISIT: this is a temporary workaround for a glitch in cds-runtime
-  amount    : Integer;
-  title     : String; //> intentionally replicated as snapshot from product.title
-  price     : Double;
-}
-
-/** This is a stand-in for arbitrary ordered Products */
-entity Products @(cds.persistence.skip:'always') {
-  key ID : String;
-}

multitenancy/db/src/.hdiconfig

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

multitenancy/map-route.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-
-SUBDOMAIN=mtx-extend-bookshop
-SAAS_HOST_SUFFIX="$(cf env multitenancy-approuter | grep TENANT_HOST_PATTERN | sed 's/.*(..)//' | sed 's/\..*//')"
-SAAS_DOMAIN="$(cf env multitenancy-approuter | grep TENANT_HOST_PATTERN | sed 's/.*(..)//' | sed 's/[^.]*\.//')"
-
-cf map-route multitenancy-approuter $SAAS_DOMAIN --hostname $SUBDOMAIN$SAAS_HOST_SUFFIX

multitenancy/mta.yaml

@@ -1,113 +0,0 @@
-## Generated mta.yaml based on template version 0.4.0
-## appName = multitenancy
-## language=nodejs; multitenant=true
-## approuter=
-_schema-version: '3.1'
-ID: multitenancy
-version: 1.0.0
-description: "A simple CAP project."
-parameters:
-  enable-parallel-deployments: true
-
-build-parameters:
-  before-all:
-   - builder: custom
-     commands:
-      - npm install --production
-      - npx -p @sap/cds-dk cds build --production
-
-modules:
-
- - name: multitenancy-approuter
-   type: nodejs
-   path: app
-   build-parameters:
-      ignore: ["node_modules/"]
-   parameters:
-      # Keep existing URLs for this application ("routes")
-      keep-existing-routes: true
-   properties:
-      TENANT_HOST_PATTERN: "^(.*)-${default-host}.${default-domain}"
-   requires:
-    - name: multitenancy-registry
-    - name: multitenancy-uaa-mt
-    - name: srv-api
-      group: destinations
-      properties:
-        forwardAuthToken: true
-        strictSSL: true
-        name: srv-api
-        url: ~{srv-url}
-
- # --------------------- SERVER MODULE ------------------------
- - name: multitenancy-srv
- # ------------------------------------------------------------
-   type: nodejs
-   path: gen/srv
- #  build-parameters:
- #    ignore: ["node_modules/"]
-   properties:
-     SAP_JWT_TRUST_ACL: [{"clientid":"*","identityzone":"sap-provisioning"}]  # Trust between server and SaaS Manager
-   requires:
-    # Resources extracted from CAP configuration
-    - name: multitenancy-db-mt
-    - name: multitenancy-uaa-mt
-    - name: multitenancy-registry
-   provides:
-    - name: srv-api      # required by consumers of CAP services (e.g. approuter)
-      properties:
-        srv-url: ${default-url}
-    - name: mtx-api      # potentially required by approuter
-      properties:
-        mtx-url: ${default-url}
-
-
-
-resources:
- # services extracted from CAP configuration
- # 'service-plan' can be configured via 'cds.requires.<name>.vcap.plan'
-# ------------------------------------------------------------
- - name: multitenancy-db-mt
-# ------------------------------------------------------------
-   type: org.cloudfoundry.managed-service
-   parameters:
-     service: service-manager
-     service-plan: container
-   properties:
-     hdi-service-name: ${service-name}
-# ------------------------------------------------------------
- - name: multitenancy-uaa-mt
-# ------------------------------------------------------------
-   type: org.cloudfoundry.managed-service
-   parameters:
-     service: xsuaa
-     service-plan: application
-     path: ./xs-security.json
-     config:
-       xsappname: multitenancy-${space}    #  name + space dependency
-       tenant-mode: shared
-
- - name: multitenancy-registry
-   type: org.cloudfoundry.managed-service
-   requires:
-      - name: multitenancy-uaa-mt
-      - name: mtx-api
-        properties:
-           prop: ~{mtx-url}
-        parameters:
-           param: ~{mtx-url}
-   parameters:
-      service: saas-registry
-      service-plan: application
-      config:
-         xsappname: multitenancy-${space}
-         appName: multitenancy
-         displayName: multitenancy
-         description: A simple CAP project.
-         #category: 'Category'
-         appUrls:
-            onSubscription: ~{mtx-api/mtx-url}/mtx/v1/provisioning/tenant/{tenantId}
-            onSubscriptionAsync: false
-            onUnSubscriptionAsync: false
-            callbackTimeoutMillis: 300000
-

multitenancy/package.json

@@ -1,107 +0,0 @@
-{
-  "name": "multitenancy",
-  "version": "1.0.0",
-  "description": "A simple CAP project.",
-  "repository": "<Add your repository here>",
-  "license": "UNLICENSED",
-  "private": true,
-  "dependencies": {
-    "@sap/cds": "^5",
-    "@sap/cds-mtx": "^2",
-    "@sap/hana-client": "^2",
-    "@sap/hdi-deploy": "^4",
-    "@sap/instance-manager": "^2",
-    "@sap/xssec": "^3",
-    "express": "^4",
-    "passport": "^0"
-  },
-  "devDependencies": {
-    "sqlite3": "^5.0.2"
-  },
-  "engines": {
-    "node": "^14"
-  },
-  "scripts": {
-    "start": "cds run",
-    "watch": "cds watch"
-  },
-  "eslintConfig": {
-    "extends": "eslint:recommended",
-    "env": {
-      "es2020": true,
-      "node": true,
-      "jest": true,
-      "mocha": true
-    },
-    "globals": {
-      "SELECT": true,
-      "INSERT": true,
-      "UPDATE": true,
-      "DELETE": true,
-      "CREATE": true,
-      "DROP": true,
-      "CDL": true,
-      "CQL": true,
-      "CXL": true,
-      "cds": true
-    },
-    "rules": {
-      "no-console": "off",
-      "require-atomic-updates": "off"
-    }
-  },
-  "cds": {
-    "[production]": {
-      "features": {
-        "fiori_preview": true
-      },
-      "requires": {
-        "multitenancy": true,
-        "auth": {
-          "strategy": "JWT"
-        },
-        "db": {
-          "kind": "hana",
-          "vcap": {
-            "label": "service-manager"
-          }
-        },
-        "uaa": {
-          "kind": "xsuaa"
-        }
-      },
-      "hana": {
-        "deploy-format": "hdbtable"
-      },
-      "mtx": {
-        "element-prefix": [
-          "Z_",
-          "ZZ_"
-        ],
-        "namespace-blocklist": [
-          "com.sap.",
-          "sap."
-        ],
-        "extension-allowlist": [
-          {
-            "for": [
-              "sap.capire.orders.Orders"
-            ],
-            "new-fields": 77
-          },
-          {
-            "for": [
-              "OrdersService"
-            ],
-            "new-entities": 88
-          }
-        ]
-      },
-      "auth": {
-        "passport": {
-          "strategy": "JWT"
-        }
-      }
-    }
-  }
-}

multitenancy/server.js

@@ -1,18 +0,0 @@
-const cds = require ('@sap/cds')
-
-cds.once('bootstrap',(app)=>{
-  //app.use ('/orders/webapp', _from('./app/orders/webapp/manifest.json'))
-  //app.use ('/bookshop', _from('@capire/bookshop/app/vue/index.html'))
-  //app.use ('/reviews', _from('@capire/reviews/app/vue/index.html'))
-})
-
-cds.once('served', require('./srv/mashup'))
-
-module.exports = cds.server
-
-
-// -----------------------------------------------------------------------
-// Helper for serving static content from npm-installed packages
-const {static} = require('express')
-const {dirname} = require('path')
-const _from = target => static (dirname (require.resolve(target)))

multitenancy/srv/admin-service.cds

@@ -1,7 +0,0 @@
-using { sap.capire.bookshop as my } from '../db/schema';
-
-//service AdminService @(requires:'admin') {
-service AdminService {
-  entity Books as projection on my.Books;
-  entity Authors as projection on my.Authors;
-}

multitenancy/srv/admin-service.js

@@ -1,12 +0,0 @@
-const cds = require('@sap/cds')
-
-module.exports = cds.service.impl (function(){
-  this.before ('NEW','Authors', genid)
-  this.before ('NEW','Books', genid)
-})
-
-/** Generate primary keys for target entity in request */
-async function genid (req) {
-  const {ID} = await cds.tx(req).run (SELECT.one.from(req.target).columns('max(ID) as ID'))
-  req.data.ID = ID - ID % 100 + 100 + 1
-}

multitenancy/srv/cat-service.cds

@@ -1,16 +0,0 @@
-using { sap.capire.bookshop as my } from '../db/schema';
-service CatalogService @(path:'/browse') {
-
-  /** For displaying lists of Books */
-  @readonly entity ListOfBooks as projection on Books
-  excluding { descr };
-
-  /** For display in details pages */
-  @readonly entity Books as projection on my.Books { *,
-    author.name as author
-  } excluding { createdBy, modifiedBy };
-
-  //@__requires: 'authenticated-user'
-  action submitOrder ( book: Books:ID, amount: Integer ) returns { stock: Integer };
-  event OrderedBook : { book: Books:ID; amount: Integer; buyer: String };
-}

multitenancy/srv/cat-service.js

@@ -1,26 +0,0 @@
-const cds = require('@sap/cds')
-const { Books } = cds.entities ('sap.capire.bookshop')
-
-class CatalogService extends cds.ApplicationService { init(){
-
-  // Reduce stock of ordered books if available stock suffices
-  this.on ('submitOrder', async req => {
-    const {book,amount} = req.data
-    let {stock} = await SELECT `stock` .from (Books,book)
-    if (stock >= amount) {
-      await UPDATE (Books,book) .with (`stock -=`, amount)
-      await this.emit ('OrderedBook', { book, amount, buyer:req.user.id })
-      return { stock }
-    }
-    else return req.error (409,`${amount} exceeds stock for book #${book}`)
-  })
-
-  // Add some discount for overstocked books
-  this.after ('READ','ListOfBooks', each => {
-    if (each.stock > 111) each.title += ` -- 11% discount!`
-  })
-
-  return super.init()
-}}
-
-module.exports = { CatalogService }

multitenancy/srv/mashup.cds

@@ -1,27 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-//
-//    Mashing up imported models...
-//
-
-using { sap.capire.bookshop.Books } from '../db/schema';
-
-//
-//  Extend Books with access to Reviews and average ratings
-//
-
-/*
-using { ReviewsService.Reviews } from '@capire/reviews';
-extend Books with {
-  reviews : Composition of many Reviews on reviews.subject = $self.ID;
-  rating  : Decimal;
-}
-*/
-
-//
-//  Extend Orders with Books as Products
-//
-
-using { sap.capire.orders.Orders_Items } from '../db/schema';
-extend Orders_Items with {
-  book : Association to Books on product.ID = book.ID
-}

multitenancy/srv/mashup.js

@@ -1,61 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-//
-//    Mashing up provided and 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.tx(req).read ('Reviews',columns).limit(limit).where({subject:String(id)})
-  }))
-
-  //
-  // Create an order with the OrdersService when CatalogService signals a new order
-  //
-  CatalogService.on ('OrderedBook', async (msg) => {
-    const { book, amount, buyer } = msg.data
-    const { title, price } = await db.tx(msg).read (Books, book, b => { b.title, b.price })
-    return OrdersService.tx(msg).create ('Orders').entries({
-      OrderNo: 'Order at '+ (new Date).toLocaleString(),
-      Items: [{ product:{ID:`${book}`}, title, price, amount }],
-      buyer, createdBy: buyer
-    })
-  })
-
-  //
-  // Update Books' average ratings when ReviewsService signals updatd reviews
-  //
-  /*
-  ReviewsService.on ('reviewed', (msg) => {
-    console.debug ('> received:', msg.event, msg.data)
-    const { subject, rating } = msg.data
-    return UPDATE(Books,subject).with({rating})
-    // ^ Note: the framework will execute this and take care for db.tx
-  })
-  */
-
-  //
-  // Reduce stock of ordered books for orders are created from Orders admin UI
-  //
-  OrdersService.on ('OrderChanged', (msg) => {
-    console.debug ('> received:', msg.event, msg.data)
-    const { product, deltaAmount } = msg.data
-    return UPDATE (Books) .where ('ID =', product)
-    .and ('stock >=', deltaAmount)
-    .set ('stock -=', deltaAmount)
-  })
-}

multitenancy/srv/orders-service.cds

@@ -1,7 +0,0 @@
-using { sap.capire.orders as my } from '../db/schema';
-
-service OrdersService
-@(requires:['authenticated-user', 'system-user'])
-{
-  entity Orders as projection on my.Orders;
-}

multitenancy/srv/orders-service.js

@@ -1,42 +0,0 @@
-const cds = require ('@sap/cds')
-class OrdersService extends cds.ApplicationService {
-
-  /** register custom handlers */
-  init(){
-    const { Orders_Items:OrderItems } = this.entities
-
-    /** 
-    this.before ('UPDATE', 'Orders', async function(req) {
-      const { ID, Items } = req.data
-      if (Items) for (let { product_ID, amount } of Items) {
-        const { amount:before } = await cds.tx(req).run (
-          SELECT.one.from (OrderItems, oi => oi.amount) .where ({up__ID:ID, product_ID})
-        )
-        if (amount != before) await this.orderChanged (product_ID, amount-before)
-      }
-    })
-   **/
-
-    /** 
-    this.before ('DELETE', 'Orders', async function(req) {
-      const { ID } = req.data
-      const Items = await cds.tx(req).run (
-        SELECT.from (OrderItems, oi => { oi.product_ID, oi.amount }) .where ({up__ID:ID})
-      )
-      if (Items) await Promise.all (Items.map(it => this.orderChanged (it.product_ID, -it.amount)))
-    })
-    **/
-    
-    return super.init()
-    
-  }
-
-  /** order changed -> broadcast event */
-  orderChanged (product, deltaAmount) {
-    // Emit events to inform subscribers about changes in orders
-    console.log ('> emitting:', 'OrderChanged', { product, deltaAmount })
-    return this.emit ('OrderChanged', { product, deltaAmount })
-  }
-
-}
-module.exports = OrdersService