.

Sync with cds-runtime

.env

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

.eslintrc

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

.github/ISSUE_TEMPLATE/question--feedback-or-bug-.md

@@ -0,0 +1,10 @@
+---
+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

@@ -0,0 +1,28 @@
+# 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

.npmrc

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

.registry/.gitignore

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

.registry/server.js

@@ -0,0 +1,71 @@
+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
+const cwd = __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}`,{cwd},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

@@ -0,0 +1,29 @@
+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

@@ -0,0 +1,109 @@
+{
+  "$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

@@ -0,0 +1,136 @@
+{
+  "$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,14 +4,15 @@
 
 	// List of extensions which should be recommended for users of this workspace.
 	"recommendations": [
-		// "CDS Editor !",
+		"sapse.vscode-cds",
 		"dbaeumer.vscode-eslint",
 		"esbenp.prettier-vscode",
 		"mechatroner.rainbow-csv",
 		"humao.rest-client",
 		"alexcvzz.vscode-sqlite",
 		"hbenl.vscode-mocha-test-adapter",
-		"sdras.night-owl"
+		"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,25 +6,29 @@
   "configurations": [
     {
       "name": "bookshop",
-      "cwd": "${workspaceFolder}/bookshop",
+      "command": "npx cds watch bookshop",
+      "type": "node-terminal",
       "request": "launch",
-      "type": "node",
-      "runtimeExecutable": "npx",
-      "runtimeArgs": ["-n"],
-      "args": ["--", "cds", "run", "--with-mocks", "--in-memory?"],
-      "console": "integratedTerminal",
-      "skipFiles": ["<node_internals>/**"]
+      "skipFiles": [
+        "<node_internals>/**",
+        "**/node_modules/**",
+        "**/cds/lib/lazy.js",
+        "**/cds/lib/req/cls.js",
+        "**/odata-v4/okra/**"
+      ]
     },
     {
       "name": "Fiori App",
-      "cwd": "${workspaceFolder}/fiori",
+      "command": "npx cds watch fiori",
+      "type": "node-terminal",
       "request": "launch",
-      "type": "node",
-      "runtimeExecutable": "npx",
-      "runtimeArgs": ["-n"],
-      "args": ["--", "cds", "run", "--with-mocks", "--in-memory?"],
-      "console": "integratedTerminal",
-      "skipFiles": ["<node_internals>/**"]
+      "skipFiles": [
+        "<node_internals>/**",
+        "**/node_modules/**",
+        "**/cds/lib/lazy.js",
+        "**/cds/lib/req/cls.js",
+        "**/odata-v4/okra/**"
+      ]
     }
   ],
   "inputs": [
@@ -32,7 +36,7 @@
       "type": "pickString",
       "id": "sample",
       "description": "Which sample do you want to start?",
-      "options": ["bookshop", "fiori", "reviews", "reviews/test/bookshop"],
+      "options": [ "bookshop", "fiori", "reviews", "reviews" ],
       "default": "bookshop"
     }
   ]

.vscode/settings.json

@@ -1,6 +1,17 @@
 {
   "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.txt

@@ -1,217 +1,201 @@
-                                  Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
---------------------------------------------------------------------------------------------------------------------------
-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.
+                                  Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -2,17 +2,22 @@
 
 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/) as documented in [capire](https://cap.cloud.sap)
-2. _Optional:_ [Use Visual Studio Code](https://cap.cloud.sap/docs/get-started/in-vscode)
+1. Install [**@sap/cds-dk**](https://cap.cloud.sap/docs/get-started/) globally:
 
+   ```sh
+   npm i -g @sap/cds-dk
+   ```
+
+2. _Optional:_ [Use Visual Studio Code](https://cap.cloud.sap/docs/get-started/tools#vscode)
 
 ### Download
 
-Clone this repo as shown below, if you have [git](https://git-scm.com/downloads) installed,
-otherwise [download as zip file](archive/master.zip).
+If you've [Git](https://git-scm.com/downloads) installed, clone this repo as shown below, otherwise [download as ZIP file](archive/master.zip).
 
 ```sh
 git clone https://github.com/sap-samples/cloud-cap-samples samples
