still to do: orders

add shared-db dependencies

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

@@ -1,11 +1,6 @@
 {
   "welcomeFile": "app/bookshop/index.html",
   "routes": [
-    {
-      "source": "^/-/cds/.*",
-      "destination": "mtx-api",
-      "authenticationType": "none"
-    },
     {
       "source": "^/app/(.*)$",
       "target": "$1",

bookstore/app/routes.js

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

bookstore/package.json

@@ -11,8 +11,7 @@
     "@sap-cloud-sdk/resilience": "^4",
     "@sap/cds": ">=5",
     "express": "^4.17.1",
-    "@cap-js/hana": "^1",
+    "@cap-js/hana": "^1"
-    "@sap/cds-mtxs": "^2"
   },
   "cds": {
     "requires": {
@@ -25,10 +24,7 @@
         "model": "@capire/orders"
       },
       "messaging": true,
-      "db": true,
+      "db": true
-      "multitenancy": true,
-      "auth": "xsuaa"
-
     },
     "log": { "service": true }
   },

bookstore/srv/server.js

@@ -1,10 +1,16 @@
 const cds = require ('@sap/cds')
 
+
 // Add routes to UIs from imported packages
-if (!cds.env.production) cds.once ('bootstrap', require('../app/routes'))
+if (!cds.env.production) cds.once ('bootstrap', (app) => {
+  app.serve ('/bookshop') .from ('@capire/bookshop','app/vue')
+  app.serve ('/reviews') .from ('@capire/reviews','app/vue')
+  app.serve ('/orders') .from('@capire/orders','app/orders')
+})
+
 
 // Mashing up bookshop services with required services...
-cds.once ('served', async ()=>{ // called by server.js
+cds.once ('served', async ()=>{
 
   const CatalogService = await cds.connect.to ('CatalogService')
   const ReviewsService = await cds.connect.to ('ReviewsService')

db

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

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

@@ -106,7 +106,7 @@
                     "name": "sap.fe.templates.ObjectPage",
                     "options": {
                         "settings" : {
-                            "entitySet" : "Books",
+                            "contextPath" : "/Books",
                             "navigation" : {
                                 "Authors" : {
                                     "detail" : {
@@ -123,7 +123,7 @@
                     "name": "sap.fe.templates.ObjectPage",
                     "options": {
                         "settings" : {
-                            "entitySet" : "Authors"
+                            "contextPath" : "/Authors"
                         }
                     }
                 }

fiori/app/browse/webapp/manifest.json

@@ -99,7 +99,7 @@
           "name": "sap.fe.templates.ListReport",
           "options": {
             "settings": {
-              "entitySet": "Books",
+              "contextPath": "/Books",
               "initialLoad": true,
               "navigation": {
                 "Books": {
@@ -117,7 +117,7 @@
           "name": "sap.fe.templates.ObjectPage",
           "options": {
             "settings": {
-              "entitySet": "Books"
+              "contextPath": "/Books"
             }
           }
         }

fiori/server.js

@@ -1,32 +0,0 @@
-const cds = require('@sap/cds/lib')
-if (cds.requires.db?.kind === 'sqlite') {
-  cds.on ('serving:AdminService', srv => srv.prepend(() => {
-    const {Genres} = srv.entities
-  // Register a simplistic handler for hierarchical queries
-    srv.on('READ', Genres, (req,next) => {
-      const q = req.query
-      // Expand query on a single row
-      if (q.SELECT.recurse?.where?.[0].ref[0] === 'Distance') {
-        q.SELECT.where[0] = 'parent_ID'
-      // Initial query
-      } else if (!q.SELECT.search && !is_count(q)) {
-        q.SELECT.where ??= [ 'parent_ID is null' ]
-      }
-      // Use scalar subselect for DrillState
-      q.SELECT.from.as = 'g'
-      q.SELECT.columns = q.SELECT.columns.map (c => {
-        if (c.ref == 'DrillState') return { xpr:[`
-          CASE WHEN ( SELECT count(1) from ${Genres} where parent_ID = g.ID ) > 0
-          THEN 'collapsed' ELSE 'leaf' END`
-        ], as: 'DrillState' }
-        else return c
-      })
-      // Suppress error message: Feature "recurse" queries not supported.
-      delete q.SELECT.__proto__.recurse
-      delete q.SELECT.recurse
-      return next()
-    })
-  }))
-}
-
-const is_count = q => q.SELECT.columns?.length === 1 && q.SELECT.columns[0].func === 'count'

mta.yaml

@@ -9,7 +9,7 @@ build-parameters:
     - builder: custom
       commands:
         - npm ci
-        - npx cds build --production
+        - npx cds build shared-db --for hana --production
         - npx cds build orders --for nodejs --production --ws-pack
         - npx cds build reviews --for nodejs --production
         - npx cds build bookstore --for nodejs --production --ws-pack
@@ -78,6 +78,14 @@ modules:
       - name: samples-auth
       - name: samples-destination
 
+  - name: samples-db-deployer
+    type: hdb
+    path: shared-db/gen/db
+    parameters:
+      buildpack: nodejs_buildpack
+    requires:
+      - name: samples-db
+
   - name: samples
     type: approuter.nodejs
     path: .deploy/app-router
@@ -85,8 +93,6 @@ modules:
       keep-existing-routes: true
       disk-quota: 256M
       memory: 256M
-    properties:
-      TENANT_HOST_PATTERN: "^(.*)-${default-uri}"
     requires:
       - name: orders-api
         group: destinations
@@ -106,17 +112,7 @@ modules:
           name: bookstore-api # must be used in xs-app.json as well
           url: ~{srv-url}
           forwardAuthToken: true
-      - name: mtx-api
-        group: destinations
-        properties:
-          name: mtx-api # must be used in xs-app.json as well
-          url: ~{mtx-url}
       - name: samples-auth
-    provides:
-      - name: app-api
-        properties:
-          app-protocol: ${protocol}
-          app-uri: ${default-uri}
 
   - name: destination-content
     type: com.sap.application.content
@@ -149,27 +145,6 @@ modules:
               TokenServiceInstanceName: samples-auth
               TokenServiceKeyName: xsuaa-service-key
 
-  - name: samples-mtx
-    type: nodejs
-    path: gen/mtx/sidecar
-    build-parameters:
-      builder: npm
-    parameters:
-      instances: 1
-      memory: 256M
-      disk-quota: 512M
-    provides:
-      - name: mtx-api
-        properties:
-          mtx-url: ${default-url}
-    requires:
-      - name: samples-db
-      - name: samples-registry
-      - name: samples-auth
-      - name: app-api
-        properties:
-          SUBSCRIPTION_URL: ~{app-protocol}://\${tenant_subdomain}-~{app-uri}
-
 resources:
   - name: samples-messaging
     type: org.cloudfoundry.managed-service
@@ -181,51 +156,23 @@ resources:
         emname: bookstore-${org}-${space}
         namespace: cap/samples/${space}
   - name: samples-db
-    type: org.cloudfoundry.managed-service
+    type: com.sap.xs.hdi-container
     parameters:
-      service: service-manager
+      service: hana
-      service-plan: container
+      service-plan: hdi-shared
-
   - name: samples-auth
     type: org.cloudfoundry.managed-service
     processed-after:
       - samples-messaging
-    requires:
-      - name: app-api
     parameters:
       service: xsuaa
       service-plan: application
       path: ./xs-security.json
       config:
         xsappname: samples-${org}-${space}
-        tenant-mode: shared
+        tenant-mode: dedicated
-        oauth2-configuration:
-          redirect-uris:
-            - https://*-~{app-api/app-uri}/**
-
   - name: samples-destination
     type: org.cloudfoundry.managed-service
     parameters:
       service: destination
       service-plan: lite
-
-  - name: samples-registry
-    type: org.cloudfoundry.managed-service
-    requires:
-      - name: mtx-api
-    parameters:
-      service: saas-registry
-      service-plan: application
-      config:
-        xsappname: samples-${org}-${space}
-        appName: samples-${org}-${space}
-        displayName: samples-shared-db
-        description: CAP Samples with shared-db and multitenancy
-        category: 'Samples shared-db'
-        appUrls:
-          getDependencies: ~{mtx-api/mtx-url}/-/cds/saas-provisioning/dependencies
-          onSubscription: ~{mtx-api/mtx-url}/-/cds/saas-provisioning/tenant/{tenantId}
-          onSubscriptionAsync: true
-          onUnSubscriptionAsync: true
-          onUpdateDependenciesAsync: true
-          callbackTimeoutMillis: 300000 # Increase if your deployments are taking longer than that

mtx/sidecar/package.json

@@ -1,19 +0,0 @@
-{
-  "name": "samples-mtx",
-  "dependencies": {
-    "@cap-js/hana": "^1",
-    "@sap/cds": "^8",
-    "@sap/cds-mtxs": "^2",
-    "@sap/xssec": "^4",
-    "express": "^4"
-  },
-  "devDependencies": {
-    "@cap-js/sqlite": "^1"
-  },
-  "scripts": {
-    "start": "cds-serve"
-  },
-  "cds": {
-    "profile": "mtx-sidecar"
-  }
-}

orders/package.json

@@ -5,15 +5,12 @@
     "@cap-js/hana": "^1",
     "@capire/common": "*",
     "@sap/cds": ">=5",
-    "@sap/xssec": "^4",
+    "@sap/xssec": "^4"
-    "@sap/cds-mtxs": "^2"
   },
   "cds": {
     "requires": {
       "messaging": true,
-      "db": true,
+      "db": true
-      "multitenancy": true,
-      "auth": "xsuaa"
     }
   },
   "scripts": {

package.json

@@ -5,8 +5,15 @@
   "repository": "https://github.com/sap-samples/cloud-cap-samples.git",
   "author": "daniel.hutzel@sap.com",
   "workspaces": [
-    "./*",
+    "bookshop",
-    "./etc/*"
+    "bookstore",
+    "common",
+    "fiori",
+    "orders",
+    "reviews",
+    "shared-db",
+    "etc/data-viewer",
+    "etc/loggers"
   ],
   "devDependencies": {
     "@cap-js/cds-test": "^0"
@@ -33,15 +40,5 @@
     "timeout": 6666
   },
   "license": "SEE LICENSE IN LICENSE",
-  "private": true,
+  "private": true
-  "dependencies": {
-    "@sap/cds-mtxs": "^2"
-  },
-  "cds": {
-    "profile": "with-mtx-sidecar",
-    "requires": {
-      "multitenancy": true,
-      "auth": "xsuaa"
-    }
-  }
 }

reviews/package.json

@@ -10,15 +10,12 @@
     "@cap-js/hana": "^1",
     "@sap/cds": ">=5",
     "@sap/xssec": "^4.2.7",
-    "express": "^4.17.1",
+    "express": "^4.17.1"
-    "@sap/cds-mtxs": "^2"
   },
   "cds": {
     "requires": {
       "messaging": true,
-      "db": true,
+      "db": true
-      "multitenancy": true,
-      "auth": "xsuaa"
     }
   },
   "scripts": {

reviews/srv/reviews-service.js

@@ -3,7 +3,7 @@ module.exports = cds.service.impl (function(){
 
   // Get the CSN definition for Reviews from the db schema for sub-sequent queries
   // ( Note: we explicitly specify the namespace to support embedded reuse )
-  const { Reviews, Likes } = this.entities ('sap.capire.reviews')
+  const { Reviews, Likes } = this.entities
 
   this.before (['CREATE','UPDATE'], 'Reviews', req => {
     if (!req.data.rating) req.data.rating = Math.round(Math.random()*4)+1

shared-db/package.json

@@ -2,6 +2,11 @@
   "name": "@capire/shared-db",
   "version": "3.0.0",
   "description": "CAP Sample CDS model deployment for shared-db scenario",
+  "dependencies": {
+    "@capire/bookstore": "*",
+    "@capire/orders": "*",
+    "@capire/reviews": "*"
+  },
   "cds": {
     "sql": {
       "native_hana_associations": false

xs-security.json

@@ -14,13 +14,6 @@
     {
       "name": "$XSAPPNAME.emmanagement",
       "description": "Enterprise-Messaging Management Access"
-    },
-    {
-      "name": "$XSAPPNAME.mtcallback",
-      "description": "Subscription via SaaS Registry",
-      "grant-as-authority-to-apps": [
-        "$XSAPPNAME(application,sap-provisioning,tenant-onboarding)"
-      ]
     }
   ],
   "attributes": [],