Update README.md

.eslintrc

@@ -6,7 +6,7 @@
         "jest": true
     },
     "parserOptions": {
-        "ecmaVersion": 2018
+        "ecmaVersion": 2017
     },
     "globals": {
         "SELECT": true,

.vscode/launch.json

@@ -5,17 +5,19 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "bookshop", "request": "launch", "type": "node", "runtimeExecutable": "npx", "runtimeArgs": [ "-n" ],
+      "name": "cds run",
-      "args": [ "--", "cds", "run", "--in-memory" ],
+      "request": "launch",
-      "cwd": "${workspaceFolder}/packages/bookshop",
+      "type": "node",
-      "console": "integratedTerminal",
+      "runtimeExecutable": "npx",
-      "skipFiles": ["<node_internals>/**"]
+      "runtimeArgs": ["-n"],
-    },
+      "args": ["--", "cds", "run", "--with-mocks", "--in-memory?"], // the leading "--" arg ensures it works with as well as without debugging
-    {
-      "name": "cds run ...", "request": "launch", "type": "node", "runtimeExecutable": "npx", "runtimeArgs": [ "-n" ],
-      "args": [ "--", "cds", "run", "--with-mocks", "--in-memory?" ],
       "cwd": "${workspaceFolder}/packages/${input:service}",
       "console": "integratedTerminal",
+      "serverReadyAction": {
+        "pattern": "server listening on (https?://\\S+|[0-9]+)",
+        "uriFormat": "http://localhost:%s",
+        "action": "openExternally"
+      },
       "skipFiles": ["<node_internals>/**"]
     }
   ],
@@ -29,9 +31,12 @@
         "bookstore",
         "media-server",
         "office-supplies",
-        "reviews-service"
+        "orders-service",
+        "products-service",
+        "reviews-service",
+        "user-service"
       ],
-      "default": "bookshop"
+      "default": "bookstore"
     }
   ]
 }

.vscode/settings.json

@@ -1,6 +1,7 @@
 {
   "files.exclude": {
-    "**/.gitignore": true,
+    "**/.gitignore": false,
-    "**/.vscode": true
+    "**/.git": false,
+    "**/.vscode": false
   }
 }

.vscode/tasks.json

@@ -4,14 +4,23 @@
     "version": "2.0.0",
     "tasks": [
         {
-            "type": "npm", "script": "watch", "path": "packages/bookshop/",
+            "type": "shell", "label": "cds run bookshop",
-            "options": { "env": { "PORT": "4004" }},
+            "command": "npx", "args": [ "cds", "watch", "packages/bookshop" ],
-            "presentation": { "group": "A" }
+            "presentation": { "group": "A" },
+            "problemMatcher": []
         },
         {
-            "type": "npm", "script": "watch", "path": "packages/reviews-service/",
+            "type": "shell", "label": "cds run bookshop-enhanced",
+            "command": "npx", "args": [ "cds", "watch", "packages/bookshop-enhanced" ],
+            "presentation": { "group": "A" },
+            "problemMatcher": []
+        },
+        {
+            "type": "shell", "label": "cds run reviews-service",
+            "command": "npx", "args": [ "cds", "watch", "packages/reviews-service" ],
             "options": {"env": { "PORT":"5005" }},
-            "presentation": { "group": "A" }
+            "presentation": { "group": "A" },
+            "problemMatcher": []
         }
     ]
 }

README.md

@@ -11,7 +11,7 @@ In SAP Business Application Studio, open a terminal.
 Then clone the repo with this specific branch:
 
 ```sh
-git clone https://github.com/sap-samples/cloud-cap-samples projects/cloud-cap-samples -b openSAP-week2-unit3
+git clone https://github.com/sap-samples/cloud-cap-samples projects/cloud-cap-samples -b openSAP-week4-unit1
 cd projects/cloud-cap-samples
 ```
 

package.json

