Play with db constraints

.github/workflows/node.js.yml

@@ -24,5 +24,5 @@ jobs:
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
-    - run: npm ci
+    - run: npm install
     - run: npm test

.gitignore

@@ -15,5 +15,3 @@ default-env.json
 packages/messageBox
 reviews/msg-box
 reviews/db/test.db
-
-*.openapi3.json

.npmrc

@@ -1,3 +0,0 @@
-# Ensure we always use public packages, i.e. avoid using local registries from ~/.npmrc
-@sap:registry=https://registry.npmjs.org/
-registry=https://registry.npmjs.org/

.registry/server.js

@@ -5,7 +5,7 @@ const app = express()
 
 const { PORT=4444 } = process.env
 const [,,port=PORT] = process.argv
-const cwd = __dirname
+process.chdir(__dirname)
 
 app.use('/-/:tarball', (req,res,next) => {
   console.debug ('GET', req.params)
@@ -13,7 +13,7 @@ app.use('/-/:tarball', (req,res,next) => {
     const { tarball } = req.params
     const [, pkg ] = /^capire-(\w+)/.exec(tarball)
     fs.lstat(tarball,(err => {
-      if (err) exec(`npm pack ../${pkg}`,{cwd},next)
+      if (err) exec(`npm pack ../${pkg}`,next)
       else next()
     }))
   } catch (e) {

.vscode/settings.json

@@ -13,5 +13,5 @@
       "**/cds/lib/req/cls.js",
       "**/odata-v4/okra/**"
     ]
-  }
+  },
 }

README.md

@@ -84,35 +84,3 @@ In case you've a question, find a bug, or otherwise need support, use our [commu
 ## License
 
 Copyright (c) 2021 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, version 2.0 except as noted otherwise in the [LICENSE](LICENSE.txt) file.
-
-# Suppliers - in progress for Messaging & Service Consumption -
-
-## TODOs
-
-1. Fix issues when running in same process
-2. Automated tests
-
-## Usage
-
-1. Run:
-
-   ```
-   CDS_ENV=local-hybrid cds mock API_BUSINESS_PARTNER -p 5001
-   ```
-
-2. Wait until startup is completed
-3. Run in a 2nd terminal:
-
-   ```
-   CDS_ENV=local-hybrid cds serve all --with-mocks --in-memory
-   ```
-
-4. Now, you can issues the requests listed in `suppliers/requests.http`
-
-## Request Sequence
-
-* TODO
-## URLs
-
-* Get books with their replicated supplier: http://localhost:4004/browse/Books?$expand=supplier
-* Get remote suppliers: http://localhost:4004/admin/Suppliers?$top=11

bookshop/app/vue/app.js

