How to run embedded OrderService?

cds deploy excludes its definitions if `OrdersService` is marked
as external.  How would we tell it to include them in the embedded case?

.github/workflows/node.js.yml

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

.gitignore

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

.npmrc

@@ -0,0 +1,3 @@
+# 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
-process.chdir(__dirname)
+const cwd = __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}`,next)
+      if (err) exec(`npm pack ../${pkg}`,{cwd},next)
       else next()
     }))
   } catch (e) {

.vscode/settings.json

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

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 orderd ${amount} item(s).` }
+                books.order = { amount, succeeded: `Successfully ordered ${amount} item(s).` }
             } catch (e) {
                 books.order = { amount, failed: e.response.data.error.message }
             }

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

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
+JPY;fr;Yen;Yen japonais

fiori/.env

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

fiori/app/admin/fiori-service.cds

@@ -1,4 +1,4 @@
-using { AdminService } from '../../db/schema';
+using { AdminService, sap.capire.bookshop } from '../../db/schema';
 
 ////////////////////////////////////////////////////////////////////////////
 //
@@ -70,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 ],
@@ -83,11 +83,12 @@ 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
+// In addition we need to expose Languages and Books.texts 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/browse/fiori-service.cds

@@ -1,4 +1,4 @@
-using CatalogService from '../../srv/cat-service';
+using CatalogService from '@capire/bookshop';
 
 ////////////////////////////////////////////////////////////////////////////
 //

fiori/app/common.cds

@@ -2,8 +2,8 @@
 	Common Annotations shared by all apps
 */
 
-using { sap.capire.bookshop as my } from '../db/schema';
-using { sap.common } from '../db/capire_common';
+using { sap.capire.bookshop as my } from '@capire/bookshop';
+using { sap.common } from '@capire/common';
 
 ////////////////////////////////////////////////////////////////////////////
 //
@@ -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}';
+	price @title:'{i18n>Price}' @Measures.ISOCurrency: currency_code;
 	stock @title:'{i18n>Stock}';
 	descr @UI.MultiLineText;
 }

fiori/app/services.cds

@@ -4,8 +4,9 @@
 
 using from './admin/fiori-service';
 using from './browse/fiori-service';
-using from './orders/fiori-service';
 using from './common';
 
-using from '../db/capire_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

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

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

@@ -0,0 +1,44 @@
+{
+  "name": "@capire/fiori",
+  "version": "1.0.0",
+  "dependencies": {
+    "@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",
+        "[development]": {
+          "model": "db/sqlite"
+        },
+        "[production]": {
+          "model": "db/hana"
+        }
+      }
+    }
+  }
+}

fiori/server.js

@@ -0,0 +1,23 @@
+const cds = require ('@sap/cds')
+module.exports = cds.server
+
+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'))
+
+// Swagger UI - see https://cap.cloud.sap/docs/advanced/openapi
+if (process.env.NODE_ENV !== 'production') {
+  const cds_swagger = require ('cds-swagger-ui-express')
+  cds.once ('bootstrap', app => app.use (cds_swagger()) )
+}
+
+
+// -----------------------------------------------------------------------
+// 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,25 +3,23 @@
 //    Mashing up imported models...
 //
 
-using { sap.capire.bookshop.Books } from '../db/schema';
+using { sap.capire.bookshop.Books } from '@capire/bookshop';
 
 //
 //  Extend Books with access to Reviews and average ratings
 //
 
-/*
 using { ReviewsService.Reviews } from '@capire/reviews';
 extend Books with {
   reviews : Composition of many Reviews on reviews.subject = $self.ID;
   rating  : Decimal;
 }
-*/
 
 //
 //  Extend Orders with Books as Products
 //
 
-using { sap.capire.orders.Orders_Items } from '../db/schema';
+using { sap.capire.orders.Orders_Items } from '@capire/orders';
 extend Orders_Items with {
   book : Association to Books on product.ID = book.ID
 }

fiori/srv/mashup.js

@@ -6,7 +6,7 @@ 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 ReviewsService = await cds.connect.to ('ReviewsService')
   const OrdersService = await cds.connect.to ('OrdersService')
   const db = await cds.connect.to ('db')
 