@@ -5,20 +5,23 @@
   "author": "daniel.hutzel@sap.com",
   "private": true,
   "scripts": {
-    "lerna": "npx --no-install lerna -v > /dev/null || npm i lerna --no-save",
-    "install": "(npm -s run lerna) && lerna bootstrap --hoist",
     "cleanup": "lerna clean -y && rm -fr node_modules",
-    "bookshop": "cds watch packages/bookshop"
+    "install": "(npm -s run lerna) && lerna bootstrap --hoist",
+    "lerna": "npx --no-install lerna -v > /dev/null || npm i lerna --no-save",
+    "test": "jest",
+    "bookshop-enhanced": "cds watch packages/bookshop-enhanced",
+    "bookshop": "cds watch packages/bookshop",
+    "bookstore": "cds watch packages/bookstore",
+    "products-service": "cds watch packages/products-service",
+    "reviews-service": "cds watch packages/reviews-service"
   },
   "dependencies": {
     "@sap/cds": "^3",
     "express": "^4"
   },
-  "devDependencies": {
-    "sqlite3": "*"
-  },
   "--add-these-to-devDependencies-for-tests": {
     "@types/jest": "*",
+    "sqlite3": "*",
     "jest": "*"
   },
   "license": "SAP SAMPLE CODE LICENSE"

packages/bookshop/app/fiori.html

@@ -43,7 +43,7 @@
 	<script 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"
+    	data-sap-ui-theme="sap_belize"
     	data-sap-ui-frameOptions="allow"
 	></script>
 	<script>

packages/bookshop/db/data/sap.capire.bookshop-Orders.csv

@@ -1,3 +1,5 @@
-ID;modifiedAt;createdAt;createdBy;modifiedBy;OrderNo;currency_code
+ID;modifiedAt;createdAt;createdBy;modifiedBy;OrderNo;currency_code;status
-7e2f2640-6866-4dcf-8f4d-3027aa831cad;;2019-01-31;john.doe@test.com;;1;EUR
+da86efd0-4ba1-4078-b7f0-5c9c530297f7;;2019-01-31;ALICE;;1;EUR;processing
-64e718c9-ff99-47f1-8ca3-950c850777d4;;2019-01-30;jane.doe@test.com;;2;EUR
+2f2f2640-6866-4dcf-8f4d-3027aa831cad;;2019-03-25;ALICE;;10;EUR;completed
+64e718c9-ff99-47f1-8ca3-950c850777d4;;2019-01-30;BOB;;2;EUR;processing
+1af3322d-3cb1-46be-b312-0ae9ec311537;;2019-03-16;BOB;;9;EUR;completed

packages/bookshop/db/schema.cds

@@ -1,5 +1,16 @@
 namespace sap.capire.bookshop;