@@ -35,7 +35,7 @@ const books = new Vue ({
             try {
                 const res = await POST(`/submitOrder`, { amount, book: book.ID })
                 book.stock = res.data.stock
-                books.order = { amount, succeeded: `Successfully ordered ${amount} item(s).` }
+                books.order = { amount, succeeded: `Successfully orderd ${amount} item(s).` }
             } catch (e) {
                 books.order = { amount, failed: e.response.data.error.message }
             }

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

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

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

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

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

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

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

@@ -14,3 +14,8 @@ ID;parent_ID;name
 22;21;Autobiography
 23;20;Essay
 24;20;Speech
+30;;Others
+31;30;Other-A
+32;30;Other-A
+33;30;Other-A
+34;30;Other-A

bookshop/db/schema.cds

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

bookshop/index.cds

@@ -1,4 +1,3 @@
 namespace sap.capire.bookshop; //> important for reflection
 using from './db/schema';
-using from './srv/cat-service';
 using from './srv/admin-service';

bookshop/index.js

@@ -1 +0,0 @@
-exports.CatalogService = require('./srv/cat-service')

bookshop/package.json

@@ -3,20 +3,42 @@
   "version": "1.0.0",
   "description": "A simple self-contained bookshop service.",
   "dependencies": {
-    "@capire/common": "*",
     "@sap/cds": "^5.0.4",
     "express": "^4.17.1",
-    "passport": "0.4.1"
+    "passport": "0.4.1",
+    "@sap/hana-client": "^2.7.21"
   },
   "scripts": {
-    "genres": "cds serve test/genres.cds",
-    "start": "cds run",
     "watch": "cds watch"
   },
   "cds": {
     "requires": {
       "db": {
-        "kind": "sql"
+        "kind": "sql",
+        "xxx-model": "*",
+        "xxx-credentials": {
+            "database": "localSqlite.db"
+        }
+      },
+      "[production]": {
+          "db": {
+              "kind": "hana",
+              "model": [
+                  "db",
+                  "srv"
+              ]
+          }
+      }
+    },
+    "features": {
+      "assert_integrity": false
+    },
+    "hana": {
+        "deploy-format": "hdbtable"
+    },
+    "cdsc": {
+      "beta": {
+        "foreignKeyConstraints": true
       }
     }
   }

bookshop/readme.md

@@ -1,31 +1,126 @@
-# Bookshop Getting Started Sample
+# Foreign key constraints on DB
 
-This stand-alone sample introduces the essential tasks in the development of CAP-based services as also covered in the [Getting Started guide in capire](https://cap.cloud.sap/docs/get-started/in-a-nutshell).
+As model we use a simplified version of the bookshop scenario, we work with nodejs runtime.
 
-## Hypothetical Use Cases
 
-1. Build a service that allows to browse _Books_ and _Authors_.
-2. Books have assigned _Genres_, which are organized hierarchically.
-3. All users may browse books without login.
-4. All entries are maintained by Administrators.
-5. End users may order books (the actual order mgmt being out of scope).
+## Preparation
 
-## Running the Sample
-
-```sh
-npm run watch
+As we want to see the effects of the database constaints, we first need to switch off the integrity checks done by the node runtime. In the `package.json`:
+```json
+"cds": {
+  ...,
+  "features": {
+    "assert_integrity": false
+  }
+}
 ```
 
-## Content & Best Practices
+Then switch on constraint generation. In the `package.json`:
+```json
+"cds": {
+  ...,
+  "cdsc": {
+    "beta": {
+      "foreignKeyConstraints": true
+    }
+  }
+}
+```
 
-| Links to capire                                                                                           | Sample files / folders               |
-| --------------------------------------------------------------------------------------------------------- | ------------------------------------ |
-| [Project Setup & Layouts](https://cap.cloud.sap/docs/get-started/projects#sharing-and-reusing-content)    | [`./`](./)                           |
-| [Domain Modeling with CDS](https://cap.cloud.sap/docs/guides/domain-models)                               | [`./db/schema.cds`](./db/schema.cds) |
-| [Defining Services](https://cap.cloud.sap/docs/guides/services#defining-services)                         | [`./srv/*.cds`](./srv)               |
-| [Single-purposed Services](https://cap.cloud.sap/docs/guides/services#single-purposed-services)           | [`./srv/*.cds`](./srv)               |
-| [Providing & Consuming Providers](https://cap.cloud.sap/docs/guides/providing-services)                   | http://localhost:4004                |
-| [Using Databases](https://cap.cloud.sap/docs/guides/databases)                                            | [`./db/data/*.csv`](./db/data)       |
-| [Adding Custom Logic](https://cap.cloud.sap/docs/guides/service-impl)                                     | [`./srv/*.js`](./srv)                |
-| Adding Tests                                                                                              | [`./test`](./test)                   |
-| [Sharing for Reuse](https://cap.cloud.sap/docs/guides/reuse-and-compose)                                  | [`./index.cds`](./index.cds)         |
+## SQLite
+
+In SQLite, FK constraints can only be specified during the creation of a table. They cannot be altered for an existing table. So here we at least don't have issues with existing data.
+
+For SQLite, constraint checks need to be enabled by application at runtime for each db connection with the command
+```sql
+PRAGMA foreign_keys = ON;
+```
+We do this via a custom handler in `admin-service.js`.
+
+Now run the requests in `requests.http` (use `http://localhost:4004` as server URL). They behave as expected.
+
+But the error messages are not providing any details. They say "constraint violation", but they don't say which table/constraint is violated:
+```
+HTTP/1.1 500 Internal Server Error
+...
+{
+  "error": {
+    "code": "SQLITE_CONSTRAINT",
+    "message": "SQLITE_CONSTRAINT: FOREIGN KEY constraint failed in: \nCOMMIT"
+  }
+}
+```
+
+The runtime constraint checks do provide the name of the restricting association (but not the name of the entity where the association lives).
+
+## HANA
+
+Preparation:
+* logon to cf account (e.g. trial)
+* create HANA service instance: `cf create-service hanatrial hdi-shared bookshop-db`
+
+First make the deplyoment without constraints (switch off constraint generation in `package.json`).
+
+* Run `cds build --production`. No constraints are generated.
+* Deploy db model: `cf push -f gen/db`
+* Deploy nodejs app: `cf push -f gen/srv --random-route`. Take note of the app URL.
+
+Run the requests in `request.http` (use the URL from the previous step as server URL, prepend with `https://`).
+Make sure to introduce some data that violates the constraints. No errors are reported - as expected.
+
+Now switch on constraint generation in `package.json`. 
+
+* Run `cds build --production`. The constraints are placed in separate `hdbconstraint` files in `gen\db\src\gen`. They are generated with `VALIDATED ON`.
+* Re-deploy db model: `cf push -f gen/db`. It fails, as the existing data violates the constraints.
+* Check logs: `cf logs bookshop-db-deployer --recent`.
+
+```
+Error: com.sap.hana.di.constraint: Could not create the database object [8250005]
+  at "src/gen/sap.capire.bookshop.Books_author.hdbconstraint" (1:1)
+ Error: com.sap.hana.di.constraint: Database error 7: : feature not supported: referential constraint violated by existing value [8201003]
+   at "src/gen/sap.capire.bookshop.Books_author.hdbconstraint" (1:1)
+```
+You can see which constraint is violated, but there is no info about the offensive entries.
+
+Now use the requests from `request.http` to fix the entries that have been broken above.
+
+* Re-deploy db model: `cf push -f gen/db`. It should succeed.
+
+Again run the requests from `request.http`. This time all changes that would lead to a
+constraint violation fail.
+
+Inserting a book with non-existing author ID or changing a book's author ID to an invalid value yields
+the message
+```
+HTTP/1.1 500 Internal Server Error
+...
+{
+  "error": {
+    "code": "500",
+    "message": "Internal Server Error"
+  }
+}
+```
+When trying to delete a genre that is still referenced in a book we get
+```
+HTTP/1.1 462 status code 462
+...
+{
+  "error": {
+    "code": "462",
+    "message": "failed on update or delete by foreign key constraint violation: TrexColumnUpdate failed on table '21F87859727E470E94917B690908A09D:SAP_CAPIRE_BOOKSHOP_GENRES' with error: DELETE on 21F87859727E470E94917B690908A09D:SAP_CAPIRE_BOOKSHOP_GENRES(ID) failed, because 1 rows with corresponding foreign keys still exist in 21F87859727E470E94917B690908A09D:SAP_CAPIRE_BOOKSHOP_BOOKS(GENRE_ID), rc=1536"
+  }
+}
+```
+
+Note: when using `cdsc` to generate the constraints
+```
+cdsc Q --beta foreignKeyConstraints -d hana -s hdi -o dbstuff db\schema.cds srv\admin-service.cds
+```
+there will be constraints for e.g. `sap_common_Currencies_texts`. This cannot be deplyoed, as the corresponding table is removed from `cds` via the tree-shaking mechanism. These constraints need to be removed manually before deployment.
+
+## Todo
+
+* Provide a way to control parameters `VALIDATED` and `ENFORCED` of the constraints (only interesting for HANA, as in SQLite changing constraints after table generation is not possible).
+* Provide some tool to identify existing entries that violate constraints. We can generate a list of `SELECT` statements that find these entries, but how do we run it and show the results to the user?
+* Can runtimes improve the error messages?

bookshop/srv/admin-service.cds

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

bookshop/srv/admin-service.js

@@ -1,12 +1,15 @@
+// sqlite: FK constraint checks need to be enabled by application at runtime
+// for each db connection
 const cds = require('@sap/cds')
+module.exports = cds.service.impl (async function(){ 
 
-module.exports = cds.service.impl (function(){
-  this.before ('NEW','Authors', genid)
-  this.before ('NEW','Books', genid)
+  const db = await cds.connect.to('db')
+
+  if (db.kind === 'sqlite')
+  {
+    db.before('BEGIN', function (req) { 
+      //console.log('--- PRAGMA foreign_keys = ON ---')
+      return this.dbc.run('PRAGMA foreign_keys = ON;')
+    })
+  }
 })
-
-/** Generate primary keys for target entity in request */
-async function genid (req) {
-  const {ID} = await cds.tx(req).run (SELECT.one.from(req.target).columns('max(ID) as ID'))
-  req.data.ID = ID - ID % 100 + 100 + 1
-}

bookshop/srv/cat-service.cds

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

bookshop/srv/cat-service.js

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

bookshop/test/genres.cds

@@ -1,4 +0,0 @@
-using { sap.capire.bookshop as my } from '../db/schema';
-service TestService {
-  entity Genres as projection on my.Genres;
-}

bookshop/test/genres.http

@@ -1,38 +0,0 @@
-#################################################
-#
-#   Genres
-#
-
-GET http://localhost:4004/test/Genres?
-###
-
-GET http://localhost:4004/test/Genres?
-&$filter=parent_ID eq null&$select=name
-&$expand=children($select=name)
-###
-
-POST http://localhost:4004/test/Genres?
-Content-Type: application/json
-
-{ "ID":100, "name":"Some Sample Genres...", "children":[
-    { "ID":101, "name":"Cat", "children":[
-        { "ID":102, "name":"Kitty", "children":[
-            { "ID":103, "name":"Kitty Cat", "children":[
-                { "ID":104, "name":"Aristocat" } ]},
-            { "ID":105, "name":"Kitty Bat" } ]},
-        { "ID":106, "name":"Catwoman", "children":[
-            { "ID":107, "name":"Catalina" } ]} ]},
-    { "ID":108, "name":"Catweazle" }
-]}
-###
-
-GET http://localhost:4004/test/Genres(100)?
-# &$expand=children
-# &$expand=children($expand=children($expand=children($expand=children)))
-###
-
-DELETE http://localhost:4004/test/Genres(103)
-###
-
-DELETE http://localhost:4004/test/Genres(100)
-###

bookshop/test/requests.http

@@ -1,82 +1,68 @@
+# running locally
 @server = http://localhost:4004
-@me = Authorization: Basic {{$processEnv USER}}:
+
+# running on cf
+#@server = https://bookshop-srv-....hana.ondemand.com
+
+### get all books
+GET {{server}}/admin/Books
+
+### get all authors
+GET {{server}}/admin/Authors
+
+### get all genres
+GET {{server}}/admin/Genres
 
 
-### ------------------------------------------------------------------------
-# Get service info
-GET {{server}}/browse
-{{me}}
-
-
-### ------------------------------------------------------------------------
-# Get $metadata document
-GET {{server}}/browse/$metadata
-{{me}}
-
-
-### ------------------------------------------------------------------------
-# Browse Books as any user
-GET {{server}}/browse/Books?
-  # &$select=title,stock
-  # &$expand=currency
-  # &sap-language=de
-{{me}}
-
-
-### ------------------------------------------------------------------------
-# Fetch Authors as admin
-GET {{server}}/admin/Authors?
-  # &$select=name,dateOfBirth,placeOfBirth
-  # &$expand=books($select=title;$expand=currency)
-  # &$filter=ID eq 101
-  # &sap-language=de
-Authorization: Basic alice:
-
-### ------------------------------------------------------------------------
-# Create book
+### create book with wrong author ID -> should fail
 POST {{server}}/admin/Books
-Content-Type: application/json;IEEE754Compatible=true
-Authorization: Basic alice:
+Content-Type: application/json
 
 {
-  "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" }
+  "ID": 701,
+  "title": "XXX",
+  "author": { "ID": 9999 }
 }
 
+### create book with correct author ID -> should work
+POST {{server}}/admin/Books
+Content-Type: application/json;IEEE754Compatible=true
 
-### ------------------------------------------------------------------------
-# Put image to books
-PUT {{server}}/admin/Books(2)/image
-Content-Type: image/png
-Authorization: Basic alice:
+{
+  "ID": 702,
+  "title": "Poems : Pocket Poets",
+  "author": { "ID": 101 }
+}
 
-data:image/png;base64,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
+### delete book
+DELETE {{server}}/admin/Books(ID=701)
+
+### change book to wrong author ID -> should fail
+
+PATCH {{server}}/admin/Books(ID=207)
+Content-Type:application/json
+
+{"author_ID": 9999}
+
+### change book to correct author ID -> should work
+
+PATCH {{server}}/admin/Books(ID=207)
+Content-Type:application/json
+
+{"author_ID": 170}
 
 
-### ------------------------------------------------------------------------
-# Reading image from from the server directly
-GET {{server}}/browse/Books(2)/image
+
+### delete "leaf" genre that is used in a book -> should not work
+DELETE {{server}}/admin/Genres(ID=13)
+
+### delete "leaf" genre that is not used in a book -> should work
+DELETE {{server}}/admin/Genres(ID=14)
 
 
-### ------------------------------------------------------------------------
-# Submit Order as authenticated user
-# (send that three times to get out-of-stock message)
-POST {{server}}/browse/submitOrder
-Content-Type: application/json
-{{me}}
-
-{ "book":201, "amount":5 }
+### delete "header" genre where leaves are used in a book -> should not work
+DELETE {{server}}/admin/Genres(ID=10)
 
 
-### ------------------------------------------------------------------------
-# Browse Genres
-GET {{server}}/browse/Genres?
-# &$filter=parent_ID eq null&$select=name
-# &$expand=children($select=name)
-{{me}}
+### delete "header" genre where leaves are not used in a book -> should work and delete all leaves
+DELETE {{server}}/admin/Genres(ID=30)

common/data/sap.common-Currencies_texts.csv

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

fiori/.env

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

fiori/app/admin/fiori-service.cds

@@ -1,5 +1,4 @@
-using { AdminService, sap.capire.bookshop } from '../../db/schema';
-using from '../common'; // to help UI linter get the complete annotations
+using { AdminService } from '../../db/schema';
 
 ////////////////////////////////////////////////////////////////////////////
 //
@@ -71,7 +70,7 @@ annotate AdminService.Authors 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 ],
@@ -84,12 +83,11 @@ 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 and Books.texts through AdminService
+// In addition we need to expose Languages through AdminService
 using { sap } from '@sap/cds/common';
 extend service AdminService {
 	entity Languages as projection on sap.common.Languages;
-	entity Books.texts as projection on bookshop.Books.texts;
 }

fiori/app/bookshop.html

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

fiori/app/common.cds

@@ -54,7 +54,7 @@ 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}' @Measures.ISOCurrency: currency_code;
+	price @title:'{i18n>Price}';
 	stock @title:'{i18n>Stock}';
 	descr @UI.MultiLineText;
 }