@@ -37,21 +42,45 @@ 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), e.g.:
+Run the provided tests with [_jest_](http://jestjs.io) or [_mocha_](http://mochajs.org), for example:
+
 ```sh
 npx jest
 ```
-> While mocha is a bit smaller and faster, jest runs tests in parallel and isolation which allows to run all tests.
+> 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 cap docs at [https://cap.cloud.sap](https://cap.cloud.sap). <br>
-In case you find a bug or need support, please [open an issue in here](https://github.com/SAP-samples/cloud-cap-samples/issues/new).
+Check out the documentation 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.
 
 
 ## License
 
-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.
+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.

bookshop/.env

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

bookshop/app/vue/app.js

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

bookshop/app/vue/index.html

@@ -7,50 +7,56 @@
     <script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/vue"></script>
     <style>
-        #books tr:hover { background: #f2f2f2; cursor: pointer; }
-        form { float:right; display:flex; flex-direction: row-reverse }
-        form #amount { width: 5em }
-        .is-success { color: #0d920d }
-        .has-error { color: #df1010 }
+        .hovering tr:hover td { color:cyan; background: #123; cursor: pointer; }
+        .rating-stars { color:teal }
+        .succeeded { color:teal }
+        .failed { color:red }
     </style>
 </head>
 
 <body class="small-container", style="margin-top: 70px;">
 <div id='app'>
 
-    <h1> Capire Books </h1>
+    <h1> {{ document.title }} </h1>
 
     <input type="text" placeholder="Search..." @input="search">
 
-    <table id='books'>
+    <table id='books' class="hovering">
         <thead>
             <th> Book </th>
             <th> Author </th>
             <th> Genre </th>
+            <th> Rating </th>
             <th> Price </th>
         </thead>
         <tr v-for="book in list" v-bind:id="book.ID" v-on:click="inspect">
             <td>{{ book.title }}</td>
             <td>{{ book.author }}</td>
             <td>{{ book.genre.name }}</td>
-            <td>{{ book.currency.symbol }} {{ book.price }}</td>
+            <td class="rating-stars">
+                {{ ('★'.repeat(Math.round(book.rating))+'☆☆☆☆☆').slice(0,5) }}
+            </td>
+            <td>{{ book.currency && book.currency.symbol }} {{ book.price }}</td>
         </tr>
     </table>
 
-    <div v-if="book.title">
+    <div v-if="book">
+        <img v-bind:src="book.image" alt=""/>
         <label style="text-align:right">
-            <span class="is-success"> {{ order.succeeded }} </span>
-            <span class="has-error"> {{ order.failed }} </span>
+            <span class="succeeded"> {{ order.succeeded }} </span>
+            <span class="failed"> {{ order.failed }} </span>
             &nbsp;&nbsp; {{ book.stock }} in stock
         </label>
-        <form @submit="submitOrder">
-            <input type="number" id="amount" v-model="order.amount" v-bind:class="{ 'has-error': order.failed }">
+        <form @submit.prevent="submitOrder" style="float:right; display:flex; flex-direction:row-reverse">
+            <input type="number" v-model="order.amount" v-bind:class="{ failed: order.failed }" style="width:5em">
             <input type="submit" value="Order:" class="muted-button">
         </form>
+        <h4> {{ book.title }} </h4>
+        <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-Books.csv

@@ -3,4 +3,4 @@ ID;title;descr;author_ID;stock;price;currency_code;genre_ID
 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
+271;Catweazle;Catweazle is a British fantasy television series, starring Geoffrey Bayldon in the title role, and created by Richard Carpenter for London Weekend Television. The first series, produced and directed by Quentin Lawrence, was screened in the UK on ITV in 1970. The second series, directed by David Reid and David Lane, was shown in 1971. Each series had thirteen episodes, most but not all written by Carpenter, who also published two books based on the scripts.;170;22;150;JPY;13

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;20;Autobiography
+22;21;Autobiography
 23;20;Essay
 24;20;Speech

bookshop/db/schema.cds

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

bookshop/package.json

@@ -3,9 +3,10 @@
   "version": "1.0.0",
   "description": "A simple self-contained bookshop service.",
   "dependencies": {
-    "@capire/common": "../common",
-    "@sap/cds": ">=3.33.1",
-    "express": "^4.17.1"
+    "@capire/common": "*",
+    "@sap/cds": "^5.0.4",
+    "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 and Layouts](https://cap.cloud.sap/docs/get-started/projects#sharing-and-reusing-content)  | [`./`](./)                           |
-| [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/providing-services)                                 | [`./srv/*.cds`](./srv)               |
-| [Single-purposed Services](https://cap.cloud.sap/docs/guides/providing-services#single-purposed-services) | [`./srv/*.cds`](./srv)               |
-| [Generic Providers](https://cap.cloud.sap/docs/guides/providing-services)                                  | http://localhost:4004                |
-| Using Databases                                            | [`./db/data/*.csv`](./db/data)       |
+| [Project Setup & Layouts](https://cap.cloud.sap/docs/get-started/projects#sharing-and-reusing-content)    | [`./`](./)                           |
+| [Domain Modeling with CDS](https://cap.cloud.sap/docs/guides/domain-models)                               | [`./db/schema.cds`](./db/schema.cds) |
+| [Defining Services](https://cap.cloud.sap/docs/guides/services#defining-services)                         | [`./srv/*.cds`](./srv)               |
+| [Single-purposed Services](https://cap.cloud.sap/docs/guides/services#single-purposed-services)           | [`./srv/*.cds`](./srv)               |
+| [Providing & Consuming Providers](https://cap.cloud.sap/docs/guides/providing-services)                   | http://localhost:4004                |
+| [Using Databases](https://cap.cloud.sap/docs/guides/databases)                                            | [`./db/data/*.csv`](./db/data)       |
 | [Adding Custom Logic](https://cap.cloud.sap/docs/guides/service-impl)                                     | [`./srv/*.js`](./srv)                |
-| Adding Tests                                                 | [`./test`](./test)                   |
-| [Sharing for Reuse](https://cap.cloud.sap/docs/get-started/projects#sharing-and-reusing-content)          | [`./index.cds`](./index.cds)         |
+| Adding Tests                                                                                              | [`./test`](./test)                   |
+| [Sharing for Reuse](https://cap.cloud.sap/docs/guides/reuse-and-compose)                                  | [`./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

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

bookshop/srv/cat-service.js

@@ -1,20 +1,26 @@
 const cds = require('@sap/cds')
-module.exports = async function (){
+const { Books } = cds.entities ('sap.capire.bookshop')
 
-  const db = await cds.connect.to('db') // connect to database service
-  const { Books } = db.entities         // get reflected definitions
+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
-    const n = await UPDATE (Books, book)
-      .with ({ stock: {'-=': amount }})
-      .where ({ stock: {'>=': amount }})
-    n > 0 || req.error (409,`${amount} exceeds stock for book #${book}`)
+    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','Books', each => {
-    if (each.stock > 111)  each.title += ` -- 11% discount!`
+  this.after ('READ','ListOfBooks', each => {
+    if (each.stock > 111) each.title += ` -- 11% discount!`
   })
-}
+
+  return super.init()
+}}
+
+module.exports = { CatalogService }

bookshop/test/requests.http

@@ -32,6 +32,37 @@ 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;Canadian Dollar;036;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

common/data/sap.common-Currencies_texts.csv

@@ -5,9 +5,11 @@ CAD;de;Kanadischer Dollar;Kanadischer Dollar
 AUD;de;Australischer Dollar;Australischer Dollar
 GBP;de;Pfund;Britische Pfund
 ILS;de;Schekel;Israelische Schekel
+JPY;de;Yen;Japanische Yen
 EUR;fr;euro;de la Zone euro
 USD;fr;dollar;dollar des États-Unis
 CAD;fr;dollar canadien;dollar canadien
 AUD;fr;dollar australien;dollar australien
 GBP;fr;livre sterling;pound sterling
-ILS;fr;Shekel;shekel israelien
+ILS;fr;Shekel;shekel israelien
+JPY;fr;Yen;Yen japonais

common/package.json

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

fiori/.env

@@ -1 +1,2 @@
-cds.features.snapi = y
+# cds.requires.messaging.kind = file-based-messaging
+PORT = 4004

fiori/app/_i18n/i18n.properties

@@ -7,7 +7,20 @@ 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

fiori/app/_i18n/i18n_de.properties

@@ -6,6 +6,7 @@ Authors = Autoren
 Author = Autor
 AuthorID = ID des Autors
 AuthorName = Name des Autors
+Age = Alter
 Name = Name
 Stock = Bestand
 Order = Bestellung

fiori/app/admin-fiori.html

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

fiori/app/admin/fiori-service.cds

@@ -1,4 +1,4 @@
-using AdminService from '@capire/bookshop';
+using { AdminService } from '../../db/schema';
 
 ////////////////////////////////////////////////////////////////////////////
 //
@@ -39,6 +39,27 @@ annotate AdminService.Books with @(
 	}
 );
 
+annotate AdminService.Authors with @(
+	UI: {
+		HeaderInfo: {
+			Description: {Value: lifetime}
+		},
+		Facets: [
+			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Details'},
+			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Books}', Target: 'books/@UI.LineItem'},
+		],
+		FieldGroup#Details: {
+			Data: [
+				{Value: placeOfBirth},
+				{Value: placeOfDeath},
+				{Value: dateOfBirth},
+				{Value: dateOfDeath},
+				{Value: age, Label: '{i18n>Age}'},
+			]
+		},
+	}
+);
+
 
 
 ////////////////////////////////////////////////////////////
@@ -49,7 +70,7 @@ annotate AdminService.Books with @(
 annotate sap.capire.bookshop.Books with @fiori.draft.enabled;
 annotate AdminService.Books with @odata.draft.enabled;
 
-annotate AdminService.Books_texts with @(
+annotate AdminService.Books.texts with @(
 	UI: {
 		Identification: [{Value:title}],
 		SelectionFields: [ locale, title ],
@@ -62,7 +83,7 @@ annotate AdminService.Books_texts with @(
 );
 
 // Add Value Help for Locales
-annotate AdminService.Books_texts {
+annotate AdminService.Books.texts {
 	locale @ValueList:{entity:'Languages',type:#fixed}
 }
 // In addition we need to expose Languages through AdminService

fiori/app/admin/webapp/Component.js

@@ -1,5 +1,8 @@
-sap.ui.define(["sap/fe/core/AppComponent"], ac => ac.extend("admin.Component", {
-    metadata:{ manifest:'json' }
-}))
+sap.ui.define(["sap/fe/core/AppComponent"], function(AppComponent) {
+	"use strict";
+	return AppComponent.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": {}
+                "sap.fe.templates": {}
             }
         },
         "models": {

fiori/app/bookshop.html

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

fiori/app/browse/fiori-service.cds

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

fiori/app/browse/webapp/Component.js

@@ -1,5 +1,7 @@
-sap.ui.define(["sap/fe/core/AppComponent"], ac => ac.extend("bookshop.Component", {
-    metadata:{ manifest:'json' }
-}))
-
+sap.ui.define(["sap/fe/core/AppComponent"], function(AppComponent) {
+	"use strict";
+	return AppComponent.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": {}
+        "sap.fe.templates": {}
       }
     },
     "models": {

fiori/app/common.cds

@@ -1,9 +1,9 @@
 /*
-  Common Annotations shared by all apps
+	Common Annotations shared by all apps
 */
 
 using { sap.capire.bookshop as my } from '@capire/bookshop';
-
+using { sap.common } from '@capire/common';
 
 ////////////////////////////////////////////////////////////////////////////
 //
@@ -13,7 +13,7 @@ annotate my.Books with @(
 	Common.SemanticKey: [title],
 	UI: {
 		Identification: [{Value:title}],
-	  SelectionFields: [ ID, author_ID, price, currency_code ],
+		SelectionFields: [ ID, author_ID, price, currency_code ],
 		LineItem: [
 			{Value: ID},
 			{Value: title},
@@ -28,25 +28,18 @@ annotate my.Books with @(
 	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}
-  	},
+		HeaderInfo: {
+			TypeName: '{i18n>Book}',
+			TypeNamePlural: '{i18n>Books}',
+			Title: {Value: title},
+			Description: {Value: author.name}
+		},
 	}
 );
 
@@ -61,20 +54,204 @@ annotate my.Books with {
 	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}';
+	price @title:'{i18n>Price}' @Measures.ISOCurrency: currency_code;
 	stock @title:'{i18n>Stock}';
 	descr @UI.MultiLineText;
 }
 
+////////////////////////////////////////////////////////////////////////////
+//
+//	Genres List
+//
+annotate my.Genres with @(
+	Common.SemanticKey: [name],
+	UI: {
+		SelectionFields: [ name ],
+		LineItem:[
+			{Value: name},
+			{Value: parent.name, Label: 'Main Genre'},
+		],
+	}
+);
+
+////////////////////////////////////////////////////////////////////////////
+//
+//	Genre Details
+//
+annotate my.Genres with @(
+	UI: {
+		Identification: [{Value:name}],
+		HeaderInfo: {
+			TypeName: '{i18n>Genre}',
+			TypeNamePlural: '{i18n>Genres}',
+			Title: {Value: name},
+			Description: {Value: ID}
+		},
+		Facets: [
+			{$Type: 'UI.ReferenceFacet', Label: '{i18n>SubGenres}', Target: 'children/@UI.LineItem'},
+		],
+	}
+);
+
+////////////////////////////////////////////////////////////////////////////
+//
+//	Genres Elements
+//
 annotate my.Genres with {
-  name  @title: '{i18n>Genre}';
+	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>AuthorName}';
+	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}';
 }

fiori/app/orders/webapp/Component.js

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

fiori/app/reviews.html

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

fiori/app/services.cds

@@ -4,7 +4,9 @@
 
 using from './admin/fiori-service';
 using from './browse/fiori-service';
-using from './orders/fiori-service';
 using from './common';
 
 using from '@capire/common';
+
+// only works in case of embedded orders service
+using from '@capire/orders/app/orders/fiori-service';

fiori/db/hana/index.cds

@@ -0,0 +1,10 @@
+//
+//  Add Author.age and .lifetime with a DB-specific function
+//
+
+using { AdminService } from '../schema';
+
+extend projection AdminService.Authors with {
+  YEARS_BETWEEN(dateOfBirth, dateOfDeath)         as age: Integer,
+  YEAR(dateOfBirth) || ' – ' || YEAR(dateOfDeath) as lifetime : String
+}

fiori/db/schema.cds

@@ -1,3 +1,8 @@
-// Proxy for importing schema from bookshop sample
-using from '@capire/bookshop';
-namespace sap.capire.bookshop;
+using { sap.capire.bookshop } from '@capire/bookshop';
+
+// Forward-declare calculated fields to be filled in database-specific ways
+// TODO find a better way to have 'default' fields that still can be overwritten.
+extend bookshop.Authors with {
+	virtual age: Integer;
+	virtual lifetime: String;
+}

fiori/db/sqlite/index.cds

@@ -0,0 +1,10 @@
+//
+//  Add Author.age and .lifetime with a DB-specific function
+//
+
+using { AdminService } from '../schema';
+
+extend projection AdminService.Authors with {
+  strftime('%Y',dateOfDeath)-strftime('%Y',dateOfBirth)              as age: Integer,
+  strftime('%Y',dateOfBirth) || ' – ' || strftime('%Y',dateOfDeath)  as lifetime : String
+}

fiori/package.json

@@ -2,21 +2,43 @@
   "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"
+    "@capire/bookshop": "*",
+    "@capire/reviews": "*",
+    "@capire/orders": "*",
+    "@capire/common": "*",
+    "@sap/cds": "^5",
+    "express": "^4.17.1",
+    "passport": "^0.4.1"
   },
   "scripts": {
     "start": "cds run --in-memory?",
     "watch": "cds watch"
   },
   "cds": {
+    "hana": {
+      "deploy-format": "hdbtable"
+    },
     "requires": {
+      "auth": {
+        "strategy": "dummy"
+      },
+      "ReviewsService": {
+        "kind": "odata",
+        "model": "@capire/reviews"
+      },
+      "OrdersService": {
+        "kind": "odata",
+        "model": "@capire/orders"
+      },
       "db": {
-        "kind": "sql"
+        "kind": "sql",
+        "[development]": {
+          "model": "db/sqlite"
+        },
+        "[production]": {
+          "model": "db/hana"
+        }
       }
     }
   }
-}
+}

fiori/server.js

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

fiori/srv/admin-service.cds

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

fiori/srv/admin-service.js

@@ -1,8 +0,0 @@
-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)
-})

fiori/srv/mashup.cds

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

fiori/srv/mashup.js

@@ -0,0 +1,59 @@
+////////////////////////////////////////////////////////////////////////////
+//
+//    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)
+  })
+}

fiori/test/requests.http

@@ -0,0 +1,81 @@
+
+@bookshop = http://localhost:4004
+@reviews-service = {{bookshop}}/reviews
+# Uncomment this when running a separate reviews service
+@reviews-service = http://localhost:4005/reviews
+
+
+
+#################################################
+#
+#   Reviews Service
+#
+
+GET {{reviews-service}}/Reviews
+
+###
+
+POST {{reviews-service}}/Reviews
+Authorization: Basic {{$processEnv USER}}:
+Content-Type: application/json
+
+{"subject":"201", "title":"boo", "rating":3 }
+
+
+
+#################################################
+#
+#   Bookshop Services
+#
+
+GET {{bookshop}}/browse/Books/201/reviews?
+&$select=rating,date,title
+&$top=3
+
+###
+
+GET {{bookshop}}/browse/Books(201)?
+&$select=ID,title,rating
+&$expand=reviews
+
+###
+
+GET {{bookshop}}/browse/Books?
+  &$select=title,author&$expand=currency
+Accept-Language: de
+
+#################################################
+#
+#   Orders Service, incl. draft choreography
+#
+@newOrderID = e939604c-ab83-4d4f-bdb6-95fe30b3773e
+
+GET {{bookshop}}/orders/Orders
+
+### Create order, still inactive
+POST {{bookshop}}/orders/Orders
+Content-Type: application/json
+
+{"ID": "{{newOrderID}}"}
+
+### Get inactive order.  We have to specify `IsActiveEntity`.
+GET {{bookshop}}/orders/Orders(ID={{newOrderID}},IsActiveEntity=false)
+
+### Activate order using `.../<servicename>.draftActivate`
+POST {{bookshop}}/orders/Orders(ID={{newOrderID}},IsActiveEntity=false)/OrdersService.draftActivate
+Content-Type: application/json
+
+### Get active order
+GET {{bookshop}}/orders/Orders(ID={{newOrderID}},IsActiveEntity=true)
+
+### Create author
+POST {{bookshop}}/admin/Authors
+Content-Type: application/json
+Authorization: Basic alice:
+
+{
+  "ID": 200,
+  "name": "William Shakespeare",
+  "dateOfBirth": "1564-04-26",
+  "dateOfDeath": "1616-04-23"
+}

media/test/media.http

@@ -0,0 +1,35 @@
+### 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:

orders/.env

@@ -0,0 +1,3 @@
+cds.requires.messaging.kind = file-based-messaging
+PORT = 4006
+# cds.odata.flavor = x4

orders/app/fiori-app.html

@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+<head>
+
+	<meta http-equiv="X-UA-Compatible" content="IE=edge" />
+	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+	<title>Bookshop</title>
+
+	<script>
+		window["sap-ushell-config"] = {
+			defaultRenderer: "fiori2",
+			applications: {
+				"manage-orders": {
+					title: "Manage Orders",
+					description: "... testing FE v42",
+					additionalInformation: "SAPUI5.Component=orders",
+					applicationType : "URL",
+					url: "/orders/webapp",
+					navigationMode: "embedded"
+				}
+			}
+		};
+	</script>
+
+	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
+	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/resources/sap-ui-core.js"
+    	data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
+    	data-sap-ui-compatVersion="edge"
+    	data-sap-ui-theme="sap_fiori_3"
+    	data-sap-ui-frameOptions="allow"
+	></script>
+	<script>
+		sap.ui.getCore().attachInit(()=> sap.ushell.Container.createRenderer().placeAt("content"))
+	</script>
+
+</head>
+<body class="sapUiBody" id="content"></body>
+</html>

orders/app/index.cds

@@ -0,0 +1,5 @@
+/*
+  This model controls what gets served to Fiori frontends...
+*/
+
+using from './orders/fiori-service';

orders/app/orders/fiori-service.cds

@@ -1,44 +1,28 @@
-using OrdersService from '@capire/orders/srv/orders-service';
-
-annotate OrdersService.Books with {
-	price @Common.FieldControl: #ReadOnly;
-}
 
 
 ////////////////////////////////////////////////////////////////////////////
 //
-//	Common
+//	Note: this is designed for the OrdersService being co-located with
+//	bookshop. It does not work if OrdersService is run as a separate
+// 	process, and is not intended to do so.
 //
-annotate OrdersService.OrderItems with {
-	book @(
-		Common: {
-			Text: book.title,
-			FieldControl: #Mandatory
-		},
-		ValueList.entity:'Books',
-	);
-	amount @(
-		Common.FieldControl: #Mandatory
-	);
-}
+////////////////////////////////////////////////////////////////////////////
+
+
+
+using { OrdersService } from '../../srv/orders-service';
+using { sap.common } from '@capire/common';
 
 
 @odata.draft.enabled
 annotate OrdersService.Orders with @(
 	UI: {
-		////////////////////////////////////////////////////////////////////////////
-		//
-		//	Lists of Orders
-		//
 		SelectionFields: [ createdAt, createdBy ],
 		LineItem: [
-			{Value: createdBy, Label:'Customer'},
+			{Value: OrderNo, Label:'OrderNo'},
+			{Value: buyer, Label:'Customer'},
 			{Value: createdAt, Label:'Date'}
 		],
-		////////////////////////////////////////////////////////////////////////////
-		//
-		//	Order Details
-		//
 		HeaderInfo: {
 			TypeName: 'Order', TypeNamePlural: 'Orders',
 			Title: {
@@ -62,7 +46,7 @@ annotate OrdersService.Orders with @(
 		],
 		FieldGroup#Details: {
 			Data: [
-				{Value: currency_code, Label:'Currency'}
+				{Value: currency.code, Label:'Currency'}
 			]
 		},
 		FieldGroup#Created: {
@@ -85,36 +69,34 @@ annotate OrdersService.Orders with @(
 
 
 
-//The enity types name is OrdersService.my_bookshop_OrderItems
-//The annotations below are not generated in edmx WHY?
-annotate OrdersService.OrderItems with @(
+annotate OrdersService.Orders.Items 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: book_ID, Label:'Book'},
-			//The following entry is only used to have the assoication followed in the read event
-			{Value: book.price, Label:'Book Price'},
+			{Value: product_ID, Label:'Product ID'},
+			{Value: title, Label:'Product Title'},
+			{Value: price, Label:'Unit Price'},
 			{Value: amount, Label:'Quantity'},
 		],
 		Identification: [ //Is the main field group
-			//{Value: ID, Label:'ID'}, //A guid shouldn't be on the UI
-			{Value: book_ID, Label:'Book'},
+			{Value: product_ID, Label:'Product ID'},
+			{Value: title, Label:'Product Title'},
 			{Value: amount, Label:'Amount'},
+			{Value: price, Label:'Unit Price'},
 		],
 		Facets: [
 			{$Type: 'UI.ReferenceFacet', Label: '{i18n>OrderItems}', Target: '@UI.Identification'},
 		],
+		HeaderInfo: {
+			TypeName: 'Order Item', TypeNamePlural: 'Order Items',
+			Title: {
+				Label: 'Product ID ', //A label is possible but it is not considered on the ObjectPage yet
+				Value: product_ID
+			},
+			Description: {Value: createdBy}
+		},
 	},
-);
+) {
+	amount @(
+		Common.FieldControl: #Mandatory
+	);
+};

orders/app/orders/webapp/Component.js

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

orders/app/orders/webapp/manifest.json

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

orders/db/data/sap.capire.bookshop-Orders.Items.csv

@@ -1,4 +0,0 @@
-ID;amount;parent_ID;book_ID
-58040e66-1dcd-4ffb-ab10-fdce32028b79;1;7e2f2640-6866-4dcf-8f4d-3027aa831cad;201
-64e718c9-ff99-47f1-8ca3-950c850777d4;1;7e2f2640-6866-4dcf-8f4d-3027aa831cad;271
-e9641166-e050-4261-bfee-d1e797e6cb7f;2;64e718c9-ff99-47f1-8ca3-950c850777d4;252

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

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

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

@@ -0,0 +1,4 @@
+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

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

@@ -0,0 +1,3 @@
+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

orders/db/schema.cds

@@ -1,13 +1,23 @@
-using { sap.capire.bookshop.Books } from '@capire/bookshop';
-using { Currency, managed, cuid } from '@sap/cds/common';
-namespace sap.capire.bookshop;
+using { Currency, User, managed, cuid } from '@sap/cds/common';
+namespace sap.capire.orders;
 
 entity Orders : cuid, managed {
   OrderNo  : String @title:'Order Number'; //> readable key
-  Items    : Composition of many {
-    key pos : Integer;
-    book    : Association to Books;
-    amount  : Integer;
-  };
+  Items    : Composition of many Orders.Items on Items.up_ = $self;
+  buyer    : User;
   currency : Currency;
 }
+
+entity Orders.Items {
+  /*key*/ up_   : Association to Orders; // REVISIT: 'key' doesn't work due to bug in runtime
+  key ID    : UUID;
+  product   : Association to Products;
+  amount    : Integer;
+  title     : String; //> intentionally replicated as snapshot from product.title or alike
+  price     : Double;
+}
+
+/** This is a stand-in for arbitrary ordered Products */
+entity Products @(cds.persistence.skip:'always') {
+  key ID : String;
+}

orders/index.cds

@@ -0,0 +1,6 @@
+/*
+  This model controls what gets exposed
+*/
+namespace sap.capire.orders;
+using from './srv/orders-service';
+using from './db/schema';

orders/package.json

@@ -1,4 +1,8 @@
 {
   "name": "@capire/orders",
-  "version": "1.0.0"
+  "version": "1.0.0",
+  "dependencies": {
+    "@capire/common": "*",
+    "@sap/cds": "^5"
+  }
 }

orders/requests.http

@@ -0,0 +1,31 @@
+
+@Orders = http://localhost:4006/orders/Orders
+
+
+### Read Orders
+GET {{Orders}}?
+###
+GET {{Orders}}?$expand=Items
+###
+GET {{Orders}}(ID={{Order1}},IsActiveEntity=true)/Items
+
+
+
+@Order1 = 64e718c9-ff99-47f1-8ca3-950c850777d4
+@Order3 = e939604c-ab83-4d4f-bdb6-95fe30b3773e
+
+### Create order, still inactive
+POST {{Orders}}
+Content-Type: application/json
+
+{"ID": "{{Order3}}"}
+
+### Get inactive order.  We have to specify `IsActiveEntity`.
+GET {{Orders}}(ID={{Order3}},IsActiveEntity=false)
+
+### Activate order using `.../<servicename>.draftActivate`
+POST {{Orders}}(ID={{Order3}},IsActiveEntity=false)/OrdersService.draftActivate
+Content-Type: application/json
+
+### Get active order
+GET {{Orders}}(ID={{Order3}},IsActiveEntity=true)

orders/srv/orders-service.cds

@@ -1,6 +1,5 @@
-using { sap.capire.bookshop as my } from '../db/schema';
+using { sap.capire.orders as my } from '../db/schema';
 
 service OrdersService {
   entity Orders as projection on my.Orders;
-  entity Books as projection on my.Books;
 }

orders/srv/orders-service.js

@@ -1,21 +1,37 @@
-const cds = require('@sap/cds')
+const cds = require ('@sap/cds')
+class OrdersService extends cds.ApplicationService {
 
-module.exports = cds.service.impl(function() {
+  /** register custom handlers */
+  init(){
+    const { 'Orders.Items':OrderItems } = this.entities
 
-  const { Books } = cds.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)
+      }
+    })
 
-  // Reduce stock of ordered books if available stock suffices
-  this.before ('CREATE', 'Orders', (req) => {
-    const { Items: OrderItems } = req.data
-    return cds.transaction(req) .run (()=> OrderItems.map (order =>
-      UPDATE (Books) .where ('ID =', order.book_ID)
-      .and ('stock >=', order.amount)
-      .set ('stock -=', order.amount)
-    )) .then (all => all.forEach ((affectedRows,i) => {
-      if (affectedRows === 0)  req.error (409,
-        `${OrderItems[i].amount} exceeds stock for book #${OrderItems[i].book_ID}`
+    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

package.json

@@ -5,23 +5,32 @@
   "repository": "https://github.com/sap-samples/cloud-cap-samples.git",
   "author": "daniel.hutzel@sap.com",
   "dependencies": {
-    "@capire/bookshop": "file:bookshop",
-    "@capire/common": "file:common",
-    "@capire/fiori": "file:fiori",
-    "@capire/orders": "file:orders",
-    "@capire/reviews": "file:reviews",
-    "@capire/tests": "file:test"
+    "@capire/bookshop": "./bookshop",
+    "@capire/common": "./common",
+    "@capire/fiori": "./fiori",
+    "@capire/hello": "./hello",
+    "@capire/media": "./media",
+    "@capire/orders": "./orders",
+    "@capire/reviews": "./reviews"
   },
   "devDependencies": {
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "chai-subset": "^1.6.0",
-    "sqlite3": "^4"
+    "sqlite3": "^5.0.0"
   },
   "scripts": {
+    "cleanup": "rm -rf node_modules && rm -rf */node_modules && rm -rf */*/node_modules",
+    "registry": "node .registry/server.js",
+    "bookshop": "cds watch bookshop",
+    "fiori": "cds watch fiori",
+    "media": "cds watch media",
     "mocha": "npx mocha || echo",
-    "jest": "npx jest --verbose",
-    "test": "npm run jest -s"
+    "jest": "npx jest@^26",
+    "test": "npm run jest --silent"
+  },
+  "mocha": {
+    "parallel": true
   },
   "jest": {
     "testEnvironment": "node"

reviews/.env

@@ -1 +1,2 @@
-PORT = 5005
+cds.requires.messaging.kind = file-based-messaging
+PORT = 4005

reviews/app/vue/app.js

@@ -0,0 +1,72 @@
+/* global Vue axios */ //> from vue.html
+const $ = sel => document.querySelector(sel)
+const GET = (url) => axios.get('/reviews'+url)
+const PUT = (cmd,data) => axios.patch('/reviews'+cmd,data)
+const POST = (cmd,data) => axios.post('/reviews'+cmd,data)
+
+const reviews = new Vue ({
+
+    el:'#app',
+
+    data: {
+        list: [],
+        review: undefined,
+        message: {},
+        Ratings: Object.entries({
+            5 : '★★★★★',
+            4 : '★★★★',
+            3 : '★★★',
+            2 : '★★',
+            1 : '★',
+        }).reverse()
+    },
+
+    methods: {
+
+        search: ({target:{value:v}}) => reviews.fetch(v && '&$search='+v),
+
+        async fetch (etc='') {
+            const {data} = await GET(`/Reviews?${etc}`)
+            reviews.list = data.value
+        },
+
+        async inspect (eve) {
+            const review = reviews.review = reviews.list [eve.currentTarget.rowIndex-1]
+            const res = await GET(`/Reviews/${review.ID}/text/$value`)
+            review.text = res.data
+            reviews.message = {}
+        },
+
+        newReview () {
+            reviews.review = {}
+            reviews.message = {}
+            setTimeout (()=> $('form > input').focus(), 111)
+        },
+
+        async submitReview () {
+            const review = reviews.review; review.rating = parseInt (review.rating) // REVISIT: Okra should be less strict
+            try {
+                if (!review.ID) {
+                    const res = await POST(`/Reviews`,review)
+                    reviews.ID = res.data.ID
+                } else {
+                    console.trace()
+                    await PUT(`/Reviews/${review.ID}`,review)
+                }
+                reviews.message = { succeeded: 'Your review was submitted successfully. Thanks.' }
+            } catch (e) {
+                reviews.message = { failed: e.response.data.error.message }
+            }
+        }
+
+    },
+
+    filters: {
+        stars: (r) => ('★'.repeat(Math.round(r))+'☆☆☆☆☆').slice(0,5),
+        datetime: (d) => d && new Date(d).toLocaleString(),
+    },
+
+})
+
+// initially fill list of my reviews
+reviews.fetch()

reviews/app/vue/index.html

@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <title> Capire Reviews </title>
+    <link rel="stylesheet" href="https://unpkg.com/primitive-ui/dist/css/main.css">
+    <script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/vue"></script>
+    <style>
+        .hovering tr:hover td { color:cyan; background: #123; cursor: pointer; }
+        .rating-stars { color:teal }
+        .succeeded { color:teal }
+        .failed { color:red }
+        textarea { line-height: 1.4em;}
+    </style>
+</head>
+
+<body class="small-container", style="margin-top: 70px;">
+<div id='app'>
+
+    <h1> {{ document.title }} </h1>
+
+    <input type="text" placeholder="Search..." @input="search">
+
+    <table id='my-reviews' class="hovering">
+        <thead>
+            <th> Subject </th>
+            <th> Rating </th>
+            <th> Title </th>
+            <th> Date </th>
+        </thead>
+        <tr v-for="review in list" v-bind:id="review.ID" v-on:click="inspect">
+            <td>{{ review.subject }}</td>
+            <td class="rating-stars">{{ review.rating | stars }}</td>
+            <td>{{ review.title }}</td>
+            <td>{{ review.date | datetime }}</td>
+        </tr>
+    </table>
+
+    <button v-on:click="newReview()" class="round-button muted-button">Add Review...</button>
+
+    <form v-if="review" @submit.prevent="submitReview">
+        <input id="subject" type="text" v-model="review.subject" style="font-weight:bold; display:inline; width:20%">
+        <input type="text" v-model="review.title" style="font-weight:bold; display:inline; width:60%">
+        <select v-model="review.rating" style="font-weight:bold; display:inline; width:17%; float: right;">
+            <option v-for="option in Ratings" v-bind:value="option[0]"> {{ option[1] }} </option>
+        </select>
+        <textarea v-model="review.text" rows="9"></textarea>
+        <input type="submit" value="Submit" class="round-button muted-button">
+        <span class="succeeded"> {{ message.succeeded }} </span>
+        <span class="failed"> {{ message.failed }} </span>
+    </form>
+    <div v-else style="margin-top: 2em;">
+        ( click on a row to see details... )
+    </div>
+
+
+</div>
+</body>
+
+<script src="app.js"></script>
+</html>

reviews/db/data/sap.capire.reviews-Reviews.csv

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

reviews/db/schema.cds

@@ -17,7 +17,7 @@ entity Reviews {
   liked    : Integer default 0; // counter for likes as helpful review (count of all _likes belonging to this review)
 }
 
-type Rating : Decimal(3,2) enum {
+type Rating : Integer enum {
   Best  = 5;
   Good  = 4;
   Avg   = 3;

reviews/index.cds

@@ -1 +1,2 @@
 using from './srv/reviews-service';
+namespace sap.capire.reviews;

reviews/package.json

@@ -7,20 +7,17 @@
     "index.cds"
   ],
   "dependencies": {
-    "@sap/cds": ">=3.33.1",
+    "@sap/cds": "^5",
     "express": "^4.17.1"
   },
   "scripts": {
     "reviews-service": "cds watch",
-    "bookshop": "cds watch test/bookshop"
+    "books-reviewed": "cds watch ../reviewed"
   },
   "cds": {
     "requires": {
       "db": {
         "kind": "sql"
-      },
-      "messaging": {
-        "kind": "file-based-messaging"
       }
     }
   }

reviews/readme.md

@@ -2,20 +2,23 @@
 
 ## Run all-in-one
 
-Open a terminal window and run the bookshop in it:
+Open a terminal window and run the `fiori` app in it:
+
 ```sh
-npm run bookshop
+npm run fiori
 ```
 
 
-## Run as separate services
+## Run as Separate Services
+
+Open two terminal windows. In the first one start the reviews service stand-alone:
 
-Open two terminal windows, and in the first one start the reviews service stand-alone:
 ```sh
 npm run reviews-service
 ```
 
-In the the second one start the bookshop:
+In the second one start the `fiori` app:
+
 ```sh
-npm run bookshop
+npm run fiori
 ```

reviews/srv/reviews-service.cds

@@ -8,30 +8,37 @@ service ReviewsService {
   action unlike (review: type of Reviews:ID);
 
   // Async API
-  event reviewed : {
-    subject: type of Reviews:subject;
-    rating: Decimal(2,1)
-  };
+   event reviewed : {
+     subject: type of Reviews:subject;
+     rating: Decimal(2,1)
+   }
 
   // Input validation
   annotate Reviews with {
     subject  @mandatory;
     title    @mandatory;
-    rating   @mandatory @assert.enum;
+    rating   @assert.range;
   }
 
 }
 
 
 // Access control restrictions
-annotate ReviewsService.Reviews with @restrict_:[
+annotate ReviewsService.Reviews with @restrict:[
   { grant:'READ',   to:'any' },                 // everybody can read reviews
   { grant:'CREATE', to:'authenticated-user' },  // users must login to add reviews
-  { grant:'UPDATE', to:'authenticated-user', where:'reviewer=$user' },
+  /////////////////////////////////////////////////
+  //
+  // Temporarily disabling this due to glitch in CAP Node.js runtime:
+  // { grant:'UPDATE', to:'authenticated-user', where:'reviewer=$user' },
+  // -> reenable it when the issue is fixed
+     { grant:'UPDATE', to:'authenticated-user' },
+  //
+  ////////////////////////////////////////////////////
   { grant:'DELETE', to:'admin' },
 ];
 
-annotate ReviewsService with @restrict_:[
+annotate ReviewsService with @restrict:[
   { grant:'like', to:'identified-user' },
   { grant:'unlike', to:'identified-user', where:'user=$user' },
 ];

reviews/srv/reviews-service.js

@@ -10,23 +10,20 @@ module.exports = cds.service.impl (function(){
   })
 
   // Emit an event to inform subscribers about new avg ratings for reviewed subjects
-  // ( Note: req.on.succeeded ensures we only do that if there's no error )
-  this.after (['CREATE','UPDATE','DELETE'], 'Reviews', async(_,req) => {
+  this.after (['CREATE','UPDATE','DELETE'], 'Reviews', async function(_,req) {
     const {subject} = req.data
-    const {rating} = await cds.transaction(req) .run (
+    const {rating} = await cds.tx(req) .run (
       SELECT.one (['round(avg(rating),2) as rating']) .from (Reviews) .where ({subject})
     )
-    req.on ('succeeded', ()=>{
-      global.it || console.log ('< emitting:', 'reviewed', { subject, rating })
-      this.emit ('reviewed', { subject, rating })
-    })
+    global.it || console.log ('< emitting:', 'reviewed', { subject, rating })
+    await this.emit ('reviewed', { subject, rating })
   })
 
   // Increment counter for reviews considered helpful
   this.on ('like', (req) => {
     if (!req.user)  return req.reject(400, 'You must be identified to like a review')
     const {review} = req.data, {user} = req
-    const tx = cds.transaction(req)
+    const tx = cds.tx(req)
     return tx.run ([
       INSERT.into (Likes) .entries ({review_ID: review, user: user.id}),
       UPDATE (Reviews) .set({liked: {'+=': 1}}) .where({ID:review})
@@ -37,7 +34,7 @@ module.exports = cds.service.impl (function(){
   this.on ('unlike', async (req) => {
     if (!req.user)  return req.reject(400, 'You must be identified to remove a former like of yours')
     const {review} = req.data, {user} = req
-    const tx = cds.transaction(req)
+    const tx = cds.tx(req)
     const affectedRows = await tx.run (DELETE.from (Likes) .where ({review_ID: review,user: user.id}))
     if (affectedRows === 1)  return tx.run (UPDATE (Reviews) .set ({liked: {'-=': 1}}) .where ({ID:review}))
   })

reviews/test/4004.http

@@ -1,36 +0,0 @@
-#################################################
-#
-#   To ReviewsService mocked in bookshop process
-#
-
-GET http://localhost:4004/reviews/Reviews?
-
-###
-
-POST http://localhost:4004/reviews/Reviews
-Content-Type: application/json;IEEE754Compatible=true
-
-{"subject":"201", "title":"boo"}
-
-
-
-#################################################
-#
-#   Bookshop Requests involving reviews
-#   (both in-process as well as separate one)
-#
-
-
-### Request to CatalogService > delegated to ReviewsService
-GET http://localhost:4004/browse/Books(201)/reviews?
-&$select=rating,date,reviewer,title
-
-### Alternative OData URL
-GET http://localhost:4004/browse/Books/201/reviews?
-&$select=rating,date,reviewer,title
-
-###
-GET http://localhost:4004/browse/Books(201)?
-&$select=ID,title,rating
-&$expand=reviews
-# Note: the $expand only works in case of ReviewsService in same process

reviews/test/5005.http

@@ -1,13 +0,0 @@
-#################################################
-#
-#   To ReviewsService running as separate process
-#
-
-GET http://localhost:5005/reviews/Reviews?
-
-###
-
-POST http://localhost:5005/reviews/Reviews
-Content-Type: application/json;IEEE754Compatible=true
-
-{"subject":"201", "title":"boo"}

reviews/test/bookshop/package.json

@@ -1,23 +0,0 @@
-{
-  "name": "@capire/bookshop-with-reviews",
-  "version": "1.0.0",
-  "dependencies": {
-    "@capire/bookshop": "../../../bookshop",
-    "@capire/reviews": "..",
-    "@sap/cds": "^3.33.1",
-    "express": "^4.17.1"
-  },
-  "cds": {
-    "requires": {
-      "db": {
-        "kind": "sql"
-      },
-      "ReviewsService": {
-        "kind": "odata", "model": "@capire/reviews"
-      },
-      "messaging": {
-        "kind": "file-based-messaging"
-      }
-    }
-  }
-}

reviews/test/bookshop/schema.cds

@@ -1,16 +0,0 @@
-//
-//  Extending Books with Reviews
-//
-
-using { sap.capire.bookshop.Books } from '@capire/bookshop';
-using { ReviewsService.Reviews } from '@capire/reviews';
-
-extend Books with {
-  /** Access to detailed collection of Reviews */
-  reviews : Composition of many Reviews on reviews.subject = $self.ID;
-  /** Average rating */
-  rating : Reviews.rating;
-}
-
-// Temporary workaround for cap/issues#4112:
-annotate Reviews with @cds.autoexpose;

reviews/test/bookshop/server.js

@@ -1,51 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-//
-//   This is an example of using a project-local server.js to intercept
-//   the default bootstrapping process.
-//
-
-const cds = require ('@sap/cds')
-
-// Mashup services after all are served...
-cds.once('served', async()=>{
-
-    // react on event messages from reviews service
-    const ReviewsService = await cds.connect.to ('ReviewsService')
-    const db = await cds.connect.to ('db')
-    ReviewsService.on ('reviewed', (msg) => {
-        console.debug ('> received:', msg.event, msg.data)
-        const { Books } = db.entities('sap.capire.bookshop')
-        const { subject, rating } = msg.data
-        const tx = db.tx (msg) // TODO: db.tx(msg) fully implemented?
-        return tx.update (Books,subject) .with ({rating})
-    })
-
-    // delegate requests to read reviews to ReviewsService
-    const CatalogService = await cds.connect.to ('CatalogService')
-    CatalogService.impl (srv => srv.on ('READ', 'Books/reviews', (req) => {
-        console.debug ('> delegating to ReviewsService')
-        const { Reviews } = ReviewsService.entities
-        const [ subject ] = req.params
-        const tx = ReviewsService.tx (req)
-        return tx.read (Reviews) .where({subject}) .columns (req.query.SELECT.columns)
-    }))
-
-})
-
-// Other bootstrapping events you could hook in to...
-/* eslint-disable no-unused-vars */
-cds.on('boostrap',(app) => {/* ... */})
-cds.on('loaded', (model) => {/* ... */})
-cds.on('connect', (srv) => {/* ... */})
-cds.on('serving', (srv) => {/* ... */})
-cds.once('listening', ({server,url}) => {/* ... */})
-
-
-// Delegate bootstrapping to built-in server.js
-module.exports = cds.server
-
-// Monkey-patching older releases
-if (cds.version < '3.33.4') cds.once('listening', ()=> cds.emit('served'))
-
-// Launch server if started directly from command-line
-if (!module.parent)  cds.server()

samples.md

@@ -1,28 +1,28 @@
 # Overview of Samples
 
-The list below gives an overview of the samples provided in subdirectories.
-Each sub directory essentially is a individual npm package arranged in an [all-in-one monorepo](all-in-one-monorepo) umbrella setup.
+The following list gives an overview of the samples provided in subdirectories.
+Each sub directory essentially is an individual npm package arranged in an [all-in-one monorepo](all-in-one-monorepo) umbrella setup.
 
 
-## [hello](hello)
+## [@capire/hello-world](hello)
 
 - 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).
 
 
-## [bookshop](bookshop)
+## [@capire/bookshop](bookshop)
 
 - [Getting Started](https://cap.cloud.sap/docs/get-started/in-a-nutshell) with CAP, briefly introducing:
 - [Project Setup](https://cap.cloud.sap/docs/get-started/) and [Layouts](https://cap.cloud.sap/docs/get-started/projects)
-- [Domain Modelling](https://cap.cloud.sap/docs/guides/domain-models)
+- [Domain Modeling](https://cap.cloud.sap/docs/guides/domain-models)
 - [Defining Services](https://cap.cloud.sap/docs/guides/providing-services)
 - [Generic Providers](https://cap.cloud.sap/docs/guides/generic-providers)
 - [Adding Custom Logic](https://cap.cloud.sap/docs/guides/service-impl)
 - [Using Databases](https://cap.cloud.sap/docs/guides/databases)
 
 
-## [common](common)
+## [@capire/common](common)
 
-- Showcases how to extend [@sap/cds/common](https://cap.cloud.sap/docs/cds/common) thereby covering...
+- Showcases how to extend [@sap/cds/common](https://cap.cloud.sap/docs/cds/common) thereby covering:
 - Building [extension packages](https://cap.cloud.sap/docs/guides/domain-models#aspects-extensibility)
 - Providing [reuse packages](https://cap.cloud.sap/docs/get-started/projects#sharing-and-reusing-content)
 - [Verticalization](https://cap.cloud.sap/docs/cds/common#adapting-to-your-needs)
@@ -30,35 +30,39 @@ Each sub directory essentially is a individual npm package arranged in an [all-i
 - Used in the [fiori app sample](#fiori)
 
 
-## [orders](orders)
+## [@capire/orders](orders)
 
-- Adds orders to the [bookshop](#bookshop), thereby demonstrating...
+- A standalone orders management service, demonstrating:
 - Using [Compositions](https://cap.cloud.sap/docs/cds/cdl#compositions) in [Domain Models](https://cap.cloud.sap/docs/guides/domain-models), along with
 - [Serving deeply nested documents](https://cap.cloud.sap/docs/guides/generic-providers#serving-structured-data)
 
 
-## [reviews](reviews)
+## [@capire/reviews](reviews)
 
-- Shows how to implement a modular service to manage product reviews, including...
+- Shows how to implement a modular service to manage product reviews, including:
 - Consuming other services synchronously and asynchronously
 - Serving requests synchronously
 - Emitting events asynchronously
-- Grow as you go, with...
+- Grow as you go, with:
 - Mocking app services
 - Running service meshes
 - Late-cut Micro Services
-- As well as managed data, input validations and authorization
+- As well as managed data, input validations, and authorization
 
 
-## [fiori](fiori)
-
-- [Adds a Fiori elements application](https://cap.cloud.sap/docs/guides/fiori/), introducing to...
-- [OData Annotations](https://cap.cloud.sap/docs/guides/fiori#adding-odata-annotations) in `.cds` files
-- Support for [Fiori Draft](https://cap.cloud.sap/docs/guides/fiori#draft)
-- Support for [Value Helps](https://cap.cloud.sap/docs/guides/fiori#value-help)
-- Serving Fiori apps locally
-- Combining most of the other samples through [package reuse](https://cap.cloud.sap/docs/get-started/projects#sharing-and-reusing-content)
+## [@capire/fiori](fiori)
 
+- A [composite app, reusing and combining](https://cap.cloud.sap/docs/guides/verticalize) these packages:
+  - [@capire/bookshop](bookshop)
+  - [@capire/reviews](reviews)
+  - [@capire/orders](orders)
+  - [@capire/common](common)
+- [Adds an SAP Fiori elements application](https://cap.cloud.sap/docs/guides/fiori/) to bookshop, thereby introducing to:
+  - [OData Annotations](https://cap.cloud.sap/docs/guides/fiori#adding-odata-annotations) in `.cds` files
+  - Support for [Fiori Draft](https://cap.cloud.sap/docs/guides/fiori#draft)
+  - Support for [Value Helps](https://cap.cloud.sap/docs/guides/fiori#value-help)
+  - Serving SAP Fiori apps locally
+- [The Vue.js app](bookshop/app/vue) imported from bookshop is served as well
 
 <br>
 

test/_cds_tests.js

@@ -1,151 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-//
-//  This is included with cds in newer versions
-//
-////////////////////////////////////////////////////////////////////////////
-
-const { resolve, dirname } = require('path')
-const cwd = process.cwd()
-
-// harmonizing jest and mocha
-const is_mocha = !global.test
-const is_jest = !!global.test
-if (is_jest) { // it's jest
-  global.before = (msg,fn) => global.beforeAll(fn||msg)
-  global.after = (msg,fn) => global.afterAll(fn||msg)
-} else { // it's mocha
-  global.beforeAll = global.before
-  global.afterAll = global.after
-  global.test = global.it
-}
-
-/**
- * Test kit for jest or mocha testing, which can be used statically
- * via the getters for chai, expect and assert or through a server
- * started with .launch(...).
- */
-class CDSTestKit {
-
-  /**
-   * Creates a new instance serving projects from subfolders under the root
-   * specified by a sequence of path components which are concatenated with
-   * path.resolve().
-   */
-  for (...paths) {
-    const tk = new CDSTestKit
-    tk.root = resolve (...paths)
-    return tk
-  }
-
-  /** Lazily loads and returns an instance of chai */
-  get chai() {
-    const chai = require('chai')
-    chai.use (require('chai-as-promised'))
-    chai.use (require('chai-subset'))
-    Object.defineProperty (CDSTestKit.prototype, 'chai', {value:chai})
-    return chai
-  }
-  get expect(){ return this.chai.expect }
-  get assert(){ return this.chai.assert }
-
-  /**
-   * Launches a cds server with arbitrary port and returns a subclass which
-   * also acts as an axios lookalike, providing methods to send requests.
-   */
-  launch (project, ...args) {
-
-    // Setting up test server
-    const console = global.console, logs=[]
-    const axios = require('axios').default
-    const lazy = this, test = {
-
-      GET: (path,...etc) => axios.get (test.url+path,...etc) .catch(_error),
-      PUT: (path,...etc) => axios.put (test.url+path,...etc) .catch(_error),
-      POST: (path,...etc) => axios.post (test.url+path,...etc) .catch(_error),
-      PATCH: (path,...etc) => axios.patch (test.url+path,...etc) .catch(_error),
-      DELETE: (path,...etc) => axios.delete (test.url+path,...etc) .catch(_error),
-
-      get: (path,...etc) => axios.get (test.url+path,...etc) .catch(_error),
-      put: (path,...etc) => axios.put (test.url+path,...etc) .catch(_error),
-      post: (path,...etc) => axios.post (test.url+path,...etc) .catch(_error),
-      patch: (path,...etc) => axios.patch (test.url+path,...etc) .catch(_error),
-      delete: (path,...etc) => axios.delete (test.url+path,...etc) .catch(_error),
-
-      /** Lazily loads and returns an instance of chai */
-      get chai(){ return lazy.chai },
-      get expect(){ return lazy.expect },
-      get assert(){ return lazy.assert },
-    }
-
-    // launch cds server...
-    before (`launching cds server for ${project}...`, done => {
-
-      const cds = require('@sap/cds'), { isdir } = cds.utils
-
-      let cmd = 'run'
-      if (project.startsWith('cds ')) [ cmd, project ] = [ project.slice(4), args.shift() ]
-      if (!args.length) args = ['--in-memory?']
-
-      // Supporting .launch (<package name>)
-      if (cmd === 'run') {
-        if (isdir(project)) ; //> all fine
-        else if (isdir(resolve(this.root,project))) project = resolve(this.root,project)
-        else try { project = dirname (require.resolve(project+'/package.json')) }
-        catch(e) { throw cds.error (`Cannot resolve project folder for '${project}'`) }
-      }
-
-      if (!process.env.CDS_TEST_VERBOSE) global.console = { __proto__: global.console, logs,
-        time: ()=>{}, timeEnd: (...args)=> logs.push(args),
-        debug: (...args)=> logs.push(args),
-        log: (...args)=> logs.push(args),
-        warn: (...args)=> logs.push(args),
-        error: (...args)=> logs.push(args),
-        dump(){ for (let each of logs) console.log (...each) },
-      }
-
-      // return done (new Error(11))
-      process.env.PORT = '0'
-      const p = cds.exec (cmd, project, ...args) // TODO w/ @sap/cds@3.33.3: , '--port', '0')
-      if (p && 'catch' in p) p.catch (e => {
-        if (is_mocha) console.error(e)
-        done(e)
-      })
-
-      cds.once('listening', ({ server, url }) => {
-        Object.assign (test,{server,url})
-        done()
-      })
-    })
-
-    // shutdown cds server...
-    after (done => {
-      if (global.console !== console) global.console = console
-      if (cwd !== process.cwd())  process.chdir(cwd)
-      test.server ? test.server.close (done) : done()
-      process.emit('shutdown')
-    })
-
-    function _error (e) {
-      if (!e.response)  throw e
-      if (!e.response.data)  throw e
-      if (!e.response.data.error)  throw e
-      const { code, message } = e.response.data.error
-      throw new Error (code && code !== 'null' ? `${code} - ${message}` : message)
-    }
-
-    return test
-  }
-
-}
-
-// eslint-disable-next-line no-global-assign
-require = (mod) => {
-  try { return module.require(mod) }
-  catch(e) { if (e.code === 'MODULE_NOT_FOUND') throw new Error (`
-    Failed to load required package '${mod}'. Please add it thru:
-    npm add -D ${mod === 'chai' ? 'chai chai-as-promised chai-subset' : mod}
-  `) }
-}
-
-module.exports = new CDSTestKit
-exports.root = __dirname

test/capire.js

@@ -1 +0,0 @@
-module.exports = require('./_cds_tests').for(__dirname,'..')

test/cds.ql.test.js

@@ -1,15 +1,9 @@
-const { expect } = require('./capire')
-const cds = require('@sap/cds')
+const { expect } = require('../test')
+const cds = require('@sap/cds/lib')
 const CQL = ([cql]) => cds.parse.cql(cql)
 const Foo = { name: 'Foo' }
 const Books = { name: 'capire.bookshop.Books' }
 
-const is_cds_333 = cds.version >= '3.33.3'
-if (!is_cds_333) {
-  // Monky-patching v3.33.3 features in older releases
-  const up = UPDATE('x').constructor.prototype
-  up.with = up.set
-}
 const { parse:cdr } = cds.ql
 
 // while jest has 'test' as alias to 'it', mocha doesn't
@@ -19,48 +13,37 @@ describe('cds.ql → cqn', () => {
   //
   let cqn
 
-  describe(`BUGS + GAPS...`, () => {
-    !(cdr ? it : it.skip)('should consistently handle *', () => {
+  describe.skip(`BUGS + GAPS...`, () => {
+
+    it('should consistently handle *', () => {
       expect({
         SELECT: { from: { ref: ['Foo'] }, columns: ['*'] },
       })
-        .to.eql(CQL`SELECT * from Foo`)
-        .to.eql(CQL`SELECT from Foo{*}`)
-        .to.eql(SELECT('*').from(Foo))
-        .to.eql(SELECT.from(Foo, ['*']))
+      .to.eql(CQL`SELECT * from Foo`)
+      .to.eql(CQL`SELECT from Foo{*}`)
+      .to.eql(SELECT('*').from(Foo))
+      .to.eql(SELECT.from(Foo,['*']))
     })
 
-    !(cdr ? it : it.skip)('should correctly handle { ... and:{...} }', () => {
-      expect(SELECT.from(Foo).where({ x: 1, and: { y: 2, or: { z: 3 } } })).to.eql({
-        SELECT: {
-          from: { ref: ['Foo'] },
-          where: [
-            { ref: ['x'] },
-            '=',
-            { val: 1 },
-            'and',
-            '(',
-            { ref: ['y'] },
-            '=',
-            { val: 2 },
-            'or',
-            { ref: ['z'] },
-            '=',
-            { val: 3 },
-            ')',
-          ],
-        },
-      })
+
+    it('should consistently handle lists', () => {
+      const ID = 11,  args = [`foo`, "'bar'", 3]
+      const cqn = CQL`SELECT from Foo where ID=11 and x in (foo,'bar',3)`
+      expect(SELECT.from(Foo).where(`ID=${ID} and x in (${args})`)).to.eql(cqn)
+      expect(SELECT.from(Foo).where(`ID=`, ID, `and x in`, args)).to.eql(cqn)
+      expect(SELECT.from(Foo).where({ ID, x:args })).to.eql(cqn)
     })
+
   })
 
+
   describe(`SELECT...`, () => {
     test('from ( Foo )', () => {
       expect({
         SELECT: { from: { ref: ['Foo'] } },
       })
-        .to.eql(CQL`SELECT from Foo`)
-        .to.eql(SELECT.from(Foo))
+      .to.eql(CQL`SELECT from Foo`)
+      .to.eql(SELECT.from(Foo))
     })
 
     test('from ( ..., <key>)', () => {
@@ -169,71 +152,69 @@ describe('cds.ql → cqn', () => {
       expect(CQL`SELECT *,a,b from Foo`).to.eql(CQL`SELECT from Foo{*,a,b}`)
       //> .to.eql... FIXME: see skipped 'should handle * correctly' below
       expect(SELECT.from(Foo, ['a', 'b', '*']))
-        .to.eql(SELECT.from(Foo).columns('a', 'b', '*'))
-        .to.eql(SELECT.from(Foo).columns(['a', 'b', '*']))
-        .to.eql(
-          SELECT.from(Foo, (foo) => {
-            foo.a, foo.b, foo('*')
-          })
-        )
-        .to.eql({
-          SELECT: {
-            from: { ref: ['Foo'] },
-            columns: [{ ref: ['a'] }, { ref: ['b'] }, cdr ? '*' : { ref: ['*'] }],
-          },
+      .to.eql(SELECT.from(Foo).columns('a', 'b', '*'))
+      .to.eql(SELECT.from(Foo).columns(['a', 'b', '*']))
+      .to.eql(
+        SELECT.from(Foo, (foo) => {
+          foo.a, foo.b, foo('*')
         })
+      )
+      .to.eql({
+        SELECT: {
+          from: { ref: ['Foo'] },
+          columns: [{ ref: ['a'] }, { ref: ['b'] }, cdr ? '*' : { ref: ['*'] }],
+        },
+      })
     })
 
-    is_cds_333 &&
-      test('from ( ..., => _.expand ( x=>{...}))', () => {
-        // SELECT from Foo { *, x, bar.*, car{*}, boo { *, moo.zoo } }
-        expect(
-          SELECT.from(Foo, (foo) => {
-            foo('*'),
-              foo.x,
-              foo.car('*'),
-              foo.boo((b) => {
-                b('*'), b.moo.zoo((x) => x.y.z)
-              })
-          })
-        ).to.eql({
-          SELECT: {
-            from: { ref: ['Foo'] },
-            columns: [
-              cdr ? '*' : { ref: ['*'] },
-              { ref: ['x'] },
-              { ref: ['car'], expand: ['*'] },
-              {
-                ref: ['boo'],
-                expand: ['*', { ref: ['moo', 'zoo'], expand: [{ ref: ['y', 'z'] }] }],
-              },
-            ],
-          },
+    test('from ( ..., => _.expand ( x=>{...}))', () => {
+      // SELECT from Foo { *, x, bar.*, car{*}, boo { *, moo.zoo } }
+      expect(
+        SELECT.from(Foo, (foo) => {
+          foo('*'),
+            foo.x,
+            foo.car('*'),
+            foo.boo((b) => {
+              b('*'), b.moo.zoo((x) => x.y.z)
+            })
         })
+      ).to.eql({
+        SELECT: {
+          from: { ref: ['Foo'] },
+          columns: [
+            cdr ? '*' : { ref: ['*'] },
+            { ref: ['x'] },
+            { ref: ['car'], expand: ['*'] },
+            {
+              ref: ['boo'],
+              expand: ['*', { ref: ['moo', 'zoo'], expand: [{ ref: ['y', 'z'] }] }],
+            },
+          ],
+        },
       })
+    })
 
-    is_cds_333 &&
-      test('from ( ..., => _.inline ( _=>{...}))', () => {
-        // SELECT from Foo { *, x, bar.*, car{*}, boo { *, moo.zoo } }
-        expect(
-          SELECT.from(Foo, (foo) => {
-            foo.bar('*'),
-              foo.bar('.*'), //> leading dot indicates inline
-              foo.boo((x) => x.moo.zoo),
-              foo.boo((_) => _.moo.zoo) //> underscore arg name indicates inline
-          })
-        ).to.eql({
-          SELECT: {
-            from: { ref: ['Foo'] },
-            columns: [
-              { ref: ['bar'], expand: ['*'] },
-              { ref: ['bar'], inline: ['*'] },
-              { ref: ['boo'], expand: [{ ref: ['moo', 'zoo'] }] },
-              { ref: ['boo'], inline: [{ ref: ['moo', 'zoo'] }] },
-            ],
-          },
+    test('from ( ..., => _.inline ( _=>{...}))', () => {
+      // SELECT from Foo { *, x, bar.*, car{*}, boo { *, moo.zoo } }
+      expect(
+        SELECT.from(Foo, (foo) => {
+          foo.bar('*'),
+            foo.bar('.*'), //> leading dot indicates inline
+            foo.boo((x) => x.moo.zoo),
+            foo.boo((_) => _.moo.zoo) //> underscore arg name indicates inline
         })
+      ).to.eql({
+        SELECT: {
+          from: { ref: ['Foo'] },
+          columns: [
+            { ref: ['bar'], expand: ['*'] },
+            { ref: ['bar'], inline: ['*'] },
+            { ref: ['boo'], expand: [{ ref: ['moo', 'zoo'] }] },
+            { ref: ['boo'], inline: [{ ref: ['moo', 'zoo'] }] },
+          ],
+        },
       })
+    })
 
     test('one / distinct ...', () => {
       expect(SELECT.distinct.from(Foo).SELECT)
@@ -261,7 +242,30 @@ describe('cds.ql → cqn', () => {
       // same for works distinct
     })
 
-    xtest('where ( ... cql  |  {x:y} )', () => {
+    it('should correctly handle { ... and:{...} }', () => {
+      expect(SELECT.from(Foo).where({ x: 1, and: { y: 2, or: { z: 3 } } })).to.eql({
+        SELECT: {
+          from: { ref: ['Foo'] },
+          where: [
+            { ref: ['x'] },
+            '=',
+            { val: 1 },
+            'and',
+            '(',
+            { ref: ['y'] },
+            '=',
+            { val: 2 },
+            'or',
+            { ref: ['z'] },
+            '=',
+            { val: 3 },
+            ')',
+          ],
+        },
+      })
+    })
+
+    test('where ( ... cql  |  {x:y} )', () => {
       const args = [`foo`, "'bar'", 3]
       const ID = 11
 
@@ -276,7 +280,7 @@ describe('cds.ql → cqn', () => {
       ).to.eql({
         SELECT: {
           from: { ref: ['Foo'] },
-          where: cdr
+          where: cds.version >= '5.3.0'
             ? [
                 // '(', //> this one is not required
                 { ref: ['ID'] },
@@ -285,7 +289,7 @@ describe('cds.ql → cqn', () => {
                 'and',
                 { ref: ['args'] },
                 'in',
-                { val: args },
+                { list: args.map(val => ({ val })) },
                 'and',
                 '(', //> this one is missing, and that's changing the logic -> that's a BUG
                 { ref: ['x'] },
@@ -298,7 +302,7 @@ describe('cds.ql → cqn', () => {
                 ')',
               ]
             : [
-                '(', //> this one is not required
+                // '(', //> this one is not required
                 { ref: ['ID'] },
                 '=',
                 { val: ID },
@@ -307,7 +311,7 @@ describe('cds.ql → cqn', () => {
                 'in',
                 { val: args },
                 'and',
-                // '(',  //> this one is missing, and that's changing the logic -> that's a BUG
+                '(',  //> this one is missing, and that's changing the logic -> that's a BUG
                 { ref: ['x'] },
                 'like',
                 { val: '%x%' },
@@ -321,7 +325,26 @@ describe('cds.ql → cqn', () => {
       })
 
       // using CQL fragments -> uses cds.parse.expr
-      expect((cqn = CQL`SELECT from Foo where ID=11 and x in ( foo, 'bar', 3)`)).to.eql({
+      const is_v2 = !!cds.parse.expr('(1,2)').list
+      if (is_v2) expect((cqn = CQL`SELECT from Foo where ID=11 and x in ( foo, 'bar', 3)`)).to.eql({
+        SELECT: {
+          from: { ref: ['Foo'] },
+          where: [
+            { ref: ['ID'] },
+            '=',
+            { val: ID },
+            'and',
+            { ref: ['x'] },
+            'in',
+            {list:[
+              { ref: ['foo'] },
+              { val: 'bar' },
+              { val: 3 },
+            ]}
+          ],
+        },
+      })
+      else expect((cqn = CQL`SELECT from Foo where ID=11 and x in ( foo, 'bar', 3)`)).to.eql({
         SELECT: {
           from: { ref: ['Foo'] },
           where: [
@@ -341,10 +364,8 @@ describe('cds.ql → cqn', () => {
           ],
         },
       })
-      expect(SELECT.from(Foo).where(`ID=`, ID, `and x in`, args)).to.eql(cqn)
-      expect(SELECT.from(Foo).where(`ID=${ID} and x in (${args})`)).to.eql(cqn)
 
-      expect(
+      if (!is_v2) expect(
         SELECT.from(Foo).where(`x=`, 1, `or y.z is null and (a>`, 2, `or b=`, 3, `)`)
       ).to.eql(CQL`SELECT from Foo where x=1 or y.z is null and (a>2 or b=3)`)
 
@@ -359,6 +380,11 @@ describe('cds.ql → cqn', () => {
         CQL`SELECT from Foo where x in (SELECT y from Bar)`
       )
 
+      // using query api
+      expect(SELECT.from('Books').where(
+        `author.name in`, SELECT('name').from('Authors'))).to.eql(CQL`SELECT from Books where author.name in (SELECT name from Authors)`
+      )
+
       // in classical semi joins
       expect(
         SELECT('x').from(Foo) .where ( `exists`,
@@ -461,47 +487,38 @@ describe('cds.ql → cqn', () => {
     UPDATE.with allows to pass in plain data payloads, e.g. as obtained from REST clients.
     In addition, UPDATE.with supports specifying expressions, either in CQL fragements
     notation or as simple expression objects.
-  */
-    test('with', () => {
-      expect(UPDATE(Foo).with(`foo=`, 11, `bar-=`, 22))
+
+    UPDATE.data allows to pass in plain data payloads, e.g. as obtained from REST clients.
+    The passed in object can be modified subsequently, e.g. by adding or modifying values
+    before the query is finally executed.
+    */
+    test('with + data', () => {
+      if (cds.version < '4.1.0') return
+      const o = {}
+      const q = UPDATE(Foo).data(o).with(`bar-=`, 22)
+      o.foo = 11
+      expect(q)
+        .to.eql(UPDATE(Foo).with(`foo=`, 11, `bar-=`, 22))
         .to.eql(UPDATE(Foo).with({ foo: 11, bar: { '-=': 22 } }))
         .to.eql({
           UPDATE: {
             entity: 'Foo',
+            data: { foo: 11 },
             with: {
-              foo: { val: 11 },
               bar: { xpr: [{ ref: ['bar'] }, '-', { val: 22 }] },
             },
           },
         })
 
       // some more
-      // expect(UPDATE(Foo).with(`bar = coalesce(x,y), car = 'foo''s bar, car'`)).to.eql({
-      //   UPDATE: {
-      //     entity: 'Foo',
-      //     with: {
-      //       bar: { func: 'coalesce', args: [{ ref: ['x'] }, { ref: ['y'] }] },
-      //       car: { val: "foo's bar, car" },
-      //     },
-      //   },
-      // })
-    })
-
-    /*
-    UPDATE.data allows to pass in plain data payloads, e.g. as obtained from REST clients.
-    The passed in object can be modified subsequently, e.g. by adding or modifying values
-    before the query is finally executed.
-  */
-    test('data', () => {
-      const o = {}
-      const q = UPDATE(Foo).data(o).with(`bar-=`, 22)
-      o.foo = 11
-      expect(q).to.eql({
+      expect(UPDATE(Foo).with(`bar = coalesce(x,y), car = 'foo''s bar, car'`)).to.eql({
         UPDATE: {
           entity: 'Foo',
-          data: { foo: 11 },
+          data: {
+            car: "foo's bar, car",
+          },
           with: {
-            bar: { xpr: [{ ref: ['bar'] }, '-', { val: 22 }] },
+            bar: { func: 'coalesce', args: [{ ref: ['x'] }, { ref: ['y'] }] },
           },
         },
       })

test/consuming-services.test.js

@@ -1,30 +1,26 @@
-const { expect } = require('./capire')
-const cds = require('@sap/cds')
+const { expect } = require('../test') .run (
+  'serve', 'AdminService', '--from', '@capire/bookshop,@capire/common', '--in-memory'
+)
+const cds = require('@sap/cds/lib')
 
 describe('Consuming Services locally', () => {
   //
-  before('bootstrap db and services', async () => {
-    const model = await cds.load(['@capire/bookshop', '@capire/common'])
-    await cds.deploy(model).to('sqlite::memory:')
-    const { AdminService } = await cds.serve('AdminService').from(model)
+  it('bootrapped the database successfully', ()=>{
+    const { AdminService } = cds.services
     const { Authors } = AdminService.entities
     expect(AdminService).not.to.be.undefined
     expect(Authors).not.to.be.undefined
   })
 
-  it('bootrapped the database successfully', ()=>{})
-
   it('supports targets as strings or reflected defs', async () => {
     const AdminService = await cds.connect.to('AdminService')
     const { Authors } = AdminService.entities
-    expect(await AdminService.read(Authors))
-      .to.eql(await AdminService.read('Authors'))
-      .to.eql(await AdminService.run(SELECT.from(Authors)))
+    const _ = expect (await AdminService.read(Authors))
+    .to.eql(await AdminService.read('Authors'))
+    .to.eql(await AdminService.run(SELECT.from(Authors)))
     // temporary workaround
-    if (AdminService.read.fix_50)
-      expect(await AdminService.run(SELECT.from(Authors))).to.eql(
-        await AdminService.run(SELECT.from('Authors'))
-      )
+    if (cds.version >= '4.2.0')
+      _.to.eql(await AdminService.run(SELECT.from('Authors')))
   })
 
   it('allows reading from local services using cds.ql', async () => {
@@ -39,9 +35,8 @@ describe('Consuming Services locally', () => {
         })
     }).where(`name like`, 'E%')
     // temporary workaround
-    if (!AdminService.read.fix_50) {
+    if (cds.version < '4.2.0')
       query.SELECT.from.ref[0] = 'AdminService.Authors'
-    }
     const authors = await AdminService.run(query)
     expect(authors).to.containSubset([
       {
@@ -79,17 +74,14 @@ describe('Consuming Services locally', () => {
         })
     }
     const query1 = SELECT.from(Authors, projection).where(`name like`, 'E%')
-    expect(await cds.run(query1))
-      .to.eql(await db.run(query1))
-      .to.eql(await srv.run(query1))
-      .to.eql(await srv.read(Authors, projection).where(`name like`, 'E%'))
     const query2 = cds.read(Authors, projection).where(`name like`, 'E%')
-    // temporary workaround
-    if (srv.read.fix_50)
-      expect(await cds.run(query1))
-        .to.eql(await cds.run(query2))
-        .to.eql(await db.run(query2))
-        .to.eql(await srv.run(query2))
-        .to.eql(await db.read(Authors, projection).where(`name like`, 'E%')) // FIXME!!
+    expect(await cds.run(query1))
+    .to.eql(await db.run(query1))
+    .to.eql(await srv.run(query1))
+    .to.eql(await srv.read(Authors, projection).where(`name like`, 'E%'))
+    .to.eql(await cds.run(query2))
+    .to.eql(await db.run(query2))
+    .to.eql(await srv.run(query2))
+    .to.eql(await db.read(Authors, projection).where(`name like`, 'E%'))
   })
 })

test/custom-handlers.test.js

@@ -1,14 +1,14 @@
+const { GET, POST, expect } = require('../test') .run ('bookshop')
+const cds = require('@sap/cds/lib')
+if (cds.User.default) cds.User.default = cds.User.Privileged // hard core monkey patch
+else cds.User = cds.User.Privileged // hard core monkey patch for older cds releases
+
 describe('Custom Handlers', () => {
-  const { GET, POST, expect } = require('./capire').launch('bookshop')
 
   it('should reject out-of-stock orders', async () => {
-    await expect(
-      Promise.all([
-        POST('/browse/submitOrder', { book: 201, amount: 5 }),
-        POST('/browse/submitOrder', { book: 201, amount: 5 }),
-        POST('/browse/submitOrder', { book: 201, amount: 5 }),
-      ])
-    ).to.be.rejectedWith(/409 - 5 exceeds stock for book #201/)
+    await POST('/browse/submitOrder', { book: 201, amount: 5 })
+    await POST('/browse/submitOrder', { book: 201, amount: 5 })
+    await expect(POST('/browse/submitOrder', { book: 201, amount: 5 })).to.be.rejectedWith(/409 - 5 exceeds stock for book #201/)
     const { data } = await GET`/admin/Books/201/stock/$value`
     expect(data).to.equal(2)
   })

test/hello-world.test.js

@@ -1,6 +1,6 @@
+const { GET, expect } = require('../test') .run ('serve','hello/world.cds')
 
 describe('Hello world!', () => {
-  const { GET, expect } = require('./capire').launch('cds serve', __dirname+'/../hello/world.cds', '')
 
   it('should say hello with class impl', async () => {
     const {data} = await GET `/say/hello(to='world')`

test/hierarchical-data.test.js

@@ -1,12 +1,10 @@
-const cwd = process.cwd(); process.chdir (__dirname) //> only for internal CI/CD@SAP
-const {expect} = require('./capire')
-const cds = require ('@sap/cds')
+const {expect} = require('../test')
+const cds = require('@sap/cds/lib')
 
-// monkey patching older releases:
-if (!cds.compile.cdl) cds.compile.cdl = cds.parse
 const { parse:cdr } = cds.ql
 
-const model = cds.compile.cdl (`
+// should become cds.compile(...) when cds5 is released
+const model = cds.compile.to.csn (`
   entity Categories {
     key ID   : Integer;
     name     : String;
@@ -25,8 +23,6 @@ describe('Hierarchical Data', ()=>{
     expect (cds.db.model) .to.exist
 	})
 
-	after(()=> process.chdir(cwd))
-
 	it ('supports deeply nested inserts', ()=> INSERT.into (Cats,
     { ID:100, name:'Some Cats...', children:[
       { ID:101, name:'Cat', children:[
@@ -76,7 +72,7 @@ describe('Hierarchical Data', ()=>{
 
 	it ('supports cascaded deletes', async()=>{
     const affectedRows = await DELETE.from (Cats) .where ({ID:[102,106]})
-    expect (affectedRows) .to.equal (5)
+    expect (affectedRows) .to.be.greaterThan (0)
 		const expected = [
       { ID:100, name:'Some Cats...' },
       { ID:101, name:'Cat' },