Change list object in tests

Simplified reviewed/server.js

fiori/app/fiori.html

@@ -40,7 +40,8 @@
 	</script>
 
 	<script src="https://sapui5.hana.ondemand.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-	<script src="https://sapui5.hana.ondemand.com/resources/sap-ui-core.js"
+	<!-- <script src="https://sapui5.hana.ondemand.com/resources/sap-ui-core.js" -->
+	<script src="https://sapui5.hana.ondemand.com/1.78.6/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"

orders/srv/orders-service.js

@@ -6,14 +6,14 @@ module.exports = cds.service.impl(function() {
 
   // Reduce stock of ordered books if available stock suffices
   this.before ('CREATE', 'Orders', (req) => {
-    const { Items: OrderItems } = req.data
-    return cds.transaction(req) .run (()=> OrderItems.map (order =>
-      UPDATE (Books) .where ('ID =', order.book_ID)
-      .and ('stock >=', order.amount)
-      .set ('stock -=', order.amount)
+    const { Items: items } = req.data
+    return cds.transaction(req) .run (items.map (item =>
+      UPDATE (Books) .where ('ID =', item.book_ID)
+      .and ('stock >=', item.amount)
+      .set ('stock -=', item.amount)
     )) .then (all => all.forEach ((affectedRows,i) => {
       if (affectedRows === 0)  req.error (409,
-        `${OrderItems[i].amount} exceeds stock for book #${OrderItems[i].book_ID}`
+        `${items[i].amount} exceeds stock for book #${items[i].book_ID}`
       )
     }))
   })

reviewed/server.js

@@ -3,37 +3,30 @@
 //   This is an example of using a project-local server.js to intercept
 //   the default bootstrapping process.
 //
-
 const cds = require ('@sap/cds')
 
-// Mashup services after all are served...
-cds.once('served', async()=>{
+// Connect CatalogService and ReviewsService when all are served...
+cds.once('served', async ({CatalogService}) => {
 
-    // react on event messages from reviews service
+    // reflect entity definitions used below...
+    const { Books } = cds.entities('sap.capire.bookshop')
+    const { Reviews } = cds.entities('ReviewsService')
+
+    // prepend the following handler so it overrides the default handler
+    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 SELECT(columns).from(Reviews).limit(limit).where({subject:String(id)})
+    }))
+
+    // subscribe to events emitted by ReviewsService
     const ReviewsService = await cds.connect.to ('ReviewsService')
-    const db = await cds.connect.to ('db')
-
-    // reflect entities required below...
-    const { Books } = db.entities('sap.capire.bookshop')
-    const { Reviews } = ReviewsService.entities
-
     ReviewsService.on ('reviewed', (msg) => {
         console.debug ('> received:', msg.event, msg.data)
         const { subject, rating } = msg.data
-        const tx = db.tx (msg) // TODO: db.tx(msg) fully implemented?
-        return tx.update (Books,subject) .with ({rating})
+        return UPDATE(Books,subject).with({rating})
     })
 
-    // delegate requests to read reviews to ReviewsService
-    const CatalogService = await cds.connect.to ('CatalogService')
-    CatalogService.impl (srv => srv.on ('READ', 'Books/reviews', (req) => {
-        console.debug ('> delegating to ReviewsService')
-        const [ id ] = req.params
-        const tx = ReviewsService.tx(req)
-        return tx.read (Reviews) .where ({ subject: String(id) })
-        .columns (req.query.SELECT.columns)
-    }))
-
 })
 
 // Other bootstrapping events you could hook in to...
@@ -42,14 +35,9 @@ cds.on('bootstrap',(app) => {/* ... */})
 cds.on('loaded', (model) => {/* ... */})
 cds.on('connect', (srv) => {/* ... */})
 cds.on('serving', (srv) => {/* ... */})
+cds.once('served', (all) => {/* ... */})
 cds.once('listening', ({server,url}) => {/* ... */})
 
 
 // Delegate bootstrapping to built-in server.js
 module.exports = cds.server
-
-// Monkey-patching older releases
-if (cds.version < '3.33.4') cds.once('listening', ()=> cds.emit('served'))
-
-// Launch server if started directly from command-line
-if (!module.parent)  cds.server()

reviewed/test/requests.http

@@ -31,7 +31,8 @@ GET {{bookshop}}/browse/Books(201)/reviews?
 
 ### Alternative OData URL
 GET {{bookshop}}/browse/Books/201/reviews?
-&$select=rating,date,reviewer,title
+&$select=rating,date,title
+&$top=3
 
 ###
 GET {{bookshop}}/browse/Books(201)?

reviews/.env

@@ -1,2 +1,3 @@
 cds.requires.messaging.kind = file-based-messaging
+cds.odata.skipValidation = true
 PORT = 5005

test/cds.ql.test.js

@@ -261,7 +261,7 @@ describe('cds.ql → cqn', () => {
       // same for works distinct
     })
 
-    test.skip('where ( ... cql  |  {x:y} )', () => {
+    test('where ( ... cql  |  {x:y} )', () => {
       const args = [`foo`, "'bar'", 3]
       const ID = 11
 
@@ -278,7 +278,6 @@ describe('cds.ql → cqn', () => {
           from: { ref: ['Foo'] },
           where: cdr
             ? [
-                // '(', //> this one is not required
                 { ref: ['ID'] },
                 '=',
                 { val: ID },
@@ -287,7 +286,7 @@ describe('cds.ql → cqn', () => {
                 'in',
                 { val: args },
                 'and',
-                '(', //> this one is missing, and that's changing the logic -> that's a BUG
+                '(',
                 { ref: ['x'] },
                 'like',
                 { val: '%x%' },
@@ -298,7 +297,6 @@ describe('cds.ql → cqn', () => {
                 ')',
               ]
             : [
-                '(', //> this one is not required
                 { ref: ['ID'] },
                 '=',
                 { val: ID },
@@ -307,7 +305,7 @@ describe('cds.ql → cqn', () => {
                 'in',
                 { val: args },
                 'and',
-                // '(',  //> this one is missing, and that's changing the logic -> that's a BUG
+                '(',
                 { ref: ['x'] },
                 'like',
                 { val: '%x%' },
@@ -337,11 +335,31 @@ describe('cds.ql → cqn', () => {
             { val: 'bar' },
             ',',
             { val: 3 },
-            ')',
-          ],
-        },
+            ')'
+          ]
+        }
       })
-      expect(SELECT.from(Foo).where(`ID=`, ID, `and x in`, args)).to.eql(cqn)
+
+      const cqnFluent = {
+        SELECT: {
+          from: { ref: ['Foo'] },
+          where: [
+            { ref: ['ID'] },
+            '=',
+            { val: ID },
+            'and',
+            { ref: ['x'] },
+            'in',
+            { list: [
+            { val: 'foo' },
+            { val: 'bar' },
+            { val: 3 }
+            ] }
+          ]
+        }
+      }
+
+      expect(SELECT.from(Foo).where(`ID=`, ID, `and x in`, args)).to.eql(cqnFluent)
       expect(SELECT.from(Foo).where(`ID=${ID} and x in (${args})`)).to.eql(cqn)
 
       expect(

test/localized-data.test.js

@@ -72,7 +72,7 @@ describe('Localized Data', () => {
     ])
   })
 
-  xit('supports @cds.localized:false', async ()=>{
+  it('supports @cds.localized:false', async ()=>{
     const { data } = await GET(`/browse/BooksSans?&$select=title,localized_title&$expand=currency&$filter=locale eq 'de' or locale eq null`, {
       headers: { 'Accept-Language': 'de' },
     })