Prepare for serve_on_root false

Media-server implementation

.eslintrc

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

.vscode/launch.json

@@ -5,19 +5,17 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "cds run",
+      "name": "bookshop", "request": "launch", "type": "node", "runtimeExecutable": "npx", "runtimeArgs": [ "-n" ],
-      "request": "launch",
+      "args": [ "--", "cds", "run", "--in-memory" ],
-      "type": "node",
+      "cwd": "${workspaceFolder}/packages/bookshop",
-      "runtimeExecutable": "npx",
+      "console": "integratedTerminal",
-      "runtimeArgs": ["-n"],
+      "skipFiles": ["<node_internals>/**"]
-      "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>/**"]
     }
   ],
@@ -31,12 +29,9 @@
         "bookstore",
         "media-server",
         "office-supplies",
-        "orders-service",
+        "reviews-service"
-        "products-service",
-        "reviews-service",
-        "user-service"
       ],
-      "default": "bookstore"
+      "default": "bookshop"
     }
   ]
 }

.vscode/settings.json

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

.vscode/tasks.json

@@ -4,23 +4,14 @@
     "version": "2.0.0",
     "tasks": [
         {
-            "type": "shell", "label": "cds run bookshop",
+            "type": "npm", "script": "watch", "path": "packages/bookshop/",
-            "command": "npx", "args": [ "cds", "watch", "packages/bookshop" ],
+            "options": { "env": { "PORT": "4004" }},
-            "presentation": { "group": "A" },
+            "presentation": { "group": "A" }
-            "problemMatcher": []
         },
         {
-            "type": "shell", "label": "cds run bookshop-enhanced",
+            "type": "npm", "script": "watch", "path": "packages/reviews-service/",
-            "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-week4-unit1-final
+git clone https://github.com/sap-samples/cloud-cap-samples projects/cloud-cap-samples -b openSAP-week3-unit1
 cd projects/cloud-cap-samples
 ```
 

package.json

@@ -5,23 +5,24 @@
   "author": "daniel.hutzel@sap.com",
   "private": true,
   "scripts": {
-    "cleanup": "lerna clean -y && rm -fr node_modules",
-    "install": "(npm -s run lerna) && lerna bootstrap --hoist",
     "lerna": "npx --no-install lerna -v > /dev/null || npm i lerna --no-save",
-    "test": "jest",
+    "install": "(npm -s run lerna) && lerna bootstrap --hoist",
-    "bookshop-enhanced": "cds watch packages/bookshop-enhanced",
+    "cleanup": "lerna clean -y && rm -fr node_modules",
     "bookshop": "cds watch packages/bookshop",
+    "bookshop-enhanced": "cds watch packages/bookshop-enhanced",
+    "reviews-service": "cds watch packages/reviews-service",
     "bookstore": "cds watch packages/bookstore",
-    "products-service": "cds watch packages/products-service",
+    "media-server": "cds watch packages/media-server"
-    "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_belize"
+    	data-sap-ui-theme="sap_fiori_3"
     	data-sap-ui-frameOptions="allow"
 	></script>
 	<script>

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

@@ -1,5 +1,3 @@
-ID;modifiedAt;createdAt;createdBy;modifiedBy;OrderNo;currency_code;status
+ID;modifiedAt;createdAt;createdBy;modifiedBy;OrderNo;currency_code
-da86efd0-4ba1-4078-b7f0-5c9c530297f7;;2019-01-31;ALICE;;1;EUR;processing
+7e2f2640-6866-4dcf-8f4d-3027aa831cad;;2019-01-31;john.doe@test.com;;1;EUR
-2f2f2640-6866-4dcf-8f4d-3027aa831cad;;2019-03-25;ALICE;;10;EUR;completed
+64e718c9-ff99-47f1-8ca3-950c850777d4;;2019-01-30;jane.doe@test.com;;2;EUR
-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,16 +1,5 @@
 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;
@@ -29,19 +18,15 @@ entity Authors : managed {
   dateOfDeath  : Date;
   placeOfBirth : String;
   placeOfDeath : String;
-      books        : Association to many Books
+  books  : Association to many Books on books.author = $self;
-                       on books.author = $self;
 }
 
 entity Orders : cuid, managed {
   OrderNo  : String @title:'Order Number'; //> readable key
-  status   : Status default 'processing';
+  Items    : Composition of many OrderItems on Items.parent = $self;
-  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,20 +5,16 @@
   "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": "npx cds run"
+    "start": "cds run --in-memory?",
+    "watch": "cds watch"
   },
   "cds": {
     "requires": {
-      "API_BUSINESS_PARTNER": {
+      "db": {
-        "kind": "odata",
+        "kind": "sql"
-        "model": "srv/external/API_BUSINESS_PARTNER"
       }
     }
   }

packages/bookshop/srv/admin-service.cds

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

packages/bookshop/srv/cat-service.js

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

packages/bookshop/tests/authors.http

@@ -0,0 +1,25 @@
+### 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