@@ -39,14 +39,12 @@ module.exports = async()=>{ // called by server.js
   //
   // 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

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

hello/package.json

@@ -2,6 +2,28 @@
   "name": "@capire/hello-world",
   "version": "1.0.0",
   "scripts": {
-    "watch": "cds serve world.cds"
+    "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
+          ]
+        }
+      }
+    }
   }
 }

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

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

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

multitenancy/.cdsrc.json

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

multitenancy/.gitignore

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

multitenancy/.vscode/extensions.json

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

multitenancy/.vscode/launch.json

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

multitenancy/.vscode/settings.json

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

multitenancy/.vscode/tasks.json

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

multitenancy/README.md

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

multitenancy/app/orders/fiori-service.cds

@@ -1,92 +0,0 @@
-
-
-////////////////////////////////////////////////////////////////////////////
-//
-//	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.
-//
-////////////////////////////////////////////////////////////////////////////
-
-
-
-using { OrdersService } from '../../srv/orders-service';
-
-
-@odata.draft.enabled
-annotate OrdersService.Orders with @(
-	UI: {
-		SelectionFields: [ createdAt, createdBy ],
-		LineItem: [
-			{Value: OrderNo, Label:'OrderNo'},
-			// {Value: buyer, Label:'Customer'}, we do not need this, because we want extend it later
-			{Value: createdAt, Label:'Date'}
-		],
-		HeaderInfo: {
-			TypeName: 'Order', TypeNamePlural: 'Orders',
-			Title: {
-				Label: 'Order number ', //A label is possible but it is not considered on the ObjectPage yet
-				Value: OrderNo
-			},
-			Description: {Value: createdBy}
-		},
-		Identification: [ //Is the main field group
-			{Value: createdBy, Label:'Customer'},
-			{Value: createdAt, Label:'Date'},
-			{Value: OrderNo },
-		],
-		HeaderFacets: [
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Created}', Target: '@UI.FieldGroup#Created'},
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Modified}', Target: '@UI.FieldGroup#Modified'},
-		],
-		Facets: [
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Details'},
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>OrderItems}', Target: 'Items/@UI.LineItem'},
-		],
-		FieldGroup#Details: {
-			Data: [
-				{Value: currency_code, Label:'Currency'}
-			]
-		},
-		FieldGroup#Created: {
-			Data: [
-				{Value: createdBy},
-				{Value: createdAt},
-			]
-		},
-		FieldGroup#Modified: {
-			Data: [
-				{Value: modifiedBy},
-				{Value: modifiedAt},
-			]
-		},
-	},
-) {
-	createdAt @UI.HiddenFilter:false;
-	createdBy @UI.HiddenFilter:false;
-};
-
-
-
-annotate OrdersService.Orders_Items with @(
-	UI: {
-		LineItem: [
-			{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: amount, Label:'Amount'},
-			{Value: title, Label:'Product'},
-			{Value: price, Label:'Unit Price'},
-		],
-		Facets: [
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>OrderItems}', Target: '@UI.Identification'},
-		],
-	},
-) {
-	amount @(
-		Common.FieldControl: #Mandatory
-	);
-};

multitenancy/app/orders/webapp/Component.js

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

multitenancy/app/orders/webapp/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

multitenancy/app/orders/webapp/manifest.json

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

multitenancy/app/package.json

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

multitenancy/app/xs-app.json

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

multitenancy/db/capire_common.cds

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

multitenancy/db/schema.cds

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

multitenancy/db/schema_bookshop.cds

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

multitenancy/db/schema_orders.cds

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

multitenancy/db/src/.hdiconfig

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

multitenancy/map-route.sh

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

multitenancy/mta.yaml

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

multitenancy/package.json

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

multitenancy/server.js

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

multitenancy/srv/admin-service.cds

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

multitenancy/srv/admin-service.js

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

multitenancy/srv/cat-service.cds

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

multitenancy/srv/cat-service.js

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

multitenancy/srv/orders-service.cds

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

multitenancy/srv/orders-service.js

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

multitenancy/tpl/db/extension.cds