fiori/app/reviews.html

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

fiori/package.json

@@ -3,11 +3,10 @@
   "version": "1.0.0",
   "dependencies": {
     "@capire/bookshop": "*",
-    "@capire/common": "*",
-    "@capire/orders": "*",
     "@capire/reviews": "*",
-    "@capire/suppliers": "*",
-    "@sap/cds": ">=5",
+    "@capire/orders": "*",
+    "@capire/common": "*",
+    "@sap/cds": ">=4",
     "express": "^4.17.1",
     "passport": "^0.4.1"
   },
@@ -20,10 +19,6 @@
       "deploy-format": "hdbtable"
     },
     "requires": {
-      "API_BUSINESS_PARTNER": {
-        "kind": "odata",
-        "model": "@capire/suppliers"
-      },
       "auth": {
         "strategy": "dummy"
       },

fiori/server.js

@@ -1,16 +1,18 @@
 const cds = require ('@sap/cds')
-module.exports = cds.server
 
 cds.once('bootstrap',(app)=>{
-  app.serve ('/orders/webapp').from('@capire/orders','app/orders/webapp')
-  app.serve ('/bookshop').from('@capire/bookshop','app/vue')
-  app.serve ('/reviews').from('@capire/reviews','app/vue')
+  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'))
-cds.once('served', require('@capire/suppliers/srv/mashup'))
 
-// Swagger UI - see https://cap.cloud.sap/docs/advanced/openapi
-if (process.env.NODE_ENV !== 'production') {
-  cds.once ('bootstrap', app => app.use (require ('cds-swagger-ui-express')()) )
-}
+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/mashup.cds

@@ -3,17 +3,17 @@
 //    Mashing up imported models...
 //
 
+using { sap.capire.bookshop.Books } from '@capire/bookshop';
+
 //
 //  Extend Books with access to Reviews and average ratings
 //
 
-using { CatalogService.ListOfBooks, sap.capire.bookshop.Books } from '@capire/bookshop';
 using { ReviewsService.Reviews } from '@capire/reviews';
 extend Books with {
   reviews : Composition of many Reviews on reviews.subject = $self.ID;
-  rating  : Reviews:rating;
+  rating  : Decimal;
 }
-extend projection ListOfBooks with { rating }
 
 //
 //  Extend Orders with Books as Products

fiori/test/requests.http

@@ -38,11 +38,7 @@ GET {{bookshop}}/browse/Books(201)?
 &$select=ID,title,rating
 &$expand=reviews
 
-###
 
-GET {{bookshop}}/browse/Books?
-  &$select=title,author&$expand=currency
-Accept-Language: de
 
 #################################################
 #

hello/package.json

@@ -2,28 +2,6 @@
   "name": "@capire/hello-world",
   "version": "1.0.0",
   "scripts": {
-    "test": "npx jest --silent",
-    "watch": "cds serve world.cds",
-    "watch:ts": "cds-ts serve world.cds"
-  },
-  "devDependencies": {
-    "@types/jest": "^26.0.23",
-    "@types/node": "^15.12.0",
-    "ts-jest": "^27.0.2",
-    "typescript": "^4.3.5"
-  },
-  "jest": {
-    "testEnvironment": "node",
-    "preset": "ts-jest",
-    "globals": {
-      "ts-jest": {
-        "diagnostics": {
-          "_comment": "see https://githubmemory.com/repo/kulshekhar/ts-jest/issues/2722",
-          "ignoreCodes": [
-            151001
-          ]
-        }
-      }
-    }
+    "watch": "cds serve world.cds"
   }
 }

hello/test/hello-world-ts.test.ts

@@ -1,15 +0,0 @@
-process.env.CDS_TYPESCRIPT = 'true';
-import * as cds from '@sap/cds';
-
-//@ts-ignore
-const {GET} = cds.test.in(__dirname,'..').run('serve', 'world.cds');
-
-describe('Hello world!', () => {
-    afterAll(() => { delete process.env.CDS_TYPESCRIPT; });
-
-    it('should say hello with class impl from a typescript file', async () => {
-        const {data} = await GET`/say/hello(to='world')`
-        expect(data.value).toMatch(/Hello world.*typescript.*/i)
-    })
-
-})

hello/world.ts

@@ -1,5 +0,0 @@
-module.exports = class say {
-    hello(req: any) {
-        return `Hello ${req.data.to} from a typescript file!`
-    }
-}

orders/package.json

@@ -2,6 +2,6 @@
   "name": "@capire/orders",
   "version": "1.0.0",
   "dependencies": {
-    "@sap/cds": "^5"
+    "@sap/cds": ">=4.3.0"
   }
 }

package.json

@@ -11,13 +11,9 @@
     "@capire/hello": "./hello",
     "@capire/media": "./media",
     "@capire/orders": "./orders",
-    "@capire/reviews": "./reviews",
-    "@capire/suppliers": "./suppliers",
-    "@sap/cds": "^5",
-    "express": "^4"
+    "@capire/reviews": "./reviews"
   },
   "devDependencies": {
-    "cds-swagger-ui-express": "^0.2.0",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "chai-subset": "^1.6.0",
@@ -31,16 +27,14 @@
     "media": "cds watch media",
     "mocha": "npx mocha || echo",
     "jest": "npx jest",
-    "test": "npm run jest --silent && npm run test:hello",
-    "test:hello": "cd hello && npm test"
-  },
-  "jest": {
-    "testEnvironment": "node",
-    "testMatch": ["**/*.test.js"]
+    "test": "npm run jest --silent"
   },
   "mocha": {
     "parallel": true
   },
