billing data

Bumps [axios](https://github.com/axios/axios) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v1.3.1...v1.3.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

.eslintrc

@@ -1,28 +1,31 @@
 {
-    "extends": "eslint:recommended",
-    "env": {
-        "browser": true,
-        "node": true,
-        "es6": true,
-        "jest": true,
-        "mocha": true
-    },
-    "parserOptions": {
-        "ecmaVersion": 2020
-    },
-    "globals": {
-        "SELECT": true,
-        "INSERT": true,
-        "UPDATE": true,
-        "DELETE": true,
-        "CREATE": true,
-        "DROP": true,
-        "cds": true
-    },
-    "rules": {
-        "no-console": "off",
-        "require-atomic-updates": "off",
+  "extends": [
+    "plugin:@sap/cds/recommended",
+    "eslint:recommended"
+  ],
+  "env": {
+    "browser": true,
+    "es2022": true,
+    "node": true,
+    "jest": true,
+    "mocha": true
+  },
+  "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/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: This channel is CLOSED. 
+    about: Use SAP community instead
+    url: https://answers.sap.com/tags/9f13aee1-834c-4105-8e43-ee442775e5ce

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

@@ -1,10 +0,0 @@
----
-name: This channel is CLOSED. 
-about: Use our community at  https://answers.sap.com/tags/9f13aee1-834c-4105-8e43-ee442775e5ce
-title: ''
-labels: ''
-assignees: ''
-
----
-
-Please use our community on https://answers.sap.com/tags/9f13aee1-834c-4105-8e43-ee442775e5ce

.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+
+updates:
+- package-ecosystem: npm
+  directory: /
+  versioning-strategy: increase-if-necessary
+  schedule:
+    interval: daily

.github/workflows/node.js.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x, 14.x, 12.x]
+        node-version: [16.x, 14.x]
 
     steps:
     - uses: actions/checkout@v2
@@ -24,5 +24,6 @@ jobs:
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
+    - run: npm i -g npm@8
     - run: npm ci
     - run: npm test

.gitignore

@@ -12,8 +12,11 @@ target/
 *.mtar
 connection.properties
 default-env.json
+.cdsrc-private.json
 packages/messageBox
 reviews/msg-box
 reviews/db/test.db
 
 *.openapi3.json
+*.sqlite
+*.db

.registry/.gitignore

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

.registry/server.js

@@ -1,80 +0,0 @@
-const { exec } = require ('child_process')
-const isWin = process.platform === 'win32'
-const express = require ('express')
-const fs = require ('fs')
-const app = express()
-
-const { PORT=4444 } = process.env
-const [,,port=PORT,scope='@capire'] = process.argv
-const cwd = __dirname
-
-// clean up on start (exit handler might not complete on Windows)
-exec(isWin ? 'del *.tgz' : 'rm *.tgz', {cwd})
-
-
-app.use('/-/:tarball', (req,res,next) => {
-  console.debug ('GET', req.params)
-  try {
-    const { tarball } = req.params
-    const [, pkg ] = /^\w+-(\w+)/.exec(tarball)
-    fs.lstat(tarball,(err => {
-      if (err) console.debug (`npm pack ../${pkg}`)
-      if (err) exec(`npm pack ../${pkg}`,{cwd},next)
-      else next()
-    }))
-  } catch (e) {
-    console.error(e)
-    res.sendStatus(500)
-  }
-})
-
-app.use('/-', express.static(__dirname))
-
-app.get('/*', (req,res)=>{
-  const urlRegex = /^\/(@\w+)\/(\w+)/
-  const url = decodeURIComponent(req.url)
-  console.debug ('GET',url)
-  try {
-    if (!urlRegex.test(url))  return res.sendStatus(404)
-    const [, scpe, pkg ] = urlRegex.exec(url)
-    const package = require (`${scpe}/${pkg}/package.json`)
-    const tarball = `${scpe.slice(1)}-${pkg}-${package.version}.tgz`
-    // https://github.com/npm/registry/blob/master/docs/responses/package-metadata.md
-    res.json({
-      "name": package.name,
-      "dist-tags": {
-        "latest": package.version
-      },
-      "versions": {
-        [package.version]: {
-          "name": package.name,
-          "version": package.version,
-          "dist": {
-            "tarball": `${server.url}/-/${tarball}`
-          },
-        }
-      },
-    })
-  } catch (e) {
-    if (e.code === 'MODULE_NOT_FOUND')  return res.sendStatus(404)
-    console.error(e);  throw e
-  }
-})
-
-const server = app.listen(port, ()=>{
-  const url = server.url = `http://localhost:${server.address().port}`
-  console.log (`npm set ${scope}:registry=${url}`)
-  exec(`npm set ${scope}:registry=${url}`)
-  console.log (`${scope} registry listening on ${url}`)
-})
-
-
-const _exit = ()=>{
-  server.close()
-  exec(`npm conf rm "${scope}:registry"`, ()=> { process.exit() })
-}
-
-process.on ('SIGTERM',_exit)
-process.on ('SIGHUP',_exit)
-process.on ('SIGINT',_exit)
-process.on ('SIGUSR2',_exit)

.tours/samples.tour

@@ -104,7 +104,7 @@
     },
     {
       "file": "fiori/app/services.cds",
-      "description": "### Annotations for SAP Fiori Elements\n\n- [Adds an SAP Fiori elements application](https://cap.cloud.sap/docs/guides/fiori/) to bookstore, thereby introducing to:\n- [OData Annotations](https://cap.cloud.sap/docs/guides/fiori#adding-odata-annotations) in `.cds` files\n- Support for [Fiori Draft](https://cap.cloud.sap/docs/guides/fiori#draft)\n- Support for [Value Helps](https://cap.cloud.sap/docs/guides/fiori#value-help)\n- Serving SAP Fiori apps locally\n",
+      "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": {
@@ -136,4 +136,4 @@
   ],
   "isPrimary": true,
   "description": "Overview of CAP Samples for Node.js"
-}
+}

.vscode/launch.json

@@ -13,7 +13,7 @@
         "<node_internals>/**",
         "**/node_modules/**",
         "**/cds/lib/lazy.js",
-        "**/cds/lib/req/cls.js",
+        "**/cds/lib/req/cds-context.js",
         "**/odata-v4/okra/**"
       ]
     },
@@ -26,10 +26,24 @@
         "<node_internals>/**",
         "**/node_modules/**",
         "**/cds/lib/lazy.js",
-        "**/cds/lib/req/cls.js",
+        "**/cds/lib/req/cds-context.js",
         "**/odata-v4/okra/**"
       ]
-    }
+    },
+    {
+      "name": "Debug Mocha Tests",
+      "type": "node",
+      "request": "attach",
+      "port": 9229,
+      "continueOnAttach": true,
+      "skipFiles": [
+        "<node_internals>/**",
+        "**/node_modules/**",
+        "**/cds/lib/lazy.js",
+        "**/cds/lib/req/cds-context.js",
+        "**/odata-v4/okra/**",
+      ]
+    },
   ],
   "inputs": [
     {

.vscode/settings.json

@@ -10,9 +10,18 @@
       "<node_internals>/**",
       "**/node_modules/**",
       "**/cds/lib/lazy.js",
-      "**/cds/lib/req/cls.js",
+      "**/cds/lib/req/cds-context.js",
       "**/odata-v4/okra/**"
     ]
   },
-  "mochaExplorer.parallel": true
+  "mochaExplorer.debuggerConfig": "Debug Mocha Tests",
+  "mochaExplorer.parallel": true,
+  "eslint.validate": [
+    "cds",
+    "csn",
+    "csv",
+    "csv (semicolon)",
+    "tsv",
+    "tab"
+  ]
 }

LICENSES/Apache-2.0.txt

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

README.md