@@ -1,60 +0,0 @@
-using {sap.capire.bookshop} from '_base/db/schema';
-using {sap.capire.orders}   from '_base/db/schema';
-using from '_base/db/capire_common';
-
-using {
-    cuid, managed, Country, sap.common.CodeList
-} from '@sap/cds/common';
-
-namespace Z_bookshop.extension;
-
-// extend existing entity 
-extend orders.Orders with { 
-  Z_Customer    : Association to one Z_Customers;  
-  Z_SalesRegion : Association to one Z_SalesRegion; 
-  Z_priority    : String @assert.range enum {high; medium; low} default 'medium';
-  Z_Remarks     : Composition of many Z_Remarks on Z_Remarks.parent = $self;
-}  
-
-// new entity - as association target
-entity Z_Customers : cuid, managed 
-{
-  email        : String;
-  firstName    : String;
-  lastName     : String; 
-  creditCardNo : String;
-  dateOfBirth  : Date;
-  status       : String   @assert.range enum {platinum; gold; silver; bronze} default 'bronze';
-  creditScore  : Decimal  @assert.range: [ 1.0, 100.0 ] default 50.0;
-  PostalAddresses : Composition of many Z_CustomerPostalAddresses on PostalAddresses.Customer = $self;
-}
-
-// new unique constraint (secondary index)
-annotate Z_Customers with @assert.unique: { email: [ email ] }   
-{
-  email @mandatory;    // mandatory check
-}
-
-// new entity - as composition target
-entity Z_CustomerPostalAddresses : cuid, managed 
-{
-  Customer       : Association to one Z_Customers;
-  description    : String;
-  street         : String;
-  town           : String;
-  country        : Country;
-}
-
-// new entity - as code list
-entity Z_SalesRegion: CodeList {
-  key regionCode : String(11);
-}
-
-// new entity - as composition target
-entity Z_Remarks : cuid, managed
-{  
-  parent      : Association to one orders.Orders;  
-  number      : Integer;  
-  remarksLine : String; 
-}
-

multitenancy/tpl/srv/extension_service.cds

@@ -1,12 +0,0 @@
-using from '_base/srv/admin-service';
-using from '_base/srv/cat-service';
-using from '_base/srv/orders-service';
-
-using { Z_bookshop.extension as ext } from '../db/extension';
-
-
-extend service OrdersService with {
-   entity Z_Customers   as projection on ext.Z_Customers;
-   entity Z_SalesRegion as projection on ext.Z_SalesRegion;
-}
-

multitenancy/tpl/srv/extension_service_ui.cds

