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" ],
-      "args": [ "--", "cds", "run", "--in-memory" ],
-      "cwd": "${workspaceFolder}/packages/bookshop",
-      "console": "integratedTerminal",
-      "skipFiles": ["<node_internals>/**"]
-    },
-    {
-      "name": "cds run ...", "request": "launch", "type": "node", "runtimeExecutable": "npx", "runtimeArgs": [ "-n" ],
-      "args": [ "--", "cds", "run", "--with-mocks", "--in-memory?" ],
+      "name": "cds run",
+      "request": "launch",
+      "type": "node",
+      "runtimeExecutable": "npx",
+      "runtimeArgs": ["-n"],
+      "args": ["--", "cds", "run", "--with-mocks", "--in-memory?"], // the leading "--" arg ensures it works with as well as without debugging
       "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,
-    "**/.vscode": true
+    "**/.gitignore": false,
+    "**/.git": false,
+    "**/.vscode": false
   }
 }

.vscode/tasks.json

@@ -4,14 +4,23 @@
     "version": "2.0.0",
     "tasks": [
         {
-            "type": "npm", "script": "watch", "path": "packages/bookshop/",
-            "options": { "env": { "PORT": "4004" }},
-            "presentation": { "group": "A" }
+            "type": "shell", "label": "cds run bookshop",
+            "command": "npx", "args": [ "cds", "watch", "packages/bookshop" ],
+            "presentation": { "group": "A" },
+            "problemMatcher": []
         },
         {
-            "type": "npm", "script": "watch", "path": "packages/reviews-service/",
-            "options": { "env": { "PORT": "5005" }},
-            "presentation": { "group": "A" }
+            "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" },
+            "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-week3-unit1
+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,24 +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",
-    "reviews-service": "cds watch packages/reviews-service",
+    "bookshop": "cds watch packages/bookshop",
     "bookstore": "cds watch packages/bookstore",
-    "media-server": "cds watch packages/media-server"
+    "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
-7e2f2640-6866-4dcf-8f4d-3027aa831cad;;2019-01-31;john.doe@test.com;;1;EUR
-64e718c9-ff99-47f1-8ca3-950c850777d4;;2019-01-30;jane.doe@test.com;;2;EUR
+ID;modifiedAt;createdAt;createdBy;modifiedBy;OrderNo;currency_code;status
+da86efd0-4ba1-4078-b7f0-5c9c530297f7;;2019-01-31;ALICE;;1;EUR;processing
+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,35 +1,50 @@
 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;
-  title  : localized String(111);
-  descr  : localized String(1111);
-  author : Association to Authors;
-  stock  : Integer;
-  price  : Decimal(9,2);
-  currency : Currency;
+  key ID       : Integer;
+      title    : localized String(111);
+      descr    : localized String(1111);
+      author   : Association to Authors;
+      stock    : Integer;
+      price    : Decimal(9, 2);
+      currency : Currency;
 }
 
 entity Authors : managed {
-  key ID : Integer;
-  name   : String(111);
-  dateOfBirth  : Date;
-  dateOfDeath  : Date;
-  placeOfBirth : String;
-  placeOfDeath : String;
-  books  : Association to many Books on books.author = $self;
+  key ID           : Integer;
+      name         : String(111);
+      dateOfBirth  : Date;
+      dateOfDeath  : Date;
+      placeOfBirth : String;
+      placeOfDeath : String;
+      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;
-  total    : Decimal(9,2) @readonly;
+  OrderNo  : String       @title : 'Order Number'; //> readable key
+  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;
   amount    : Integer;
-  netAmount : Decimal(9,2);
-}
+  netAmount : Decimal(9, 2);
+}

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?",
-    "watch": "cds watch"
-  },
-  "cds": {
-    "requires": {
-      "db": {
-        "kind": "sql"
-      }
-    }
+    "start": "npx cds run"
   }
 }

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

@@ -10,4 +10,4 @@ service CatalogService {
   @requires_: 'authenticated-user'
   @insertonly entity Orders as projection on my.Orders;
 
-}
+}

packages/bookshop/srv/cat-service.js

@@ -1,26 +1,26 @@
 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))
-  this.before ('CREATE', 'Orders', _reduceStock)
+module.exports = cds.service.impl(function () {
+  const { Books, Orders } = this.entities
+  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) {
+    each.title += ` -- ${discount}% discount!`
+  }
+
+  /** Reduce stock of ordered books if available stock suffices */
+  async function _reduceStock(req) {
+    const { Items: OrderItems } = req.data
+    return cds.transaction(req).run(() => OrderItems.map(order =>
+      UPDATE(Books).set('stock -=', order.amount)
+        .where('ID =', order.book_ID).and('stock >=', order.amount)
+    )).then(all => all.forEach((affectedRows, i) => {
+      if (affectedRows === 0) req.error(409,
+        `${OrderItems[i].amount} exceeds stock for book #${OrderItems[i].book_ID}`
+      )
+    }))
+  }
 })
-
-/** Add some discount for overstocked books */
-function _addDiscount2 (each,discount) {
-  each.title += ` -- ${discount}% discount!`
-}
-
-/** Reduce stock of ordered books if available stock suffices */
-async function _reduceStock (req) {
-  const { Items: OrderItems } = req.data
-  return cds.transaction(req) .run (()=> OrderItems.map (order =>
-    UPDATE (Books) .set ('stock -=', order.amount)
-    .where ('ID =', order.book_ID) .and ('stock >=', order.amount)
-  )) .then (all => all.forEach ((affectedRows,i) => {
-    if (affectedRows === 0)  req.error (409,
-      `${OrderItems[i].amount} exceeds stock for book #${OrderItems[i].book_ID}`
-    )
-  }))
-}

packages/bookshop/tests/authors.http

@@ -1,25 +0,0 @@
-### Service Document
-GET http://localhost:4004/admin/Authors
-
-### Create Author
-POST http://localhost:4004/admin/Authors HTTP/1.1
-content-Type: application/json
-
-{
-    "ID": 105, 
-    "name": "J.K. Rowling",
-    "dateOfBirth": null,
-    "dateOfDeath": null,
-    "placeOfBirth": "",
-    "placeOfDeath": ""
-} 
-### Update Author
-PATCH http://localhost:4004/admin/Authors/105 HTTP/1.1
-content-Type: application/json
-
-{
-    "placeOfBirth": "United Kingdom"
-} 
-
-### Delete Author
-DELETE http://localhost:4004/admin/Authors/105 HTTP/1.1