@@ -7,13 +7,14 @@ Find here a collection of samples for the [SAP Cloud Application Programming Mod
 
 ### Preliminaries
 
-1. Install [**@sap/cds-dk**](https://cap.cloud.sap/docs/get-started/) globally:
+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
    ```
 
-2. _Optional:_ [Use Visual Studio Code](https://cap.cloud.sap/docs/get-started/tools#vscode)
+3. _Optional:_ [Use Visual Studio Code](https://cap.cloud.sap/docs/get-started/tools#vscode)
 
 ### Download
 

bookshop/app/index.cds

@@ -0,0 +1,2 @@
+// Incorporate pre-build extensions from...
+using from '../../common';

bookshop/app/vue/app.js

@@ -3,14 +3,15 @@ const $ = sel => document.querySelector(sel)
 const GET = (url) => axios.get('/browse'+url)
 const POST = (cmd,data) => axios.post('/browse'+cmd,data)
 
-const books = new Vue ({
+const books = Vue.createApp ({
 
-    el:'#app',
-
-    data: {
+    data() {
+      return {
         list: [],
         book: undefined,
-        order: { quantity:1, succeeded:'', failed:'' }
+        order: { quantity:1, succeeded:'', failed:'' },
+        user: undefined
+      }
     },
 
     methods: {
@@ -37,12 +38,52 @@ const books = new Vue ({
                 book.stock = res.data.stock
                 books.order = { quantity, succeeded: `Successfully ordered ${quantity} item(s).` }
             } catch (e) {
-                books.order = { quantity, failed: e.response.data.error.message }
+                books.order = { quantity, failed: e.response.data.error ? e.response.data.error.message : e.response.data }
             }
-        }
+        },
 
+        async login() {
+            try {
+                const { data:user } = await axios.post('/user/login',{})
+                if (user.id !== 'anonymous') books.user = user
+            } catch (err) { books.user = { id: err.message } }
+        },
+
+        async getUserInfo() {
+            try {
+                const { data:user } = await axios.get('/user/me')
+                if (user.id !== 'anonymous') books.user = user
+            } catch (err) { books.user = { id: err.message } }
+        },
     }
+}).mount('#app')
+
+books.getUserInfo()
+books.fetch() // initially fill list of books
+
+document.addEventListener('keydown', (event) => {
+    // hide user info on request
+    if (event.key === 'u')  books.user = undefined
 })
 
-// initially fill list of books
-books.fetch()
+axios.interceptors.request.use(csrfToken)
+function csrfToken (request) {
+    if (request.method === 'head' || request.method === 'get') return request
+    if ('csrfToken' in document) {
+        request.headers['x-csrf-token'] = document.csrfToken
+        return request
+    }
+    return fetchToken().then(token => {
+        document.csrfToken = token
+        request.headers['x-csrf-token'] = document.csrfToken
+        return request
+    }).catch(_ => {
+        document.csrfToken = null // set mark to not try again
+        return request
+    })
+
+    function fetchToken() {
+        return axios.get('/', { headers: { 'x-csrf-token': 'fetch' } })
+        .then(res => res.headers['x-csrf-token'])
+    }
+}

bookshop/app/vue/index.html

@@ -5,19 +5,32 @@
     <title> Capire Books </title>
     <link rel="stylesheet" href="https://unpkg.com/primitive-ui/dist/css/main.css">
     <script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/vue"></script>
+    <script src="https://cdn.jsdelivr.net/npm/vue@3/dist/vue.global.prod.js"></script>
     <style>
         .hovering tr:hover td { color:cyan; background: #123; cursor: pointer; }
         .rating-stars { color:teal }
         .succeeded { color:teal }
         .failed { color:red }
+        .user {text-align: end; color: grey;}
     </style>
 </head>
 
 <body class="small-container", style="margin-top: 70px;">
 <div id='app'>
 
-    <h1> {{ document.title }} </h1>
+    <form class="user" @submit.prevent="login">
+        <div v-if="user">
+            <div v-if="user.tenant">Tenant: {{ user.tenant }}</div>
+            <div> User: {{ user.id }}</div>
+            <div>Locale: {{ user.locale }}</div>
+        </div>
+        <div v-else>
+            <input type="submit" value="Login" class="muted-button">
+            <!-- <a href="/user/login()">Login</a> -->
+        </div>
+    </form>
+
+    <h1> Capire Books </h1>
 
     <input type="text" placeholder="Search..." @input="search">
 

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

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

@@ -4,21 +4,21 @@
  * currencies, if not obtained through @capire/common.
  */
 
-module.exports = async (db)=>{
+module.exports = async (tx)=>{
 
-  const has_common = db.model.definitions['sap.common.Currencies'].elements.numcode
+  const has_common = tx.model.definitions['sap.common.Currencies']?.elements.numcode
   if (has_common) return
 
-  const already_filled = await db.exists('sap.common.Currencies',{code:'EUR'})
+  const already_filled = await tx.exists('sap.common.Currencies',{code:'EUR'})
   if (already_filled) return
 
-  await INSERT.into ('sap.common.Currencies') .columns (
-    'code','symbol','name'
+  await tx.run (INSERT.into ('sap.common.Currencies') .columns (
+    [ 'code', 'symbol', 'name' ]
   ) .rows (
-    [ 'EUR','€','Euro' ],
-    [ 'USD','$','US Dollar' ],
-    [ 'GBP','£','British Pound' ],
-    [ 'ILS','₪','Shekel' ],
-    [ 'JPY','¥','Yen' ],
-  )
+    [ 'EUR', '€', 'Euro' ],
+    [ 'USD', '$', 'US Dollar' ],
+    [ 'GBP', '£', 'British Pound' ],
+    [ 'ILS', '₪', 'Shekel' ],
+    [ 'JPY', '¥', 'Yen' ],
+  ))
 }

bookshop/index.cds

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

bookshop/package.json

@@ -2,10 +2,17 @@
   "name": "@capire/bookshop",
   "version": "1.0.0",
   "description": "A simple self-contained bookshop service.",
+  "files": [
+    "app",
+    "srv",
+    "db",
+    "index.cds",
+    "index.js"
+  ],
   "dependencies": {
-    "@sap/cds": "^5.0.4",
+    "@sap/cds": ">=5.9",
     "express": "^4.17.1",
-    "passport": "0.4.1"
+    "passport": ">=0.4.1"
   },
   "scripts": {
     "genres": "cds serve test/genres.cds",
@@ -14,9 +21,7 @@
   },
   "cds": {
     "requires": {
-      "db": {
-        "kind": "sql"
-      }
+      "db": "sql"
     }
   }
 }

bookshop/srv/admin-service.js

@@ -1,9 +1,10 @@
-const cds = require('@sap/cds')
+const cds = require('@sap/cds/lib')
 
-module.exports = cds.service.impl (function(){
+module.exports = 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) {

bookshop/srv/cat-service.cds

@@ -10,7 +10,12 @@ service CatalogService @(path:'/browse') {
     author.name as author
   } excluding { createdBy, modifiedBy };
 
+<<<<<<< HEAD
+  @requires_: 'authenticated-user'
+  action submitOrder (book : Integer, amount: Integer);
+=======
   @requires: 'authenticated-user'
   action submitOrder ( book: Books:ID, quantity: Integer ) returns { stock: Integer };
   event OrderedBook : { book: Books:ID; quantity: Integer; buyer: String };
+>>>>>>> 534af7ffee60e086c563dbaa450e86e5fca5cf2b
 }

bookshop/srv/cat-service.js

@@ -3,6 +3,7 @@ const cds = require('@sap/cds')
 class CatalogService extends cds.ApplicationService { init(){
 
   const { Books } = cds.entities ('sap.capire.bookshop')
+  const { ListOfBooks } = this.entities
 
   // Reduce stock of ordered books if available stock suffices
   this.on ('submitOrder', async req => {
@@ -18,7 +19,7 @@ class CatalogService extends cds.ApplicationService { init(){
   })
 
   // Add some discount for overstocked books
-  this.after ('READ','ListOfBooks', each => {
+  this.after ('READ', ListOfBooks, each => {
     if (each.stock > 111) each.title += ` -- 11% discount!`
   })
 

bookshop/srv/user-service.cds

@@ -0,0 +1,15 @@
+/**
+ * Exposes user information
+ */
+service UserService {
+  /**
+   * The current user
+   */
+  @odata.singleton entity me @cds.persistence.skip {
+    id     : String; // user id
+    locale : String;
+    tenant : String;
+  }
+
+  action login() returns me;
+}

bookshop/srv/user-service.js

@@ -0,0 +1,9 @@
+const cds = require('@sap/cds')
+module.exports = 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)
+      req._.res.set('WWW-Authenticate','Basic realm="Users"').sendStatus(401)
+    else return this.read('me')
+  })
+}}

bookshop/test/requests.http

@@ -16,9 +16,9 @@ GET {{server}}/browse/$metadata
 
 ### ------------------------------------------------------------------------
 # Browse Books as any user
-GET {{server}}/browse/Books?
+GET {{server}}/browse/ListOfBooks?
   # &$select=title,stock
-  # &$expand=currency
+  &$expand=genre
   # &sap-language=de
 {{me}}
 

bookstore/package.json

@@ -7,7 +7,7 @@
     "@capire/orders": "*",
     "@capire/common": "*",
     "@capire/data-viewer": "*",
-    "@sap/cds": "^5",
+    "@sap/cds": ">=5",
     "express": "^4.17.1"
   },
   "cds": {

bookstore/server.js

@@ -19,4 +19,4 @@ module.exports = cds.server
 
 // For didactic reasons in capire
 const { ReviewsService, OrdersService } = cds.requires
-if (!ReviewsService.credentials && !OrdersService.credentials) cds.requires.messaging = false
+if (!ReviewsService?.credentials && !OrdersService?.credentials) cds.requires.messaging = false

bookstore/srv/mashup.cds

@@ -12,7 +12,11 @@ using { sap.capire.bookshop.Books } from '@capire/bookshop';
 using { ReviewsService.Reviews } from '@capire/reviews';
 extend Books with {
   reviews : Composition of many Reviews on reviews.subject = $self.ID;
+
+  @Common.Label : '{i18n>Rating}'
   rating  : Decimal;
+
+  @Common.Label : '{i18n>NumberOfReviews}'
   numberOfReviews : Integer;
 }
 

data-viewer/package.json

@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "description": "A generic browser for data",
   "dependencies": {
-    "@sap/cds": "^5.0.4"
+    "@sap/cds": ">=5.0.4"
   },
   "files": [
     "app",

data-viewer/srv/data-service.cds

@@ -2,12 +2,12 @@
  * Exposes data + entity metadata
  */
 @requires:'authenticated-user'
-service DataService @( path:'-data' ) {
+@odata service DataService @( path:'-data' ) {
 
   /**
    * Metadata like name and columns/elements
    */
-  entity Entities {
+  entity Entities @cds.persistence.skip {
     key name : String;
     columns: Composition of many {
       name :  String;
@@ -19,7 +19,7 @@ service DataService @( path:'-data' ) {
   /**
    * The actual data, organized by column name
    */
-  entity Data {
+  entity Data @cds.persistence.skip {
     record   : array of {
       column : String;
       data   : String;

fiori/app/_i18n/i18n.properties

@@ -6,16 +6,33 @@ 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

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

@@ -43,5 +43,10 @@ extend sap.capire.bookshop.Authors with {
   virtual lifetime : String;
 }
 
+annotate AdminService.Authors with {
+  age      @Common.Label : '{i18n>Age}';
+  lifetime @Common.Label : '{i18n>Lifetime}'
+}
+
 // Workaround for Fiori popup for asking user to enter a new UUID on Create
 annotate AdminService.Authors with { ID @Core.Computed; }

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

@@ -11,7 +11,7 @@
     },
     "dataSources": {
       "AdminService": {
-        "uri": "/admin/",
+        "uri": "admin/",
         "type": "OData",
         "settings": {
           "odataVersion": "4.0"

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

@@ -62,6 +62,11 @@ annotate AdminService.Books.texts with @(
 	}
 );
 
+annotate AdminService.Books.texts with {
+    ID       @UI.Hidden;
+    ID_texts @UI.Hidden;
+};
+
 // Add Value Help for Locales
 annotate AdminService.Books.texts {
 	locale @(

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

@@ -8,7 +8,7 @@
         "i18n": "i18n/i18n.properties",
         "dataSources": {
             "AdminService": {
-                "uri": "/admin/",
+                "uri": "admin/",
                 "type": "OData",
                 "settings": {
                     "odataVersion": "4.0"

fiori/app/appconfig/fioriSandboxConfig.json

@@ -19,6 +19,14 @@
                     "title": "Browse Books",
                     "targetURL": "#Books-display"
                   }
+                },
+                {
+                  "id": "BrowseGenres",
+                  "tileType": "sap.ushell.ui.tile.StaticTile",
+                  "properties": {
+                    "title": "Browse Genres (OData v2)",
+                    "targetURL": "#Genres-display"
+                  }
                 }
               ]
             },
@@ -107,6 +115,24 @@
                 "url": "/admin-authors/webapp"
               }
             },
+            "BrowseGenres": {
+              "semanticObject": "Genres",
+              "action": "display",
+              "title": "Browse Genres",
+              "signature": {
+                "parameters": {
+                  "Genre.ID": {
+                    "renameTo": "ID"
+                  }
+                },
+                "additionalParameters": "ignored"
+              },
+              "resolutionResult": {
+                "applicationType": "SAPUI5",
+                "additionalInformation": "SAPUI5.Component=genres",
+                "url": "/genres/webapp"
+              }
+            },
             "ManageBooks": {
               "semanticObject": "Books",
               "action": "manage",

fiori/app/browse/fiori-service.cds

@@ -33,7 +33,7 @@ annotate CatalogService.Books with @(UI : {
 
 ////////////////////////////////////////////////////////////////////////////
 //
-//	Books Object Page
+//	Books List Page
 //
 annotate CatalogService.Books with @(UI : {
     SelectionFields : [
@@ -52,9 +52,6 @@ annotate CatalogService.Books with @(UI : {
         },
         {Value : genre.name},
         {Value : price},
-        {
-            Value : currency.symbol,
-            Label : ' '
-        },
+        {Value : currency.symbol},
     ]
 }, );

fiori/app/browse/webapp/manifest.json

@@ -11,7 +11,7 @@
     },
     "dataSources": {
       "CatalogService": {
-        "uri": "/browse/",
+        "uri": "browse/",
         "type": "OData",
         "settings": {
           "odataVersion": "4.0"
@@ -32,7 +32,7 @@
                 "renameTo": "ID"
               },
               "Authors.books.ID": {
-                "renameTo": "ID"                    
+                "renameTo": "ID"
               }
             },
             "additionalParameters": "ignored"

fiori/app/common.cds

@@ -4,57 +4,53 @@
 
 using { sap.capire.bookshop as my } from '@capire/bookstore';
 using { sap.common } from '@capire/common';
+using { sap.common.Currencies } from '@sap/cds/common';
 
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Books Lists
 //
 annotate my.Books with @(
-    Common.SemanticKey : [ID],
-    UI                 : {
-        Identification  : [{Value : title}],
-        SelectionFields : [
-            ID,
-            author_ID,
-            price,
-            currency_code
-        ],
-        LineItem        : [
-            {
-                Value : ID,
-                Label : '{i18n>Title}'
-            },
-            {
-                Value : author.ID,
-                Label : '{i18n>Author}'
-            },
-            {Value : genre.name},
-            {Value : stock},
-            {Value : price},
-            {
-                Value : currency.symbol,
-                Label : ' '
-            },
-        ]
-    }
+  Common.SemanticKey : [ID],
+  UI                 : {
+    Identification  : [{ Value: title }],
+    SelectionFields : [
+      ID,
+      author_ID,
+      price,
+      currency_code
+    ],
+    LineItem        : [
+      { Value: ID, Label: '{i18n>Title}' },
+      { Value: author.ID, Label: '{i18n>Author}' },
+      { Value: genre.name },
+      { Value: stock },
+      { Value: price },
+      { Value: currency.symbol },
+    ]
+  }
 ) {
-    ID  @Common: {
-        SemanticObject : 'Books',
-        Text: title,
-        TextArrangement : #TextOnly
-    };
-    author @ValueList.entity      : 'Authors';
+  ID  @Common: {
+    SemanticObject : 'Books',
+    Text: title,
+    TextArrangement : #TextOnly
+  };
+  author @ValueList.entity      : 'Authors';
 };
 
+annotate Currencies with {
+  symbol @Common.Label : '{i18n>Currency}';
+}
+
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Books Details
 //
 annotate my.Books with @(UI : {HeaderInfo : {
-    TypeName       : '{i18n>Book}',
-    TypeNamePlural : '{i18n>Books}',
-    Title          : {Value : title},
-    Description    : {Value : author.name}
+  TypeName       : '{i18n>Book}',
+  TypeNamePlural : '{i18n>Books}',
+  Title          : { Value: title },
+  Description    : { Value: author.name }
 }, });
 
 
@@ -63,19 +59,14 @@ annotate my.Books with @(UI : {HeaderInfo : {
 //	Books Elements
 //
 annotate my.Books with {
-    ID     @title : '{i18n>ID}';
-    title  @title : '{i18n>Title}';
-    genre  @title : '{i18n>Genre}'  @Common               : {
-        Text            : genre.name,
-        TextArrangement : #TextOnly
-    };
-    author @title : '{i18n>Author}'  @Common              : {
-        Text            : author.name,
-        TextArrangement : #TextOnly
-    };
-    price  @title : '{i18n>Price}'  @Measures.ISOCurrency : currency_code;
-    stock  @title : '{i18n>Stock}';
-    descr  @UI.MultiLineText;
+  ID     @title: '{i18n>ID}';
+  title  @title: '{i18n>Title}';
+  genre  @title: '{i18n>Genre}'   @Common: { Text: genre.name, TextArrangement: #TextOnly };
+  author @title: '{i18n>Author}'  @Common: { Text: author.name, TextArrangement: #TextOnly };
+  price  @title: '{i18n>Price}'   @Measures.ISOCurrency : currency_code;
+  stock  @title: '{i18n>Stock}';
+  descr  @title: '{i18n>Description}'  @UI.MultiLineText;
+  image  @title: '{i18n>Image}';
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -83,36 +74,40 @@ annotate my.Books with {
 //	Genres List
 //
 annotate my.Genres with @(
-    Common.SemanticKey : [name],
-    UI                 : {
-        SelectionFields : [name],
-        LineItem        : [
-            {Value : name},
-            {
-                Value : parent.name,
-                Label : 'Main Genre'
-            },
-        ],
-    }
+  Common.SemanticKey : [name],
+  UI                 : {
+    SelectionFields : [name],
+    LineItem        : [
+      { Value: name },
+      {
+        Value : parent.name,
+        Label: 'Main Genre'
+      },
+    ],
+  }
 );
 
+annotate my.Genres with {
+  ID  @Common.Text : name  @Common.TextArrangement : #TextOnly;
+}
+
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Genre Details
 //
 annotate my.Genres with @(UI : {
-    Identification : [{Value : name}],
-    HeaderInfo     : {
-        TypeName       : '{i18n>Genre}',
-        TypeNamePlural : '{i18n>Genres}',
-        Title          : {Value : name},
-        Description    : {Value : ID}
-    },
-    Facets         : [{
-        $Type  : 'UI.ReferenceFacet',
-        Label  : '{i18n>SubGenres}',
-        Target : 'children/@UI.LineItem'
-    }, ],
+  Identification : [{ Value: name}],
+  HeaderInfo     : {
+    TypeName       : '{i18n>Genre}',
+    TypeNamePlural : '{i18n>Genres}',
+    Title          : { Value: name },
+    Description    : { Value: ID }
+  },
+  Facets         : [{
+    $Type  : 'UI.ReferenceFacet',
+    Label  : '{i18n>SubGenres}',
+    Target : 'children/@UI.LineItem'
+  }, ],
 });
 
 ////////////////////////////////////////////////////////////////////////////
@@ -120,8 +115,8 @@ annotate my.Genres with @(UI : {
 //	Genres Elements
 //
 annotate my.Genres with {
-    ID   @title : '{i18n>ID}';
-    name @title : '{i18n>Genre}';
+  ID   @title: '{i18n>ID}';
+  name @title: '{i18n>Genre}';
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -129,24 +124,24 @@ annotate my.Genres with {
 //	Authors List
 //
 annotate my.Authors with @(
-    Common.SemanticKey : [ID],
-    UI                 : {
-        Identification  : [{Value : name}],
-        SelectionFields : [name],
-        LineItem        : [
-            {Value : ID},
-            {Value : dateOfBirth},
-            {Value : dateOfDeath},
-            {Value : placeOfBirth},
-            {Value : placeOfDeath},
-        ],
-    }
+  Common.SemanticKey : [ID],
+  UI                 : {
+    Identification  : [{ Value: name}],
+    SelectionFields : [name],
+    LineItem        : [
+      { Value: ID },
+      { Value: dateOfBirth },
+      { Value: dateOfDeath },
+      { Value: placeOfBirth },
+      { Value: placeOfDeath },
+    ],
+  }
 ) {
-    ID  @Common: {
-        SemanticObject : 'Authors',
-        Text: name,
-        TextArrangement : #TextOnly,
-    };
+  ID  @Common: {
+    SemanticObject : 'Authors',
+    Text: name,
+    TextArrangement : #TextOnly,
+  };
 };
 
 ////////////////////////////////////////////////////////////////////////////
@@ -154,16 +149,16 @@ annotate my.Authors with @(
 //	Author Details
 //
 annotate my.Authors with @(UI : {
-    HeaderInfo : {
-        TypeName       : '{i18n>Author}',
-        TypeNamePlural : '{i18n>Authors}',
-        Title          : {Value : name},
-        Description    : {Value : dateOfBirth}
-    },
-    Facets     : [{
-        $Type  : 'UI.ReferenceFacet',
-        Target : 'books/@UI.LineItem'
-    }, ],
+  HeaderInfo : {
+    TypeName       : '{i18n>Author}',
+    TypeNamePlural : '{i18n>Authors}',
+    Title          : { Value: name },
+    Description    : { Value: dateOfBirth }
+  },
+  Facets     : [{
+    $Type  : 'UI.ReferenceFacet',
+    Target : 'books/@UI.LineItem'
+  }, ],
 });
 
 
@@ -172,12 +167,12 @@ annotate my.Authors with @(UI : {
 //	Authors Elements
 //
 annotate my.Authors with {
-    ID           @title : '{i18n>ID}';
-    name         @title : '{i18n>Name}';
-    dateOfBirth  @title : '{i18n>DateOfBirth}';
-    dateOfDeath  @title : '{i18n>DateOfDeath}';
-    placeOfBirth @title : '{i18n>PlaceOfBirth}';
-    placeOfDeath @title : '{i18n>PlaceOfDeath}';
+  ID           @title: '{i18n>ID}';
+  name         @title: '{i18n>Name}';
+  dateOfBirth  @title: '{i18n>DateOfBirth}';
+  dateOfDeath  @title: '{i18n>DateOfDeath}';
+  placeOfBirth @title: '{i18n>PlaceOfBirth}';
+  placeOfDeath @title: '{i18n>PlaceOfDeath}';
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -185,18 +180,18 @@ annotate my.Authors with {
 //	Languages List
 //
 annotate common.Languages with @(
-    Common.SemanticKey : [code],
-    Identification     : [{Value : code}],
-    UI                 : {
-        SelectionFields : [
-            name,
-            descr
-        ],
-        LineItem        : [
-            {Value : code},
-            {Value : name},
-        ],
-    }
+  Common.SemanticKey : [code],
+  Identification     : [{ Value: code}],
+  UI                 : {
+    SelectionFields : [
+      name,
+      descr
+    ],
+    LineItem        : [
+      { Value: code },
+      { Value: name },
+    ],
+  }
 );
 
 ////////////////////////////////////////////////////////////////////////////
@@ -204,22 +199,22 @@ annotate common.Languages with @(
 //	Language Details
 //
 annotate common.Languages with @(UI : {
-    HeaderInfo          : {
-        TypeName       : '{i18n>Language}',
-        TypeNamePlural : '{i18n>Languages}',
-        Title          : {Value : name},
-        Description    : {Value : descr}
-    },
-    Facets              : [{
-        $Type  : 'UI.ReferenceFacet',
-        Label  : '{i18n>Details}',
-        Target : '@UI.FieldGroup#Details'
-    }, ],
-    FieldGroup #Details : {Data : [
-        {Value : code},
-        {Value : name},
-        {Value : descr}
-    ]},
+  HeaderInfo          : {
+    TypeName       : '{i18n>Language}',
+    TypeNamePlural : '{i18n>Languages}',
+    Title          : { Value: name },
+    Description    : { Value: descr }
+  },
+  Facets              : [{
+    $Type  : 'UI.ReferenceFacet',
+    Label  : '{i18n>Details}',
+    Target : '@UI.FieldGroup#Details'
+  }, ],
+  FieldGroup #Details : {Data : [
+    { Value: code },
+    { Value: name },
+    { Value: descr }
+  ]},
 });
 
 ////////////////////////////////////////////////////////////////////////////
@@ -227,19 +222,19 @@ annotate common.Languages with @(UI : {
 //	Currencies List
 //
 annotate common.Currencies with @(
-    Common.SemanticKey : [code],
-    Identification     : [{Value : code}],
-    UI                 : {
-        SelectionFields : [
-            name,
-            descr
-        ],
-        LineItem        : [
-            {Value : descr},
-            {Value : symbol},
-            {Value : code},
-        ],
-    }
+  Common.SemanticKey : [code],
+  Identification     : [{ Value: code}],
+  UI                 : {
+    SelectionFields : [
+      name,
+      descr
+    ],
+    LineItem        : [
+      { Value: descr },
+      { Value: symbol },
+      { Value: code },
+    ],
+  }
 );
 
 ////////////////////////////////////////////////////////////////////////////
@@ -247,35 +242,35 @@ annotate common.Currencies with @(
 //	Currency Details
 //
 annotate common.Currencies with @(UI : {
-    HeaderInfo           : {
-        TypeName       : '{i18n>Currency}',
-        TypeNamePlural : '{i18n>Currencies}',
-        Title          : {Value : descr},
-        Description    : {Value : code}
+  HeaderInfo           : {
+    TypeName       : '{i18n>Currency}',
+    TypeNamePlural : '{i18n>Currencies}',
+    Title          : { Value: descr },
+    Description    : { Value: code }
+  },
+  Facets               : [
+    {
+      $Type  : 'UI.ReferenceFacet',
+      Label  : '{i18n>Details}',
+      Target : '@UI.FieldGroup#Details'
     },
-    Facets               : [
-        {
-            $Type  : 'UI.ReferenceFacet',
-            Label  : '{i18n>Details}',
-            Target : '@UI.FieldGroup#Details'
-        },
-        {
-            $Type  : 'UI.ReferenceFacet',
-            Label  : '{i18n>Extended}',
-            Target : '@UI.FieldGroup#Extended'
-        },
-    ],
-    FieldGroup #Details  : {Data : [
-        {Value : name},
-        {Value : symbol},
-        {Value : code},
-        {Value : descr}
-    ]},
-    FieldGroup #Extended : {Data : [
-        {Value : numcode},
-        {Value : minor},
-        {Value : exponent}
-    ]},
+    {
+      $Type  : 'UI.ReferenceFacet',
+      Label  : '{i18n>Extended}',
+      Target : '@UI.FieldGroup#Extended'
+    },
+  ],
+  FieldGroup #Details  : {Data : [
+    { Value: name },
+    { Value: symbol },
+    { Value: code },
+    { Value: descr }
+  ]},
+  FieldGroup #Extended : {Data : [
+    { Value: numcode },
+    { Value: minor },
+    { Value: exponent }
+  ]},
 });
 
 ////////////////////////////////////////////////////////////////////////////
@@ -283,7 +278,7 @@ annotate common.Currencies with @(UI : {
 //	Currencies Elements
 //
 annotate common.Currencies with {
-    numcode  @title : '{i18n>NumCode}';
-    minor    @title : '{i18n>MinorUnit}';
-    exponent @title : '{i18n>Exponent}';
+  numcode  @title: '{i18n>NumCode}';
+  minor    @title: '{i18n>MinorUnit}';
+  exponent @title: '{i18n>Exponent}';
 }

fiori/app/fiori-apps.html

@@ -16,10 +16,10 @@
 
 	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
 	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/resources/sap-ui-core.js"
-    	data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
-    	data-sap-ui-compatVersion="edge"
-    	data-sap-ui-theme="sap_fiori_3"
-    	data-sap-ui-frameOptions="allow"
+			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"))

fiori/app/genres/fiori-service.cds

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

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

@@ -0,0 +1,4 @@
+#XTIT
+appTitle=Genres
+#XTXT
+appDescription=Browse Genres

fiori/app/genres/webapp/manifest.json

@@ -0,0 +1,155 @@
+{
+  "_version": "1.8.0",
+  "sap.app": {
+    "id": "genres",
+    "type": "application",
+    "i18n": "i18n/i18n.properties",
+    "applicationVersion": {
+      "version": "1.0.0"
+    },
+    "title": "Browse Genres Hierarchy (OData v2)",
+    "description": "{{appDescription}}",
+    "tags": {
+      "keywords": []
+    },
+    "crossNavigation": {
+      "inbounds": {
+        "appShow": {
+          "title": "{{appTitle}}",
+          "semanticObject": "GenreHierarchy",
+          "action": "display",
+          "deviceTypes": {
+            "desktop": true,
+            "tablet": true,
+            "phone": true
+          },
+          "icon": "sap-icon://settings",
+          "size": "1x1"
+        }
+      },
+      "outbounds": {}
+    },
+    "ach": "",
+    "resources": "resources.json",
+    "dataSources": {
+      "main": {
+        "uri": "/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.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": "main",
+        "preload": true,
+        "settings": {
+          "useBatch": true,
+          "defaultBindingMode": "TwoWay",
+          "defaultCountMode": "Inline",
+          "refreshAfterChange": true,
+          "metadataUrlParams": {
+            "sap-value-list": "none"
+          }
+        }
+      }
+    },
+    "contentDensities": {
+      "compact": true,
+      "cozy": true
+    }
+  },
+  "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,5 +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/index.cds

@@ -0,0 +1 @@
+using from './db/common';

fiori/package.json

@@ -3,9 +3,10 @@
   "version": "1.0.0",
   "dependencies": {
     "@capire/bookstore": "*",
-    "@sap/cds": "^5",
+    "@sap/cds": ">=5",
+    "@sap/cds-odata-v2-adapter-proxy": "^1.9.0",
     "express": "^4.17.1",
-    "passport": "^0.4.1"
+    "passport": ">=0.4.1"
   },
   "scripts": {
     "start": "cds run --in-memory?",
@@ -13,9 +14,6 @@
   },
   "cds": {
     "requires": {
-      "auth": {
-        "strategy": "dummy"
-      },
       "ReviewsService": {
         "kind": "odata",
         "model": "@capire/reviews"
@@ -45,10 +43,10 @@
         "[production]": {
           "model": "db/hana"
         }
-      },
-      "hana": {
-        "deploy-format": "hdbtable"
       }
+    },
+    "hana": {
+      "deploy-format": "hdbtable"
     }
   }
-}
+}

fiori/server.js

@@ -1 +1,8 @@
+// install OData v2 adapter
+const cds = require("@sap/cds")
+const proxy = require('@sap/cds-odata-v2-adapter-proxy')
+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`
+
 module.exports = require('@capire/bookstore/server.js')

gdpr/.cdsrc.json

@@ -1,28 +0,0 @@
-{
-  "build": {
-    "target": "gen",
-    "tasks": [{
-        "for": "hana",
-        "src": "db",
-        "options": {
-          "model": [
-            "db",
-            "srv",
-            "app"
-          ]
-        }
-      },
-      {
-        "for": "node-cf",
-        "src": "srv",
-        "options": {
-          "model": [
-            "db",
-            "srv",
-            "app"
-          ]
-        }
-      }
-    ]
-  }
-}

gdpr/.env

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

gdpr/.etc/deploy.sh

@@ -1,4 +0,0 @@
-npm run build
-cf create-service-push
-cf bind-service gdpr-srv gdpr-pdm -c .pdm/pdm-binding-config.json
-cf restage gdpr-srv

gdpr/.etc/undeploy.sh

@@ -1,7 +0,0 @@
-cf delete gdpr-srv -f
-cf delete gdpr-db-deployer -f
-cf delete-service gdpr-pdm -f
-cf delete-service gdpr-auditlog -f
-cf delete-service gdpr-uaa -f
-cf delete-service gdpr-hdi -f
-cf delete-service gdpr-logs -f

gdpr/.pdm/pdm-binding-config.json

@@ -1,16 +0,0 @@
-{
-  "fullyQualifiedApplicationName": "capire-gdpr",
-  "fullyQualifiedModuleName": "gdpr-srv",
-  "applicationTitle": "Capire GDPR Sample App",
-  "applicationTitleKey": "Capire GDPR Sample App",
-  "applicationURL": "https://capire-gdpr-srv.cfapps.eu10.hana.ondemand.com",
-  "endPoints": [{
-    "type": "odatav4",
-    "serviceName": "PDMService",
-    "serviceURI": "/pdm",
-    "serviceTitle": "Capire GDPR Sample App PDM Service",
-    "serviceTitleKey": "Capire GDPR Sample App PDM Service",
-    "hasGdprV4Annotations": true,
-    "cacheControl": "no-cache"
-  }]
-}

gdpr/.pdm/pdm-config.json

@@ -0,0 +1,18 @@
+{
+  "fullyQualifiedApplicationName": "gdpr-bookshop",
+  "fullyQualifiedModuleName": "gdpr-srv",
+  "applicationTitle": "PDM Bookshop",
+  "applicationTitleKey": "PDM Bookshop",
+  "applicationURL": "https://gdpr-srv.cfapps.sap.hana.ondemand.com/",
+  "endPoints": [
+    {
+      "type": "odatav4",
+      "serviceName": "pdm-service",
+      "serviceTitle": "GDPR",
+      "serviceTitleKey": "GDPR",
+      "serviceURI": "pdm",
+      "hasGdprV4Annotations": true,
+      "cacheControl": "no-cache"
+    }
+  ]
+}

gdpr/.pdm/pdm-instance-config.json

@@ -1,8 +1,8 @@
 {
   "xs-security": {
-    "xsappname": "capire-gdpr",
+    "xsappname": "gdpr-bookshop",
     "authorities": ["$ACCEPT_GRANTED_AUTHORITIES"]
   },
-  "fullyQualifiedApplicationName": "capire-gdpr",
+  "fullyQualifiedApplicationName": "gdpr-bookshop",
   "appConsentServiceEnabled": true
 }

gdpr/app/fiori.cds

@@ -1,317 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-//
-//	Note: this is designed for the GDPRService being co-located with
-//	orders. It does not work if GDPRService is run as a separate
-// 	process, and is not intended to do so.
-//
-////////////////////////////////////////////////////////////////////////////
-
-
-using {GDPRService} from '../srv/gdpr-service';
-
-annotate cds.UUID with @Core.Computed;
-
-/*
- * Orders
- */
-@odata.draft.enabled
-annotate GDPRService.Orders with @(UI : {
-  SelectionFields      : [
-    createdAt,
-    createdBy
-  ],
-  LineItem             : [
-    {
-      Value : OrderNo,
-      Label : 'Order number'
-    },
-    {
-      Value : customer.firstName,
-      Label : 'First Name'
-    },
-    {
-      Value : customer.lastName,
-      Label : 'Last Name'
-    }
-  ],
-  HeaderInfo           : {
-    TypeName       : 'Order',
-    TypeNamePlural : 'Orders',
-    Title          : {
-      Value : OrderNo,
-      Label : 'Order number'
-    }
-  },
-  Identification       : [
-    {
-      Value : createdBy,
-      Label : 'Created by'
-    },
-    {
-      Value : createdAt,
-      Label : 'Created at'
-    }
-  ],
-  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 : customer_ID,
-      Label : 'Customer'
-    },
-    {
-      Value : customer.firstName,
-      Label : 'First Name'
-    },
-    {
-      Value : customer.lastName,
-      Label : 'Last Name'
-    },
-    {
-      Value : currency_code,
-      Label : 'Currency'
-    }
-  ]},
-  FieldGroup #Created  : {Data : [
-    {
-      Value : createdBy,
-      Label : 'Created by'
-    },
-    {
-      Value : createdAt,
-      Label : 'Created at'
-    }
-  ]},
-  FieldGroup #Modified : {Data : [
-    {
-      Value : modifiedBy,
-      Label : 'Modified by'
-    },
-    {
-      Value : modifiedAt,
-      Label : 'Modified at'
-    }
-  ]},
-}, ) {
-  createdAt @UI.HiddenFilter  : false;
-  createdBy @UI.HiddenFilter  : false;
-  customer  @ValueList.entity : 'Customers';
-};
-
-/*
- * TODO: Order Items are not really maintainable in Fiori preview app
- */
-annotate GDPRService.Orders.Items with @(UI : {
-  LineItem       : [
-    {
-      Value : product_ID,
-      Label : 'Product ID'
-    },
-    {
-      Value : title,
-      Label : 'Product Name'
-    },
-    {
-      Value : price,
-      Label : 'Price'
-    },
-    {
-      Value : quantity,
-      Label : 'Quantity'
-    },
-  ],
-  Identification : [
-    {
-      Value : product_ID,
-      Label : 'Product ID'
-    },
-    {
-      Value : title,
-      Label : 'Product Name'
-    },
-    {
-      Value : quantity,
-      Label : 'Quantity'
-    },
-    {
-      Value : price,
-      Label : 'Price'
-    },
-  ],
-  Facets         : [{
-    $Type  : 'UI.ReferenceFacet',
-    Label  : 'Order Items',
-    Target : '@UI.Identification'
-  }, ],
-}, ) {
-  ID       @Core.Computed  @UI.Hidden : true;
-  title    @Core.Computed;
-  price    @Core.Computed;
-  quantity @(Common.FieldControl : #Mandatory);
-};
-
-/*
- * Customers
- */
-@odata.draft.enabled
-annotate GDPRService.Customers with @(UI : {
-  SelectionFields      : [
-    firstName,
-    lastName
-  ],
-  LineItem             : [
-    {
-      Value : firstName,
-      Label : 'First Name'
-    },
-    {
-      Value : lastName,
-      Label : 'Last Name'
-    },
-    {
-      Value : dateOfBirth,
-      Label : 'Date of Birth'
-    }
-  ],
-  HeaderInfo           : {
-    TypeName       : 'Customer',
-    TypeNamePlural : 'Customers',
-    Title          : {
-      Value : lastName,
-      Label : 'Last Name'
-    },
-    Description    : {
-      Value : firstName,
-      Label : 'First Name'
-    }
-  },
-  Identification       : [
-    {
-      Value : createdBy,
-      Label : 'Created by'
-    },
-    {
-      Value : createdAt,
-      Label : 'Created at'
-    }
-  ],
-  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>Addresses}',
-      Target : 'addresses/@UI.LineItem'
-    },
-  ],
-  FieldGroup #Details  : {Data : [
-    {
-      Value : dateOfBirth,
-      Label : 'Date of Birth'
-    },
-    {
-      Value : email,
-      Label : 'E-Mail'
-    },
-    {
-      Value : creditCardNo,
-      Label : 'Credit Card Number'
-    }
-  ]},
-  FieldGroup #Created  : {Data : [
-    {
-      Value : createdBy,
-      Label : 'Created by'
-    },
-    {
-      Value : createdAt,
-      Label : 'Created at'
-    }
-  ]},
-  FieldGroup #Modified : {Data : [
-    {
-      Value : modifiedBy,
-      Label : 'Modified by'
-    },
-    {
-      Value : modifiedAt,
-      Label : 'Modified at'
-    }
-  ]},
-}, ) {
-  createdAt @UI.HiddenFilter : false;
-  createdBy @UI.HiddenFilter : false;
-};
-
-annotate GDPRService.CustomerPostalAddresses with @(UI : {
-  LineItem       : [
-    {
-      Value : town,
-      Label : 'Town'
-    },
-    {
-      Value : street,
-      Label : 'Street'
-    },
-    {
-      Value : country.name,
-      Label : 'Country'
-    }
-  ],
-  Identification : [
-    {
-      Value : town,
-      Label : 'Town'
-    },
-    {
-      Value : street,
-      Label : 'Street'
-    },
-    {
-      Value : country_code,
-      Label : 'Country Code'
-    }
-  ],
-  Facets         : [{
-    $Type  : 'UI.ReferenceFacet',
-    Label  : 'Customer Postal Address',
-    Target : '@UI.Identification'
-  }, ],
-}, );