+  "jest": {
+    "testEnvironment": "node"
+  },
   "license": "SAP SAMPLE CODE LICENSE",
   "private": true
 }

reviews/package.json

@@ -7,7 +7,7 @@
     "index.cds"
   ],
   "dependencies": {
-    "@sap/cds": "^5",
+    "@sap/cds": ">=4",
     "express": "^4.17.1"
   },
   "scripts": {

reviews/srv/reviews-service.cds

@@ -8,9 +8,9 @@ service ReviewsService {
   action unlike (review: type of Reviews:ID);
 
   // Async API
-   event reviewed : projection on Reviews {
-     subject, //> recieved new reviews
-     rating  //> new avg rating
+   event reviewed : {
+     subject: type of Reviews:subject;
+     rating: Decimal(2,1)
    }
 
   // Input validation

reviews/test/bookshop/.env

@@ -1,2 +0,0 @@
-cds.requires.messaging.kind = file-based-messaging
-PORT = 4004

reviews/test/bookshop/package.json

@@ -1,19 +0,0 @@
-{
-  "name": "@capire/fiori",
-  "version": "1.0.0",
-  "dependencies": {
-    "@capire/bookshop": "*",
-    "@capire/reviews": "*",
-    "@sap/cds": "^5",
-    "express": "^4.17.1"
-  },
-  "cds": {
-    "requires": {
-      "auth": { "strategy": "dummy" },
-      "ReviewsService": {
-        "kind": "odata",
-        "model": "@capire/reviews"
-      }
-    }
-  }
-}

reviews/test/bookshop/server.js

@@ -1,20 +0,0 @@
-const cds = require ('@sap/cds')
-
-cds.once('bootstrap',(app)=>{
-  // Delegate to imported apps (reviews only when mocked)
-  app.serve ('/bookshop').from ('@capire/bookshop','app/vue')
-  app.serve ('/reviews',).from ('@capire/reviews','app/vue')
-})
-
-cds.once('served', async ()=>{
-  // Update Books' average ratings when ReviewsService signals updated reviews
-  const ReviewsService = await cds.connect.to ('ReviewsService')
-  ReviewsService.on ('reviewed', (msg) => {
-    console.debug ('> received:', msg.event, msg.data)
-    const { subject, rating } = msg.data
-    return UPDATE('Books',subject).with({rating})
-  })
-
-})
-
-module.exports = cds.server

reviews/test/bookshop/services.cds

@@ -1,11 +0,0 @@
-namespace sap.capire.bookshop; //> allows UPDATE('Books')...
-//
-//  Extend Books with access to Reviews and average ratings
-//
-using { CatalogService.ListOfBooks, sap.capire.bookshop.Books } from '@capire/bookshop';
-using { ReviewsService.Reviews } from '@capire/reviews';
-extend Books with {
-  reviews : Composition of many Reviews on reviews.subject = $self.ID;
-  rating  : Reviews:rating;
-}
-extend projection ListOfBooks with { rating }

samples.md

@@ -7,7 +7,6 @@ Each sub directory essentially is an individual npm package arranged in an [all-
 ## [@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).
-- [Typescript support](https://cap.cloud.sap/docs/get-started/using-typescript)
 
 
 ## [@capire/bookshop](bookshop)
@@ -50,29 +49,20 @@ Each sub directory essentially is an individual npm package arranged in an [all-
 - Late-cut Micro Services
 - As well as managed data, input validations, and authorization
 
-## [@capire/suppliers](suppliers)
-
-- Shows how to integrate remote services, in this case the BusinessPartner service from SAP S/4HANA.
-- Extending [@capire/bookshop](bookshop) with suppliers from SAP S/4HANA
-- Providing that as a pre-built integration & extension package
-- Used in [@capire/fiori](fiori)
-
 
 ## [@capire/fiori](fiori)
 
 - A [composite app, reusing and combining](https://cap.cloud.sap/docs/guides/verticalize) these packages:
   - [@capire/bookshop](bookshop)
-  - [@capire/common](common)
-  - [@capire/orders](orders)
   - [@capire/reviews](reviews)
-  - [@capire/suppliers](suppliers)
+  - [@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
-- [OpenAPI export + Swagger UI](https://cap.cloud.sap/docs/advanced/openapi)
 
 <br>
 

suppliers/.env

@@ -1 +0,0 @@
-PORT = 4006

suppliers/app/_i18n/i18n.properties

@@ -1,31 +0,0 @@
-Books = Books
-Book = Book
-ID = ID
-Title = Title
-Author = Author
-AuthorID = Author ID
-Stock = Stock
-Name = Name
-AuthorName = Author's Name
-DateOfBirth = Date of Birth
-DateOfDeath = Date of Death
-PlaceOfBirth = Place of Birth
-PlaceOfDeath = Place of Death
-Age = Age
-Authors = Authors
-Order = Order
-Orders = Orders
-Price = Price
-
-Genre = Genre
-Genres = Genres
-SubGenres = Sub Genres
-
-NumCode = Numeric Code
-MinorUnit = Minor Unit
-Exponent = Exponent
-
-Supplier = Supplier
-SupplierName = Supplier Name
-Id = Id
-Name = Name

suppliers/app/_i18n/i18n_de.properties

@@ -1,18 +0,0 @@
-Books = Bücher
-Book = Buch
-ID = ID
-Title = Titel
-Authors = Autoren
-Author = Autor
-AuthorID = ID des Autors
-AuthorName = Name des Autors
-Age = Alter
-Name = Name
-Stock = Bestand
-Order = Bestellung
-Orders = Bestellungen
-Price = Preis
-Supplier = Lieferant
-SupplierName = Lieferantenname
-Id = Id
-Name = Name

suppliers/app/admin-fiori.html

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

suppliers/app/admin/fiori-service.cds

@@ -1,105 +0,0 @@
-//using { AdminService } from '../../db/schema';
-
-////////////////////////////////////////////////////////////////////////////
-//
-//	Books Object Page
-//
-
-annotate AdminService.Books with @(
-	UI: {
-		Facets: [
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>General}', Target: '@UI.FieldGroup#General'},
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Translations}', Target:  'texts/@UI.LineItem'},
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Details'},
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Supplier}', Target: '@UI.FieldGroup#Supplier'},
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Admin}', Target: '@UI.FieldGroup#Admin'},
-		],
-		FieldGroup#General: {
-			Data: [
-				{Value: title},
-				{Value: author_ID},
-				{Value: genre_ID},
-				{Value: descr},
-			]
-		},
-		FieldGroup#Details: {
-			Data: [
-				{Value: stock},
-				{Value: price},
-				{Value: currency_code, Label: '{i18n>Currency}'},
-			]
-		},
-		FieldGroup#Supplier: {
-			Data: [
-				{Value: supplier_ID, Label: '{i18n>Id}'},
-				{Value: supplier.name, Label: '{i18n>Name}'}
-			]
-		},
-		FieldGroup#Admin: {
-			Data: [
-				{Value: createdBy},
-				{Value: createdAt},
-				{Value: modifiedBy},
-				{Value: modifiedAt}
-			]
-		}
-	}
-);
-
-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}'},
-			]
-		},
-	}
-);
-
-
-
-////////////////////////////////////////////////////////////
-//
-//  Draft for Localized Data
-//
-
-annotate sap.capire.bookshop.Books with @fiori.draft.enabled;
-annotate AdminService.Books with @odata.draft.enabled;
-
-annotate AdminService.Books.texts with @(
-	UI: {
-		Identification: [{Value:title}],
-		SelectionFields: [ locale, title ],
-		LineItem: [
-			{Value: locale, Label: 'Locale'},
-			{Value: title, Label: 'Title'},
-			{Value: descr, Label: 'Description'}
-		]
-	}
-);
-
-// Add Value Help for Locales
-annotate AdminService.Books.texts {
-	locale @ValueList:{entity:'Languages',type:#fixed}
-}
-// In addition we need to expose Languages through AdminService
-using { sap } from '@sap/cds/common';
-extend service AdminService {
-	entity Languages as projection on sap.common.Languages;
-}
-
-annotate AdminService.Suppliers with
-	@(Capabilities.SearchRestrictions : {
-    	Searchable : false
-});

suppliers/app/admin/webapp/Component.js

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

suppliers/app/admin/webapp/i18n/i18n.properties

@@ -1,11 +0,0 @@
-# This is the resource bundle of itelo
-# __ldi.translation.uuid=c3431418-9caf-11e8-98d0-529269fb1459
-
-# JCI app descriptor contains lower case TITLE
-appTitle=Bookshop Sample
-
-# JCI app descriptor contains lower case DESCRIPTION
-appSubTitle=CAP Sample Application
-
-# JCI app descriptor contains lower case DESCRIPTION
-appDescription=CDS Sample Service

suppliers/app/admin/webapp/manifest.json

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

suppliers/app/common.cds

@@ -1,265 +0,0 @@
-/*
-	Common Annotations shared by all apps
-*/
-
-using { sap.capire.bookshop as my } from '@capire/bookshop';
-using { sap.common } from '@capire/common';
-
-////////////////////////////////////////////////////////////////////////////
-//
-//	Books Lists
-//
-annotate my.Books with @(
-	Common.SemanticKey: [title],
-	UI: {
-		Identification: [{Value:title}],
-		SelectionFields: [ ID, author_ID, price, currency_code, supplier.ID, supplier.name ],
-		LineItem: [
-			{Value: ID},
-			{Value: title},
-			{Value: author.name, Label:'{i18n>Author}'},
-			{Value: genre.name},
-			{Value: stock},
-			{Value: price},
-			{Value: currency.symbol, Label:' '},
-			{Value: supplier.ID},
-			{Value: supplier.name}
-		]
-	}
-) {
-	author @ValueList.entity:'Authors';
-};
-
-////////////////////////////////////////////////////////////////////////////
-//
-//	Books Details
-//
-annotate my.Books with @(
-	UI: {
-		HeaderInfo: {
-			TypeName: '{i18n>Book}',
-			TypeNamePlural: '{i18n>Books}',
-			Title: {Value: title},
-			Description: {Value: author.name}
-		},
-	}
-);
-
-
-
-////////////////////////////////////////////////////////////////////////////
-//
-//	Books Elements
-//
-annotate my.Books with {
-	ID @title:'{i18n>ID}' @UI.HiddenFilter;
-	title @title:'{i18n>Title}';
-	genre  @title:'{i18n>Genre}'  @Common: { Text: genre.name,  TextArrangement: #TextOnly };
-	author @title:'{i18n>Author}' @Common: { Text: author.name, TextArrangement: #TextOnly };
-	price @title:'{i18n>Price}' @Measures.ISOCurrency: currency_code;
-	stock @title:'{i18n>Stock}';
-	descr @UI.MultiLineText;
-	supplier_ID @title:'{i18n>Supplier}';
-}
-
-annotate my.Suppliers with {
-	name @title:'{i18n>SupplierName}';
-	ID @title:'{i18n>Supplier}';
-}
-
-////////////////////////////////////////////////////////////////////////////
-//
-//	Genres List
-//
-annotate my.Genres with @(
-	Common.SemanticKey: [name],
-	UI: {
-		SelectionFields: [ name ],
-		LineItem:[
-			{Value: name},
-			{Value: parent.name, Label: 'Main Genre'},
-		],
-	}
-);
-
-////////////////////////////////////////////////////////////////////////////
-//
-//	Genre Details
-//
-annotate my.Genres with @(
-	UI: {
-		Identification: [{Value:name}],
-		HeaderInfo: {
-			TypeName: '{i18n>Genre}',
-			TypeNamePlural: '{i18n>Genres}',
-			Title: {Value: name},
-			Description: {Value: ID}
-		},
-		Facets: [
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>SubGenres}', Target: 'children/@UI.LineItem'},
-		],
-	}
-);
-
-////////////////////////////////////////////////////////////////////////////
-//
-//	Genres Elements
-//
-annotate my.Genres with {
-	ID  @title: '{i18n>ID}';
-	name  @title: '{i18n>Genre}';
-}
-
-////////////////////////////////////////////////////////////////////////////
-//
-//	Authors List
-//
-annotate my.Authors with @(
-	Common.SemanticKey: [name],
-	UI: {
-		Identification: [{Value:name}],
-		SelectionFields: [ name ],
-		LineItem:[
-			{Value: ID},
-			{Value: name},
-			{Value: dateOfBirth},
-			{Value: dateOfDeath},
-			{Value: placeOfBirth},
-			{Value: placeOfDeath},
-		],
-	}
-);
-
-////////////////////////////////////////////////////////////////////////////
-//
-//	Author Details
-//
-annotate my.Authors with @(
-	UI: {
-		HeaderInfo: {
-			TypeName: '{i18n>Author}',
-			TypeNamePlural: '{i18n>Authors}',
-			Title: {Value: name},
-			Description: {Value: dateOfBirth}
-		},
-		Facets: [
-			{$Type: 'UI.ReferenceFacet', Target: 'books/@UI.LineItem'},
-		],
-	}
-);
-
-
-////////////////////////////////////////////////////////////////////////////
-//
-//	Authors Elements
-//
-annotate my.Authors with {
-	ID @title:'{i18n>ID}' @UI.HiddenFilter;
-	name @title:'{i18n>Name}';
-	dateOfBirth @title:'{i18n>DateOfBirth}';
-	dateOfDeath @title:'{i18n>DateOfDeath}';
-	placeOfBirth @title:'{i18n>PlaceOfBirth}';
-	placeOfDeath @title:'{i18n>PlaceOfDeath}';
-}
-
-////////////////////////////////////////////////////////////////////////////
-//
-//	Languages List
-//
-annotate common.Languages with @(
-	Common.SemanticKey: [code],
-	Identification: [{Value:code}],
-	UI: {
-		SelectionFields: [ name, descr ],
-		LineItem:[
-			{Value: code},
-			{Value: name},
-		],
-	}
-);
-
-////////////////////////////////////////////////////////////////////////////
-//
-//	Language Details
-//
-annotate common.Languages with @(
-	UI: {
-		HeaderInfo: {
-			TypeName: '{i18n>Language}',
-			TypeNamePlural: '{i18n>Languages}',
-			Title: {Value: name},
-			Description: {Value: descr}
-		},
-		Facets: [
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Details'},
-		],
-		FieldGroup#Details: {
-			Data: [
-				{Value: code},
-				{Value: name},
-				{Value: descr}
-			]
-		},
-	}
-);
-
-////////////////////////////////////////////////////////////////////////////
-//
-//	Currencies List
-//
-annotate common.Currencies with @(
-	Common.SemanticKey: [code],
-	Identification: [{Value:code}],
-	UI: {
-		SelectionFields: [ name, descr ],
-		LineItem:[
-			{Value: descr},
-			{Value: symbol},
-			{Value: code},
-		],
-	}
-);
-
-////////////////////////////////////////////////////////////////////////////
-//
-//	Currency Details
-//
-annotate common.Currencies with @(
-	UI: {
-		HeaderInfo: {
-			TypeName: '{i18n>Currency}',
-			TypeNamePlural: '{i18n>Currencies}',
-			Title: {Value: descr},
-			Description: {Value: code}
-		},
-		Facets: [
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Details'},
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Extended}', Target: '@UI.FieldGroup#Extended'},
-		],
-		FieldGroup#Details: {
-			Data: [
-				{Value: name},
-				{Value: symbol},
-				{Value: code},
-				{Value: descr}
-			]
-		},
-		FieldGroup#Extended: {
-			Data: [
-				{Value: numcode},
-				{Value: minor},
-				{Value: exponent}
-			]
-		},
-	}
-);
-
-////////////////////////////////////////////////////////////////////////////
-//
-//	Currencies Elements
-//
-annotate common.Currencies with {
-	numcode @title:'{i18n>NumCode}';
-	minor @title:'{i18n>MinorUnit}';
-	exponent @title:'{i18n>Exponent}';
-}