@@ -1,212 +0,0 @@
-using from '_base/app/services';
-using OrdersService from './extension_service';
-
-// new entity -- draft enabled
-annotate OrdersService.Z_Customers   with @odata.draft.enabled;
-
-// new entity -- titles
-annotate OrdersService.Z_Customers with {
-    ID           @(     
-        UI.Hidden,
-        Common : {Text : email}
-    );
-    firstName    @title : 'First Name';
-    lastName     @title : 'Last Name';
-    email        @title : 'Email';
-    creditCardNo @title : 'Credit Card No';
-    dateOfBirth  @title : 'Date of Birth';
-	status       @title : 'Status';
-	creditScore  @title : 'Credit Score';
-}
-
-// new entity -- titles
-annotate OrdersService.Z_CustomerPostalAddresses with {
-    ID          @(       
-        UI.Hidden,
-        Common : {Text : description}
-    );
-    description @title : 'Description';
-    street      @title : 'Street';
-    town        @title : 'Town';
-    country     @title : 'Country';
-}
-
-// new entity -- titles
-annotate OrdersService.Z_SalesRegion with {
-	regionCode      @title: 'Region Code';
-}
-
-// new entity -- titles
-annotate OrdersService.Z_Remarks with {
-    number          @title: 'Remark Number';
-	remarksLine     @title: 'Remark';
-}
-
-
-// new entity in service -- UI
-annotate OrdersService.Z_Customers with @(UI : {
-    HeaderInfo       : {
-        TypeName       : 'Customer',
-        TypeNamePlural : 'Customers',
-        Title          : {
-            $Type : 'UI.DataField',
-            Value : email
-        }
-    },
-    LineItem         : [
-        {Value : firstName},
-        {Value : lastName},
-        {Value : email},
-		{Value : status},
-        {Value : creditScore}
-    ],
-    Facets           : [
-		{$Type: 'UI.ReferenceFacet', Label: 'Main', Target : '@UI.FieldGroup#Main'},
-		{$Type: 'UI.ReferenceFacet', Label: 'Customer Postal Addresses', Target: 'PostalAddresses/@UI.LineItem'}
-	],
-    FieldGroup #Main : {Data : [
-        {Value : firstName},
-        {Value : lastName},
-        {Value : email},
-		{Value : status},
-        {Value : creditScore}
-    ]}
-} ) ;
-
-// new entity -- UI
-annotate OrdersService.Z_CustomerPostalAddresses with @(UI : {
-    HeaderInfo       : {
-        TypeName       : 'CustomerPostalAddress',
-        TypeNamePlural : 'CustomerPostalAddresses',
-        Title          : {
-            $Type : 'UI.DataField',
-            Value : description
-        }
-    },
-    LineItem         : [
-        {Value : description},
-        {Value : street},
-        {Value : town},
-		{Value : country_code}
-	],
-    Facets           : [
-		{$Type: 'UI.ReferenceFacet', Label: 'Main', Target : '@UI.FieldGroup#Main'}
-	],
-    FieldGroup #Main : {Data : [
-        {Value : description},
-        {Value : street},
-        {Value : town},
-		{Value : country_code}
-    ]}
-}, ) {
-
-};
-
-// new entity -- UI
-annotate OrdersService.Z_SalesRegion with @(
-	UI: {
-		HeaderInfo: {
-			TypeName: 'Sales Region',
-			TypeNamePlural: 'Sales Regions',
-			Title          : {
-                $Type : 'UI.DataField',
-                Value : regionCode
-            }
-		},
-		LineItem: [
-			{Value: regionCode},   
-            {Value: name}, 
-            {Value: descr}   
-		],
-		Facets: [
-			{$Type: 'UI.ReferenceFacet', Label: 'Main',    Target: '@UI.FieldGroup#Main'}
-		],
-		FieldGroup#Main: {
-			Data: [
-		        {Value: regionCode},   
-				{Value: name}, 
-                {Value: descr}     
-			]
-		}
-	},
-) {
-
-};
-
-
-// new entity -- UI
-annotate OrdersService.Z_Remarks with @(
-	UI: {
-		HeaderInfo: {
-			TypeName: 'Remark',
-			TypeNamePlural: 'Remarks',
-			Title          : {
-                $Type : 'UI.DataField',
-				Value : number
-            }
-		},
-		LineItem: [
-			{Value: number},
-			{Value: remarksLine}       
-		],
-		Facets: [
-			{$Type: 'UI.ReferenceFacet', Label: 'Main',    Target: '@UI.FieldGroup#Main'}
-		],
-		FieldGroup#Main: {
-			Data: [
-		        {Value: number},
-			    {Value: remarksLine}       
-			]
-		}
-	},
-) {
-
-};
-
-// extend existing entity Orders with new extension fields and new composition
-
-annotate OrdersService.Orders with @(
-	UI: {
-		LineItem: [...,	
-			{Value: Z_Customer_ID,            Label:'Customer'},          // extension field
-			{Value: Z_SalesRegion_regionCode, Label:'Sales Region'},      // extension field
-			{Value: Z_priority,               Label:'Priority'}           // extension field
-		],
-		Facets: [...,
-			{$Type: 'UI.ReferenceFacet', Label: 'Remarks', Target: 'Z_Remarks/@UI.LineItem'} // new composition		
-		],
-		FieldGroup#Details: {
-			Data: [...,             
-				{Value: Z_Customer_ID,            Label:'Customer'},      // extension field
-				{Value: Z_SalesRegion_regionCode, Label:'Sales Region'},  // extension field
-				{Value: Z_priority,               Label:'Priority'}       // extension field
-			]
-		}
-	}
-);
-
-// new field in existing service -- exchange ID with text
- annotate OrdersService.Orders with {
-	Z_Customer @(
-		Common: {
-			//show email, not id for Customer in the context of Orders
-			Text: Z_Customer.email  , TextArrangement: #TextOnly,
-			ValueList: {
-				Label: 'Customers',
-				CollectionPath: 'Z_Customers',
-				Parameters: [
-					{ $Type: 'Common.ValueListParameterInOut',
-						LocalDataProperty: Z_Customer_ID,  
-						ValueListProperty: 'ID'            
-					},
-					{ $Type: 'Common.ValueListParameterDisplayOnly',
-						ValueListProperty: 'email'
-					}
-				]
-			}
-		} 
-	);
-} 
-
-
-

