Patch for missing containment in v4

.eslintrc

@@ -21,6 +21,7 @@
     },
     "rules": {
         "no-console": "off",
-        "require-atomic-updates": "off"
+        "require-atomic-updates": "off",
+        "require-await":"warn"
     }
 }

bookshop/srv/admin-service.js

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

bookshop/srv/cat-service.cds

@@ -6,7 +6,7 @@ service CatalogService @(path:'/browse') {
   } excluding { createdBy, modifiedBy };
 
   @readonly entity ListOfBooks as SELECT from Books
-  excluding { descr, stock };
+  excluding { descr };
 
   @requires: 'authenticated-user'
   action submitOrder ( book: Books:ID, amount: Integer ) returns { stock: Integer };

bookshop/srv/cat-service.js

@@ -1,25 +1,30 @@
 const cds = require('@sap/cds')
-const { Books } = cds.entities ('sap.capire.bookshop')
 
-class CatalogService extends cds.ApplicationService { async init(){
+class CatalogService extends cds.ApplicationService { init(){
+
+  // Reflect entities from model
+  const { Books } = cds.entities ('sap.capire.bookshop')
 
   // Reduce stock of ordered books if available stock suffices
   this.on ('submitOrder', async req => {
-    const {book,amount} = req.data, tx = cds.tx(req)
+    const {book,amount} = req.data
-    let {stock} = await tx.read('stock').from(Books,book)
+    // Read stock from database
+    let {stock} = await SELECT.from (Books, book, b => b.stock)
     if (stock >= amount) {
-      await tx.update (Books,book).with ({ stock: stock -= amount })
+      // Reduce stock by ordered amount
-      this.emit ('OrderedBook', { book, amount, buyer:req.user.id })
+      await UPDATE (Books,book) .with ({ stock: stock -= amount })
-      return { stock }
+      // Emit event to inform others
+      await this.emit ('OrderedBook', { book, amount, buyer:req.user.id })
+      // Return reduced stock to caller
+      return req.reply ({ stock })
     }
+    // Return error about insufficient stock
     else return req.error (409,`${amount} exceeds stock for book #${book}`)
   })
 
   // Add some discount for overstocked books
   this.after ('READ','Books', each => {
-    if (each.stock > 111) {
+    if (each.stock > 111) each.title += ` -- 11% discount!`
-      each.title += ` -- 11% discount!`
-    }
   })
 
   return super.init()

common/package.json

@@ -1,4 +1,8 @@
 {
   "name": "@capire/common",
-  "version": "1.0.0"
+  "description": "Provides a pre-built extension package for std @sap/cds/common",
+  "version": "1.0.0",
+  "dependencies": {
+    "@sap/cds": "latest"
+  }
 }

fiori/srv/mashup.cds

@@ -19,7 +19,7 @@ extend Books with {
 //  Extend Orders with Books as Products
 //
 
-using { sap.capire.orders.OrderItems } from '@capire/orders';
+using { sap.capire.orders.Orders_Items } from '@capire/orders';
-extend OrderItems with {
+extend Orders_Items with {
   book : Association to Books on product.ID = book.ID
 }

fiori/srv/mashup.js

@@ -5,13 +5,17 @@
 module.exports = async()=>{ // called by server.js
 
   const cds = require('@sap/cds')
+
+  // Connect to services to mashup
   const CatalogService = await cds.connect.to ('CatalogService')
   const ReviewsService = await cds.connect.to ('ReviewsService')
   const OrdersService = await cds.connect.to ('OrdersService')
   const db = await cds.connect.to ('db')
 
-  // reflect entity definitions used below...
+  // Reflect entity definitions used below...
   const { Books } = db.entities ('sap.capire.bookshop')
+  const { Orders } = OrdersService.entities
+  const { Reviews } = ReviewsService.entities
 
   //
   // Delegate requests to read reviews to the ReviewsService
@@ -20,7 +24,7 @@ module.exports = async()=>{ // called by server.js
   CatalogService.prepend (srv => srv.on ('READ', 'Books/reviews', (req) => {
     console.debug ('> delegating request to ReviewsService')
     const [id] = req.params, { columns, limit } = req.query.SELECT
-    return ReviewsService.tx(req).read ('Reviews',columns).limit(limit).where({subject:String(id)})
+    return SELECT.from (Reviews,columns).limit(limit).where({subject:String(id)})
   }))
 
   //
@@ -28,8 +32,9 @@ module.exports = async()=>{ // called by server.js
   //
   CatalogService.on ('OrderedBook', async (msg) => {
     const { book, amount, buyer } = msg.data
-    const { title, price } = await db.tx(msg).read (Books, book, b => { b.title, b.price })
+    const { title, price } = await SELECT.from (Books, book, b => { b.title, b.price })
-    return OrdersService.tx(msg).create ('Orders').entries({
+    // FIXME: Fails due to Draft glitches when OrdersService is remote
+    return INSERT.into (Orders).entries({
       OrderNo: 'Order at '+ (new Date).toLocaleString(),
       Items: [{ product:{ID:`${book}`}, title, price, amount }],
       buyer, createdBy: buyer
@@ -43,17 +48,17 @@ module.exports = async()=>{ // called by server.js
     console.debug ('> received:', msg.event, msg.data)
     const { subject, rating } = msg.data
     return UPDATE (Books,subject) .with ({rating})
-    // ^ Note: the framework will execute this and take care for db.tx
   })
 
   //
-  // Reduce stock of ordered books for orders are created from Orders admin UI
+  // Reduce stock of ordered books when orders are modified in admin UI
   //
-  OrdersService.on ('OrderChanged', async (msg) => {
+  OrdersService.on ('OrderChanged', (msg) => {
     console.debug ('> received:', msg.event, msg.data)
     const { product, deltaAmount } = msg.data
     return UPDATE (Books) .where ('ID =', product)
     .and ('stock >=', deltaAmount)
     .set ('stock -=', deltaAmount)
   })
+
 }

fiori/test/requests.http

@@ -42,7 +42,24 @@ GET {{bookshop}}/browse/Books(201)?
 
 #################################################
 #
-#   Orders Service
+#   Orders Service, incl. draft choreography
 #
+@newOrderID = e939604c-ab83-4d4f-bdb6-95fe30b3773e
 
 GET {{bookshop}}/orders/Orders
+
+### Create order, still inactive
+POST {{bookshop}}/orders/Orders
+Content-Type: application/json
+
+{"ID": "{{newOrderID}}"}
+
+### Get inactive order.  We have to specify `IsActiveEntity`.
+GET {{bookshop}}/orders/Orders(ID={{newOrderID}},IsActiveEntity=false)
+
+### Activate order using `.../<servicename>.draftActivate`
+POST {{bookshop}}/orders/Orders(ID={{newOrderID}},IsActiveEntity=false)/OrdersService.draftActivate
+Content-Type: application/json
+
+### Get active order
+GET {{bookshop}}/orders/Orders(ID={{newOrderID}},IsActiveEntity=true)

orders/app/orders/fiori-service.cds

@@ -68,7 +68,7 @@ annotate OrdersService.Orders with @(
 
 
 
-annotate OrdersService.OrderItems with @(
+annotate OrdersService.Orders_Items with @(
 	UI: {
 		LineItem: [
 			{Value: product_ID, Label:'Product ID'},

orders/app/orders/webapp/manifest.json

@@ -121,7 +121,7 @@
                     "name": "sap.fe.templates.ObjectPage",
                     "options": {
                         "settings" : {
-                            "entitySet": "OrderItems"
+                            "entitySet": "Orders_Items"
                         }
                     }
                 },

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

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

orders/db/schema.cds

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

orders/srv/orders-service.js

@@ -3,24 +3,20 @@ class OrdersService extends cds.ApplicationService {
 
   /** register custom handlers */
   init(){
-    const { OrderItems } = this.entities
+    const { Orders_Items:OrderItems } = this.entities
 
     this.before ('UPDATE', 'Orders', async function(req) {
       const { ID, Items } = req.data
       if (Items) for (let { product_ID, amount } of Items) {
-        const { amount:before } = await cds.tx(req).run (
+        const { amount:before } = await SELECT.one.from (OrderItems, oi => oi.amount) .where ({up__ID:ID, product_ID})
-          SELECT.one.from (OrderItems, oi => oi.amount) .where ({order_ID:ID, product_ID})
+        if (amount != before) await this.orderChanged (product_ID, amount-before)
-        )
-        if (amount != before) this.orderChanged (product_ID, amount-before)
       }
     })
 
     this.before ('DELETE', 'Orders', async function(req) {
       const { ID } = req.data
-      const Items = await cds.tx(req).run (
+      const Items = await SELECT.from (OrderItems, oi => { oi.product_ID, oi.amount }) .where ({up__ID:ID})
-        SELECT.from (OrderItems, oi => { oi.product_ID, oi.amount }) .where ({order_ID:ID})
+      if (Items) await Promise.all (Items.map(it => this.orderChanged (it.product_ID, -it.amount)))
-      )
-      if (Items) for (let it of Items) this.orderChanged (it.product_ID, -it.amount)
     })
 
     return super.init()

package.json

@@ -31,6 +31,9 @@
   "mocha": {
     "parallel": true
   },
+  "engines": {
+    "node": ">= 12.18"
+  },
   "jest": {
     "testEnvironment": "node"
   },

reviews/app/vue/app.js

@@ -37,7 +37,7 @@ const reviews = new Vue ({
             reviews.message = {}
         },
 
-        async newReview () {
+        newReview () {
             reviews.review = {}
             reviews.message = {}
             setTimeout (()=> $('form > input').focus(), 111)

reviews/srv/reviews-service.js

@@ -1,5 +1,5 @@
 const cds = require ('@sap/cds')
-module.exports = cds.service.impl (async function(){
+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 )
@@ -12,19 +12,16 @@ module.exports = cds.service.impl (async function(){
   // Emit an event to inform subscribers about new avg ratings for reviewed subjects
   this.after (['CREATE','UPDATE','DELETE'], 'Reviews', async function(_,req) {
     const {subject} = req.data
-    const {rating} = await cds.tx(req) .run (
+    const {rating} = await SELECT.one (['round(avg(rating),2) as rating']) .from (Reviews) .where ({subject})
-      SELECT.one (['round(avg(rating),2) as rating']) .from (Reviews) .where ({subject})
-    )
     global.it || console.log ('< emitting:', 'reviewed', { subject, rating })
-    this.emit ('reviewed', { subject, rating })
+    await this.emit ('reviewed', { subject, rating })
   })
 
   // Increment counter for reviews considered helpful
   this.on ('like', (req) => {
     if (!req.user)  return req.reject(400, 'You must be identified to like a review')
     const {review} = req.data, {user} = req
-    const tx = cds.tx(req)
+    return cds.run ([
-    return tx.run ([
       INSERT.into (Likes) .entries ({review_ID: review, user: user.id}),
       UPDATE (Reviews) .set({liked: {'+=': 1}}) .where({ID:review})
     ]).catch(() => req.reject(400, 'You already liked that review'))
@@ -34,9 +31,8 @@ module.exports = cds.service.impl (async function(){
   this.on ('unlike', async (req) => {
     if (!req.user)  return req.reject(400, 'You must be identified to remove a former like of yours')
     const {review} = req.data, {user} = req
-    const tx = cds.tx(req)
+    const affectedRows = await DELETE.from (Likes) .where ({review_ID: review,user: user.id})
-    const affectedRows = await tx.run (DELETE.from (Likes) .where ({review_ID: review,user: user.id}))
+    if (affectedRows === 1)  return UPDATE (Reviews) .set ({liked: {'-=': 1}}) .where ({ID:review})
-    if (affectedRows === 1)  return tx.run (UPDATE (Reviews) .set ({liked: {'-=': 1}}) .where ({ID:review}))
   })
 
 })

test/cds.ql.test.js

@@ -1,5 +1,5 @@
+const { expect } = require('../test')
 const cds = require('@sap/cds/lib')
-const { expect } = cds.test
 const CQL = ([cql]) => cds.parse.cql(cql)
 const Foo = { name: 'Foo' }
 const Books = { name: 'capire.bookshop.Books' }

test/consuming-services.test.js

@@ -1,7 +1,7 @@
-const cds = require('@sap/cds/lib')
+const { expect } = require('../test') .run (
-const { expect } = cds.test (
   'serve', 'AdminService', '--from', '@capire/bookshop,@capire/common', '--in-memory'
-).in(__dirname)
+)
+const cds = require('@sap/cds/lib')
 
 describe('Consuming Services locally', () => {
   //

test/custom-handlers.test.js

@@ -1,5 +1,7 @@
-const cds = require('@sap/cds/lib'); cds.User = cds.User.Privileged // skip auth
+const { GET, POST, expect } = require('../test') .run ('bookshop')
-const { GET, POST, expect } = cds.test('bookshop').in(__dirname,'..')
+const cds = require('@sap/cds/lib')
+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('Custom Handlers', () => {
 

test/hello-world.test.js

@@ -1,5 +1,4 @@
-const cds = require('@sap/cds/lib')
+const { GET, expect } = require('../test') .run ('serve','hello/world.cds')
-const { GET, expect } = cds.test('serve','hello/world.cds').in(__dirname,'..')
 
 describe('Hello world!', () => {
 

test/hierarchical-data.test.js

@@ -1,6 +1,5 @@
-const cwd = process.cwd(); process.chdir (__dirname) //> only for internal CI/CD@SAP
+const {expect} = require('../test')
 const cds = require('@sap/cds/lib')
-const {expect} = cds.test
 
 // monkey patching older releases:
 if (!cds.compile.cdl) cds.compile.cdl = cds.parse
@@ -25,8 +24,6 @@ describe('Hierarchical Data', ()=>{
     expect (cds.db.model) .to.exist
 	})
 
-	after(()=> process.chdir(cwd))
-
 	it ('supports deeply nested inserts', ()=> INSERT.into (Cats,
     { ID:100, name:'Some Cats...', children:[
       { ID:101, name:'Cat', children:[

test/index.js

@@ -0,0 +1,6 @@
+
+const test = require('@sap/cds/lib/utils/tests').in(__dirname,'..')
+module.exports = Object.assign(test,{run:test})
+
+// REVISIT: With upcoming release of @sap/cds this should become:
+// module.exports = require('@sap/cds/tests').in(__dirname,'..')

test/localized-data.test.js

@@ -1,5 +1,7 @@
-const cds = require('@sap/cds/lib'); cds.User = cds.User.Privileged // skip auth
+const { GET, expect } = require('../test') .run ('serve', 'test/localized-data.cds', '--in-memory')
-const { GET, expect } = cds.test ('serve', __dirname+'/localized-data.cds', '--in-memory')
+const cds = require('@sap/cds/lib')
+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('Localized Data', () => {
 

test/messaging.test.js

@@ -1,13 +1,11 @@
+const { expect } = require('../test')
 const cds = require('@sap/cds/lib')
-const cwd = process.cwd(); process.chdir (__dirname) //> only for internal CI/CD@SAP
-const {expect} = cds.test
 const _model = '@capire/reviews'
-cds.User = cds.User.Privileged // hard core monkey patch
+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('Messaging', ()=>{
 
-    after(()=> process.chdir(cwd))
-
     it ('should bootstrap sqlite in-memory db', async()=>{
         const db = await cds.deploy (_model) .to ('sqlite::memory:')
         await db.delete('Reviews')

test/odata.test.js

@@ -1,8 +1,11 @@
-const cds = require('@sap/cds/lib'); cds.User = cds.User.Privileged // skip auth
+const { GET, expect } = require('../test') .run ('bookshop')
-const { GET, expect } = cds.test('bookshop').in(__dirname,'..')
+const cds = require('@sap/cds/lib')
+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('OData Protocol', () => {
 
+
   it('serves $metadata documents in v4', async () => {
     const { headers, status, data } = await GET `/browse/$metadata`
     expect(status).to.equal(200)