suppliers/app/services.cds

@@ -1,12 +0,0 @@
-/*
-  This model controls what gets served to Fiori frontends...
-*/
-
-using from './admin/fiori-service';
-//using from './browse/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';

suppliers/index.cds

@@ -1 +0,0 @@
-using from './srv/mashup';

suppliers/model.drawio

@@ -1 +0,0 @@
-<mxfile host="Electron" modified="2021-06-16T08:41:31.745Z" agent="5.0 (Macintosh; Intel Mac OS X 11_4_0) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/14.6.13 Chrome/89.0.4389.128 Electron/12.0.7 Safari/537.36" etag="keOnkQccb51SB06o_xsB" version="14.6.13" type="device"><diagram id="kIZwyAu_b989F7xyfxsf" name="Page-1">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</diagram></mxfile>

suppliers/package.json

@@ -1,40 +0,0 @@
-{
-  "name": "@capire/suppliers",
-  "version": "1.0.0",
-  "description": "Shows integration with SAP S/4HANA, in turn provided as a reusable extension package to bookshop.",
-  "private": true,
-  "dependencies": {
-    "@capire/common": "*",
-    "@sap/cds": ">=4",
-    "express": "^4"
-  },
-  "scripts": {
-    "start": "cds run --in-memory?",
-    "watch": "cds watch",
-    "mocked-s4": "cds mock API_BUSINESS_PARTNER"
-  },
-  "cds": {
-    "requires": {
-      "API_BUSINESS_PARTNER": {
-        "kind": "odata",
-        "model": "srv/external/API_BUSINESS_PARTNER",
-        "[hybrid]": {
-          "credentials": {
-            "destination": "cap-api098",
-            "path": "/sap/opu/odata/sap/API_BUSINESS_PARTNER"
-          }
-        }
-      },
-      "[local-hybrid]": {
-        "messaging": {
-          "kind": "file-based-messaging"
-        }
-      },
-      "[hybrid]": {
-        "messaging": {
-          "kind": "enterprise-messaging-shared"
-        }
-      }
-    }
-  }
-}