multitenancy/xs-security.json

@@ -1,46 +0,0 @@
-{
-  "xsappname": "multitenancy-${space}", 
-  "tenant-mode": "shared",
-  "scopes": [
-    { "name": "$XSAPPNAME.ExtendCDS", "description": "Extend CDS application" },
-    { "name": "$XSAPPNAME.ExtendCDSdelete", "description": "Extend CDS application with undeploy" },
-    { "name": "$XSAPPNAME.MtxDiagnose", "description": "Diagnose MTX sidecar" },
-    { "name": "$XSAPPNAME.mtdeployment", "description": "Deploy applications" },
-    {
-      "name": "$XSAPPNAME.mtcallback",
-      "description": "With this scope set, the callbacks for subscribe, unsubscribe and getDependencies can be called.",
-      "grant-as-authority-to-apps": [
-      "$XSAPPNAME(application,sap-provisioning,tenant-onboarding)"
-      ]
-    }
-  ],
-  "authorities": [
-    "$XSAPPNAME.MtxDiagnose"
-  ],
-  "role-templates": [
-    {
-      "name": "ExtensionDeveloper",
-      "description": "Extend application",
-      "scope-references": [
-        "$XSAPPNAME.ExtendCDS"
-      ],
-      "attribute-references": []
-    },
-    {
-      "name": "ExtensionDeveloperUndeploy",
-      "description": "Undeploy extension",
-      "scope-references": [
-        "$XSAPPNAME.ExtendCDSdelete"
-      ],
-      "attribute-references": []
-    },
-    {
-      "name": "MultitenancyAdministrator",
-      "description": "Multitenancy Administrator",
-      "scope-references": [
-        "$XSAPPNAME.mtcallback",
-        "$XSAPPNAME.mtdeployment"
-      ]
-    }
-  ]
-}

orders/package.json

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

package.json

@@ -12,9 +12,11 @@
     "@capire/media": "./media",
     "@capire/orders": "./orders",
     "@capire/reviews": "./reviews",
-    "@capire/multitenancy": "./multitenancy"
+    "@sap/cds": "^5",
+    "express": "^4"
   },
   "devDependencies": {
+    "cds-swagger-ui-express": "^0.2.0",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "chai-subset": "^1.6.0",
@@ -26,17 +28,18 @@
     "bookshop": "cds watch bookshop",
     "fiori": "cds watch fiori",
     "media": "cds watch media",
-    "multitenancy": "cds watch multitenancy",
     "mocha": "npx mocha || echo",
     "jest": "npx jest",
-    "test": "npm run jest --silent"
+    "test": "npm run jest --silent && npm run test:hello",
+    "test:hello": "cd hello && npm test"
+  },
+  "jest": {
+    "testEnvironment": "node",
+    "testMatch": ["**/*.test.js"]
   },
   "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": ">=4",
+    "@sap/cds": "^5",
     "express": "^4.17.1"
   },
   "scripts": {

samples.md

@@ -7,6 +7,7 @@ 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)
@@ -63,6 +64,7 @@ Each sub directory essentially is an individual npm package arranged in an [all-
   - 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>
 

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: { 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: ['*'] }],
+        },
       })
+    })
 
-      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'] }] }],
+            },
+          ],
+        },
       })
+    })
 
-      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)
@@ -280,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'] },
@@ -289,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'] },

test/custom-handlers.test.js

@@ -6,13 +6,9 @@ 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 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/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: 'Euro' } },
+      { title: 'Catweazle', author: 'Richard Carpenter', currency: { name: 'Yen' } },
     ])
   })
 
@@ -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: 'Euro' } },
+      { title: 'Catweazle', currency: { name: 'Yen' } },
     ])
   })
 })