Update

.registry/server.js

@@ -16,8 +16,7 @@ app.use('/-/:tarball', (req,res,next) => {
   console.debug ('GET', req.params)
   try {
     const { tarball } = req.params
-    const pkgFull = tarball.substring(0, tarball.lastIndexOf('-'))
-    const [, pkg ] = /^\w+-(.+)/.exec(pkgFull)
+    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)
@@ -32,7 +31,7 @@ app.use('/-/:tarball', (req,res,next) => {
 app.use('/-', express.static(__dirname))
 
 app.get('/*', (req,res)=>{
-  const urlRegex = /^\/(@[\w-]+)\/(.+)/
+  const urlRegex = /^\/(@\w+)\/(\w+)/
   const url = decodeURIComponent(req.url)
   console.debug ('GET',url)
   try {

bookshop/app/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "approuter",
+  "dependencies": {
+    "@sap/approuter": "^10"
+  },
+  "engines": {
+    "node": "^16"
+  },
+  "scripts": {
+    "start": "node node_modules/@sap/approuter/approuter.js"
+  }
+}

bookshop/app/vue/app.js

@@ -40,22 +40,19 @@ const books = Vue.createApp ({
             } catch (e) {
                 books.order = { quantity, failed: e.response.data.error ? e.response.data.error.message : e.response.data }
             }
-        },
-
-        async fetchUserInfo() {
-            try {
-                const { data } = await axios.get('/user/me')
-                books.user = data
-            } catch (err) { books.user = { id: err.message } }
         }
+
     }
 }).mount("#app")
 
 // initially fill list of books
 books.fetch()
 
-books.fetchUserInfo()
-document.addEventListener('keydown', (event) => {
-    // hide user info on request
-    if (event.key === 'u')  books.user = undefined
+// show user info on request
+document.addEventListener('keydown', async (event) => {
+    if (event.key === 'u')  {
+        try {
+            books.user = (await axios.get('/user/User')).data
+        } catch (err) { }
+    }
 })

bookshop/app/vue/index.html

@@ -18,10 +18,10 @@
 <body class="small-container", style="margin-top: 70px;">
 <div id='app'>
 
-    <div v-if="user" class="user">
-        <div>User: {{ user.id || 'anonymous' }}</div>
+    <div v-if="user.ID && user.ID !== 'anonymous'" class="user">
+        <div>User: {{ user.ID }}</div>
         <div>Locale: {{ user.locale }}</div>
-        <div v-if="user.tenant">Tenant: {{ user.tenant }}</div>
+        <div>Tenant: {{ user.tenant }}</div>
     </div>
 
     <h1> Capire Books </h1>

bookshop/app/xs-app.json

@@ -0,0 +1,19 @@
+{
+  "authenticationMethod": "route",
+  "routes": [
+    {
+      "source": "^/app/(.*)$",
+      "target": "$1",
+      "localDir": ".",
+      "authenticationType": "xsuaa",
+      "cacheControl": "no-cache, no-store, must-revalidate"
+    },
+    {
+      "source": "^/(.*)$",
+      "target": "$1",
+      "destination": "srv-api",
+      "authenticationType": "xsuaa",
+      "csrfProtection": false
+    }
+  ]
+}

bookshop/db/src/.hdiconfig

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

bookshop/db/undeploy.json

@@ -0,0 +1,5 @@
+[
+  "src/gen/**/*.hdbview",
+  "src/gen/**/*.hdbindex",
+  "src/gen/**/*.hdbconstraint"
+]

bookshop/mta.yaml

@@ -0,0 +1,98 @@
+---
+_schema-version: '3.1'
+ID: capire.bookshop
+version: 1.0.0
+description: "A simple self-contained bookshop service."
+parameters:
+  enable-parallel-deployments: true
+build-parameters:
+  before-all:
+    - builder: custom
+      commands:
+        - npx -p @sap/cds-dk cds build --production
+
+modules:
+  - name: bookshop-srv
+    type: nodejs
+    path: gen/srv
+    parameters:
+      buildpack: nodejs_buildpack
+    build-parameters:
+      builder: npm-ci
+    provides:
+      - name: srv-api # required by consumers of CAP services (e.g. approuter)
+        properties:
+          srv-url: ${default-url}
+      - name: mtx-api # potentially required by approuter
+        properties:
+          mtx-url: ${default-url}
+    requires:
+      - name: bookshop-auth
+      - name: bookshop-db
+      - name: bookshop-registry
+    properties:
+      SUBSCRIPTION_URL: ${protocol}://\${tenant_subdomain}-${default-uri}
+      SUBSCRIPTION_URL_REPLACEMENT_RULES: [ [ '-srv', '' ] ]
+
+  - name: bookshop
+    type: approuter.nodejs
+    path: app/ # from cds.env.folders. Consider also cds.env.build.target -> gen/app
+    parameters:
+      keep-existing-routes: true
+      disk-quota: 256M
+      memory: 256M
+    requires:
+      - name: srv-api
+        group: destinations
+        properties:
+          name: srv-api # must be used in xs-app.json as well
+          url: ~{srv-url}
+          forwardAuthToken: true
+      - name: bookshop-auth
+      - name: mtx-api
+        group: destinations
+        properties:
+          name: mtx-api # must be used in xs-app.json as well
+          url: ~{mtx-url}
+    properties:
+      TENANT_HOST_PATTERN: "^(.*)-${default-uri}"
+
+resources:
+
+  - name: bookshop-auth
+    type: org.cloudfoundry.managed-service
+    parameters:
+      service: xsuaa
+      service-plan: application
+      path: ./xs-security.json
+      config:
+        xsappname: bookshop-${org}-${space}
+        tenant-mode: shared
+
+  - name: bookshop-db
+    type: org.cloudfoundry.managed-service
+    parameters:
+      service: service-manager
+      service-plan: container
+    properties:
+      hdi-service-name: ${service-name}
+
+  - name: bookshop-registry
+    type: org.cloudfoundry.managed-service
+    requires:
+      - name: mtx-api
+    parameters:
+      service: saas-registry
+      service-plan: application
+      config:
+        xsappname: bookshop-${org}-${space}
+        appName: bookshop-${org}-${space}
+        displayName: bookshop
+        description: A simple CAP project.
+        category: 'Category'
+        appUrls:
+          getDependencies: ~{mtx-api/mtx-url}/mtx/v1/provisioning/dependencies
+          onSubscription: ~{mtx-api/mtx-url}/mtx/v1/provisioning/tenant/{tenantId}
+          onSubscriptionAsync: false
+          onUnSubscriptionAsync: false
+          callbackTimeoutMillis: 300000

bookshop/package.json

@@ -10,9 +10,12 @@
     "index.js"
   ],
   "dependencies": {
-    "@sap/cds": "^6.1.1",
+    "@sap/cds": "^5",
+    "@sap/cds-mtx": "^2",
+    "@sap/xssec": "^3",
     "express": "^4.17.1",
-    "passport": ">=0.4.1"
+    "hdb": "^0.19.0",
+    "passport": "0.4.1"
   },
   "scripts": {
     "genres": "cds serve test/genres.cds",
@@ -22,11 +25,25 @@
   "cds": {
     "requires": {
       "db": {
-        "kind": "sqlite",
-        "credentials": {
-          "database": "sqlite.db"
+        "kind": "sql"
+      },
+      "[production]": {
+        "db": {
+          "kind": "hana-mt"
+        },
+        "auth": {
+          "kind": "xsuaa"
+        },
+        "multitenancy": true,
+        "approuter": {
+          "kind": "cloudfoundry"
         }
       }
+    },
+    "mtx": {
+      "element-prefix": "Z_",
+      "namespace-blocklist": [],
+      "extension-allowlist": []
     }
   }
 }

bookshop/srv/user-service.cds

@@ -1,14 +1,9 @@
-/**
- * Exposes user information
- */
-@requires: 'authenticated-user'
+@requires : 'authenticated-user'
 service UserService {
 
-  /**
-   * The current user
-   */
-  @odata.singleton entity me {
-    id     : String; // user id
+  @odata.singleton
+  entity User {
+    ID     : String;
     locale : String;
     tenant : String;
   }

bookshop/srv/user-service.js

@@ -1,4 +1,11 @@
-const cds = require('@sap/cds')
+const cds = require('@sap/cds');
+
 module.exports = cds.service.impl((srv) => {
-  srv.on('READ', 'me', ({ tenant, user, locale }) => ({ id: user.id, locale, tenant }))
-})
+  srv.on('READ', 'User', ({ user }) => {
+    return {
+      ID: user.id,
+      locale: user.locale,
+      tenant: user.tenant,
+    };
+  });
+});

bookshop/test/requests.http

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

bookshop/xs-security.json

@@ -0,0 +1,70 @@
+{
+  "scopes": [
+    {
+      "name": "$XSAPPNAME.admin",
+      "description": "admin"
+    },
+    {
+      "name": "$XSAPPNAME.MtxDiagnose",
+      "description": "Diagnose MTX"
+    },
+    {
+      "name": "$XSAPPNAME.mtcallback",
+      "description": "Subscribe to applications",
+      "grant-as-authority-to-apps": [
+        "$XSAPPNAME(application,sap-provisioning,tenant-onboarding)"
+      ]
+    },
+    {
+      "name": "$XSAPPNAME.mtdeployment",
+      "description": "Deploy applications"
+    },
+    {
+      "name": "$XSAPPNAME.ExtendCDS",
+      "description": "Extend CDS applications"
+    },
+    {
+      "name": "$XSAPPNAME.ExtendCDSdelete",
+      "description": "Extend CDS applications with undeployments"
+    }
+  ],
+  "attributes": [],
+  "role-templates": [
+    {
+      "name": "admin",
+      "description": "generated",
+      "scope-references": [
+        "$XSAPPNAME.admin"
+      ],
+      "attribute-references": []
+    },
+    {
+      "name": "MultitenancyAdministrator",
+      "description": "Administrate multitenant applications",
+      "scope-references": [
+        "$XSAPPNAME.MtxDiagnose",
+        "$XSAPPNAME.mtdeployment",
+        "$XSAPPNAME.mtcallback"
+      ]
+    },
+    {
+      "name": "ExtensionDeveloper",
+      "description": "Extend application",
+      "scope-references": [
+        "$XSAPPNAME.ExtendCDS"
+      ]
+    },
+    {
+      "name": "ExtensionDeveloperUndeploy",
+      "description": "Undeploy extension",
+      "scope-references": [
+        "$XSAPPNAME.ExtendCDSdelete"
+      ]
+    }
+  ],
+  "authorities": [
+    "$XSAPPNAME.MtxDiagnose",
+    "$XSAPPNAME.mtdeployment",
+    "$XSAPPNAME.mtcallback"
+  ]
+}

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": {

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",

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

@@ -3,9 +3,9 @@
   "version": "1.0.0",
   "dependencies": {
     "@capire/bookstore": "*",
-    "@sap/cds": ">=5",
+    "@sap/cds": "^5",
     "express": "^4.17.1",
-    "passport": ">=0.4.1"
+    "passport": "^0.4.1"
   },
   "scripts": {
     "start": "cds run --in-memory?",
@@ -14,7 +14,7 @@
   "cds": {
     "requires": {
       "auth": {
-        "kind": "dummy-auth"
+        "strategy": "dummy"
       },
       "ReviewsService": {
         "kind": "odata",
@@ -51,4 +51,4 @@
       }
     }
   }
-}
+}

hello/package.json

@@ -7,11 +7,11 @@
     "start:ts": "cds-ts serve srv/world.cds"
   },
   "dependencies": {
-    "@sap/cds": ">=5.0.4"
+    "@sap/cds": "^5.0.4"
   },
   "devDependencies": {
-    "@types/jest": "*",
-    "@types/node": "*",
+    "@types/jest": "^27.0.2",
+    "@types/node": "^16.11.6",
     "ts-jest": "^27.0.2",
     "typescript": "^4.3.5"
   },

orders/app/fiori.cds

@@ -2,19 +2,19 @@
 
 ////////////////////////////////////////////////////////////////////////////
 //
-//	Note: this is designed for the PerformanceService being co-located with
-//	bookshop. It does not work if PerformanceService is run as a separate
+//	Note: this is designed for the OrdersService being co-located with
+//	bookshop. It does not work if OrdersService is run as a separate
 // 	process, and is not intended to do so.
 //
 ////////////////////////////////////////////////////////////////////////////
 
 
 
-using { PerformanceService } from '../srv/performance-service';
+using { OrdersService } from '../srv/orders-service';
 
 
 @odata.draft.enabled
-annotate PerformanceService.Orders with @(
+annotate OrdersService.Orders with @(
 	UI: {
 		SelectionFields: [ createdAt, createdBy ],
 		LineItem: [
@@ -68,7 +68,7 @@ annotate PerformanceService.Orders with @(
 
 
 
-annotate PerformanceService.Orders.Items with @(
+annotate OrdersService.Orders.Items with @(
 	UI: {
 		LineItem: [
 			{Value: product_ID, Label:'Product ID'},

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

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

orders/db/schema.cds

@@ -0,0 +1,24 @@
+using { Currency, User, managed, cuid } from '@sap/cds/common';
+namespace sap.capire.orders;
+
+entity Orders : cuid, managed {
+  OrderNo  : String @title:'Order Number'; //> readable key
+  Items    : Composition of many {
+    key ID    : UUID;
+    product   : Association to Products;
+    quantity  : Integer;
+    title     : String; //> intentionally replicated as snapshot from product.title
+    price     : Double; //> materialized calculated field
+  };
+  buyer    : User;
+  currency : Currency;
+}
+
+/** This is a stand-in for arbitrary ordered Products */
+entity Products @(cds.persistence.skip:'always') {
+  key ID : String;
+}
+
+
+// this is to ensure we have filled-in currencies
+using from '@capire/common';

orders/package.json

@@ -3,6 +3,6 @@
   "version": "1.0.0",
   "dependencies": {
     "@capire/common": "*",
-    "@sap/cds": ">=5"
+    "@sap/cds": "^5"
   }
 }

orders/srv/orders-service.cds

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

orders/srv/orders-service.js

@@ -5,14 +5,6 @@ class OrdersService extends cds.ApplicationService {
   init(){
     const { 'Orders.Items':OrderItems } = this.entities
 
-    // fill itemCategory at runtime
-    this.before (['CREATE', 'UPDATE'], async req =>{
-      if(req.data.quantity > 500) {req.data.itemCategory = 'Large'}
-        else if (req.data.quantity > 100) {req.data.itemCategory = 'Medium'}
-        else    {req.data.itemCategory = 'Small'}
-    })   
-    //
-
     this.before ('UPDATE', 'Orders', async function(req) {
       const { ID, Items } = req.data
       if (Items) for (let { product_ID, quantity } of Items) {

package.json

@@ -14,14 +14,14 @@
     "@capire/media": "./media",
     "@capire/orders": "./orders",
     "@capire/reviews": "./reviews",
-    "@sap/cds": ">=5.5.3"
+    "@sap/cds": "^5.5.3"
   },
   "devDependencies": {
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "chai-subset": "^1.6.0",
     "semver": "^7",
-    "sqlite3": "^5"
+    "sqlite3": "npm:@mendix/sqlite3@^5"
   },
   "scripts": {
     "cleanup": "rm -rf node_modules && rm -rf */node_modules && rm -rf */*/node_modules",

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

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

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

@@ -1,6 +0,0 @@
-ID;title;descr;author_ID;stock;price;currency_code
-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
-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
-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
-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
-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

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

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

performance/db/schema.cds

@@ -1,122 +0,0 @@
-using { Currency, cuid, managed } from '@sap/cds/common';
-
-namespace sap.capire.performance;
-
-
-entity OrdersHeaders : managed {
-  key ID   : UUID;
-  OrderNo  : String @title:'Order Number'; //> readable key 
-  buyer    : String;
-  currency : Currency;
-  Items    : Composition of many OrdersItems on Items.Header = $self;
-}
-
-entity OrdersItems   {
-    key ID    : UUID;
-    product   : Association to Books;
-    quantity  : Integer;
-    title     : String; //> intentionally replicated as snapshot from product.title
-    price     : Double; //> materialized calculated field
-    Header    : Association to OrdersHeaders;  
-};
-
-
-entity Books {
-  key ID : Integer;
-  title  : localized String(111);
-  descr  : localized String(1111);
-  author : Association to Authors;
-  stock  : Integer;
-  price  : Decimal;
-  currency : Currency;
-}
-
-entity Authors  {
-  key ID : Integer;
-  name   : String(111);
-  dateOfBirth  : Date;
-  dateOfDeath  : Date;
-  placeOfBirth : String;
-  placeOfDeath : String;
-  books  : Association to many Books on books.author = $self;
-}
-
-
-entity Apples : cuid, managed { 
-  description  : String;
-  vendor       : association to one Vendor;
-  appleDetails : appleDetailsType;
-}
-
-entity Bananas : cuid, managed { 
-  description   : String;
-  vendor        : association to one Vendor;
-  bananaDetails : bananaDetailsType;
-}
-
-entity Cherries : cuid, managed {
-  description   : String;
-  vendor        : association to one Vendor;
-  cherryDetails : cherryDetailsType;
-}
-
-entity Mangos : cuid, managed {
-  description  : String;
-  vendor       : association to one Vendor;
-  mangoDetails : mangoDetailsType;
-}
-
-entity Vendor : cuid, managed { 
-  description  : String;
-}
-
-type appleDetailsType  : String;
-type bananaDetailsType : String;
-type cherryDetailsType : String;
-type mangoDetailsType  : String;
-
-entity Fruit : cuid, managed {
-    type          : String enum { apple; banana; cherry; mango };
-    description   : String;
-    vendor        : association to one Vendor;   
-    appleDetails  : composition of AppleDetails;
-    bananaDetails : composition of BananaDetails;
-    cherryDetails : composition of CherryDetails;
-    mangoDetails  : composition of MangoDetails; 
-}
-
-entity AppleDetails : cuid {
-  appleDetails : appleDetailsType;
-}
-
-entity BananaDetails : cuid {
-  bananaDetails : bananaDetailsType;
-}
-
-entity CherryDetails : cuid {
-  cherryDetails : cherryDetailsType;
-}
-
-entity MangoDetails : cuid {
-  mangoDetails : mangoDetailsType;
-}
-
-view Banana as select from Fruit
-{
-    type,
-    description,
-    vendor,
-    bananaDetails,
-}
-    where type = 'banana';
-
-
-aspect apple  { appleDetails  : appleDetailsType; };
-aspect banana { bananaDetails : bananaDetailsType;};
-aspect cherry { cherryDetails : cherryDetailsType;};
-aspect mango  { mangoDetails  : mangoDetailsType; };
-entity Fruit_2 : apple, banana, cherry, mango, cuid, managed {
-    type        : String enum { apple; banana; cherry; mango };
-    description : String;
-    vendor      : association to one Vendor;
-}

performance/srv/performance-service.cds

@@ -1,95 +0,0 @@
-using { sap.capire.performance as my } from '../db/schema';
-
-service PerformanceService {
-  entity OrdersHeaders as projection on my.OrdersHeaders;
-  entity OrdersItems   as projection on my.OrdersItems;
-  entity Books         as projection on my.Books;
-  entity Authors       as projection on my.Authors;
-
-// static
-view OrdersItemsViewJoin as select 
-
-    OrdersHeaders.ID        as Header_ID, 
-    OrdersHeaders.OrderNo   as OrderNo, 
-    OrdersHeaders.buyer     as buyer, 
-    OrdersHeaders.currency  as currency,
-    key OrdersItems.ID      as Item_ID,
-    OrdersItems.product     as product,
-    OrdersItems.quantity    as quantity,
-    OrdersItems.title       as title,
-    OrdersItems.price       as price
-
- from OrdersHeaders JOIN OrdersItems on OrdersHeaders.ID = OrdersItems.Header.ID;
-
-// dynamic entity
-entity OrderItemsViewAssoc as projection on OrdersHeaders;
-
-// sort on right table
-view SortedOrdersJoin as select 
-    OrdersHeaders.ID        as Header_ID, 
-    OrdersHeaders.OrderNo   as OrderNo, 
-    OrdersHeaders.buyer     as buyer, 
-    OrdersHeaders.currency  as currency,
-    key OrdersItems.ID      as Item_ID,
-    OrdersItems.product     as product,
-    OrdersItems.quantity    as quantity,
-    OrdersItems.title       as title,
-    OrdersItems.price       as price
-from OrdersHeaders JOIN OrdersItems on OrdersHeaders.ID = OrdersItems.Header.ID
-order by title;
-
-// sort on items and join back to header via assoc
-
-view SortedOrdersAssoc as select
-from OrdersItems {*, Header.OrderNo, Header.buyer, Header.currency }
-order by OrdersItems.title;
-
-// filter on right table 
-
-view FilteredOrdersJoin as select 
-    OrdersHeaders.ID        as Header_ID, 
-    OrdersHeaders.OrderNo   as OrderNo, 
-    OrdersHeaders.buyer     as buyer, 
-    OrdersHeaders.currency  as currency,
-    key OrdersItems.ID          as Item_ID,
-    OrdersItems.product     as product,
-    OrdersItems.quantity    as quantity,
-    OrdersItems.title       as title,
-    OrdersItems.price       as price
-from OrdersHeaders JOIN OrdersItems on OrdersHeaders.ID = OrdersItems.Header.ID
-where price > 100;
-
-// filter on items and join back to header via assoc
-
-view FilteredOrdersAssoc as select
-from OrdersItems {*, Header.OrderNo, Header.buyer, Header.currency }
-where OrdersItems.price > 100;
-
-
-// TODO avoid CASE -- Denormalization of expensive complex structures, 
-// calculate on write instead of read
-
-// CASE -> try to remodel to avoid CASE, if re-modelling is not possible, 
-// fill redundant fields at write
-
-entity OrdersItemsCaseView as projection on OrdersItems {
-    *,
-    case  
-       when quantity > 500 then 'Large'
-       when quantity > 100 then 'Medium'       
-       else 'Small'
-    end as category : String
-};
-
-
-extend my.OrdersItems with {
-    itemCategory: String enum{ Small; Medium; Large;};
-    // fill itemCategory at runtime in performance-service.js
-}
-
-entity OrdersItemsNoCaseView as projection on OrdersItems {
-    *,
-    itemCategory as category 
-};
-}
-

reviews/package.json

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

test/cds.ql.test.js

@@ -81,8 +81,6 @@ describe('cds.ql → cqn', () => {
       .to.eql(SELECT('Foo','Boo').from('Bar'))
       .to.eql(SELECT(['Foo','Boo']).from('Bar'))
       .to.eql(SELECT `Bar` .columns `Foo, Boo`)
-      .to.eql(SELECT `Bar` .columns `{ Foo, Boo }`)
-      .to.eql(SELECT `Bar` .columns ('{ Foo, Boo }'))
       .to.eql(SELECT `Bar` .columns ('Foo','Boo'))
       .to.eql(SELECT `Bar` .columns (['Foo','Boo']))
       .to.eql(SELECT.from `Bar` .columns ('Foo','Boo'))

test/consuming-services.test.js

@@ -1,7 +1,7 @@
 const cds = require('@sap/cds/lib')
 const { expect } = cds.test ('@capire/bookshop')
 
-describe('cap/samples - Consuming Services locally', () => {
+describe('Consuming Services locally', () => {
   //
   it('bootstrapped the database successfully', ()=>{
     const { AdminService } = cds.services

test/custom-handlers.test.js

@@ -3,7 +3,7 @@ const { GET, POST, expect } = cds.test(__dirname+'/../bookshop')
 if (cds.User.default) cds.User.default = cds.User.Privileged // hard core monkey patch
 else cds.User = cds.User.Privileged // hard core monkey patch for older cds releases
 
-describe('cap/samples - Custom Handlers', () => {
+describe('Custom Handlers', () => {
 
   it('should reject out-of-stock orders', async () => {
     await POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`

test/hello-world.test.js

@@ -1,7 +1,7 @@
 const cds = require('@sap/cds/lib')
 const { GET, expect } = cds.test (__dirname+'/../hello')
 
-describe('cap/samples - Hello world!', () => {
+describe('Hello world!', () => {
 
   it('should say hello with class impl', async () => {
     const {data} = await GET `/say/hello(to='world')`

test/hierarchical-data.test.js

@@ -13,7 +13,7 @@ const model = cds.compile.to.csn (`
 const {Categories:Cats} = model.definitions
 
 
-describe('cap/samples - Hierarchical Data', ()=>{
+describe('Hierarchical Data', ()=>{
 
 	before ('bootstrap sqlite in-memory db...', async()=>{
 		await cds.deploy (model) .to ('sqlite::memory:')

test/localized-data/services.test.js

@@ -2,7 +2,7 @@ const { GET, expect, cds } = require('@sap/cds/lib').test (__dirname)
 if (cds.User.default) cds.User.default = cds.User.Privileged // hard core monkey patch
 else cds.User = cds.User.Privileged // hard core monkey patch for older cds releases
 
-describe('cap/samples - Localized Data', () => {
+describe('Localized Data', () => {
 
   it('serves localized $metadata documents', async () => {
     const { data } = await GET`/browse/$metadata?sap-language=de`

test/messaging.test.js

@@ -4,7 +4,7 @@ const _model = '@capire/reviews'
 if (cds.User.default) cds.User.default = cds.User.Privileged // hard core monkey patch
 else cds.User = cds.User.Privileged // hard core monkey patch for older cds releases
 
-describe('cap/samples - Messaging', ()=>{
+describe('Messaging', ()=>{
 
     it ('should bootstrap sqlite in-memory db', async()=>{
         const db = await cds.deploy (_model) .to ('sqlite::memory:')

test/odata.test.js

@@ -1,48 +1,9 @@
 const cds = require('@sap/cds/lib')
-const { GET, expect, axios } = cds.test ('@capire/bookshop')
-axios.defaults.auth = { username: 'alice', password: 'admin' }
+const { GET, expect } = cds.test ('@capire/bookshop')
+if (cds.User.default) cds.User.default = cds.User.Privileged // hard core monkey patch
+else cds.User = cds.User.Privileged // hard core monkey patch for older cds releases
 
-describe('cap/samples - Bookshop APIs', () => {
-
-  // Genres
-  const Drama = {
-    "name": "Drama",
-    "descr": null,
-    "ID": 11,
-    "parent_ID": 10
-  }
-  const Mystery = {
-    "name": "Mystery",
-    "descr": null,
-    "ID": 16,
-    "parent_ID": 10
-  }
-  const Fantasy = {
-    "name": "Fantasy",
-    "descr": null,
-    "ID": 13,
-    "parent_ID": 10
-  }
-
-  // Currencies
-  const GBP = {
-    "name": "British Pound",
-    "descr": null,
-    "code": "GBP",
-    "symbol": "£"
-  }
-  const USD = {
-    "name": "US Dollar",
-    "descr": null,
-    "code": "USD",
-    "symbol": "$"
-  }
-  const JPY = {
-    "name": "Yen",
-    "descr": null,
-    "code": "JPY",
-    "symbol": "¥"
-  }
+describe('OData Protocol', () => {
 
 
   it('serves $metadata documents in v4', async () => {
@@ -56,16 +17,6 @@ describe('cap/samples - Bookshop APIs', () => {
     expect(data).to.contain('<Annotation Term="Common.Label" String="Currency"/>')
   })
 
-  it('serves ListOfBooks?$expand=genre,currency', async () => {
-    const { data } = await GET `/browse/ListOfBooks ${{
-      params: { $search: 'Po', $select: `title,author`, $expand:`genre,currency` },
-    }}`
-    expect(data.value).to.eql([
-      { ID: 251, title: 'The Raven', author: 'Edgar Allen Poe', genre:Mystery, currency:USD  },
-      { ID: 252, title: 'Eleonora', author: 'Edgar Allen Poe', genre:Mystery, currency:USD  },
-    ])
-  })
-
   it('supports $search in multiple fields', async () => {
     const { data } = await GET `/browse/Books ${{
       params: { $search: 'Po', $select: `title,author` },
@@ -124,16 +75,4 @@ describe('cap/samples - Bookshop APIs', () => {
       { ID: 271, title: 'Catweazle' },
     ])
   })
-
-  it('serves user info', async () => {
-    {
-      const { data } = await GET (`/user/me`)
-      expect(data).to.containSubset({ id: 'alice', locale:'en', tenant: null })
-    }
-    {
-      const { data } = await GET (`/user/me`, {auth: { username: 'joe' }})
-      expect(data).to.containSubset({ id: 'joe', locale:'en', tenant: null })
-    }
-  })
-
 })

test/registry.test.js

@@ -6,7 +6,7 @@ const { resolve } = require('path')
 const verbose = process.env.CDS_TEST_VERBOSE
 // ||true
 
-describe('cap/samples - Local NPM registry', () => {
+describe('Local NPM registry', () => {
   let registry
   let axios
   const cwd = resolve(__dirname, '..')
@@ -20,7 +20,7 @@ describe('cap/samples - Local NPM registry', () => {
 
   after(() => { registry.kill() })
 
-  for (const mod of ['bookshop', 'data-viewer', 'fiori','orders','reviews']) {
+  for (const mod of ['bookshop','fiori','orders','reviews']) {
     it(`should serve ${mod}`, async () => {
       const resp = await axios.get(`/@capire/${mod}`)
       expect(resp.data).to.containSubset({name: `@capire/${mod}`, versions:{}})