suppliers/requests.http

@@ -1,51 +0,0 @@
-
-@server = http://localhost:4006
-@bpServer = http://localhost:5001
-@authAlice = Authorization: Basic alice:
-
-###
-### Replication on changed Business Partner
-###
-
-### 1. Check supplier name before update ("A Company Making Everything")
-
-GET {{server}}/admin/Books(299)?$expand=supplier
-{{authAlice}}
-
-### 2. Change Business Partner -> Triggers event that updates supplier replication
-
-PATCH {{bpServer}}/api-business-partner/A_BusinessPartner('ACME')
-Content-Type: application/json
-
-{
-    "BusinessPartnerFullName": "A Company Making Everything *better*"
-}
-
-### 3. Check supplier name after update ("A Company Making Everything *better*")
-
-GET {{server}}/admin/Books(299)?$expand=supplier
-{{authAlice}}
-
-###
-### Replication on new assigned supplier
-###
-
-### 1. No supplier is assigned to "Wuthering Heights"
-
-GET {{server}}/admin/Books(201)?$expand=supplier
-{{authAlice}}
-
-### 2. Assign supplier ID "PNG"
-
-PATCH {{server}}/admin/Books(201)
-{{authAlice}}
-Content-Type: application/json
-
-{
-    "supplier_ID": "PNG"
-}
-
-### 3. Supplier information is replicated
-
-GET {{server}}/admin/Books(201)?$expand=supplier
-{{authAlice}}

