ES Modules

.deploy/app-router/package.json

@@ -1,9 +0,0 @@
-{
-  "name": "approuter",
-  "dependencies": {
-    "@sap/approuter": "^20.0.0"
-  },
-  "scripts": {
-    "start": "node node_modules/@sap/approuter/approuter.js"
-  }
-}

.deploy/app-router/resources/bookshop

@@ -1 +0,0 @@
-../../../bookshop/app/vue

.deploy/app-router/resources/orders

@@ -1 +0,0 @@
-../../../orders/app/orders

.deploy/app-router/resources/reviews

@@ -1 +0,0 @@
-../../../reviews/app/vue

.deploy/app-router/xs-app.json

@@ -1,46 +0,0 @@
-{
-  "welcomeFile": "app/bookshop/index.html",
-  "routes": [
-    {
-      "source": "^/-/cds/.*",
-      "destination": "mtx-api",
-      "authenticationType": "none"
-    },
-    {
-      "source": "^/app/(.*)$",
-      "target": "$1",
-      "localDir": "resources",
-      "cacheControl": "no-cache, no-store, must-revalidate"
-    },
-    {
-      "source": "^/admin/(.*)$",
-      "target": "/admin/$1",
-      "destination": "bookstore-api",
-      "csrfProtection": true
-    },
-    {
-      "source": "^/browse/(.*)$",
-      "target": "/browse/$1",
-      "destination": "bookstore-api",
-      "csrfProtection": true
-    },
-    {
-      "source": "^/user/(.*)$",
-      "target": "/user/$1",
-      "destination": "bookstore-api",
-      "csrfProtection": true
-    },
-    {
-      "source": "^/odata/v4/orders/(.*)$",
-      "target": "/odata/v4/orders/$1",
-      "destination": "orders-api",
-      "csrfProtection": true
-    },
-    {
-      "source": "^/reviews/(.*)$",
-      "target": "/reviews/$1",
-      "destination": "reviews-api",
-      "csrfProtection": true
-    }
-  ]
-}

.eslintrc

@@ -0,0 +1,34 @@
+{
+  "extends": [
+    "plugin:@sap/cds/recommended",
+    "eslint:recommended"
+  ],
+  "env": {
+    "browser": true,
+    "es2022": true,
+    "node": true,
+    "jest": true,
+    "mocha": true
+  },
+  "parserOptions": {
+    "sourceType": "module"
+  },
+  "globals": {
+    "SELECT": true,
+    "INSERT": true,
+    "UPSERT": true,
+    "UPDATE": true,
+    "DELETE": true,
+    "CREATE": true,
+    "DROP": true,
+    "CDL": true,
+    "CQL": true,
+    "cds": true
+  },
+  "rules": {
+    "no-console": "off",
+    "require-atomic-updates": "off",
+        "require-await":"warn",
+        "no-unused-vars": ["warn", { "argsIgnorePattern": "_" }]
+  }
+}

.github/dependabot.yml

@@ -5,16 +5,4 @@ updates:
   directory: /
   versioning-strategy: increase-if-necessary
   schedule:
-    interval: weekly
-  groups:
-    production-dependencies:
-      dependency-type: "production"
-    development-dependencies:
-      dependency-type: "development"
-  ignore:
-    - dependency-name: "chai"
-        # chai 5 doesn't work atm w/ cds.test, TODO fix that in cds.test
-      versions: ["5.x"]
-    - dependency-name: "chai-as-promised"
-        # chai-as-promised 8 doesn't work atm w/ cds.test, TODO fix that in cds.test
-      versions: ["8.x"]
+    interval: daily

.github/workflows/node.js.yml

@@ -11,28 +11,18 @@ on:
 
 jobs:
   build:
+
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        node-version: [22.x, 20.x, 18.x]
+        node-version: [20.x, 18.x]
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
     - run: npm ci
     - run: npm test
-
-  lint:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
-      with:
-        node-version: 22.x
-    - run: npm ci
-    - run: npm run lint

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

.reuse/dep5

@@ -24,6 +24,6 @@ Disclaimer: The code in this project may include calls to APIs (“API Calls”)
  you any rights to use or access any SAP External Product, or provide any third
  parties the right to use of access any SAP External Product, through API Calls.
 
-Files: *.*
-Copyright: 2019-2025 SAP SE or an SAP affiliate company and cap-cloud-samples
+Files: *
+Copyright: 2019-2020 SAP SE or an SAP affiliate company and cap-cloud-samples
 License: Apache-2.0

.tours/db-native.tour

@@ -0,0 +1,117 @@
+{
+  "$schema": "https://aka.ms/codetour-schema",
+  "title": "Database Functions",
+  "steps": [
+    {
+      "title": "Introduction",
+      "description": "### Database Functions in CDS Models\n\nIn this tour, you'll learn how to add database-specific functions to CDS models in your application."
+    },
+    {
+      "file": "bookshop/db/schema.cds",
+      "description": "#### Basic Schema\n\nWe want to add two fields to the `Authors` entity, one for the author's age and one for the span of years that she or he lived.\n\nThese two fields can be computed out of the existing `dateOfBirth` and `dateOfDeath` fields.",
+      "selection": {
+        "start": {
+          "line": 19,
+          "character": 1
+        },
+        "end": {
+          "line": 21,
+          "character": 1
+        }
+      },
+      "title": "Base fields in Author"
+    },
+    {
+      "file": "bookshop/srv/admin-service.cds",
+      "description": "This is how the `Authors` entity gets exposed in an OData or REST service.\n\nIn the next step, you'll see how we extend this projection.",
+      "selection": {
+        "start": {
+          "line": 4,
+          "character": 1
+        },
+        "end": {
+          "line": 5,
+          "character": 1
+        }
+      },
+      "title": "Authors service"
+    },
+    {
+      "file": "fiori/db/sqlite/index.cds",
+      "description": "#### SQLite Implementation\n\nHere's the first implementation for SQLite.  It computes the two fields `age` and `lifetime` through SQLite's [strftime](https://sqlite.org/lang_datefunc.html) function.\n\nThrough the [`extend projection`](https://cap.cloud.sap/docs/cds/cdl#extend-view) clause you can add additional fields to projection entities.  These are deployed as database views, which is why we can integrate the database functions in the first place.\n",
+      "selection": {
+        "start": {
+          "line": 7,
+          "character": 1
+        },
+        "end": {
+          "line": 11,
+          "character": 1
+        }
+      },
+      "title": "SQLite implementation"
+    },
+    {
+      "file": "fiori/db/hana/index.cds",
+      "description": "#### SAP HANA Implementation\n\nThis is the second implementation for SAP HANA.  It computes the same two fields `age` and `lifetime` through the [YEARS_BETWEEN](https://help.sap.com/viewer/7c78579ce9b14a669c1f3295b0d8ca16/Cloud/en-US/7c0d2c161ea34def86de3f5eadd6a0af.html) and [YEAR](https://help.sap.com/viewer/7c78579ce9b14a669c1f3295b0d8ca16/Cloud/en-US/20f5fac6751910148dabd3c6821f907d.html) functions of SAP HANA.\n\n#### File Layout and Code Structure\n\nNote the path of the `.cds` file we are in: it's in a subfolder of `db`, so that it's _not_ automatically picked up when we start the application.  The same is true for the SQLite implementation: it's in a separate `db/sqlite/` folder as well.  In the next step, you'll see how these files are loaded.\n\nAlso, we choose to implement all of that as an extension of the original bookshop here in the _fiori_ package.  See the first [CAP Samples] code tour for more details on the different packages of this repository.",
+      "selection": {
+        "start": {
+          "line": 7,
+          "character": 1
+        },
+        "end": {
+          "line": 11,
+          "character": 1
+        }
+      },
+      "title": "SAP HANA implementation"
+    },
+    {
+      "file": "fiori/package.json",
+      "description": "#### Configuration\n\nThe `cds.requires` section in `package.json` is a place to configure which of the `db/sqlite` and `db/hana` folders are used for which database.\n\nWe use [Node.js profiles](https://cap.cloud.sap/docs/node.js/cds-env#profiles) to separate the configuration.\nIn the `development` profile, you can see that `db/sqlite` is set as the model, while the `db/hana` folder is configured in the `production` profile.  `db-ext` is a pseudo datasource, its name doesn't matter.\n\nSee [`cds.resolve`](https://cap.cloud.sap/docs/node.js/cds-compile#cds-resolve) to learn more about how models are found.",
+      "selection": {
+        "start": {
+          "line": 41,
+          "character": 1
+        },
+        "end": {
+          "line": 48,
+          "character": 1
+        }
+      },
+      "title": "Configuration"
+    },
+    {
+      "file": "fiori/package.json",
+      "description": "#### Run with SQLite\n\nTo run with `development` and an in-memory SQLite database, you don't need to do anything special, because it's activated by default.  Just run:\n\n>> cds watch fiori\n\nThen open [http://localhost:4004/admin/Authors](http://localhost:4004/admin/Authors) to see the two new fields.\n",
+      "line": 43,
+      "title": "Run with SQLite"
+    },
+    {
+      "file": "fiori/package.json",
+      "description": "#### Deploy the CDS Model to SAP HANA\n\nTo 'activate' SAP HANA through the `production` profile, you can use the global `--production` flag:\n\n>> cd fiori; cds deploy --to hana --production\n\n[Learn more about SAP HANA deployment](https://cap.cloud.sap/docs/guides/databases#get-hana)\n\n#### Run the Application\n\n>> cd fiori; cds watch --production\n\nThe service on [http://localhost:4004/admin/Authors](http://localhost:4004/admin/Authors) is the same as before, but this time the `Authors` entity is backed by a database view with an SAP HANA function.\n\n#### More\n\nIf you don't see data, you can add some in the next step.",
+      "line": 46,
+      "title": "Run with SAP HANA"
+    },
+    {
+      "file": "fiori/test/requests.http",
+      "description": "### Add More Data\n\nOptionally you can add some `Authors` data by clicking on the _Send Request_ link (provided by the [REST client](https://marketplace.visualstudio.com/items?itemName=humao.rest-client) extension).",
+      "line": 72,
+      "selection": {
+        "start": {
+          "line": 67,
+          "character": 1
+        },
+        "end": {
+          "line": 73,
+          "character": 1
+        }
+      },
+      "title": "Add Data"
+    },
+    {
+      "title": "Wrap-up",
+      "description": "### Summary\n\nThat's it!  You have seen: \n- How to integrate database-specific functions in a CDS model.\n- How to switch between the two implementations for SQLite and SAP HANA."
+    }
+  ]
+}

