Better clone path

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-unit1
+git clone https://github.com/sap-samples/cloud-cap-samples projects/cloud-cap-samples -b openSAP-week2-unit2
 cd projects/cloud-cap-samples
 ```
 

package.json

@@ -8,11 +8,7 @@
     "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",
-    "bookshop-enhanced": "cds watch packages/bookshop-enhanced",
-    "reviews-service": "cds watch packages/reviews-service",
-    "bookstore": "cds watch packages/bookstore",
-    "media-server": "cds watch packages/media-server"
+    "bookshop": "cds watch packages/bookshop"
   },
   "dependencies": {
     "@sap/cds": "^3",

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

@@ -1,5 +1,5 @@
-ID;name
-101;Emily Brontë
-107;Charlotte Brontë
-150;Edgar Allen Poe
-170;Richard Carpenter
+ID;name;dateOfBirth;placeOfBirth;dateOfDeath;placeOfDeath
+101;Emily Brontë;1818-07-30;Thornton, Yorkshire;1848-12-19;Haworth, Yorkshire
+107;Charlotte Brontë;1818-04-21;Thornton, Yorkshire;1855-03-31;Haworth, Yorkshire
+150;Edgar Allen Poe;1809-01-19;Boston, Massachusetts;1849-10-07;Baltimore, Maryland
+170;Richard Carpenter;1929-08-14;King’s Lynn, Norfolk;2012-02-26;Hertfordshire, England

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

@@ -1,6 +1,6 @@
-ID;title;author_ID;stock
-201;Wuthering Heights;101;12
-207;Jane Eyre;107;11
-251;The Raven;150;333
-252;Eleonora;150;555
-271;Catweazle;170;22
+ID;title;descr;author_ID;stock;price;currency_code
+201;Wuthering Heights;"Wuthering Heights, Emily Brontë's only novel, was published in 1847 under the pseudonym ""Ellis Bell"". It was written between October 1845 and June 1846. Wuthering Heights and Anne Brontë's Agnes Grey were accepted by publisher Thomas Newby before the success of their sister Charlotte's novel Jane Eyre. After Emily's death, Charlotte edited the manuscript of Wuthering Heights and arranged for the edited version to be published as a posthumous second edition in 1850.";101;12;11.11;GBP
+207;Jane Eyre;"Jane Eyre /ɛər/ (originally published as Jane Eyre: An Autobiography) is a novel by English writer Charlotte Brontë, published under the pen name ""Currer Bell"", on 16 October 1847, by Smith, Elder & Co. of London. The first American edition was published the following year by Harper & Brothers of New York. Primarily a bildungsroman, Jane Eyre follows the experiences of its eponymous heroine, including her growth to adulthood and her love for Mr. Rochester, the brooding master of Thornfield Hall. The novel revolutionised prose fiction in that the focus on Jane's moral and spiritual development is told through an intimate, first-person narrative, where actions and events are coloured by a psychological intensity. The book contains elements of social criticism, with a strong sense of Christian morality at its core and is considered by many to be ahead of its time because of Jane's individualistic character and how the novel approaches the topics of class, sexuality, religion and feminism.";107;11;12.34;GBP
+251;The Raven;"""The Raven"" is a narrative poem by American writer Edgar Allan Poe. First published in January 1845, the poem is often noted for its musicality, stylized language, and supernatural atmosphere. It tells of a talking raven's mysterious visit to a distraught lover, tracing the man's slow fall into madness. The lover, often identified as being a student, is lamenting the loss of his love, Lenore. Sitting on a bust of Pallas, the raven seems to further distress the protagonist with its constant repetition of the word ""Nevermore"". The poem makes use of folk, mythological, religious, and classical references.";150;333;13.13;USD
+252;Eleonora;"""Eleonora"" is a short story by Edgar Allan Poe, first published in 1842 in Philadelphia in the literary annual The Gift. It is often regarded as somewhat autobiographical and has a relatively ""happy"" ending.";150;555;14;USD
+271;Catweazle;Catweazle is a British fantasy television series, starring Geoffrey Bayldon in the title role, and created by Richard Carpenter for London Weekend Television. The first series, produced and directed by Quentin Lawrence, was screened in the UK on ITV in 1970. The second series, directed by David Reid and David Lane, was shown in 1971. Each series had thirteen episodes, most but not all written by Carpenter, who also published two books based on the scripts.;170;22;15;EUR

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

@@ -0,0 +1,4 @@
+ID;locale;title;descr
+201;de;Sturmhöhe;Sturmhöhe (Originaltitel: Wuthering Heights) ist der einzige Roman der englischen Schriftstellerin Emily Brontë (1818–1848). Der 1847 unter dem Pseudonym Ellis Bell veröffentlichte Roman wurde vom viktorianischen Publikum weitgehend abgelehnt, heute gilt er als ein Klassiker der britischen Romanliteratur des 19. Jahrhunderts.
+207;de;Jane Eyre;Jane Eyre. Eine Autobiographie (Originaltitel: Jane Eyre. An Autobiography), erstmals erschienen im Jahr 1847 unter dem Pseudonym Currer Bell, ist der erste veröffentlichte Roman der britischen Autorin Charlotte Brontë und ein Klassiker der viktorianischen Romanliteratur des 19. Jahrhunderts. Der Roman erzählt in Form einer Ich-Erzählung die Lebensgeschichte von Jane Eyre (ausgesprochen /ˌdʒeɪn ˈɛə/), die nach einer schweren Kindheit eine Stelle als Gouvernante annimmt und sich in ihren Arbeitgeber verliebt, jedoch immer wieder um ihre Freiheit und Selbstbestimmung kämpfen muss. Als klein, dünn, blass, stets schlicht dunkel gekleidet und mit strengem Mittelscheitel beschrieben, gilt die Heldin des Romans Jane Eyre nicht zuletzt aufgrund der Kino- und Fernsehversionen der melodramatischen Romanvorlage als die bekannteste englische Gouvernante der Literaturgeschichte
+252;de;Eleonora;“Eleonora” ist eine Erzählung von Edgar Allan Poe. Sie wurde 1841 erstveröffentlicht. In ihr geht es um das Paradox der Treue in der Treulosigkeit.

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

@@ -0,0 +1,4 @@
+ID;amount;parent_ID;book_ID;netAmount
+58040e66-1dcd-4ffb-ab10-fdce32028b79;1;7e2f2640-6866-4dcf-8f4d-3027aa831cad;201;11.11
+64e718c9-ff99-47f1-8ca3-950c850777d4;1;7e2f2640-6866-4dcf-8f4d-3027aa831cad;271;15
+e9641166-e050-4261-bfee-d1e797e6cb7f;2;64e718c9-ff99-47f1-8ca3-950c850777d4;252;28

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

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

packages/bookshop/db/data/sap.common-Currencies.csv

@@ -0,0 +1,7 @@
+code;symbol;name;descr
+EUR;€;Euro;European Euro
+USD;$;US Dollar;United States Dollar
+CAD;$;Canadian Dollar;Canadian Dollar
+AUD;$;Australian Dollar;Australian Dollar
+GBP;£;Pound;Great Britain Pound
+ILS;₪;Shekel;Israeli New Shekel

packages/bookshop/db/data/sap.common-Currencies_texts.csv

@@ -0,0 +1,13 @@
+code;locale;name;descr
+EUR;de;Euro;European Euro
+USD;de;US-Dollar;United States Dollar
+CAD;de;Kanadischer Dollar;Kanadischer Dollar
+AUD;de;Australischer Dollar;Australischer Dollar
+GBP;de;Pfund;Britische Pfund
+ILS;de;Schekel;Israelische Schekel
+EUR;fr;euro;de la Zone euro
+USD;fr;dollar;dollar des États-Unis
+CAD;fr;dollar canadien;dollar canadien
+AUD;fr;dollar australien;dollar australien
+GBP;fr;livre sterling;pound sterling
+ILS;fr;Shekel;shekel israelien

packages/bookshop/db/schema.cds

@@ -1,40 +1,45 @@
 namespace sap.capire.bookshop;
-using { Currency, managed } from '@sap/cds/common';
+using { Currency, managed, cuid } from '@sap/cds/common';
+using { sap.capire.products.Products } from '../../products';
 
-entity Books : managed, additionalInfo {
-  key ID   : Integer;
-  title    : localized String(111);
-  descr    : localized String(1111);
-  author   : Association to Authors;
-  stock    : Integer;
-  price    : Decimal(9,2);
+/*
+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;
+} */
+
+entity Books : Products {
+  author : Association to Authors;
+}
+
+entity Magazines : Products {
+  publisher : String;
 }
 
 entity Authors : managed {
-  key ID   : Integer;
-  name     : String(111);
-  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 : managed {
-  key ID   : UUID;
+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;
+  currency : Currency;
 }
-entity OrderItems {
-  key ID   : UUID;
-  parent   : Association to Orders;
-  book     : Association to Books;
-  amount   : Integer;
-}
-
-entity Movies: additionalInfo {
-    key ID   : Integer;
-    name     : String(111); 
-}
-
-aspect additionalInfo{
-    genre: String(100);
-    language: String(200);
+entity OrderItems : cuid {
+  parent    : Association to Orders;
+  book      : Association to Books;
+  amount    : Integer;
+  netAmount : Decimal(9,2);
 }

packages/bookshop/package.json

@@ -1,14 +1,21 @@
 {
-  "name": "bookshop",
+  "name": "@sap/capire-bookshop",
   "version": "1.0.0",
-  "description": "A simple CAP project.",
-  "repository": "<Add your repository here>",
-  "license": "ISC",
+  "description": "A simple bookshop application, build in a self-contained all-in-one fashion, i.e. w/o reusing other packages.",
+  "license": "SAP SAMPLE CODE LICENSE",
   "dependencies": {
     "@sap/cds": "^3",
     "express": "^4"
   },
   "scripts": {
-    "start": "npx cds run"
+    "start": "cds run --in-memory?",
+    "watch": "cds watch"
+  },
+  "cds": {
+    "requires": {
+      "db": {
+        "kind": "sql"
+      }
+    }
   }
 }

packages/bookshop/sample requests.http

@@ -1,12 +0,0 @@
-### Submit Orders
-POST http://localhost:4004/browse/Orders
-Content-Type: application/json
-
-{ "OrderNo":"2019-09...", "Items":[
-    { "book_ID":201, "amount":5 }
-]}
-
-# Sending this three times should result in a 409: 5 exceeds stock for book #201
-
-### Check books entity that stock was reduced
-GET http://localhost:4004/admin/Books(201)

packages/bookshop/srv/admin-service.cds

@@ -1,7 +1,16 @@
 using { sap.capire.bookshop as my } from '../db/schema';
-service AdminService @(_requires:'admin') {
+
+service AdminService @(_requires:'authenticated-user') {
   entity Books as projection on my.Books;
-  entity Movies as projection on my.Movies;
   entity Authors as projection on my.Authors;
   entity Orders as select from my.Orders;
-}
+}
+
+// Enable Fiori Draft for Orders
+annotate AdminService.Orders with @odata.draft.enabled;
+// annotate AdminService.Books with @odata.draft.enabled;
+
+// Temporary workaround -> cap/issues#3121
+extend service AdminService with {
+  entity OrderItems as select from my.OrderItems;
+}

packages/bookshop/srv/cat-service.cds

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

packages/bookshop/srv/cat-service.js

@@ -1,28 +1,26 @@
-/**
- * Implementation for CatalogService defined in ./cat-service.cds
- */
-module.exports = (srv)=>{
+const cds = require('@sap/cds')
+const { Books } = cds.entities
 
-  // Use reflection to get the csn definition of Books
-  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)
+})
 
-  // Add some discount for overstocked books
-  srv.after ('READ','Books', (each)=>{
-    if (each.stock > 111) each.title += ' -- 11% discount!'
-  })
-
-  // Reduce stock of books upon incoming orders
-  srv.before ('CREATE','Orders', async (req)=>{
-    const tx = cds.transaction(req), order = req.data;
-    if (order.Items) {
-      const affectedRows = await tx.run(order.Items.map(item =>
-        UPDATE(Books) .where({ID:item.book_ID})
-          .and(`stock >=`, item.amount)
-          .set(`stock -=`, item.amount)
-        )
-      )
-      if (affectedRows.some(row => !row)) req.error(409, 'Sold out, sorry')
-    }
-  })
+/** 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/bookshop.http

@@ -0,0 +1,18 @@
+### Service Document
+GET http://localhost:4004/browse
+
+### Service $metadata document
+GET http://localhost:4004/browse/$metadata
+
+### Browsing Books
+GET http://localhost:4004/browse/Books?
+# &$select=title,author
+# &$expand=currency
+# &sap-language=de
+
+### Browsing Authors
+GET http://localhost:4004/admin/Authors?
+# &$select=name,dateOfBirth,placeOfBirth
+# &$expand=books($select=title;$expand=currency)
+# &$filter=ID eq 101
+# &sap-language=de

packages/bookshop/tests/orders.http

@@ -0,0 +1,18 @@
+
+### 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
+POST http://localhost:4004/browse/Orders
+Content-Type: application/json
+
+{ "OrderNo":"2019-09...", "Items":[
+    { "book_ID":201, "amount":5 },
+    { "book_ID":207, "amount":3 }
+]}
+
+# Sending this three times should result in a 409: 5 exceeds stock for book #201

packages/products/db/schema.cds

@@ -0,0 +1,19 @@
+namespace sap.capire.products;
+
+using { Currency, managed, sap.common.CodeList } from '@sap/cds/common';
+
+entity Products : managed {
+  key ID   : String;
+  title    : localized String(111);
+  descr    : localized String(1111);
+  stock    : Integer;
+  price    : Decimal(9,2);
+  currency : Currency;
+  category : Association to Categories;
+}
+
+entity Categories : CodeList {
+  key ID   : Integer;
+  parent   : Association to Categories;
+  children : Composition of many Categories on children.parent = $self;
+}

packages/products/index.cds

@@ -0,0 +1 @@
+using from './db/schema';

packages/products/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "@sap/products",
+  "version": "1.0.0",
+  "description": "A reuse package providing domain models and services to manage product catalogs.",
+  "repository": "https://github.com/SAP-samples/cloud-cap-samples.git",
+  "license": "SAP SAMPLE CODE LICENSE",
+  "dependencies": {
+    "@sap/cds": "^3",
+    "express": "^4"
+  },
+  "files": [
+    "db",
+    "index.cds"
+  ]
+}