suppliers/server.js

@@ -1,3 +0,0 @@
-const cds = require ('@sap/cds')
-cds.once('served', require('./srv/mashup'))
-module.exports = cds.server

suppliers/srv/data/sap.capire.bookshop-Books.csv

@@ -1,2 +0,0 @@
-ID;title;descr;author_ID;stock;price;currency_code;genre_ID;supplier_ID;
-299;Mobby Dick;"""Moby-Dick""" or """The Whale""" is an 1851 novel by American writer Herman Melville. The book is the sailor Ishmael's narrative of the obsessive quest of Ahab, captain of the whaling ship Pequod, for revenge on Moby Dick, the giant white sperm whale that on the ship's previous voyage bit off Ahab's leg at the knee. A contribution to the literature of the American Renaissance, Moby-Dick was published to mixed reviews, was a commercial failure, and was out of print at the time of the author's death in 1891.;105;99;15.20;GBP;11;ACME

suppliers/srv/data/sap.capire.bookshop-Suppliers.csv

@@ -1,3 +0,0 @@
-ID;name
-ACME;A Company Making Everything (replicated)
-

suppliers/srv/external/API_BUSINESS_PARTNER.js

@@ -1,10 +0,0 @@
-const cds = require('@sap/cds');
-
-module.exports = cds.service.impl(function () {
-  const { A_BusinessPartner } = this.entities;
-
-  // https://api.sap.com/event/SAPS4HANACloudBusinessEvents_BusinessPartner/resource
-  this.after('UPDATE', A_BusinessPartner, async data => {
-    await this.emit("BusinessPartner.Changed", { BusinessPartner: data.BusinessPartner });
-  });
-});

suppliers/srv/external/data/API_BUSINESS_PARTNER-A_BusinessPartner.csv

@@ -1,7 +0,0 @@
-BusinessPartner;BusinessPartnerFullName
-ACME;A Company Making Everything
-B4U;Books for You
-S&C;Shakespeare & Co.
-WSL;Waterstones
-TLD;Thalia
-PNG;Penguin Books

suppliers/srv/mashup.cds

@@ -1,72 +0,0 @@
-using { API_BUSINESS_PARTNER as S4 } from './external/API_BUSINESS_PARTNER.csn';
-using { CatalogService, sap.capire.bookshop.Books } from '@capire/bookshop';
-namespace sap.capire.bookshop;
-
-
-/**
-  Add projections to external entities to capture the subset of fields we're
-  actually interested in. This fosters both: (a) minimized network traffic as
-  well as (b) options to dynamically add extension fields by SaaS tenants.
- */
-entity Suppliers as projection on S4.A_BusinessPartner {
-    key BusinessPartner as ID,
-    BusinessPartnerFullName as name,
-    // to_BusinessPartnerAddress[1: ValidityStartDate <= $now and $now < ValidityEndDate].CityName,
-    // to_BusinessPartnerAddress[1: ValidityStartDate <= $now and $now < ValidityEndDate].Country,
-}
-
-
-/**
-  We can mashup entities from external services, or projections thereof, with
-  our project's own entities, e.g. by adding relationships as below.
- */
-extend Books with {
-  supplier : Association to Suppliers;
-}
-
-
-/*
-  Optionally expose external entities through own services, e.g. for Value Helps,
-  or to display details fetched on demand.
-  For this to work, we need to delegate the respective calls addressed to our
-  services into calls to the external service.
- */
-extend service AdminService with {
-  @cds.odata.valuelist
-  entity Suppliers as projection on bookshop.Suppliers;
-}
-
-
-/*
-  Optionally add local persistency to replicate data for fast access,
-  e.g. to display lists containing remote data.
- */
-annotate Suppliers with @cds.persistence: {table,skip:false};
-
-
-/**
-  Having locally cached replicas also allows to display supplier data in lists
-  of books, which otherwise would generate unwanted traffic on S4 backends.
- */
-extend projection CatalogService.ListOfBooks with {
-  supplier.name as supplier
-}
-
-
-/**
-  Optionally declare events emitted from the source, but not included in
-  imported APIs (e.g. as in case of EDMXes from API Hub).
-
-  This allows CAP's advanced support for events and messaging to kick in,
-  e.g. to automatically emit to and subscribe to events from message brokers
-  behind the scenes.
-
-  Note: as sync and async APIs from S/4 sources are not correlated, we have
-  to specify the event type names, e.g. as be found at:
-  https://api.sap.com/event/SAPS4HANACloudBusinessEvents_BusinessPartner/resource
- */
-extend service S4 {
-  event BusinessPartner.Changed @(type: 'sap.s4.beh.businesspartner.v1.BusinessPartner.Changed.v1') {
-    BusinessPartner: S4.A_BusinessPartner:BusinessPartner;
-  }
-}