-using { Currency, managed, cuid } from '@sap/cds/common';
+
+using {
+  Currency,
+  managed,
+  cuid
+} from '@sap/cds/common';
+
+type Status : String enum {
+  completed;
+  processing;
+  blocked;
+}
 
 entity Books : managed {
   key ID       : Integer;
@@ -11,7 +22,6 @@ entity Books : managed {
       currency : Currency;
 }
 
-@cds.autoexpose
 entity Authors : managed {
   key ID           : Integer;
       name         : String(111);
@@ -19,15 +29,19 @@ entity Authors : managed {
       dateOfDeath  : Date;
       placeOfBirth : String;
       placeOfDeath : String;
-  books  : Association to many Books on books.author = $self;
+      books        : Association to many Books
+                       on books.author = $self;
 }
 
 entity Orders : cuid, managed {
   OrderNo  : String       @title : 'Order Number'; //> readable key
-  Items    : Composition of many OrderItems on Items.parent = $self;
+  status   : Status default 'processing';
+  Items    : Composition of many OrderItems
+               on Items.parent = $self;
   total    : Decimal(9, 2)@readonly;
   currency : Currency;
 }
+
 entity OrderItems : cuid {
   parent    : Association to Orders;
   book      : Association to Books;

packages/bookshop/package.json

@@ -5,17 +5,13 @@
   "license": "SAP SAMPLE CODE LICENSE",
   "dependencies": {
     "@sap/cds": "^3",
-    "express": "^4"
+    "express": "^4",
+    "@sap/xb-msg-amqp-v100": "^0.9.35"
+  },
+  "devDependencies": {
+    "sqlite3": "^4.1.1"
   },
   "scripts": {
-    "start": "cds run --in-memory?",
+    "start": "npx cds run"
-    "watch": "cds watch"
-  },
-  "cds": {
-    "requires": {
-      "db": {
-        "kind": "sql"
-      }
-    }
   }
 }

packages/bookshop/srv/admin-service.cds

@@ -1,6 +1,6 @@
 using { sap.capire.bookshop as my } from '../db/schema';
 
-service AdminService @(_requires:'authenticated-user',path:'/admin') {
+service AdminService @(_requires:'authenticated-user') {
   entity Books as projection on my.Books;
   entity Authors as projection on my.Authors;
   entity Orders as select from my.Orders;
@@ -10,7 +10,7 @@ service AdminService @(_requires:'authenticated-user',path:'/admin') {
 annotate AdminService.Orders with @odata.draft.enabled;
 // annotate AdminService.Books with @odata.draft.enabled;
 
-// Temporary workaround -> cap/issues#3121
+// Temporary workaround -> https://github.wdf.sap.corp/cap/issues/issues/3121
 extend service AdminService with {
   entity OrderItems as select from my.OrderItems;
 }

packages/bookshop/srv/cat-service.cds

@@ -3,7 +3,9 @@ using { sap.capire.bookshop as my } from '../db/schema';
 @path:'/browse'
 service CatalogService {
 
-  @readonly entity Books as SELECT from my.Books { * } excluding { createdBy, modifiedBy };
+  @readonly entity Books as SELECT from my.Books {*,
+    author.name as author
+  } excluding { createdBy, modifiedBy };
 
   @requires_: 'authenticated-user'
   @insertonly entity Orders as projection on my.Orders;

packages/bookshop/srv/cat-service.js

@@ -1,11 +1,10 @@
 const cds = require('@sap/cds')
-const { Books } = cds.entities
 
 /** Service implementation for CatalogService */
 module.exports = cds.service.impl(function () {
-  this.after ('READ', 'Books', each => each.stock > 111 && _addDiscount2(each,11))
+  const { Books, Orders } = this.entities
-  this.before ('CREATE', 'Orders', _reduceStock)
+  this.after('READ', Books, each => each.stock > 111 && _addDiscount2(each, 11))
-})
+  this.before('CREATE', Orders, _reduceStock)
 
   /** Add some discount for overstocked books */
   function _addDiscount2(each, discount) {
@@ -24,3 +23,4 @@ async function _reduceStock (req) {
       )
     }))
   }
+})

packages/bookshop/tests/bookshop.http

@@ -1,14 +1,18 @@
-### Browse Books
+### Service Document
-GET http://localhost:4004/browse/Books
+GET http://localhost:4004/browse
 
-### Browse Books with expanded Authors
+### Service $metadata document
-GET http://localhost:4004/browse/Books?$expand=author
+GET http://localhost:4004/browse/$metadata
 
-### Try to insert into Books
+### Browsing Books
-POST http://localhost:4004/browse/Books
+GET http://localhost:4004/browse/Books?
-Content-Type: application/json
+# &$select=title,author
+# &$expand=currency
+# &sap-language=de
 
-{ 
+### Browsing Authors
-    "title": "Anna Karenina",
+GET http://localhost:4004/admin/Authors?
-    "stock": 10
+# &$select=name,dateOfBirth,placeOfBirth
-}
+# &$expand=books($select=title;$expand=currency)
+# &$filter=ID eq 101
+# &sap-language=de

packages/bookshop/tests/orders.http

@@ -1,15 +1,18 @@
-### List all Orders - deep read
+
+### List Books with their current stocks
+GET http://localhost:4004/admin/Books?$select=ID,stock
+
+### List all Orders
 GET http://localhost:4004/admin/Orders?
 &$expand=Items
 
-### Submit Orders - deep insert
+### Submit Orders
 POST http://localhost:4004/browse/Orders
 Content-Type: application/json
 
-{ "OrderNo":"1234", "Items":[
+{ "OrderNo":"2019-09...", "Items":[
     { "book_ID":201, "amount":5 },
     { "book_ID":207, "amount":3 }
 ]}
 
-### Try to get the Orders
+# Sending this three times should result in a 409: 5 exceeds stock for book #201
-GET http://localhost:4004/browse/Orders