gdpr/db/AuditLogStore.cds

@@ -0,0 +1,23 @@
+using { managed, cuid, sap.common.CodeList } from '@sap/cds/common';
+
+namespace sap.capire.auditLog;
+
+entity AuditLogStore : cuid {
+
+  Action              : String enum{DataAccess; DataModification};  
+
+  User                : String;    
+  Timestamp           : Timestamp;
+  Tenant              : String;
+  Channel             : String;
+
+  DataSubjectType     : String;         // Bussiness Partner
+  DataSubjectRole     : String;         // Customer // Employee // ...
+  DataSubjectID       : LargeString;    // key value pair as JSON
+  ObjectType          : String;         // like SalesOrder
+  ObjectKey           : LargeString;    // key value pair as JSON   
+ 
+  Blob                : LargeString;    // Payload: DataModification or Data Access as BLOB
+                               
+}
+

gdpr/db/data-privacy.cds

@@ -1,54 +1,64 @@
-using {sap.capire.orders} from '@capire/orders';
-using {sap.capire.gdpr} from './schema';
+// Proxy for importing schema from bookshop sample
+using {sap.capire.bookshop} from './schema';
 
-/*
- * annotations for Data Privacy (Personal Data Manager and Audit Logging)
- */
-annotate gdpr.Customers with @PersonalData  : {
+// annotations for Data Privacy
+annotate bookshop.Customers with @PersonalData : {
   DataSubjectRole : 'Customer',
   EntitySemantics : 'DataSubject'
-}{
+} 
+{
   ID           @PersonalData.FieldSemantics : 'DataSubjectID';
   email        @PersonalData.IsPotentiallyPersonal;
   firstName    @PersonalData.IsPotentiallyPersonal;
   lastName     @PersonalData.IsPotentiallyPersonal;
-  creditCardNo @PersonalData.IsPotentiallySensitive;
+ // creditCardNo @PersonalData.IsPotentiallySensitive;
   dateOfBirth  @PersonalData.IsPotentiallyPersonal;
 }
 
-annotate gdpr.CustomerPostalAddresses with @PersonalData : {
+annotate bookshop.CustomerBillingData with @PersonalData : {
   DataSubjectRole : 'Customer',
   EntitySemantics : 'DataSubjectDetails'
-}{
-  customer @PersonalData.FieldSemantics                  : 'DataSubjectID';
+} 
+{
+  creditCardNo @PersonalData.IsPotentiallySensitive;
+}
+
+annotate bookshop.CustomerPostalAddress with @PersonalData : {
+  DataSubjectRole : 'Customer',
+  EntitySemantics : 'DataSubjectDetails'
+} 
+{
+  Customer @PersonalData.FieldSemantics : 'DataSubjectID';
   street   @PersonalData.IsPotentiallyPersonal;
   town     @PersonalData.IsPotentiallyPersonal;
   country  @PersonalData.IsPotentiallyPersonal;
 }
 
-/*
- * TODO: Personal Data Manager doesn't know EntitySemantics: 'Other' and FieldSemantics: 'ContractRelatedID'
- *       see: https://help.sap.com/viewer/620a3ea6aaf64610accdd05cca9e3de2/Cloud/en-US/5a55fae1eb7c496c92c56071186d76b3.html
- */
-annotate orders.Orders with @PersonalData : {
-  DataSubjectRole : 'Customer',
-  EntitySemantics : 'LegalGround'
-}{
-  ID       @PersonalData.FieldSemantics   : 'LegalGroundID';
-  customer @PersonalData.FieldSemantics   : 'DataSubjectID';
+annotate bookshop.Orders with @PersonalData.EntitySemantics : 'Other'
+{
+  ID              @PersonalData.FieldSemantics : 'ContractRelatedID';
+  Customer        @PersonalData.FieldSemantics : 'DataSubjectID';
+  personalComment @PersonalData.IsPotentiallyPersonal;
 }
 
-/*
- * additional annotations for Audit Logging
- */
-annotate gdpr.Customers with @AuditLog.Operation : {
+// annotations for Audit Log
+annotate bookshop.Customers with @AuditLog.Operation : {
   Read   : true,
   Insert : true,
   Update : true,
   Delete : true
 };
 
-annotate gdpr.CustomerPostalAddresses with @AuditLog.Operation : {
+// annotations for Audit Log
+annotate bookshop.CustomerPostalAddress with @AuditLog.Operation : {
+  Read   : true,
+  Insert : true,
+  Update : true,
+  Delete : true
+};
+
+// annotations for Audit Log
+annotate bookshop.Orders with @AuditLog.Operation : {
   Read   : true,
   Insert : true,
   Update : true,

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

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

gdpr/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;150;JPY;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;15;EUR;13

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

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

gdpr/db/data/sap.capire.bookshop-CustomerBillingData.csv

@@ -1,3 +1,3 @@
-ID;modifiedAt;createdAt;createdBy;modifiedBy;customer_ID;street;town;country_code
-1e2f2640-6866-4dcf-8f4d-3027aa831cad;2019-04-04;2019-01-31;admin@business.com;admin@business.com;8e2f2640-6866-4dcf-8f4d-3027aa831cad;Hauptstrasse 11;Berlin;DE
-24e718c9-ff99-47f1-8ca3-950c850777d4;2019-04-04;2019-01-30;admin@business.com;admin@business.com;74e718c9-ff99-47f1-8ca3-950c850777d4;Main Street 22;London;GB
+ID;modifiedAt;createdAt;createdBy;modifiedBy;Customer_ID;creditCardNo
+1e2f2640-6866-4dcf-8f4d-3027aa831cad;2019-04-04;2019-01-31;admin@business.com;admin@business.com;8e2f2640-6866-4dcf-8f4d-3027aa831cad;2222-1111-6666-7777
+24e718c9-ff99-47f1-8ca3-950c850777d4;2019-04-04;2019-01-30;admin@business.com;admin@business.com;74e718c9-ff99-47f1-8ca3-950c850777d4;3333-2222-5555-8888

gdpr/db/data/sap.capire.bookshop-CustomerPostalAddress.csv

@@ -0,0 +1,3 @@
+ID;modifiedAt;createdAt;createdBy;modifiedBy;Customer_ID;street;town;country_code;someOtherField
+1e2f2640-6866-4dcf-8f4d-3027aa831cad;2019-04-04;2019-01-31;admin@business.com;admin@business.com;8e2f2640-6866-4dcf-8f4d-3027aa831cad;Hauptstrasse 11;Berlin;DE;Eine Bemerkung
+24e718c9-ff99-47f1-8ca3-950c850777d4;2019-04-04;2019-01-30;admin@business.com;admin@business.com;74e718c9-ff99-47f1-8ca3-950c850777d4;Main Street 22;London;GB;Some Remark

gdpr/db/data/sap.capire.bookshop-Customers.csv

@@ -0,0 +1,3 @@
+ID;modifiedAt;createdAt;createdBy;modifiedBy;email;firstName;lastName;dateOfBirth
+8e2f2640-6866-4dcf-8f4d-3027aa831cad;2019-04-04;2019-01-31;admin@business.com;admin@business.com;john.doe@test.com;John;Doe;1970-01-01
+74e718c9-ff99-47f1-8ca3-950c850777d4;2019-04-04;2019-01-30;admin@business.com;admin@business.com;jane.doe@sap.com;Jane;Doe;1980-11-11

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

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

gdpr/db/data/sap.capire.bookshop-OrderItems.csv

@@ -0,0 +1,4 @@
+ID;amount;parent_ID;book_ID;netAmount
+78040e66-1dcd-4ffb-ab10-fdce32028b79;1;5e2f2640-6866-4dcf-8f4d-3027aa831cad;201;11.11
+84e718c9-ff99-47f1-8ca3-950c850777d4;1;5e2f2640-6866-4dcf-8f4d-3027aa831cad;271;15
+f9641166-e050-4261-bfee-d1e797e6cb7f;2;44e718c9-ff99-47f1-8ca3-950c850777d4;252;28

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

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

gdpr/db/data/sap.capire.gdpr-Customers.csv

@@ -1,3 +0,0 @@
-ID;modifiedAt;createdAt;createdBy;modifiedBy;email;firstName;lastName;creditCardNo;dateOfBirth
-8e2f2640-6866-4dcf-8f4d-3027aa831cad;2019-04-04;2019-01-31;admin@business.com;admin@business.com;john.doe@test.com;John;Doe;9977-6655-4433-2211;1970-01-01
-74e718c9-ff99-47f1-8ca3-950c850777d4;2019-04-04;2019-01-30;admin@business.com;admin@business.com;jane.doe@sap.com;Jane;Doe;2211-3344-5566-7788;1980-11-11

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

@@ -1,4 +0,0 @@
-ID;up__ID;quantity;product_ID;title;price
-4bd2c9df-c19f-47b8-a921-3cde0d863b52;29f15ef6-4a13-47d4-aef4-329a403b49eb;1;201;Wuthering Heights;11.11
-6c42a40d-5f7c-4c2f-816b-a73c7c28d722;29f15ef6-4a13-47d4-aef4-329a403b49eb;1;271;Catweazle;15
-748555fc-2cb0-42b5-a361-dd19a50bd682;31c2bd15-5146-4418-b574-866a08911de7;2;252;Eleonora;28

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

@@ -1,3 +0,0 @@
-ID;createdAt;createdBy;customer_ID;OrderNo;currency_code
-29f15ef6-4a13-47d4-aef4-329a403b49eb;2019-01-31;john.doe@test.com;8e2f2640-6866-4dcf-8f4d-3027aa831cad;1;EUR
-31c2bd15-5146-4418-b574-866a08911de7;2019-01-30;jane.doe@test.com;74e718c9-ff99-47f1-8ca3-950c850777d4;2;EUR

gdpr/db/schema.cds

@@ -1,30 +1,37 @@
-using {
-  Country,
-  managed,
-  cuid
-} from '@sap/cds/common';
-using {sap.capire.orders} from '@capire/orders';
+// Proxy for importing schema from bookshop sample
+using { sap.capire.bookshop.Books }        from '../../bookshop/db/schema';
+using { sap.capire.orders.Orders }         from '../../orders/db/schema';
+using { sap.capire.orders.OrderItems }     from '../../orders/db/schema';
+using { Country, managed, cuid }           from '@sap/cds/common';
 
-namespace sap.capire.gdpr;
+namespace sap.capire.bookshop;
 
-extend orders.Orders with {
-  customer : Association to Customers;
-}
+extend Orders with { 
+  Customer        : Association to Customers; 
+  personalComment : String;
+}  
 
 entity Customers : cuid, managed {
-  email        : String;
-  firstName    : String;
-  lastName     : String;
-  creditCardNo : String;
-  dateOfBirth  : Date;
-  addresses    : Composition of many CustomerPostalAddresses
-                   on addresses.customer = $self;
+  email         : String;
+  firstName     : String;
+  lastName      : String;
+ // creditCardNo  : String;
+  dateOfBirth   : Date;
+  billingData   : Composition of one CustomerBillingData   on billingData.Customer   = $self;
+  postalAddress : Composition of one CustomerPostalAddress on postalAddress.Customer = $self;
 }
 
-entity CustomerPostalAddresses : cuid, managed {
-  customer : Association to Customers;
-  street   : String(128);
-  town     : String(128);
-  @assert.integrity : false
-  country  : Country;
+entity CustomerPostalAddress : cuid, managed {
+  Customer       : Association to one Customers;
+  street         : String(128);
+  town           : String(128);
+  country        : Country;           
+  someOtherField : String(128);
 };
+
+
+entity CustomerBillingData : cuid, managed {
+  Customer      : Association to one Customers;
+  creditCardNo  : String;
+};
+

gdpr/index.cds

@@ -0,0 +1,4 @@
+namespace sap.capire.gdpr; //> important for reflection
+using from './db/schema';
+using from './srv/pdm-service';
+using from './srv/log-service';

gdpr/manifest.yml

@@ -1,5 +1,22 @@
+# Generated manifest.yml based on template version 0.1.0
+# appName = gdpr
+# language=nodejs
+# multiTenant=false
 ---
 applications:
+# -----------------------------------------------------------------------------------
+# Backend Service
+# -----------------------------------------------------------------------------------
+- name: gdpr-srv
+  path: gen/srv
+  memory: 256M
+  buildpack: nodejs_buildpack
+  services:
+  - gdpr-db
+  - uaa
+#  - name: pdm
+#    parameters: ./pdm-config.json 
+
 # -----------------------------------------------------------------------------------
 # HANA Database Content Deployer App
 # -----------------------------------------------------------------------------------
@@ -8,24 +25,7 @@ applications:
   no-route: true
   health-check-type: process
   memory: 256M
+  instances: 1
   buildpack: nodejs_buildpack
   services:
-  - gdpr-logs
-  - gdpr-hdi
-# -----------------------------------------------------------------------------------
-# Backend Service
-# -----------------------------------------------------------------------------------
-- name: gdpr-srv
-  path: gen/srv
-  memory: 256M
-  buildpack: nodejs_buildpack
-  routes:
-  - route: capire-gdpr-srv.cfapps.eu10.hana.ondemand.com
-  services:
-  - gdpr-logs
-  - gdpr-hdi
-  - gdpr-uaa
-  - gdpr-auditlog
-  # binding with parameters not yet supported -> binding done manually in .etc/deploy.sh
-  #- name: gdpr-pdm
-  #  parameters: ./pdm-binding-config.json
+  - gdpr-db

gdpr/mta.yaml

@@ -0,0 +1,72 @@
+## Generated mta.yaml based on template version 0.4.0
+## appName = gdpr
+## language=nodejs; multitenant=false
+## approuter=
+_schema-version: '3.1'
+ID: capire.gdpr
+version: 1.0.0
+description: "gdpr"
+parameters:
+  enable-parallel-deployments: true
+   
+build-parameters:
+  before-all:
+   - builder: custom
+     commands:
+      - npm install --production
+      - npx -p @sap/cds-dk cds build --production
+
+modules:
+ # --------------------- SERVER MODULE ------------------------
+ - name: gdpr-srv
+ # ------------------------------------------------------------
+   type: nodejs
+   path: gen/srv
+   parameters:
+     buildpack: nodejs_buildpack
+   requires:
+    # Resources extracted from CAP configuration
+    - name: gdpr-db
+    - name: gdpr-uaa
+   provides:
+    - name: srv-api      # required by consumers of CAP services (e.g. approuter)
+      properties:
+        srv-url: ${default-url}
+
+ # -------------------- SIDECAR MODULE ------------------------
+ - name: gdpr-db-deployer
+ # ------------------------------------------------------------
+   type: hdb
+   path: gen/db  
+   parameters:
+     buildpack: nodejs_buildpack
+   requires:
+    # 'hana' and 'xsuaa' resources extracted from CAP configuration
+    - name: gdpr-db
+    - name: gdpr-uaa
+
+
+resources:
+ # services extracted from CAP configuration
+ # 'service-plan' can be configured via 'cds.requires.<name>.vcap.plan'
+# ------------------------------------------------------------
+ - name: gdpr-db
+# ------------------------------------------------------------
+   type: com.sap.xs.hdi-container
+   parameters:
+     service: hana  # or 'hanatrial' on trial landscapes
+     service-plan: hdi-shared
+   properties:
+     hdi-service-name: ${service-name}
+# ------------------------------------------------------------
+ - name: gdpr-uaa
+# ------------------------------------------------------------
+   type: org.cloudfoundry.managed-service
+   parameters:
+     service: xsuaa
+     service-plan: application  
+     config:
+       xsappname: gdpr-${space}    #  name + space dependency
+       tenant-mode: dedicated
+
+

gdpr/package.json

@@ -1,48 +1,33 @@
 {
-  "name": "@capire/gdpr",
-  "version": "0.0.1",
-  "dependencies": {
-    "@capire/orders": "../orders",
-    "@sap/audit-logging": "^5.1.0",
-    "@sap/cds": "^5.7",
-    "express": "^4.17.1",
-    "hdb": "^0.19.0"
-  },
-  "scripts": {
-    "build": "rm -rf gen && cds build --production",
-    "deploy": "sh .etc/deploy.sh",
-    "undeploy": "sh .etc/undeploy.sh",
-    "start": "cds run"
-  },
-  "cds": {
-    "requires": {
-      "auth": {
-        "__comment__": "workaround to avoid approuter et al. setup",
-        "impl": "srv/auth.js"
-      },
-      "audit-log": {
-        "[development]": {
-          "credentials": {
-            "logToConsole": true
-          }
-        }
-      },
-      "db": {
-        "kind": "sql"
-      },
-      "uaa": {
-        "kind": "xsuaa"
-      }
+    "name": "@capire/gdpr",
+    "version": "1.0.0",
+    "dependencies": {
+        "@capire/bookshop": "../bookshop",
+        "@capire/common": "../common",
+        "@capire/orders": "../orders",
+        "@sap/cds": "^5",
+        "@sap/hana-client": "^2.4.177",
+        "@sap/xsenv": "^3.1.0",
+        "@sap/xssec": "^3.1.1",
+        "express": "^4.17.1",
+        "passport": "^0.4.1"
     },
-    "features": {
-      "audit_personal_data": true,
-      "fiori_preview": true,
-      "[production]": {
-        "kibana_formatter": true
-      }
+    "scripts": {
+        "start": "cds run --in-memory?",
+        "watch": "cds watch"
     },
-    "hana": {
-      "deploy-format": "hdbtable"
+    "cds": {
+        "requires": {
+            "db": {
+                "kind": "sql"
+            },
+            "uaa": {
+                "kind": "xsuaa"
+            },
+            "audit-log": {
+                "impl": "srv/customAuditLog.js"
+            }
+        },
+        "features": {"audit_personal_data": true}
     }
-  }
 }

gdpr/readme.md

@@ -1,35 +0,0 @@
-# how-to
-
-## required services and subscriptions
-
-services:
-- Audit Log Service
-- SAP HANA Cloud
-- SAP HANA Schemas & HDI Containers
-- Application Logging Service
-- Personal Data Manager
-- Authorization and Trust Management Service
-
-subscriptions:
-- Audit Log Viewer Service
-- Personal Data Manager
-
-## deploy
-
-after adding the necessary entitlements, do:
-- `cf l` to log into the respective account
-- `cd gdpr` (if still in root of `cloud-cap-samples`)
-- `npm run deploy`, which executes build and deployment via `.etc/deploy.sh`
-
-## authorization
-
-create roles for Audit Log Viewer Service and Personal Data Manager, and assign the roles to the respective users
-
-# open issues
-
-- deploy via mta, which can bind with parameters, and get rid of scripts in `.etc`
-- use approuter to remove hacky custom auth impl (`srv/auth.js`)
-- clarify annotation `EntitySemantics`, which differs between audit logging (`Other`) and personal data manager (`LegalGround`)
-- annotations for order items Fiori preview app
-  + `Products` has `@cds.persistence.skip:'always'`
-- how to reuse intial data from `common`?

gdpr/services-manifest.yml

@@ -1,20 +1,18 @@
+# Generated services-manifest.yml based on template version 0.1.0
+# appName = gdpr
 ---
 create-services:
-  - name:       gdpr-logs         # > for kibana
-    broker:     application-logs
-    plan:       standard
-  - name:       gdpr-hdi          # > hana
-    broker:     hana
-    plan:       hdi-shared
-  - name:       gdpr-auditlog     # > audit log sink
-    broker:     auditlog
-    plan:       standard
-  # gdpr-pdm needs to exist before creating gdpr-uaa for authorization grant
-  - name:       gdpr-pdm          # > personal data manager
-    broker:     personal-data-manager-service
-    plan:       standard
+# ------------------------------------------------------------
+  - name:   gdpr-db
+    broker: hana  # 'hanatrial' on trial landscapes
+    plan: "hdi-shared"
+  - name:   pdm
+    broker: personal-data-manager-service  
+    plan: standard
     parameters: ./.pdm/pdm-instance-config.json
-  - name:       gdpr-uaa          # > uaa for authentication
-    broker:     xsuaa
-    plan:       application
+  - name:   uaa
+    broker: xsuaa
+    plan: application
     parameters: xs-security.json
+     
+

gdpr/srv/auth.js

@@ -1,43 +0,0 @@
-/*
- * workaround to avoid approuter et al. setup
- */
-
-const jwt = require('jsonwebtoken')
-const tenant = process.env.VCAP_SERVICES
-  ? JSON.parse(process.env.VCAP_SERVICES).xsuaa[0].credentials.tenantid
-  : 'anonymous'
-
-module.exports = (req, res, next) => {
-  /*
-   * decode JWT coming from Personal Data Manager
-   *
-   * DO NOT USE FOR PRODUCTION!
-   * - no token validation
-   * - no xsappname check
-   */
-  const bearer = req.headers.authorization && req.headers.authorization.split('Bearer ')[1]
-  if (bearer) {
-    const { client_id: id, zid: tenant, scope: roles } = jwt.decode(bearer)
-    req.user = {
-      id,
-      tenant,
-      is: role => roles.some(r => r.endsWith(`.${role}`))
-    }
-    return next()
-  }
-
-  // mock user that has every role EXCEPT PersonalDataManagerUser
-  const basic = req.headers.authorization && req.headers.authorization.split('Basic ')[1]
-  if (basic) {
-    const [id] = Buffer.from(basic, 'base64').toString('utf-8').split(':')
-    req.user = {
-      id,
-      tenant,
-      is: role => role !== 'PersonalDataManagerUser'
-    }
-    return next()
-  }
-
-  // no bearer & no basic -> 401
-  res.set('WWW-Authenticate', 'Basic realm="Users"').status(401).end()
-}

gdpr/srv/customAuditLog.js

@@ -0,0 +1,143 @@
+const cds = require('@sap/cds')
+
+module.exports = class MyAuditLogService extends cds.AuditLogService {
+  async init() {
+    
+    // console.log('My Audit Log');
+    // call AuditLogService's init
+    await super.init()
+
+    const db = await cds.connect.to('db')
+    const { AuditLogStore } = db.entities('sap.capire.auditLog')
+
+    // register custom handlers
+    this.on('dataAccessLog', async req => {
+   
+    const logs = [];
+
+    const action    = 'DataAccess';
+    const user      = req.user.id;
+    const timestamp = req.timestamp;
+    const tenant    = req.tenant;
+    const channel   = req.channel;
+   
+    req.data.accesses.forEach( dataAccess => {
+      logs.push({
+          Action:          action,
+          User:            user,
+          Timestamp:       timestamp,
+          Tenant:          tenant,
+          Channel:         channel,
+          DataSubjectType: dataAccess.dataSubject.type,
+          DataSubjectRole: dataAccess.dataSubject.role,
+          DataSubjectID:   JSON.stringify(dataAccess.dataSubject.id),
+          ObjectType:      dataAccess.dataObject.type,
+          ObjectKey:       JSON.stringify(dataAccess.dataObject.id),
+          Blob: JSON.stringify(dataAccess)   
+      })  }
+    )
+   
+
+    await INSERT.into(AuditLogStore).entries(logs)
+    }
+    )
+
+    this.on('dataModificationLog', async req => {
+
+      const mods = [];
+
+      const action    = 'DataModification';
+      const user      = req.user.id;
+      const timestamp = req.timestamp;
+      const tenant    = req.tenant;
+      const channel   = req.channel;
+
+      req.data.modifications.forEach( dataModification => {
+        mods.push({
+            Action:          action,
+            User:            user,
+            Timestamp:       timestamp,
+            Tenant:          tenant,
+            Channel:         channel,
+            DataSubjectType: dataModification.dataSubject.type,
+            DataSubjectRole: dataModification.dataSubject.role,
+            DataSubjectID:   JSON.stringify(dataModification.dataSubject.id),
+            ObjectType:      dataModification.dataObject.type,
+            ObjectKey:       JSON.stringify(dataModification.dataObject.id),
+            Blob: JSON.stringify(dataModification)   
+        })  }
+      )
+    
+      
+
+      await INSERT.into(AuditLogStore).entries(mods)
+      }
+      )
+    }
+  
+  
+
+
+    
+
+
+    }
+
+/*
+service AuditLogService {
+
+    // SEC-254: Log read access to sensitive personal data
+    event dataAccessLog {
+      accesses         : array of Access;
+    };
+  
+    // SEC-265: Log changes to personal data
+    event dataModificationLog : {
+      c : array of DataModification;
+    };
+}
+*/
+
+
+/*
+define type KeyValuePair {
+  keyName : String;
+  value   : String;
+};
+
+define type DataObject {
+  type : String;
+  id   : array of KeyValuePair;
+};
+
+define type DataSubject {
+  type : String;
+  id   : array of KeyValuePair;
+  role : String;
+};
+
+define type Attribute {
+  name : String;
+};
+
+
+define type Access {
+  dataObject  : DataObject;
+  dataSubject : DataSubject;
+  attributes  : array of Attribute;
+  attachments : array of Attachment;
+};
+
+define type ChangedAttribute {
+  name     : String;
+  oldValue : String;
+  newValue : String;
+};
+
+define type DataModification {
+  dataObject  : DataObject;
+  dataSubject : DataSubject;
+  action      : String @assert.range enum { Create; Update; Delete; };
+  attributes  : array of ChangedAttribute;
+}
+*/

gdpr/srv/gdpr-service.cds

@@ -1,10 +0,0 @@
-using {
-  sap.capire.orders,
-  sap.capire.gdpr
-} from '../db/schema';
-
-@requires : 'admin' // > authorization check
-service GDPRService {
-  entity Customers as projection on gdpr.Customers;
-  entity Orders    as projection on orders.Orders;
-}

gdpr/srv/log-service.cds

@@ -0,0 +1,14 @@
+using {sap.capire.bookshop as db}   from '../db/data-privacy';
+using {sap.capire.orders   as dbo}   from '../db/data-privacy';
+using {sap.capire.auditLog as log}  from '../db/AuditLogStore.cds';
+
+//@requires: 'PersonalDataManagerUser' // security check
+service LogService {
+
+  entity Customers             as projection on db.Customers;
+  entity CustomerPostalAddress as projection on db.CustomerPostalAddress;
+  entity Orders                as projection on dbo.Orders;
+
+  entity AuditLogStore         as projection on log.AuditLogStore;
+        
+};

gdpr/srv/pdm-service.cds

@@ -1,18 +1,36 @@
-using {
-  sap.capire.gdpr as gdpr,
-  sap.capire.orders as orders
-} from '../db/data-privacy';
+using {sap.capire.bookshop as db}      from '../db/data-privacy';
+using {sap.capire.bookshop.Books}      from '../db/data-privacy';
+using {sap.capire.orders.Orders}       from '../db/data-privacy';
+using {sap.capire.orders.OrderItems}   from '../db/data-privacy';
 
-@requires : 'PersonalDataManagerUser' // > authorization check
+//@requires: 'PersonalDataManagerUser' // security check
 service PDMService {
 
-  entity Customers               as projection on gdpr.Customers;
-  entity CustomerPostalAddresses as projection on gdpr.CustomerPostalAddresses;
-  entity Orders                  as projection on orders.Orders;
+  entity Customers             as projection on db.Customers;
+  entity CustomerPostalAddress as projection on db.CustomerPostalAddress;
+  entity CustomerBillingData   as projection on db.CustomerBillingData;
 
-  /*
-   * additional annotations for Personal Data Manager's Search Fields
-   */
+  //   create view on Orders and Items as flat projection
+  entity OrderItemView         as
+    select from Orders {
+          ID,
+      key Items.ID        as Item_ID,
+          OrderNo,
+          Customer.ID     as Customer_ID,
+          Customer.email  as Customer_Email,
+          Items.book.ID   as Item_Book_ID,
+          Items.amount    as Item_Amount,
+          Items.netAmount as Item_NetAmount
+    };
+
+  //  annotate new view
+  annotate PDMService.OrderItemView with @(PersonalData.EntitySemantics : 'Other') {
+    Item_ID        @PersonalData.FieldSemantics : 'ContractRelatedID';
+    Customer_ID    @PersonalData.FieldSemantics : 'DataSubjectID';
+    Customer_Email @PersonalData.IsPotentiallyPersonal;
+  };
+
+  // annotations for Personal Data Manager - Search Fields
   annotate Customers with @(Communication.Contact : {
     n    : {
       surname : lastName,
@@ -21,4 +39,6 @@ service PDMService {
     bday : dateOfBirth
   });
 
+  //  Data Privacy annotations on 'Customers' and 'CustomerPostalAddress' are derived from original entity definitions
+
 };

gdpr/srv/server.js

@@ -1,26 +0,0 @@
-const cds = require('@sap/cds')
-
-/*
- * in development, write audit logs to custom sink (i.e., to console in this example)
- */
-cds.on('served', async () => {
-  if (process.env.NODE_ENV === 'production') return
-
-  const auditLogService = await cds.connect.to('audit-log')
-  // use prepend to get called before the generic implementation
-  auditLogService.prepend(function() {
-    const LOG = cds.log('my custom audit logging impl')
-    // triggered when reading sensitive personal data
-    this.on('dataAccessLog', function(req) {
-      const { accesses } = req.data
-      for (const access of accesses) LOG.info(access)
-    })
-    // triggered when modifying personal data
-    this.on('dataModificationLog', function(req) {
-      const { modifications } = req.data
-      for (const modification of modifications) LOG.info(modification)
-    })
-  })
-})
-
-module.exports = cds.server

gdpr/test.http

@@ -0,0 +1,25 @@
+###
+
+get http://localhost:4004/log/AuditLogStore
+
+###
+
+get http://localhost:4004/log/Customers
+
+###
+
+post http://localhost:4004/log/Customers
+Content-Type: application/json
+
+{
+            "ID": "22e718c9-ff99-47f1-8ca3-950c850777d4",
+            "createdAt": "2019-01-30T00:00:00.000Z",
+            "createdBy": "admin@business.com",
+            "modifiedAt": "2019-04-04T00:00:00.000Z",
+            "modifiedBy": "admin@business.com",
+            "email": "johanna.doe@company.org",
+            "firstName": "Queen Johanna",
+            "lastName": "Doe",
+            "creditCardNo": "1313-7171-5656-7878",
+            "dateOfBirth": "2001-11-11"
+}

gdpr/xs-security.json

@@ -1,14 +1,13 @@
-{
-  "xsappname": "capire-gdpr",
-  "tenant-mode": "shared",
-  "scopes": [{
-    "name": "$XSAPPNAME.PersonalDataManagerUser",
-    "description": "Authority for Personal Data Manager",
-    "grant-as-authority-to-apps": [
-      "$XSSERVICENAME(gdpr-pdm)"
-    ]
-  }, {
-    "name": "$XSAPPNAME.admin",
-    "description": "Administrator"
-  }]
-}
+{
+    "xsappname": "gdpr-bookshop",
+    "tenant-mode": "shared",
+    "scopes": [
+        {
+            "name": "$XSAPPNAME.PersonalDataManagerUser",
+            "description": "Authority for Personal Data Manager",
+            "grant-as-authority-to-apps": [
+                "$XSSERVICENAME(pdm)"
+            ]
+        }
+    ]
+}

hello/package.json

@@ -7,28 +7,13 @@
     "start:ts": "cds-ts serve srv/world.cds"
   },
   "dependencies": {
-    "@sap/cds": "^5.0.4"
+    "@sap/cds": ">=5.0.4"
   },
   "devDependencies": {
-    "@types/jest": "^27.0.2",
-    "@types/node": "^16.11.6",
-    "ts-jest": "^27.0.2",
+    "@types/jest": "*",
+    "@types/node": "*",
     "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
-          ]
-        }
-      }
-    }
-  },
   "eslintConfig": {
     "extends": "eslint:recommended",
     "env": {

hello/srv/world.js

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

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/hello-world-ts.test.ts

@@ -1,15 +0,0 @@
-process.env.CDS_TYPESCRIPT = 'true';
-import * as cds from '@sap/cds';
-
-//@ts-ignore
-const {GET} = cds.test.in(__dirname,'../srv').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)
-    })
-
-})

loggers/app/loggers.html

@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <title> cds.log </title>
+  <link rel="stylesheet" href="https://unpkg.com/primitive-ui/dist/css/main.css">
+  <script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/vue@3/dist/vue.global.prod.js"></script>
+  <style>
+    select { border-color: transparent; padding: 4px 12px; margin: 0px; }
+    button { padding: 2px 11px; margin: 0px 4px; font: 90% italic; }
+  </style>
+</head>
+
+<body class="small-container" , style="margin-top: 70px;">
+  <div id='app'>
+    <h1> Log Levels </h1>
+    <input type="text" placeholder="Search by ID or Log Level..." @input="fetch">
+    <table id='loggers'>
+      <thead>
+        <th> Module ID </th>
+        <th> Log Level </th>
+      </thead>
+      <tr v-for="each in list">
+        <td>{{ each.id }}</td>
+        <td><select v-bind:id="each.id" v-model="each.level" @change="set">
+            <option>SILENT</option>
+            <option>ERROR</option>
+            <option>WARN</option>
+            <option>INFO</option>
+            <option>DEBUG</option>
+            <option>TRACE</option>
+          </select>
+        </td>
+      </tr>
+    </table>
+    <h4>Log Format:</h4>
+    [ <button class="round-button" :class={'muted-button':!format.timestamp} @click="toggle_format" id="timestamp">Timestamp </button>
+    | <button class="round-button" :class={'muted-button':!format.level} @click="toggle_format" id="level">Log Level </button>
+    | <button class="round-button" :class={'muted-button':!format.tenant} @click="toggle_format" id="tenant">Tenant </button>
+    | <button class="round-button" :class={'muted-button':!format.reqid} @click="toggle_format" id="reqid">Request ID </button>
+    | <button class="round-button" :class={'muted-button':!format.id} @click="toggle_format" id="module">Logger ID </button>
+    ] - <i>log message ...</i>
+  </div>
+</body>
+
+<script>
+  axios.defaults.headers['Content-Type'] = 'application/json'
+  axios.defaults.baseURL = '/log'
+  const loggers = Vue.createApp({ el: '#app',
+  data() {
+      return {
+        format: { timestamp:false, level:false, tenant:false, reqid:false, id:true, },
+        list: [],
+      }
+    },
+    methods: {
+      async fetch (eve) {
+        this.list = (await axios.get (`/Loggers${
+          eve && eve.target.value ? `?$search=${eve.target.value}` : ''
+        }`)).data
+      },
+      async set (eve) {
+        const { id, value:level } = eve.target
+        await axios.put (`/Logger/${id}`, {id,level})
+      },
+      async toggle_format (eve) {
+        this.format[eve.target.id] = !this.format[eve.target.id]
+        await axios.post (`/format`, this.format)
+      },
+    },
+  }).mount('#app')
+  loggers.fetch() // initially fill list of loggers
+</script>
+
+</html>

loggers/package.json

@@ -0,0 +1,22 @@
+{
+  "name": "@capire/loggers",
+  "version": "1.0.0",
+  "description": "Simple sample on how to dynamically set cds.log levels and formats.",
+  "files": [
+    "app",
+    "srv"
+  ],
+  "dependencies": {
+    "@sap/cds": ">=5.9",
+    "express": "^4.17.1"
+  },
+  "scripts": {
+    "start": "cds run",
+    "watch": "cds watch"
+  },
+  "cds": {
+    "requires": {
+      "db": "sql"
+    }
+  }
+}

loggers/readme.md

@@ -0,0 +1,11 @@
+# Dynamically Set `cds.log` Levels and Formats
+
+### Run 
+
+```sh
+cds watch
+```
+
+### Test
+
+Either using the UI through http://localhost:4004/loggers.html, or try the requests in `test/requests.http`

loggers/srv/dummy.cds

@@ -0,0 +1,3 @@
+service Sue {
+  entity Dummy { key ID: UUID; title: String; }
+}