.tours/samples.tour

@@ -0,0 +1,139 @@
+{
+  "$schema": "https://aka.ms/codetour-schema",
+  "title": "CAP Samples",
+  "steps": [
+    {
+      "title": "Welcome",
+      "file": "README.md",
+      "description": "### Welcome to CAP Samples!\n\nThis tour leads you through a collection of samples for the [SAP Cloud Application Programming Model (CAP)](https://cap.cloud.sap).\nYou will learn which features of the programming model are demonstrated in which sample.\n\nLet's start!",
+      "line": 2,
+      "selection": {
+        "start": {
+          "line": 1,
+          "character": 1
+        },
+        "end": {
+          "line": 3,
+          "character": 108
+        }
+      }
+    },
+    {
+      "file": "hello/srv/world.cds",
+      "description": "### Hello World!\n\nThis is a simplistic [Hello World](https://cap.cloud.sap/docs/get-started/hello-world) service using [CDS](https://cap.cloud.sap/docs/cds/) and [cds.services](https://cap.cloud.sap/docs/node.js/api#services-api).",
+      "line": 2,
+      "selection": {
+        "start": {
+          "line": 1,
+          "character": 1
+        },
+        "end": {
+          "line": 4,
+          "character": 1
+        }
+      },
+      "title": "Hello World!"
+    },
+    {
+      "file": "bookshop/db/schema.cds",
+      "description": "### A Bookshop!\n\nIntroduces:\n- [Project Setup](https://cap.cloud.sap/docs/get-started/) and [Layouts](https://cap.cloud.sap/docs/get-started/projects)\n- [Domain Modeling](https://cap.cloud.sap/docs/guides/domain-models)\n- [Defining Services](https://cap.cloud.sap/docs/guides/providing-services)\n- [Generic Providers](https://cap.cloud.sap/docs/guides/generic-providers)\n- [Adding Custom Logic](https://cap.cloud.sap/docs/guides/service-impl)\n- [Using Databases](https://cap.cloud.sap/docs/guides/databases)\n",
+      "line": 1,
+      "selection": {
+        "start": {
+          "line": 1,
+          "character": 1
+        },
+        "end": {
+          "line": 32,
+          "character": 1
+        }
+      },
+      "title": "Bookshop"
+    },
+    {
+      "file": "common/index.cds",
+      "description": "### Extend and Reuse\n\nShowcases how to extend [@sap/cds/common](https://cap.cloud.sap/docs/cds/common) thereby covering:\n- Building [extension packages](https://cap.cloud.sap/docs/guides/domain-models#aspects-extensibility)\n- Providing [reuse packages](https://cap.cloud.sap/docs/get-started/projects#sharing-and-reusing-content)\n- [Verticalization](https://cap.cloud.sap/docs/cds/common#adapting-to-your-needs)\n- Using [Aspects](https://cap.cloud.sap/docs/cds/cdl#aspects)\n- Used in the [fiori app sample](#fiori)\n",
+      "line": 1,
+      "selection": {
+        "start": {
+          "line": 1,
+          "character": 1
+        },
+        "end": {
+          "line": 46,
+          "character": 1
+        }
+      },
+      "title": "Common"
+    },
+    {
+      "file": "orders/db/schema.cds",
+      "description": "### Orders - Compositions and Serving Documents\n\nA standalone orders management service, demonstrating:\n- Using [Compositions](https://cap.cloud.sap/docs/cds/cdl#compositions) in [Domain Models](https://cap.cloud.sap/docs/guides/domain-models), along with\n- [Serving deeply nested documents](https://cap.cloud.sap/docs/guides/generic-providers#serving-structured-data)\n",
+      "line": 1,
+      "selection": {
+        "start": {
+          "line": 1,
+          "character": 1
+        },
+        "end": {
+          "line": 27,
+          "character": 1
+        }
+      },
+      "title": "Orders"
+    },
+    {
+      "file": "reviews/db/schema.cds",
+      "description": "### Reviews - More Modularity\n\nShows how to implement a modular service to manage product reviews, including:\n- Consuming other services synchronously and asynchronously\n- Serving requests synchronously\n- Emitting events asynchronously\n- Grow as you go, with:\n- Mocking app services\n- Running service meshes\n- Late-cut Micro Services\n- As well as managed data, input validations, and authorization\n",
+      "line": 1,
+      "selection": {
+        "start": {
+          "line": 1,
+          "character": 1
+        },
+        "end": {
+          "line": 39,
+          "character": 1
+        }
+      },
+      "title": "Reviews"
+    },
+    {
+      "title": "Bookstore",
+      "description": "### Bookstore - Reuse and UI\n\n- A [composite app, reusing and combining](https://cap.cloud.sap/docs/guides/reuse-and-compose) these packages:\n  - [@capire/bookshop](bookshop)\n  - [@capire/reviews](reviews)\n  - [@capire/orders](orders)\n  - [@capire/common](common)\n- [The Vue.js app](bookshop/app/vue) imported from bookshop is served as well\n- [The Vue.js app](reviews/app/vue) imported from reviews is served as well\n- [The Fiori app](orders/app) imported from orders is served as well\n- [OpenAPI export + Swagger UI](https://cap.cloud.sap/docs/advanced/openapi)"
+    },
+    {
+      "file": "fiori/app/services.cds",
+      "description": "### Annotations for SAP Fiori Elements\n\nAdds an SAP Fiori elements application to bookstore, thereby introducing:\n- OData Annotations in `.cds` files\n- Support for Fiori Draft\n- Support for Value Helps\n- Serving SAP Fiori apps locally\n\nSee the [Serving Fiori UIs](https://cap.cloud.sap/docs/advanced/fiori) documentation for more information.",
+      "line": 1,
+      "selection": {
+        "start": {
+          "line": 1,
+          "character": 1
+        },
+        "end": {
+          "line": 13,
+          "character": 1
+        }
+      },
+      "title": "Fiori"
+    },
+    {
+      "file": "package.json",
+      "description": "### All-in-one Monorepo\n\nEach sample sub directory essentially is a standard npm package, some with standard npm dependencies to other samples. The root folder's [package.json](package.json) has local links to the sub folders, such that an `npm install` populates a local `node_modules` folder acts like a local npm registry to the individual sample packages.\n",
+      "selection": {
+        "start": {
+          "line": 8,
+          "character": 1
+        },
+        "end": {
+          "line": 16,
+          "character": 1
+        }
+      },
+      "title": "Packages"
+    }
+  ],
+  "isPrimary": true,
+  "description": "Overview of CAP Samples for Node.js"
+}

.vscode/extensions.json

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

.vscode/settings.json

@@ -1,8 +1,9 @@
 {
   "files.exclude": {
-    "**/node_modules": true,
-    "LICENSES": true,
-    ".reuse": true
+    ".reuse/**": true,
+    "**/.gitignore": true,
+    "**/.vscode": true,
+    "LICENSES/**": true
   },
   "debug.javascript.terminalOptions": {
     "skipFiles": [
@@ -13,5 +14,14 @@
       "**/odata-v4/okra/**"
     ]
   },
-  "jest.jestCommandLine": "npx jest"
+  "mochaExplorer.debuggerConfig": "Debug Mocha Tests",
+  "mochaExplorer.parallel": true,
+  "eslint.probe": [
+    "cds",
+    "csn",
+    "csv",
+    "csv (semicolon)",
+    "tsv",
+    "tab"
+  ]
 }

README.md