suppliers/srv/mashup.js

@@ -1,50 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-//
-//    Mashing up provided and required services...
-//
-module.exports = async()=>{ // called by server.js
-
-  if (!cds.services.AdminService) return //> mocking S4 service only
-
-  // Connect to services we want to mashup below...
-  const S4bupa = await cds.connect.to('API_BUSINESS_PARTNER')   //> external S4 service
-  const admin = await cds.connect.to('AdminService')            //> local domain service
-  const db = await cds.connect.to('db')                         //> our primary database
-
-  // Reflect CDS definition of the Suppliers entity
-  const { Suppliers }  = db.entities
-
-  admin.prepend (()=>{ //> to ensure our .on handlers below go before the default ones
-
-    // Delegate Value Help reads for Suppliers to S4 backend
-    admin.on ('READ', 'Suppliers', req => {
-      console.log ('>> delegating to S4 service...')
-      return S4bupa.run(req.query)
-    })
-
-    // Replicate Supplier data when edited Books have suppliers
-    admin.after (['CREATE','UPDATE'], 'Books', async data => {
-      const { supplier_ID: ID } = data
-      if (ID) {
-        let replicated = await db.exists (Suppliers,ID)
-        if (!replicated) { // initially replicate Supplier info
-            let supplier = await S4bupa.read (Suppliers,ID)
-            await INSERT(supplier) .into (Suppliers)
-        }
-      }
-    })
-
-  })
-
-  // Subscribe to changes in the S4 origin of Suppliers data
-  S4bupa.on ('BusinessPartner.Changed', async msg => { //> would be great if we had batch events from S/4
-    console.log(">>", msg.event, msg.data)
-    const ID = msg.data.BusinessPartner;
-    let replicated = await db.exists (Suppliers,ID)
-    if (replicated) { // update replicated Supplier info
-      let supplier = await S4bupa.read (Suppliers,ID)
-      await UPDATE(Suppliers,ID) .with (supplier)
-    }
-  })
-
-}

test/cds.events.test.js

@@ -1,22 +0,0 @@
-const cds = require ('@sap/cds/lib')
-const { expect } = cds.test.in (__dirname)
-
-describe('cds.events tests', ()=>{
-
-  let m; before (async ()=> m = await cds.load('events.cds'))
-
-  it ('should have the model loaded', ()=>{
-    expect(m.definitions).to.have.property('Sue.Foo')
-  })
-
-  it ('should compile the model to edmx', ()=>{
-    const edmx = cds.compile(m).to.edmx({service:'Sue'})
-    expect(edmx).to.match(/<EntitySet Name="Foo" EntityType="Sue.Foo"\/>/)
-  })
-
-  it ('should compile the model to sql', ()=>{
-    const sql = cds.compile(m).to.sql().join(';\n')
-    expect(sql).not.to.match(/CREATE TABLE Sue_Foo/)
-    expect(sql).to.match(/CREATE TABLE Sue_Bar/)
-  })
-})

test/cds.ql.test.js

@@ -152,69 +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(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: { ref: ['Foo'] },
-          columns: [{ ref: ['a'] }, { ref: ['b'] }, cdr ? '*' : { ref: ['*'] }],
-        },
       })
-    })
 
-    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)
-            })
+      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'] }] }],
+              },
+            ],
+          },
         })
-      ).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 ( ..., => _.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
+      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'] }] },
+            ],
+          },
         })
-      ).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)
@@ -280,7 +280,7 @@ describe('cds.ql → cqn', () => {
       ).to.eql({
         SELECT: {
           from: { ref: ['Foo'] },
-          where: cds.version >= '5.3.0'
+          where: cdr
             ? [
                 // '(', //> this one is not required
                 { ref: ['ID'] },
@@ -289,7 +289,7 @@ describe('cds.ql → cqn', () => {
                 'and',
                 { ref: ['args'] },
                 'in',
-                { list: args.map(val => ({ val })) },
+                { val: args },
                 'and',
                 '(', //> this one is missing, and that's changing the logic -> that's a BUG
                 { ref: ['x'] },

test/custom-handlers.test.js

@@ -6,9 +6,13 @@ else cds.User = cds.User.Privileged // hard core monkey patch for older cds rele
 describe('Custom Handlers', () => {
 
   it('should reject out-of-stock orders', async () => {
-    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/)
+    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/)
     const { data } = await GET`/admin/Books/201/stock/$value`
     expect(data).to.equal(2)
   })

test/events.cds

@@ -1,6 +0,0 @@
-service Sue {
-  @cds.persistence.skip
-  entity Foo { key ID:Integer; title:String; status:String(1); }
-  entity Bar { key ID:Integer; foo: Association to Foo }
-  event Foo.changed : projection on Foo { ID, status }
-}

test/localized-data.test.js

@@ -43,7 +43,7 @@ describe('Localized Data', () => {
       { title: 'Jane Eyre', author: 'Charlotte Brontë', currency: { name: 'Pfund' } },
       { title: 'The Raven', author: 'Edgar Allen Poe', currency: { name: 'US-Dollar' } },
       { title: 'Eleonora', author: 'Edgar Allen Poe', currency: { name: 'US-Dollar' } },
-      { title: 'Catweazle', author: 'Richard Carpenter', currency: { name: 'Yen' } },
+      { title: 'Catweazle', author: 'Richard Carpenter', currency: { name: 'Euro' } },
     ])
   })
 
@@ -85,7 +85,7 @@ describe('Localized Data', () => {
       { title: 'Jane Eyre', currency: { name: 'British Pound' } },
       { title: 'The Raven', currency: { name: 'US Dollar' } },
       { title: 'Eleonora',  currency: { name: 'US Dollar' } },
-      { title: 'Catweazle', currency: { name: 'Yen' } },
+      { title: 'Catweazle', currency: { name: 'Euro' } },
     ])
   })
 })