Test for chinese locales

So that fewer users stumble over the basic authentication popup.

README.md

@@ -5,12 +5,15 @@ Find here a collection of samples for the [SAP Cloud Application Programming Mod
 ![](https://github.com/SAP-samples/cloud-cap-samples/workflows/CI/badge.svg)
 [![REUSE status](https://api.reuse.software/badge/github.com/SAP-samples/cloud-cap-samples)](https://api.reuse.software/info/github.com/SAP-samples/cloud-cap-samples)
 
+
 ### Preliminaries
 
-1. [Install @sap/cds-dk](https://cap.cloud.sap/docs/get-started/) as documented in [capire](https://cap.cloud.sap)
+1. [Install @sap/cds-dk](https://cap.cloud.sap/docs/get-started/) globally as documented in [capire](https://cap.cloud.sap)
+   ```sh
+   npm i -g @sap/cds-dk
+   ```
 2. _Optional:_ [Use Visual Studio Code](https://cap.cloud.sap/docs/get-started/in-vscode)
 
-
 ### Download
 
 Clone this repo as shown below, if you have [git](https://git-scm.com/downloads) installed,
@@ -39,6 +42,8 @@ cds watch bookshop
 
 After that open this link in your browser: [http://localhost:4004](http://localhost:4004)
 
+When asked to log in, type `alice` as user and leave the password field blank, which is the [default user](https://cap.cloud.sap/docs/node.js/authentication#mocked).
+
 ### Testing
 
 Run the provided tests with [_jest_](http://jestjs.io) or [_mocha_](http://mochajs.org), for example:
@@ -48,15 +53,15 @@ npx jest
 > While mocha is a bit smaller and faster, jest runs tests in parallel and isolation, which allows to run all tests.
 
 
-### Serve `npm` 
+### Serve `npm`
 
-We've simple npm registry mock included which allows you to do an `npm install @capire/<package>` anywhere locally. Use it as follows:
+We've included a simple npm registry mock which allows you to do an `npm install @capire/<package>` locally. Use it as follows:
 
 1. Start the @capire registry:
 ```sh
 npm run registry
 ```
-> While running this will have `@capire:registry=http://localhost:4444` set with npmrc. 
+> While running this will have `@capire:registry=http://localhost:4444` set with npmrc.
 
 2. Install one of the @capire packages wherever you like, e.g.:
 ```sh

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 SELECT.one.from(req.target).columns('max(ID) as ID')
+  const {ID} = await cds.tx(req).run (SELECT.one.from(req.target).columns('max(ID) as ID'))
   req.data.ID = ID - ID % 100 + 100 + 1
 }

bookshop/srv/cat-service.js

@@ -1,30 +1,25 @@
 const cds = require('@sap/cds')
+const { Books } = cds.entities ('sap.capire.bookshop')
 
 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
-    // Read stock from database
-    let {stock} = await SELECT.from (Books, book, b => b.stock)
+    const {book,amount} = req.data, tx = cds.tx(req)
+    let {stock} = await tx.read('stock').from(Books,book)
     if (stock >= amount) {
-      // Reduce stock by ordered amount
-      await UPDATE (Books,book) .with ({ stock: stock -= amount })
-      // Emit event to inform others
+      await tx.update (Books,book).with ({ stock: stock -= amount })
       await this.emit ('OrderedBook', { book, amount, buyer:req.user.id })
-      // Return reduced stock to caller
-      return req.reply ({ stock })
+      return { 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) each.title += ` -- 11% discount!`
+    if (each.stock > 111) {
+      each.title += ` -- 11% discount!`
+    }
   })
 
   return super.init()

fiori/app/_i18n/i18n_zh.properties

@@ -0,0 +1 @@
+# this file is not used

fiori/app/_i18n/i18n_zh_CN.properties

@@ -0,0 +1,14 @@
+Books = Chinesische Bücher
+Book = Chinesiches Buch
+ID = CN ID
+Title = Chinese Titel
+Authors = Chinese Autoren
+Author = Chinese Autor
+AuthorID = Chinese ID des Autors
+AuthorName = Chinese Name des Autors
+Name = Chinese Name
+Stock = Chinese Bestand
+Order = Chinese Bestellung
+Orders = Chinese Bestellungen
+Price = Chinese Preis
+Genre = Chinese Genre

fiori/app/admin-fiori.html

@@ -13,7 +13,7 @@
 			applications: {
 				"browse-books": {
 					title: "Browse Books",
-					description: "... testing FE v42",
+					description: "w/ SAP Fiori Elements",
 					additionalInformation: "SAPUI5.Component=bookshop",
 					applicationType : "URL",
 					url: "/browse/webapp",
@@ -21,7 +21,7 @@
 				},
 				"manage-books": {
 					title: "Manage Books",
-					description: "... testing FE v42",
+					description: "w/ SAP Fiori Elements",
 					additionalInformation: "SAPUI5.Component=admin",
 					applicationType : "URL",
 					url: "/admin/webapp",
@@ -29,7 +29,7 @@
 				},
 				"manage-orders": {
 					title: "Manage Orders",
-					description: "... testing FE v42",
+					description: "w/ SAP Fiori Elements",
 					additionalInformation: "SAPUI5.Component=orders",
 					applicationType : "URL",
 					url: "/orders/webapp",
@@ -40,8 +40,7 @@
 	</script>
 
 	<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" -->
-	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/1.78.6/resources/sap-ui-core.js"
+	<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"

fiori/app/browse/fiori-service.cds

@@ -7,8 +7,8 @@ using CatalogService from '@capire/bookshop';
 annotate CatalogService.Books with @(
 	UI: {
   	HeaderInfo: {
-			TypeName: 'Book',
-			TypeNamePlural: 'Books',
+			TypeName: '{i18n>Book}',
+			TypeNamePlural: '{i18n>Books}',
   		Description: {Value: author}
   	},
 		HeaderFacets: [

fiori/srv/mashup.js

@@ -5,17 +5,13 @@
 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
@@ -24,7 +20,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 SELECT.from (Reviews,columns).limit(limit).where({subject:String(id)})
+    return ReviewsService.tx(req).read ('Reviews',columns).limit(limit).where({subject:String(id)})
   }))
 
   //
@@ -32,9 +28,8 @@ module.exports = async()=>{ // called by server.js
   //
   CatalogService.on ('OrderedBook', async (msg) => {
     const { book, amount, buyer } = msg.data
-    const { title, price } = await SELECT.from (Books, book, b => { b.title, b.price })
-    // FIXME: Fails due to Draft glitches when OrdersService is remote
-    return INSERT.into (Orders).entries({
+    const { title, price } = await db.tx(msg).read (Books, book, b => { b.title, b.price })
+    return OrdersService.tx(msg).create ('Orders').entries({
       OrderNo: 'Order at '+ (new Date).toLocaleString(),
       Items: [{ product:{ID:`${book}`}, title, price, amount }],
       buyer, createdBy: buyer
@@ -47,11 +42,12 @@ module.exports = async()=>{ // called by server.js
   ReviewsService.on ('reviewed', (msg) => {
     console.debug ('> received:', msg.event, msg.data)
     const { subject, rating } = msg.data
-    return UPDATE (Books,subject) .with ({rating})
+    return UPDATE(Books,subject).with({rating})
+    // ^ Note: the framework will execute this and take care for db.tx
   })
 
   //
-  // Reduce stock of ordered books when orders are modified in admin UI
+  // Reduce stock of ordered books for orders are created from Orders admin UI
   //
   OrdersService.on ('OrderChanged', (msg) => {
     console.debug ('> received:', msg.event, msg.data)
@@ -60,5 +56,4 @@ module.exports = async()=>{ // called by server.js
     .and ('stock >=', deltaAmount)
     .set ('stock -=', deltaAmount)
   })
-
 }

orders/db/schema.cds

@@ -18,7 +18,7 @@ entity Orders_Items {
 }
 
 /** This is a stand-in for arbitrary ordered Products */
-entity Products @(cds.persistence.skip:'always',cds.autoexpose) {
+entity Products @(cds.persistence.skip:'always') {
   key ID : String;
 }
 

orders/srv/orders-service.js

@@ -8,14 +8,18 @@ class OrdersService extends cds.ApplicationService {
     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 SELECT.one.from (OrderItems, oi => oi.amount) .where ({up__ID:ID, product_ID})
+        const { amount:before } = await cds.tx(req).run (
+          SELECT.one.from (OrderItems, oi => oi.amount) .where ({up__ID:ID, product_ID})
+        )
         if (amount != before) await this.orderChanged (product_ID, amount-before)
       }
     })
 
     this.before ('DELETE', 'Orders', async function(req) {
       const { ID } = req.data
-      const Items = await SELECT.from (OrderItems, oi => { oi.product_ID, oi.amount }) .where ({up__ID:ID})
+      const Items = await cds.tx(req).run (
+        SELECT.from (OrderItems, oi => { oi.product_ID, oi.amount }) .where ({up__ID:ID})
+      )
       if (Items) await Promise.all (Items.map(it => this.orderChanged (it.product_ID, -it.amount)))
     })
 

package.json

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

reviews/srv/reviews-service.js

@@ -12,7 +12,9 @@ module.exports = cds.service.impl (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 SELECT.one (['round(avg(rating),2) as rating']) .from (Reviews) .where ({subject})
+    const {rating} = await cds.tx(req) .run (
+      SELECT.one (['round(avg(rating),2) as rating']) .from (Reviews) .where ({subject})
+    )
     global.it || console.log ('< emitting:', 'reviewed', { subject, rating })
     await this.emit ('reviewed', { subject, rating })
   })
@@ -21,7 +23,8 @@ module.exports = cds.service.impl (function(){
   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
-    return cds.run ([
+    const tx = cds.tx(req)
+    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'))
@@ -31,8 +34,9 @@ module.exports = cds.service.impl (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 affectedRows = await DELETE.from (Likes) .where ({review_ID: review,user: user.id})
-    if (affectedRows === 1)  return UPDATE (Reviews) .set ({liked: {'-=': 1}}) .where ({ID:review})
+    const tx = cds.tx(req)
+    const affectedRows = await tx.run (DELETE.from (Likes) .where ({review_ID: review,user: user.id}))
+    if (affectedRows === 1)  return tx.run (UPDATE (Reviews) .set ({liked: {'-=': 1}}) .where ({ID:review}))
   })
 
 })

test/cds.ql.test.js

@@ -325,7 +325,26 @@ describe('cds.ql → cqn', () => {
       })
 
       // using CQL fragments -> uses cds.parse.expr
-      expect((cqn = CQL`SELECT from Foo where ID=11 and x in ( foo, 'bar', 3)`)).to.eql({
+      const is_v2 = !!cds.parse.expr('(1,2)').list
+      if (is_v2) expect((cqn = CQL`SELECT from Foo where ID=11 and x in ( foo, 'bar', 3)`)).to.eql({
+        SELECT: {
+          from: { ref: ['Foo'] },
+          where: [
+            { ref: ['ID'] },
+            '=',
+            { val: ID },
+            'and',
+            { ref: ['x'] },
+            'in',
+            {list:[
+              { ref: ['foo'] },
+              { val: 'bar' },
+              { val: 3 },
+            ]}
+          ],
+        },
+      })
+      else expect((cqn = CQL`SELECT from Foo where ID=11 and x in ( foo, 'bar', 3)`)).to.eql({
         SELECT: {
           from: { ref: ['Foo'] },
           where: [

test/messaging.test.js

@@ -42,16 +42,16 @@ describe('Messaging', ()=>{
         //     { ID: 111 + (++N),  subject: "201", title: "Captivating", rating: N },
         // ),
         srv.create ('Reviews') .entries (
-            { ID: 111 + (++N),  subject: "201", title: "Captivating", rating: N }
+            { ID: String(111 + (++N)),  subject: "201", title: "Captivating", rating: N }
         ),
         srv.create ('Reviews') .entries (
-            { ID: 111 + (++N),  subject: "201", title: "Captivating", rating: N }
+            { ID: String(111 + (++N)),  subject: "201", title: "Captivating", rating: N }
         ),
         srv.create ('Reviews') .entries (
-            { ID: 111 + (++N),  subject: "201", title: "Captivating", rating: N }
+            { ID: String(111 + (++N)),  subject: "201", title: "Captivating", rating: N }
         ),
         srv.create ('Reviews') .entries (
-            { ID: 111 + (++N),  subject: "201", title: "Captivating", rating: N }
+            { ID: String(111 + (++N)),  subject: "201", title: "Captivating", rating: N }
         ),
     ]))