@@ -0,0 +1,75 @@
+# Welcome to cap/samples
+
+Find here a collection of samples for the [SAP Cloud Application Programming Model](https://cap.cloud.sap) organized in a simplistic [monorepo setup](samples.md#all-in-one-monorepo).
+
+[See **Overview** of contained samples](samples.md):
+
+![](etc/samples.drawio.svg)
+
+![](https://github.com/SAP-samples/cloud-cap-samples/workflows/CI/badge.svg)
+[![REUSE status](https://api.reuse.software/badge/github.com/SAP-samples/cloud-cap-samples)](https://api.reuse.software/info/github.com/SAP-samples/cloud-cap-samples)
+
+
+
+### Preliminaries
+
+1. Ensure you have the latest LTS version of Node.js installed (see [Getting Started](https://cap.cloud.sap/docs/get-started/))
+2. Install [**@sap/cds-dk**](https://cap.cloud.sap/docs/get-started/) globally:
+
+   ```sh
+   npm i -g @sap/cds-dk
+   ```
+
+3. _Optional:_ [Use Visual Studio Code](https://cap.cloud.sap/docs/get-started/tools#vscode)
+
+### Download
+
+If you've [Git](https://git-scm.com/downloads) installed, clone this repo as shown below, otherwise [download as ZIP file](archive/main.zip).
+
+```sh
+git clone https://github.com/sap-samples/cloud-cap-samples samples
+cd samples
+```
+
+### Setup
+
+In the samples folder run:
+
+```sh
+npm install
+```
+
+### Run
+
+With that you're ready to run the samples, for example:
+
+```sh
+cds watch bookshop
+```
+
+After that open this link in your browser: [http://localhost:4004](http://localhost:4004)
+
+When asked to log in, type `alice` as user and leave the password field blank, which is the [default user](https://cap.cloud.sap/docs/node.js/authentication#mocked).
+
+### Testing
+
+Run the provided tests with [_jest_](http://jestjs.io) or [_mocha_](http://mochajs.org), for example:
+
+```sh
+npx jest
+```
+> While mocha is a bit smaller and faster, jest runs tests in parallel and isolation, which allows to run all tests.
+
+## Code Tours
+
+Take one of the [guided tours](.tours) in VS Code through our CAP samples and learn which CAP features are showcased by the different parts of the repository. Just install the [CodeTour extension](https://marketplace.visualstudio.com/items?itemName=vsls-contrib.codetour) for VS Code. We'll add more code tours in the future. Stay tuned!
+
+## Get Support
+
+Check out the documentation at [https://cap.cloud.sap](https://cap.cloud.sap). <br>
+In case you've a question, find a bug, or otherwise need support, use our [community](https://answers.sap.com/tags/9f13aee1-834c-4105-8e43-ee442775e5ce) to get more visibility.
+
+
+## License
+
+Copyright (c) 2022 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under the Apache Software License, version 2.0 except as noted otherwise in the [LICENSE](LICENSE) file.

bookshop/.gitignore

@@ -0,0 +1,2 @@
+@cds-models
+@cds

bookshop/app/vue/app.js

@@ -19,7 +19,7 @@ const books = Vue.createApp ({
         search: ({target:{value:v}}) => books.fetch(v && '&$search='+v),
 
         async fetch (etc='') {
-            const {data} = await GET(`/ListOfBooks?$expand=genre($select=name),currency($select=symbol)${etc}`)
+            const {data} = await GET(`/ListOfBooks?$expand=genre,currency${etc}`)
             books.list = data.value
         },
 
@@ -77,7 +77,7 @@ function csrfToken (request) {
         document.csrfToken = token
         request.headers['x-csrf-token'] = document.csrfToken
         return request
-    }).catch(() => {
+    }).catch(_ => {
         document.csrfToken = null // set mark to not try again
         return request
     })

bookshop/app/vue/index.html

@@ -3,7 +3,7 @@
 
 <head>
     <title> Capire Books </title>
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/primitive-ui/dist/css/main.css">
+    <link rel="stylesheet" href="https://unpkg.com/primitive-ui/dist/css/main.css">
     <script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/vue@3/dist/vue.global.prod.js"></script>
     <style>

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

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

@@ -1,5 +1,5 @@
-ID_texts,ID,locale,title,descr
-d2a65a27-9f2a-480f-bc38-84ee8ec5c13e,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."
-8c42c706-a979-41cf-9ffe-91e6cf1383a0,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."
-9e1c4c81-dc90-4600-85b1-e9dd4bf12ce0,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"
-9be0524b-4cb9-4fc1-9dc2-d65b1c13cf53,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,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."

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

@@ -1,43 +1,16 @@
 ID,parent_ID,name
-10aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,,Fiction
-11aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,10aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Drama
-12aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,10aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Poetry
-13aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,10aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Fantasy
-131aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,13aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Fairy Tale
-132aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,13aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Epic Fantasy
-133aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,13aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,High Fantasy
-134aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,13aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Gothic
-14aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,10aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Science Fiction
-141aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,14aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Utopian and Dystopian
-1411aaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,141aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Utopian
-1412aaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,141aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Dystopian
-14121aaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,1412aaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Cyberpunk
-141211aa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,14121aaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Steampunk
-142aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,14aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Space Opera
-143aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,14aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Time Travel
-144aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,14aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Tech Noir
-15aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,10aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Romance
-151aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,15aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Contemporary Romance
-152aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,15aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Historical Romance
-153aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,15aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Romantic Suspense
-16aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,10aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Mystery
-161aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,16aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Crime
-1611aaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,161aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Thriller
-16111aaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,1611aaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Police Procedural
-16112aaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,1611aaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Legal Thriller
-16113aaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,1611aaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Medical Thriller
-16114aaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,1611aaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Spy Thriller
-1612aaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,161aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Detective
-1613aaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,161aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Suspense
-162aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,16aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Noir
-1621aaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,162aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Nordic Noir
-1622aaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,162aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Tart Noir
-163aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,16aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Cozy Mystery
-17aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,10aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Adventure
-18aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,10aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Short Story
-19aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,10aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Graphic Novel
-20aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,,Non-Fiction
-21aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,20aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Biography
-22aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,21aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Autobiography
-23aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,20aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Essay
-24aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,20aaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,Speech
+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

bookshop/db/init.js

@@ -1,5 +1,3 @@
-const cds = require('@sap/cds')
-
 /**
  * In order to keep basic bookshop sample as simple as possible, we don't add
  * reuse dependencies. This db/init.js ensures we still have a minimum set of
@@ -8,7 +6,7 @@ const cds = require('@sap/cds')
 
 // NOTE: We use cds.on('served') to delay the UPSERTs after the db init
 // to run after all INSERTs from .csv files happened.
-module.exports = cds.on('served', ()=>
+cds.on('served', ()=> cds.run(
   UPSERT.into ('sap.common.Currencies') .columns (
     [ 'code', 'symbol', 'name' ]
   ) .rows (
@@ -18,4 +16,4 @@ module.exports = cds.on('served', ()=>
     [ 'ILS', '₪', 'Shekel' ],
     [ 'JPY', '¥', 'Yen' ],
   )
-)
+))

bookshop/db/schema.cds

@@ -8,7 +8,7 @@ entity Books : managed {
   author   : Association to Authors @mandatory;
   genre    : Association to Genres;
   stock    : Integer;
-  price    : Price;
+  price    : Decimal;
   currency : Currency;
   image    : LargeBinary @Core.MediaType: 'image/png';
 }
@@ -25,14 +25,7 @@ entity Authors : managed {
 
 /** Hierarchically organized Code List for Genres */
 entity Genres : sap.common.CodeList {
-  key ID   : UUID;
+  key ID   : Integer;
   parent   : Association to Genres;
   children : Composition of many Genres on children.parent = $self;
 }
-
-type Price : Decimal(9,2);
-
-
-// ------------------------------------------------------------------
-// temporary workaround for reuse in fiori sample and hana deployment
-annotate Books with @fiori.draft.enabled;

bookshop/index.js

@@ -0,0 +1 @@
+export { CatalogService } from './srv/cat-service'

bookshop/jsconfig.json

@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "module": "NodeNext",
+    "moduleResolution": "nodenext",
+    "paths": {
+      "#cds/*": [
+        "./@cds/*"
+      ]
+    }
+  }
+}

bookshop/package.json

@@ -2,22 +2,29 @@
   "name": "@capire/bookshop",
   "version": "1.0.0",
   "description": "A simple self-contained bookshop service.",
+  "type": "module",
   "files": [
     "app",
     "srv",
     "db",
-    "index.cds"
+    "index.cds",
+    "index.js"
   ],
   "devDependencies": {
-    "@cap-js/sqlite": "*"
+    "@cap-js/sqlite": "*",
+    "@cap-js/cds-typer": ">=0.1"
   },
   "dependencies": {
-    "@sap/cds": ">=7",
-    "express": "^4.17.1"
+    "@sap/cds": "^7",
+    "express": "^4.17.1",
+    "passport": ">=0.4.1"
   },
   "scripts": {
     "genres": "cds serve test/genres.cds",
     "start": "cds-serve",
     "watch": "cds watch"
+  },
+  "imports": {
+    "#cds/*": "./@cds/*/index.js"
   }
 }

bookshop/srv/access-control.cds

@@ -1,2 +0,0 @@
-using { AdminService } from './admin-service';
-annotate AdminService with @requires:'admin';

bookshop/srv/admin-service.cds

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

bookshop/srv/admin-service.js

@@ -1,14 +1,13 @@
-const cds = require('@sap/cds')
+import cds from '@sap/cds'
 
-module.exports = class AdminService extends cds.ApplicationService { init(){
-  this.before (['NEW','CREATE'],'Authors', genid)
-  this.before (['NEW','CREATE'],'Books', genid)
+export class AdminService extends cds.ApplicationService { init(){
+  this.before ('NEW','Authors', genid)
+  this.before ('NEW','Books', genid)
   return super.init()
 }}
 
 /** Generate primary keys for target entity in request */
 async function genid (req) {
-  if (req.data.ID) return
   const {id} = await SELECT.one.from(req.target).columns('max(ID) as id')
-  req.data.ID = id + 4 // Note: that is not safe! ok for this sample only.
+  req.data.ID = id - id % 100 + 100 + 1
 }

bookshop/srv/cat-service.js

@@ -1,13 +1,13 @@
-const cds = require('@sap/cds')
+import cds from '@sap/cds'
 
-class CatalogService extends cds.ApplicationService { init() {
+export class CatalogService extends cds.ApplicationService { init() {
 
   const { Books } = cds.entities('sap.capire.bookshop')
   const { ListOfBooks } = this.entities
 
   // Add some discount for overstocked books
-  this.after('each', ListOfBooks, book => {
-    if (book.stock > 111) book.title += ` -- 11% discount!`
+  this.after('READ', ListOfBooks, each => {
+    if (each.stock > 111) each.title += ` -- 11% discount!`
   })
 
   // Reduce stock of ordered books if available stock suffices
@@ -34,5 +34,3 @@ class CatalogService extends cds.ApplicationService { init() {
   // Delegate requests to the underlying generic service
   return super.init()
 }}
-
-module.exports = CatalogService

bookshop/srv/user-service.js

@@ -1,5 +1,5 @@
-const cds = require('@sap/cds')
-module.exports = class UserService extends cds.Service { init(){
+import cds from '@sap/cds'
+export class UserService extends cds.Service { init(){
   this.on('READ', 'me', ({ tenant, user, locale }) => ({ id: user.id, locale, tenant }))
   this.on('login', (req) => {
     if (req.user._is_anonymous)

bookshop/test/genres.http

@@ -3,15 +3,15 @@
 #   Genres
 #
 
-GET http://localhost:4004/odata/v4/test/Genres?
+GET http://localhost:4004/test/Genres?
 ###
 
-GET http://localhost:4004/odata/v4/test/Genres?
+GET http://localhost:4004/test/Genres?
 &$filter=parent_ID eq null&$select=name
 &$expand=children($select=name)
 ###
 
-POST http://localhost:4004/odata/v4/test/Genres?
+POST http://localhost:4004/test/Genres?
 Content-Type: application/json
 
 { "ID":100, "name":"Some Sample Genres...", "children":[
@@ -26,13 +26,13 @@ Content-Type: application/json
 ]}
 ###
 
-GET http://localhost:4004/odata/v4/test/Genres(100)?
+GET http://localhost:4004/test/Genres(100)?
 # &$expand=children
 # &$expand=children($expand=children($expand=children($expand=children)))
 ###
 
-DELETE http://localhost:4004/odata/v4/test/Genres(103)
+DELETE http://localhost:4004/test/Genres(103)
 ###
 
-DELETE http://localhost:4004/odata/v4/test/Genres(100)
+DELETE http://localhost:4004/test/Genres(100)
 ###

bookstore/_i18n/i18n_de.properties

@@ -1,12 +0,0 @@
-Books = Bücher
-Book = Buch
-Title = Titel
-Description = Beschreibung
-Stock = Bestand
-Image = Bild
-Price = Preis
-Currency = Währung
-
-Authors = Autoren
-Author = Autor
-AuthorID = ID des Autors

bookstore/_i18n/i18n_en.properties

@@ -1,21 +0,0 @@
-Books = Books
-Book = Book
-ID = ID
-Title = Title
-Description = Description
-Stock = Stock
-Image = Image
-Price = Price
-Currency = Currency
-
-Authors = Authors
-Author = Author
-AuthorID = Author''s ID
-Name = Name
-DateOfBirth = Date of Birth
-DateOfDeath = Date of Death
-PlaceOfBirth = Place of Birth
-PlaceOfDeath = Place of Death
-
-Genres = Genres
-Genre = Genre

bookstore/_i18n/i18n_fr.properties

@@ -1,20 +0,0 @@
-Books = Livres
-Book = Livre
-Title = Titre
-Description = Description
-Stock = Action
-Image = Image
-Price = Prix
-Currency = Devise
-
-Authors = Auteurs
-Author = Auteur
-AuthorID = ID de l''auteur
-Name = Nom
-DateOfBirth = Date de naissance
-DateOfDeath = Date de décès
-PlaceOfBirth = Lieu de naissance
-PlaceOfDeath = Lieu de décès
-
-Genres = Genre
-Genre = Genre

bookstore/_i18n/messages_de.properties

@@ -1,34 +0,0 @@
-400 = Ungültige Anfrage
-401 = Nicht autorisiert
-403 = Verboten
-404 = Nicht gefunden
-405 = Methode nicht zulässig
-406 = Nicht akzeptabel
-407 = Proxy-Authentifizierung erforderlich
-408 = Anfrage-Timeout
-409 = Konflikt
-410 = Weg
-411 = Erforderliche Länge
-412 = Vorbedingung fehlgeschlagen
-413 = Nutzlast zu groß
-414 = URI zu lang
-415 = Nicht unterstützter Medientyp
-416 = Bereich nicht erfüllbar
-417 = Erwartung fehlgeschlagen
-422 = Nicht verarbeitbarer Inhalt
-424 = Fehlgeschlagene Abhängigkeit
-428 = Vorbedingung erforderlich
-429 = Zu viele Anfragen
-431 = Anfrage-Headerfelder zu groß
-451 = Aus rechtlichen Gründen nicht verfügbar
-500 = Interner Serverfehler
-501 = Der Server unterstützt die zur Erfüllung der Anfrage erforderliche Funktionalität nicht
-502 = Ungültiges Gateway
-503 = Dienst nicht verfügbar
-504 = Gateway-Timeout
-
-ASSERT_RANGE = Wert {0} liegt nicht im angegebenen Bereich [{1}, {2}]
-ASSERT_FORMAT = Wert "{0}" liegt nicht im angegebenen Format "{1}"
-ASSERT_ARRAY = Wert muss ein Array sein
-ASSERT_ENUM = Wert {0} ist gemäß Enumerationsdeklaration {{1}} ungültig
-ASSERT_NOT_NULL = Wert ist erforderlich

bookstore/_i18n/messages_en.properties

@@ -1,34 +0,0 @@
-400 = Bad Request
-401 = Unauthorized
-403 = Forbidden
-404 = Not Found
-405 = Method Not Allowed
-406 = Not Acceptable
-407 = Proxy Authentication Required
-408 = Request Timeout
-409 = Conflict
-410 = Gone
-411 = Length Required
-412 = Precondition Failed
-413 = Payload Too Large
-414 = URI Too Long
-415 = Unsupported Media Type
-416 = Range Not Satisfiable
-417 = Expectation Failed
-422 = Unprocessable Content
-424 = Failed Dependency
-428 = Precondition Required
-429 = Too Many Requests
-431 = Request Header Fields Too Large
-451 = Unavailable For Legal Reasons
-500 = Internal Server Error
-501 = The server does not support the functionality required to fulfill the request
-502 = Bad Gateway
-503 = Service Unavailable
-504 = Gateway Timeout
-
-ASSERT_RANGE = Value {0} is not in specified range [{1}, {2}]
-ASSERT_FORMAT = Value "{0}" is not in specified format "{1}"
-ASSERT_ARRAY = Value must be an array
-ASSERT_ENUM = Value {0} is invalid according to enum declaration {{1}}
-ASSERT_NOT_NULL = Value is required

bookstore/_i18n/messages_fr.properties

@@ -1,34 +0,0 @@
-400 = Requête incorrecte
-401 = Non autorisée
-403 = Interdite
-404 = Introuvable
-405 = Méthode non autorisée
-406 = Non acceptable
-407 = Authentification proxy requise
-408 = Délai d''expiration de la requête
-409 = Conflit
-410 = Disparu
-411 = Longueur requise
-412 = Échec de la condition préalable
-413 = Charge utile trop importante
-414 = URI trop longue
-415 = Type de média non pris en charge
-416 = Plage non satisfaisante
-417 = Échec de l''attente
-422 = Contenu non traitable
-424 = Dépendance échouée
-428 = Condition préalable requise
-429 = Trop de requêtes
-431 = Champs d''en-tête de requête trop importants
-451 = Indisponible pour des raisons juridiques
-500 = Erreur interne du serveur
-501 = Le serveur ne prend pas en charge la fonctionnalité requise pour répondre à la requête
-502 = Passerelle incorrecte
-503 = Service indisponible
-504 = Délai d''attente de la passerelle
-
-ASSERT_RANGE = La valeur {0} n''est pas dans la plage spécifiée [{1}, {2}]
-ASSERT_FORMAT = La valeur "{0}" n''est pas au format spécifié "{1}"
-ASSERT_ARRAY = La valeur doit être un tableau
-ASSERT_ENUM = La valeur {0} n''est pas valide selon la déclaration d''énumération {{1}}
-ASSERT_NOT_NULL = La valeur est obligatoire

bookstore/app/routes.js

@@ -1,6 +0,0 @@
-// Add routes to UIs from imported packages
-module.exports = (app) => {
-  app.serve ('/bookshop') .from ('@capire/bookshop','app/vue')
-  app.serve ('/reviews') .from ('@capire/reviews','app/vue')
-  app.serve ('/orders') .from('@capire/orders','app/orders')
-}

bookstore/cds-plugin.js

@@ -1 +0,0 @@
-require('./srv/server')

bookstore/package.json

@@ -7,12 +7,8 @@
     "@capire/orders": "*",
     "@capire/common": "*",
     "@capire/data-viewer": "*",
-    "@sap-cloud-sdk/http-client": "^4",
-    "@sap-cloud-sdk/resilience": "^4",
     "@sap/cds": ">=5",
-    "express": "^4.17.1",
-    "@cap-js/hana": "^1",
-    "@sap/cds-mtxs": "^2"
+    "express": "^4.17.1"
   },
   "cds": {
     "requires": {
@@ -24,15 +20,15 @@
         "kind": "odata",
         "model": "@capire/orders"
       },
-      "messaging": true,
-      "db": true,
-      "multitenancy": true,
-      "auth": "xsuaa"
-
+      "messaging": {
+        "[development]": { "kind": "file-based-messaging" },
+        "[hybrid]": { "kind": "enterprise-messaging-shared" },
+        "[production]": { "kind": "enterprise-messaging" }
+      },
+      "db": {
+        "kind": "sql"
+      }
     },
     "log": { "service": true }
-  },
-  "scripts": {
-    "start": "cds-serve"
   }
 }

bookstore/server.js

@@ -0,0 +1,15 @@
+const cds = require ('@sap/cds')
+
+// Add mashup logic
+cds.once('served', require('./srv/mashup'))
+
+// Add routes to UIs from imported packages
+cds.once('bootstrap',(app)=>{
+  app.serve ('/bookshop') .from ('@capire/bookshop','app/vue')
+  app.serve ('/reviews') .from ('@capire/reviews','app/vue')
+  app.serve ('/orders') .from('@capire/orders','app/orders')
+  app.serve ('/data') .from('@capire/data-viewer','app/viewer')
+})
+
+// Add Swagger UI
+require('./srv/swagger-ui')

bookstore/srv/mashup.js

@@ -1,11 +1,10 @@
-const cds = require ('@sap/cds')
-
-// Add routes to UIs from imported packages
-if (!cds.env.production) cds.once ('bootstrap', require('../app/routes'))
-
+////////////////////////////////////////////////////////////////////////////
+//
 //    Mashing up bookshop services with required services...
-cds.once ('served', async ()=>{ // called by server.js
+//
+module.exports = async()=>{ // called by server.js
 
+  const cds = require('@sap/cds')
   const CatalogService = await cds.connect.to ('CatalogService')
   const ReviewsService = await cds.connect.to ('ReviewsService')
   const OrdersService = await cds.connect.to ('OrdersService')
@@ -19,7 +18,7 @@ cds.once ('served', async ()=>{ // called by server.js
   // Note: prepend is neccessary to intercept generic default handler
   //
   CatalogService.prepend (srv => srv.on ('READ', 'Books/reviews', (req) => {
-    console.debug ('> delegating request to ReviewsService') // eslint-disable-line no-console
+    console.debug ('> delegating request to ReviewsService')
     const [id] = req.params, { columns, limit } = req.query.SELECT
     return ReviewsService.read ('Reviews',columns).limit(limit).where({subject:String(id)})
   }))
@@ -29,8 +28,8 @@ cds.once ('served', async ()=>{ // called by server.js
   //
   CatalogService.on ('OrderedBook', async (msg) => {
     const { book, quantity, buyer } = msg.data
-    const { title, price } = await db.read (Books, book, b => { b.title, b.price })
-    return OrdersService.create ('OrdersNoDraft').entries({
+    const { title, price } = await db.tx(msg).read (Books, book, b => { b.title, b.price })
+    return OrdersService.tx(msg).create ('Orders').entries({
       OrderNo: 'Order at '+ (new Date).toLocaleString(),
       Items: [{ product:{ID:`${book}`}, title, price, quantity }],
       buyer, createdBy: buyer
@@ -41,7 +40,7 @@ cds.once ('served', async ()=>{ // called by server.js
   // Update Books' average ratings when ReviewsService signals updated reviews
   //
   ReviewsService.on ('reviewed', (msg) => {
-    console.debug ('> received:', msg.event, msg.data) // eslint-disable-line no-console
+    console.debug ('> received:', msg.event, msg.data)
     const { subject, count, rating } = msg.data
     return UPDATE(Books,subject).with({ numberOfReviews:count, rating })
   })
@@ -50,10 +49,10 @@ cds.once ('served', async ()=>{ // called by server.js
   // Reduce stock of ordered books for orders are created from Orders admin UI
   //
   OrdersService.on ('OrderChanged', (msg) => {
-    console.debug ('> received:', msg.event, msg.data) // eslint-disable-line no-console
+    console.debug ('> received:', msg.event, msg.data)
     const { product, deltaQuantity } = msg.data
     return UPDATE (Books) .where ('ID =', product)
     .and ('stock >=', deltaQuantity)
     .set ('stock -=', deltaQuantity)
   })
-})
+}

bookstore/srv/swagger-ui.js

@@ -0,0 +1,10 @@
+
+// -----------------------------------------------------------------------
+// Adding Swagger UI - see https://cap.cloud.sap/docs/advanced/openapi
+const cds = require ('@sap/cds')
+try {
+  const cds_swagger = require ('cds-swagger-ui-express')
+  cds.once ('bootstrap', app => app.use (cds_swagger()) )
+} catch (err) {
+  if (err.code !== 'MODULE_NOT_FOUND')  throw err
+}

bookstore/test/requests.http

@@ -12,12 +12,11 @@
 #
 
 GET {{reviews-service}}/Reviews
-Authorization: Basic me:
 
 ###
 
 POST {{reviews-service}}/Reviews
-Authorization: Basic me:
+Authorization: Basic {{$processEnv USER}}:
 Content-Type: application/json
 
 {"subject":"201", "title":"boo", "rating":3 }
@@ -51,23 +50,23 @@ Accept-Language: de
 #
 @newOrderID = e939604c-ab83-4d4f-bdb6-95fe30b3773e
 
-GET {{bookshop}}/odata/v4/orders/Orders
+GET {{bookshop}}/orders/Orders
 
 ### Create order, still inactive
-POST {{bookshop}}/odata/v4/orders/Orders
+POST {{bookshop}}/orders/Orders
 Content-Type: application/json
 
 {"ID": "{{newOrderID}}"}
 
 ### Get inactive order.  We have to specify `IsActiveEntity`.
-GET {{bookshop}}/odata/v4/orders/Orders(ID={{newOrderID}},IsActiveEntity=false)
+GET {{bookshop}}/orders/Orders(ID={{newOrderID}},IsActiveEntity=false)
 
 ### Activate order using `.../<servicename>.draftActivate`
-POST {{bookshop}}/odata/v4/orders/Orders(ID={{newOrderID}},IsActiveEntity=false)/OrdersService.draftActivate
+POST {{bookshop}}/orders/Orders(ID={{newOrderID}},IsActiveEntity=false)/OrdersService.draftActivate
 Content-Type: application/json
 
 ### Get active order
-GET {{bookshop}}/odata/v4/orders/Orders(ID={{newOrderID}},IsActiveEntity=true)
+GET {{bookshop}}/orders/Orders(ID={{newOrderID}},IsActiveEntity=true)
 
 ### Create author
 POST {{bookshop}}/admin/Authors

common/cds-plugin.js

@@ -1 +0,0 @@
-// dummy to auto-load the plugin

common/package.json

@@ -4,12 +4,5 @@
   "version": "1.0.0",
   "dependencies": {
     "@sap/cds": "*"
-  },
-  "cds": {
-    "requires": {
-      "@capire/common/data": {
-        "model": "@capire/common"
-      }
-    }
   }
 }

data-viewer/srv/data-service.js

@@ -18,7 +18,7 @@ class DataService extends cds.ApplicationService { init(){
       .sort((e1, e2) => e1.name.localeCompare(e2.name))
       .map(e => {
         const columns = Object.entries(e.elements)
-          .filter(([,el]) => !(el instanceof cds.Association)) // exclude assocs+compositions
+          .filter(([_, el]) => !(el instanceof cds.Association)) // exclude assocs+compositions
           .map(([name, el]) => { return { name, type: el.type, isKey:!!el.key }})
         return { name: e.name, columns }
       })
@@ -34,8 +34,7 @@ class DataService extends cds.ApplicationService { init(){
     query.SELECT.limit = req.query.SELECT.limit  // forward $skip / $top
 
     const dataSource = findDataSource(dataSourceName, entityName)
-    let res = await dataSource.run(query)
-    if (!Array.isArray(res))  res = [res] // singleton result
+    const res = await dataSource.run(query)
     return res.map((line) => {
       const record = Object.entries(line).map(([column, data]) => ({ column, data }))
       return {
@@ -50,7 +49,6 @@ class DataService extends cds.ApplicationService { init(){
 
 module.exports = { DataService }
 
-/** @returns {cds.Service} */
 function findDataSource(dataSourceName, entityName) {
   for (let srv of Object.values(cds.services)) { // all connected services
     if (!srv.name)  continue // FIXME intermediate/pending in cds.services ?

db

@@ -1 +0,0 @@
-shared-db/db

eslint.config.mjs

@@ -1,20 +0,0 @@
-import cds from '@sap/cds/eslint.config.mjs'
-export default [ ...cds.recommended ]
-
-//
-// The above is the recommended minimalistic eslint config, just using
-// recommended defaults provided by cds. Alternatively, go for enhanced
-// project-specific options, but only if really required, like this:
-//
-// export default [ ...cds.recommended, {
-//   rules: {
-//     'complexity': [ 'warn', 66 ],
-//     'require-await': 'warn',
-//     'no-await-in-loop': 'warn',
-//   },
-// }, {
-//   ignores: [
-//     '**/webapp/**'
-//   ]
-// }]
-//

etc/data-viewer/cds-plugin.js

@@ -1,4 +0,0 @@
-const cds = require("@sap/cds")
-cds.on ('served', ()=> {
-  cds.app.serve ('/data') .from ('@capire/data-viewer','app/viewer')
-})

event-mesh.json

@@ -1,29 +0,0 @@
-{
-  "version": "1.1.0",
-  "options": {
-    "management": true,
-    "messagingrest": true,
-    "messaging": true
-  },
-  "rules": {
-    "topicRules": {
-      "publishFilter": [
-        "*"
-      ],
-      "subscribeFilter": [
-        "*"
-      ]
-    },
-    "queueRules": {
-      "publishFilter": [
-        "*"
-      ],
-      "subscribeFilter": [
-        "*"
-      ]
-    }
-  },
-  "authorities": [
-    "$ACCEPT_GRANTED_AUTHORITIES"
-  ]
-}

fiori/.env

@@ -1 +0,0 @@
-cds.requires.[hybrid].messaging.kind=file-based-messaging

fiori/app/_i18n/i18n.properties

@@ -0,0 +1,43 @@
+Books = Books
+Book = Book
+ID = ID
+Title = Title
+Author = Author
+AuthorID = Author ID
+Stock = Stock
+Name = Name
+Description = Description
+Image = Image
+AuthorName = Author's Name
+DateOfBirth = Date of Birth
+DateOfDeath = Date of Death
+PlaceOfBirth = Place of Birth
+PlaceOfDeath = Place of Death
+Age = Age
+Lifetime = Lifetime
+Authors = Authors
+
+Order = Order
+Orders = Orders
+OrderNo = Order Number
+OrderItems = Order Items
+Customer = Customer
+Product = Product
+ProductID = Product ID
+ProductTitle = Product Title
+UnitPrice = Unit Price
+Quantity = Quantity
+
+Price = Price
+Currency = Currency
+Date = Date
+Rating = Rating
+NumberOfReviews = Number of Reviews
+
+Genre = Genre
+Genres = Genres
+SubGenres = Sub Genres
+
+NumCode = Numeric Code
+MinorUnit = Minor Unit
+Exponent = Exponent

fiori/app/_i18n/i18n_de.properties

@@ -1,5 +1,14 @@
+Books = Bücher
+Book = Buch
+ID = ID
+Title = Titel
+Authors = Autoren
+Author = Autor
+AuthorID = ID des Autors
 AuthorName = Name des Autors
 Age = Alter
-rder = Bestellung
+Name = Name
+Stock = Bestand
+Order = Bestellung
 Orders = Bestellungen
 Price = Preis

fiori/app/_i18n/i18n_en.properties

@@ -1,8 +0,0 @@
-Age = Age
-Lifetime = Lifetime
-
-SubGenres = Subgenre
-
-NumCode = Numeric Code
-MinorUnit = Minor Unit
-Exponent = Exponent

fiori/app/admin-authors/webapp/i18n/i18n.properties

@@ -2,10 +2,10 @@
 # __ldi.translation.uuid=c3431418-9caf-11e8-98d0-529269fb1459
 
 # JCI app descriptor contains lower case TITLE
-appTitle=Manage Authors
+appTitle=Bookshop Authors
 
 # JCI app descriptor contains lower case DESCRIPTION
-appSubTitle=CAP Sample Application
+appSubTitle=Bookshop Authors
 
 # JCI app descriptor contains lower case DESCRIPTION
 appDescription=Bookshop Authors

fiori/app/admin-authors/webapp/manifest.json

@@ -35,7 +35,7 @@
             "additionalParameters": "ignored"
           },
           "semanticObject": "Authors",
-          "action": "manage",
+          "action": "display",
           "title": "{{appTitle}}",
           "info": "{{appInfo}}",
           "subTitle": "{{appSubTitle}}",

fiori/app/admin-books/fiori-service.cds

@@ -1,8 +1,6 @@
 using { AdminService } from '@capire/bookstore';
 using from '../common'; // to help UI linter get the complete annotations
 
-
-
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Books Object Page
@@ -42,48 +40,7 @@ annotate AdminService.Books with @(
 	}
 );
 
-////////////////////////////////////////////////////////////////////////////
-//
-//	Value Help for Tree Table
-//
-annotate AdminService.Books with {
-    genre @(Common: {
-        Label    : 'Genre',
-        ValueList: {
-            CollectionPath              : 'Genres',
-            Parameters                  : [
-            {
-                $Type            : 'Common.ValueListParameterDisplayOnly',
-                ValueListProperty: 'name',
-            },
-            {
-                $Type            : 'Common.ValueListParameterInOut',
-                LocalDataProperty: genre_ID,
-                ValueListProperty: 'ID',
-            }
-            ],
-            PresentationVariantQualifier: 'VH',
-        }
-    });
-}
 
-annotate AdminService.Genres with @UI: {
-    PresentationVariant #VH: {
-        $Type                      : 'UI.PresentationVariantType',
-        Visualizations             : ['@UI.LineItem'],
-        RecursiveHierarchyQualifier: 'GenreHierarchy'
-    },
-    LineItem               : [{
-        $Type: 'UI.DataField',
-        Value: name,
-        Label :'{i18n>Name}'
-    }],
-};
-
-// Hide ID because of the ValueHelp
-annotate AdminService.Genres with {
-  ID @UI.Hidden;
-};
 
 ////////////////////////////////////////////////////////////
 //
@@ -125,3 +82,5 @@ extend service AdminService {
 // Workaround for Fiori popup for asking user to enter a new UUID on Create
 annotate AdminService.Books with { ID @Core.Computed; }
 
+// Show Genre as drop down, not a dialog
+annotate AdminService.Books with { genre @Common.ValueListWithFixedValues; }

fiori/app/admin-books/webapp/i18n/i18n.properties

@@ -2,7 +2,7 @@
 # __ldi.translation.uuid=c3431418-9caf-11e8-98d0-529269fb1459
 
 # JCI app descriptor contains lower case TITLE
-appTitle=Manage Books
+appTitle=Bookshop Sample
 
 # JCI app descriptor contains lower case DESCRIPTION
 appSubTitle=CAP Sample Application

fiori/app/admin-books/webapp/manifest.json

@@ -19,22 +19,6 @@
             "id": "ui5template.basicSAPUI5ApplicationProject",
             "-id": "ui5template.smartTemplate",
             "-version": "1.40.12"
-        },
-        "crossNavigation": {
-            "inbounds": {
-                "intent1": {
-                        "signature": {
-                        "parameters": {},
-                        "additionalParameters": "allowed"
-                    },
-                    "semanticObject": "Books",
-                    "action": "manage",
-                    "title": "{{appTitle}}",
-                    "info": "{{appInfo}}",
-                    "subTitle": "{{appSubTitle}}",
-                    "icon": "sap-icon://course-book"
-                }
-            }
         }
     },
     "sap.ui5": {

fiori/app/appconfig/fioriSandboxConfig.json

@@ -3,6 +3,7 @@
     "LaunchPage": {
       "adapter": {
         "config": {
+          "catalogs": [],
           "groups": [
             {
               "id": "Bookshop",
@@ -23,7 +24,7 @@
                   "id": "BrowseGenres",
                   "tileType": "sap.ushell.ui.tile.StaticTile",
                   "properties": {
-                    "title": "Browse Genres",
+                    "title": "Browse Genres (OData v2)",
                     "targetURL": "#Genres-display"
                   }
                 }
@@ -49,7 +50,7 @@
                   "tileType": "sap.ushell.ui.tile.StaticTile",
                   "properties": {
                     "title": "Manage Authors",
-                    "targetURL": "#Authors-manage"
+                    "targetURL": "#Authors-display"
                   }
                 },
                 {
@@ -98,7 +99,7 @@
             },
             "BrowseAuthors": {
               "semanticObject": "Authors",
-              "action": "manage",
+              "action": "display",
               "title": "Browse Authors",
               "signature": {
                 "parameters": {

fiori/app/browse/fiori-service.cds

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

fiori/app/browse/webapp/i18n/i18n.properties

@@ -2,7 +2,7 @@
 # __ldi.translation.uuid=c3431418-9caf-11e8-98d0-529269fb1459
 
 # JCI app descriptor contains lower case TITLE
-appTitle=Browse Books
+appTitle=Bookshop Sample
 
 # JCI app descriptor contains lower case DESCRIPTION
 appSubTitle=CAP Sample Application

fiori/app/common.cds

@@ -69,67 +69,6 @@ annotate my.Books with {
   image  @title: '{i18n>Image}';
 }
 
-////////////////////////////////////////////////////////////////////////////
-//
-//	Computed Fields for Tree Tables 
-//
-//  DISCLAIMER: The below are an alpha version implementation and will change in final release !!!
-//
-aspect Hierarchy {
-  LimitedDescendantCount : Integer64 = null;
-  DistanceFromRoot       : Integer64 = null;
-  DrillState             : String = null;
-  Matched                : Boolean = null;
-  MatchedDescendantCount : Integer64 = null;
-  LimitedRank            : Integer64 = null;
-}
-
-annotate Hierarchy with @Capabilities.FilterRestrictions.NonFilterableProperties: [
-  'LimitedDescendantCount',
-  'DistanceFromRoot',
-  'DrillState',
-  'Matched',
-  'MatchedDescendantCount',
-  'LimitedRank'
-];
-
-annotate Hierarchy with @Capabilities.SortRestrictions.NonSortableProperties: [
-  'LimitedDescendantCount',
-  'DistanceFromRoot',
-  'DrillState',
-  'Matched',
-  'MatchedDescendantCount',
-  'LimitedRank'
-];
-
-extend my.Genres with Hierarchy;
-
-////////////////////////////////////////////////////////////////////////////
-//
-//	Genres Tree Table Annotations
-//
-//  DISCLAIMER: The below are an alpha version implementation and will change in final release !!!
-//
-annotate my.Genres with @Aggregation.RecursiveHierarchy #GenreHierarchy: {
-  $Type                   : 'Aggregation.RecursiveHierarchyType',
-  NodeProperty            : ID, // identifies a node
-  ParentNavigationProperty: parent // navigates to a node's parent
-};
-
-annotate my.Genres with @Hierarchy.RecursiveHierarchy #GenreHierarchy: {
-  $Type                 : 'Hierarchy.RecursiveHierarchyType',
-  LimitedDescendantCount: LimitedDescendantCount,
-  DistanceFromRoot      : DistanceFromRoot,
-  DrillState            : DrillState,
-  Matched               : Matched,
-  MatchedDescendantCount: MatchedDescendantCount,
-  LimitedRank           : LimitedRank
-};
-
-annotate my.Genres with @(
- readonly,
- cds.search: {name}
-);
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Genres List
@@ -139,11 +78,19 @@ annotate my.Genres with @(
   UI                 : {
     SelectionFields : [name],
     LineItem        : [
-         { Value : name, Label : '{i18n>Name}' },
+      { Value: name },
+      {
+        Value : parent.name,
+        Label: 'Main Genre'
+      },
     ],
   }
 );
 
+annotate my.Genres with {
+  ID  @Common.Text : name  @Common.TextArrangement : #TextOnly;
+}
+
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Genre Details
@@ -155,7 +102,12 @@ annotate my.Genres with @(UI : {
     TypeNamePlural : '{i18n>Genres}',
     Title          : { Value: name },
     Description    : { Value: ID }
-  }
+  },
+  Facets         : [{
+    $Type  : 'UI.ReferenceFacet',
+    Label  : '{i18n>SubGenres}',
+    Target : 'children/@UI.LineItem'
+  }, ],
 });
 
 ////////////////////////////////////////////////////////////////////////////
@@ -163,6 +115,7 @@ annotate my.Genres with @(UI : {
 //	Genres Elements
 //
 annotate my.Genres with {
+  ID   @title: '{i18n>ID}';
   name @title: '{i18n>Genre}';
 }
 

fiori/app/fiori-apps.html

@@ -1,7 +1,7 @@
-<!doctype html>
+<!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" />
@@ -10,22 +10,21 @@
 	<script>
 		window["sap-ushell-config"] = {
 			defaultRenderer: "fiori2",
-			applications: {},
+			applications: {}
 		};
 	</script>
 
-	<script id="sap-ushell-bootstrap" src="https://ui5.sap.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-	<script id="sap-ui-bootstrap" src="https://ui5.sap.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_horizon"></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_horizon"
+			data-sap-ui-frameOptions="allow"
+	></script>
 	<script>
-		sap.ui.getCore().attachInit(() =>
-			sap.ushell.Container.createRenderer().placeAt("content")
-		);
+		sap.ui.getCore().attachInit(()=> sap.ushell.Container.createRenderer().placeAt("content"))
 	</script>
+
 </head>
-
-<body class="sapUiBody" id="content">
-</body>
-
+<body class="sapUiBody" id="content"></body>
 </html>

fiori/app/genres/fiori-service.cds

@@ -1,3 +1,8 @@
-/*
-All annotations needed for UI5 Tree Table View are located in '../common'
-*/
+using { sap.capire.bookshop } from '../../db/common';
+
+annotate bookshop.GenreHierarchy {
+  ID             @sap.hierarchy.node.for;
+  parent         @sap.hierarchy.parent.node.for;
+  hierarchyLevel @sap.hierarchy.level.for;
+  drillState     @sap.hierarchy.drill.state.for;
+}

fiori/app/genres/webapp/Component.js

@@ -1,3 +1,7 @@
-sap.ui.define(["sap/fe/core/AppComponent"], ac => ac.extend("genres.Component", {
-  metadata:{ manifest:'json' }
-}))
+sap.ui.define(["sap/suite/ui/generic/template/lib/AppComponent"], (AppComponent) =>
+  AppComponent.extend("genres.Component", {
+    metadata: {
+      manifest: "json",
+    },
+  })
+);

fiori/app/genres/webapp/i18n/i18n.properties

@@ -1,4 +1,4 @@
 #XTIT
-appTitle=Browse Genres
+appTitle=Genres
 #XTXT
-appDescription=Genres as Tree View
+appDescription=Browse Genres

fiori/app/genres/webapp/i18n/i18n_de.properties

@@ -1,2 +0,0 @@
-appTitle=Zeige Genres
-appDescription=Genres als Baumansicht

fiori/app/genres/webapp/manifest.json

@@ -3,107 +3,110 @@
   "sap.app": {
     "id": "genres",
     "type": "application",
-		"title": "{{appTitle}}",
-		"description": "{{appDescription}}",
+    "i18n": "i18n/i18n.properties",
     "applicationVersion": {
       "version": "1.0.0"
     },
-		"dataSources": {
-			"AdminService": {
-				"uri": "admin/",
-				"type": "OData",
-				"settings": {
-					"odataVersion": "4.0"
-				}
-			}
+    "title": "Browse Genres Hierarchy (OData v2)",
+    "description": "{{appDescription}}",
+    "tags": {
+      "keywords": []
     },
     "crossNavigation": {
       "inbounds": {
-				"Genres-display": {
-					"signature": {
-						"parameters": {},
-						"additionalParameters": "allowed"
+        "appShow": {
+          "title": "{{appTitle}}",
+          "semanticObject": "GenreHierarchy",
+          "action": "display",
+          "deviceTypes": {
+            "desktop": true,
+            "tablet": true,
+            "phone": true
           },
-					"semanticObject": "Genres",
-					"action": "display"
+          "icon": "sap-icon://settings",
+          "size": "1x1"
+        }
+      },
+      "outbounds": {}
+    },
+    "ach": "",
+    "resources": "resources.json",
+    "dataSources": {
+      "main": {
+        "uri": "/odata/v2/browse",
+        "type": "OData",
+        "settings": {
+          "annotations": ["localAnnotations"],
+          "localUri": "localService/metadata.xml"
+        }
+      },
+      "localAnnotations": {
+        "type": "ODataAnnotation",
+        "uri": "annotations/localAnnotations.xml",
+        "settings": {
+          "localUri": "annotations/localAnnotations.xml"
         }
       }
+    },
+    "offline": false,
+    "sourceTemplate": {
+      "id": "ui5template.smartTemplate",
+      "version": "1.40.12"
     }
   },
+  "sap.ui": {
+    "technology": "UI5",
+    "icons": {
+      "icon": "",
+      "favIcon": "",
+      "phone": "",
+      "phone@2": "",
+      "tablet": "",
+      "tablet@2": ""
+    },
+    "deviceTypes": {
+      "desktop": true,
+      "tablet": true,
+      "phone": true
+    },
+    "supportedThemes": ["sap_hcb", "sap_belize", "sap_belize_deep", "sap_fiori_3"]
+  },
   "sap.ui5": {
+    "resources": {
+      "js": [],
+      "css": []
+    },
     "dependencies": {
-			"minUI5Version": "1.122.0",
-			"libs": {
-				"sap.fe.templates": {}
-			}
+      "minUI5Version": "1.65.6",
+      "libs": {},
+      "components": {}
     },
     "models": {
       "i18n": {
         "type": "sap.ui.model.resource.ResourceModel",
         "uri": "i18n/i18n.properties"
       },
+      "@i18n": {
+        "type": "sap.ui.model.resource.ResourceModel",
+        "uri": "i18n/i18n.properties"
+      },
+      "json": {
+        "type": "sap.ui.model.json.JSONModel"
+      },
+      "i18n|sap.suite.ui.generic.template.ListReport|Genres": {
+        "type": "sap.ui.model.resource.ResourceModel",
+        "uri": "i18n/ListReport/Genres/i18n.properties"
+      },
       "": {
-				"dataSource": "AdminService",
+        "dataSource": "main",
+        "preload": true,
         "settings": {
-					"synchronizationMode": "None",
-					"operationMode": "Server",
-					"autoExpandSelect": true,
-					"earlyRequests": true,
-					"groupProperties": {
-						"default": {
-						  "submit": "Auto"
-						}
-					}
-				}
-			}
-		},
-		"routing": {
-			"routes": [
-				{
-					"pattern": ":?query:",
-					"name": "GenresList",
-					"target": "GenresList"
-				},
-				{
-					"pattern": "Genres({key}):?query:",
-					"name": "GenresDetails",
-					"target": "GenresDetails"
-				}
-			],
-			"targets": {
-				"GenresList": {
-					"type": "Component",
-					"id": "GenresList",
-					"name": "sap.fe.templates.ListReport",
-					"options": {
-						"settings": {
-							"contextPath": "/Genres",
-							"navigation": {
-								"Genres": {
-									"detail": {
-										"route": "GenresDetails"
-										}
-								}
-							},
-							"controlConfiguration": {
-                                "@com.sap.vocabularies.UI.v1.LineItem": {
-                                    "tableSettings": {
-                                        "hierarchyQualifier": "GenreHierarchy",
-                                        "type": "TreeTable"
-                                    }
-                                }
-                            }
-						}
-					}
-				},
-				"GenresDetails": {
-					"type": "Component",
-					"id": "GenresDetails",
-					"name": "sap.fe.templates.ObjectPage",
-					"options": {
-						"settings": {
-							"contextPath": "/Genres"
-						}
+          "useBatch": true,
+          "defaultBindingMode": "TwoWay",
+          "defaultCountMode": "Inline",
+          "refreshAfterChange": true,
+          "metadataUrlParams": {
+            "sap-value-list": "none"
           }
         }
       }
@@ -113,12 +116,40 @@
       "cozy": true
     }
   },
-	"sap.ui": {
-		"technology": "UI5",
-		"fullWidth": false
+  "sap.ui.generic.app": {
+    "_version": "1.3.0",
+    "settings": {
+      "forceGlobalRefresh": false,
+      "useColumnLayoutForSmartForm": false,
+      "showBasicSearch": false
+    },
+    "pages": {
+      "ListReport|Genres": {
+        "entitySet": "GenreHierarchy",
+        "component": {
+          "name": "sap.suite.ui.generic.template.ListReport",
+          "list": true,
+          "settings": {
+            "condensedTableLayout": true,
+            "smartVariantManagement": true,
+            "tableType": "TreeTable",
+            "enableTableFilterInPageVariant": true,
+            "dataLoadSettings": {
+              "loadDataOnAppLaunch": "always"
+            }
+          }
+        }
+      }
+    }
   },
   "sap.fiori": {
     "registrationIds": [],
     "archeType": "transactional"
+  },
+  "sap.platform.hcp": {
+    "uri": ""
+  },
+  "sap.platform.cf": {
+    "oAuthScopes": []
   }
 }

fiori/app/services.cds

@@ -5,6 +5,6 @@
 using from './admin-authors/fiori-service';
 using from './admin-books/fiori-service';
 using from './browse/fiori-service';
-
+using from './genres/fiori-service';
 using from './common';
 using from '@capire/bookstore/srv/mashup';

fiori/db/common.cds

@@ -0,0 +1,14 @@
+namespace sap.capire.bookshop;
+
+using { sap.capire.bookshop } from '@capire/bookstore/srv/mashup';
+
+entity GenreHierarchy : bookshop.Genres {
+  hierarchyLevel : Integer default 0;
+  drillState     : String default 'leaf';
+  parent         : Association to GenreHierarchy;
+  children       : Composition of many GenreHierarchy on children.parent = $self;
+}
+
+extend service CatalogService with {
+  @readonly entity GenreHierarchy as projection on bookshop.GenreHierarchy;
+}

fiori/db/data/sap.capire.bookshop-GenreHierarchy.csv

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

fiori/package.json

@@ -4,7 +4,9 @@
   "dependencies": {
     "@capire/bookstore": "*",
     "@sap/cds": ">=5",
-    "express": "^4.17.1"
+    "@cap-js-community/odata-v2-adapter": "^1",
+    "express": "^4.17.1",
+    "passport": ">=0.4.1"
   },
   "devDependencies": {
     "@cap-js/sqlite": "^1"
@@ -23,8 +25,20 @@
         "kind": "odata",
         "model": "@capire/orders"
       },
-      "messaging": true,
-      "db": true,
+      "messaging": {
+        "[production]": {
+          "kind": "enterprise-messaging"
+        },
+        "[development]": {
+          "kind": "file-based-messaging"
+        },
+        "[hybrid]": {
+          "kind": "enterprise-messaging-shared"
+        }
+      },
+      "db": {
+        "kind": "sql"
+      },
       "db-ext": {
         "[development]": {
           "model": "db/sqlite"
@@ -33,11 +47,9 @@
           "model": "db/hana"
         }
       }
-    }
     },
-  "sapux": [
-    "app/admin-authors",
-    "app/admin-books",
-    "app/browse"
-  ]
+    "hana": {
+      "deploy-format": "hdbtable"
+    }
+  }
 }

fiori/server.js

@@ -1,32 +1,8 @@
-const cds = require('@sap/cds/lib')
-if (cds.requires.db?.kind === 'sqlite') {
-  cds.on ('serving:AdminService', srv => srv.prepend(() => {
-    const {Genres} = srv.entities
-  // Register a simplistic handler for hierarchical queries
-    srv.on('READ', Genres, (req,next) => {
-      const q = req.query
-      // Expand query on a single row
-      if (q.SELECT.recurse?.where?.[0].ref[0] === 'Distance') {
-        q.SELECT.where[0] = 'parent_ID'
-      // Initial query
-      } else if (!q.SELECT.search && !is_count(q)) {
-        q.SELECT.where ??= [ 'parent_ID is null' ]
-      }
-      // Use scalar subselect for DrillState
-      q.SELECT.from.as = 'g'
-      q.SELECT.columns = q.SELECT.columns.map (c => {
-        if (c.ref == 'DrillState') return { xpr:[`
-          CASE WHEN ( SELECT count(1) from ${Genres} where parent_ID = g.ID ) > 0
-          THEN 'collapsed' ELSE 'leaf' END`
-        ], as: 'DrillState' }
-        else return c
-      })
-      // Suppress error message: Feature "recurse" queries not supported.
-      delete q.SELECT.__proto__.recurse
-      delete q.SELECT.recurse
-      return next()
-    })
-  }))
-}
+// install OData v2 adapter
+const cds = require("@sap/cds")
+const proxy = require('@cap-js-community/odata-v2-adapter')
+const opts = global.it ? { target:'auto' } : {}   // for tests, set 'auto' to detect port dynamically
+cds.on('bootstrap', app => app.use(proxy(opts)))  // install proxy
+// cds.log('cov2ap','silent') // suppress anoying log outpout, e.g. for `npm run mocha -- --reporter nyan`
 
-const is_count = q => q.SELECT.columns?.length === 1 && q.SELECT.columns[0].func === 'count'
+module.exports = require('@capire/bookstore/server.js')

hello/README.md

@@ -0,0 +1,15 @@
+# Hello World Getting Started Sample
+
+## Next Steps
+
+- To run the JavaScript implementation, open a new terminal and run `cds watch`.
+- To run the TypeScript implementation, open a new terminal and run `cds-ts watch`.
+
+Then call the service at: http://localhost:4004/say/hello(to='world')
+
+## Learn More
+
+Learn more about:
+
+- [Hello World!](https://cap.cloud.sap/docs/get-started/hello-world)
+- [Using TypeScript](https://cap.cloud.sap/docs/node.js/typescript)

hello/package.json

@@ -0,0 +1,42 @@
+{
+  "name": "@capire/hello-world",
+  "version": "1.0.0",
+  "scripts": {
+    "test": "npx jest --silent",
+    "start": "cds serve srv/world.cds",
+    "start:ts": "cds-ts serve srv/world.cds"
+  },
+  "dependencies": {
+    "@sap/cds": ">=5.0.4"
+  },
+  "devDependencies": {
+    "@types/jest": "*",
+    "@types/node": "*",
+    "typescript": ">=4.3.5"
+  },
+  "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"
+    }
+  }
+}

hello/srv/world.cds

@@ -0,0 +1,3 @@
+service say @(path: '/say') {
+  function hello (to:String) returns String;
+}

hello/srv/world.js

@@ -0,0 +1,7 @@
+module.exports = class say {
+  hello(req) {
+    let {to} = req.data
+    if (to === 'me') to = require('os').userInfo().username
+    return `Hello ${to}!`
+  }
+}

hello/srv/world.ts

@@ -0,0 +1,7 @@
+import type { Request } from "@sap/cds/apis/services"
+
+module.exports = class say {
+    hello(req: Request) {
+        return `Hello ${req.data.to} from a TypeScript file!`
+    }
+}

hello/test/hello-world-test.js

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

hello/test/test.http

@@ -0,0 +1 @@
+GET http://localhost:4004/say/hello(to='world')

jest.config.mjs

@@ -1,3 +0,0 @@
-export default {
-  silent: true
-}

loggers/package.json

@@ -13,5 +13,10 @@
   "scripts": {
     "start": "cds-serve",
     "watch": "cds watch"
+  },
+  "cds": {
+    "requires": {
+      "db": "sql"
+    }
   }
 }

loggers/srv/loggers.js

@@ -1,4 +1,4 @@
-const cds = require ('@sap/cds')
+const cds = require ('@sap/cds/lib')
 const LOG = cds.log('cds.log')
 
 module.exports = class LogService extends cds.Service {

media/db/data-model.cds

@@ -0,0 +1,13 @@
+namespace sap.capire.media;
+
+entity Media {
+
+   key id:Integer;
+   @Core.MediaType: mediaType
+   content : LargeBinary ;
+
+   @Core.IsMediaType: true
+   mediaType : String;
+   fileName : String;
+   applicationName:String;
+}

media/index.cds

@@ -0,0 +1,2 @@
+using from './db/data-model';
+using from './srv/media-service';