Update README.md

final state of exercise 2
final state of exercise 1
2019-09-23 14:12:30 +02:00 · 2019-09-23 13:25:44 +02:00 · 2019-09-23 13:19:24 +02:00 · 2019-09-23 13:06:09 +02:00 · 2019-09-22 13:32:18 +02:00 · 2019-09-21 11:36:45 +02:00
86 changed files with 643 additions and 3844 deletions
--- a/.eslintrc
+++ b/.eslintrc
@@ -6,7 +6,7 @@
        "jest": true
    },
    "parserOptions": {
-        "ecmaVersion": 2018
+        "ecmaVersion": 2017
    },
    "globals": {
        "SELECT": true,
--- a/.npmrc
+++ b/.npmrc
@@ -1 +1,2 @@
-@sap:registry=https://npm.sap.com
+@sap:registry=https://npm.sap.com
+package-lock=false
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -1,37 +0,0 @@
-{
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-  "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?" ],
-      "cwd": "${workspaceFolder}/packages/${input:service}",
-      "console": "integratedTerminal",
-      "skipFiles": ["<node_internals>/**"]
-    }
-  ],
-  "inputs": [
-    {
-      "type": "pickString",
-      "id": "service",
-      "description": "Which service do you want to start?",
-      "options": [
-        "bookshop",
-        "bookstore",
-        "media-server",
-        "office-supplies",
-        "reviews-service"
-      ],
-      "default": "bookshop"
-    }
-  ]
-}
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,6 +0,0 @@
-{
-  "files.exclude": {
-    "**/.gitignore": true,
-    "**/.vscode": true
-  }
-}
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -1,17 +0,0 @@
-{
-    // See https://go.microsoft.com/fwlink/?LinkId=733558
-    // for the documentation about the tasks.json format
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "type": "npm", "script": "watch", "path": "packages/bookshop/",
-            "options": { "env": { "PORT": "4004" }},
-            "presentation": { "group": "A" }
-        },
-        {
-            "type": "npm", "script": "watch", "path": "packages/reviews-service/",
-            "options": { "env": { "PORT": "5005" }},
-            "presentation": { "group": "A" }
-        }
-    ]
-}
--- a/README.md
+++ b/README.md
@@ -1,42 +1,3 @@
-# Welcome to SAP Cloud Application Programming model samples
+# Final state after exercise 2 for CAA265 - Rapid Service Development with SAP Cloud Application Programming Model

-Find here the samples for the openSAP course [Building Applications with the SAP Cloud Application Programming Model](https://open.sap.com/courses/cp7).
-
-## Get Access to SAP Business Application Studio
-The recommended environment for the course is SAP Business Application Studio.  Watch [unit 2 of week 1](https://open.sap.com/courses/cp7/items/51pzQUzbXHr2kdbOmVs6jI) for how to get access.
-
-## Setup
-
-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-unit2
-cd projects/cloud-cap-samples
-```
-
-In the `cloud-cap-samples` folder run:
-```sh
-npm install
-```
-
-## Run
-
-Now you're ready to run the samples, for example:
-```sh
-cd packages/officesupplies
-cds watch
-```
-
-After that, watch out for the little popup in the lower right corner of SAP Business Application Studio that asks you to open the application in your browser.
-
-
-## Get Support
-
-Check out the cap docs at https://cap.cloud.sap. <br>
-In case you find a bug or need support, please [open an issue in here](https://github.com/SAP-samples/cloud-cap-samples/issues/new).
-
-
-## License
-
-Copyright (c) 2020 SAP SE or an SAP affiliate company. All rights reserved. This file is licensed under SAP Sample Code License Agreement, except as noted otherwise in the [LICENSE](/LICENSE) file.
+**DO NOT MERGE IN MASTER**
--- a/lerna.json
+++ b/lerna.json
@@ -1 +1,7 @@
-{"packages":["packages/*"],"version":"1.0.0"}
+{
+  "packages": [
+    "packages/*",
+    "shared/*"
+  ],
+  "version": "0.0.0"
+}
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,29 +1,16 @@
 {
  "name": "@sap/capire-samples",
  "description": "The umbrella project for all samples to easily setup for local development and tests.",
-  "repository": "https://github.com/SAP-samples/cloud-cap-samples.git",
+  "repository": "https://github.wdf.sap.corp/capire/samples.git",
  "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",
-    "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"
+    "install": "(npx --no-install lerna -v || npm i lerna --no-save) && lerna bootstrap --hoist --ignore tests-env --loglevel warn",
+    "reset": "lerna clean -y && rm -fr node_modules",
+    "test": "jest",
+    "bookstore": "cds run packages/bookstore --in-memory",
+    "products-service": "cds run packages/products-service --in-memory",
+    "reviews-service": "cds run packages/reviews-service --in-memory"
  },
-  "dependencies": {
-    "@sap/cds": "^3",
-    "express": "^4"
-  },
-  "devDependencies": {
-    "sqlite3": "*"
-  },
-  "--add-these-to-devDependencies-for-tests": {
-    "@types/jest": "*",
-    "jest": "*"
-  },
-  "license": "SAP SAMPLE CODE LICENSE"
+  "license": "ISC"
 }
--- a/packages/bookstore/.cdsrc.json
+++ b/packages/bookstore/.cdsrc.json
@@ -0,0 +1,6 @@
+{
+    "build": {
+        "target": ".",
+        "tasks": []
+    }
+}
--- a/packages/officesupplies/.gitignore
+++ b/packages/officesupplies/.gitignore
@@ -1,23 +1,15 @@
-# CAP officesupplies
-_out
-*.db
-connection.properties
-default-*.json
-gen/
-node_modules/
-package-lock.json
-target/
-
-# Web IDE, App Studio
 .che/
 .gen/
-
-# MTA
-*_mta_build_tmp
-*.mtar
+gen/
 mta_archives/
+node_modules/
+target/

-# Other
+.cds_gen.log
+connection.properties
+*.db
 .DS_Store
 *.orig
-*.log
+_out
+default-*.json
+package-lock.json
--- a/packages/bookstore/db/csv/sap.capire.bookstore-Authors.csv
+++ b/packages/bookstore/db/csv/sap.capire.bookstore-Authors.csv
@@ -0,0 +1,5 @@
+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
--- a/packages/bookstore/db/csv/sap.capire.bookstore-OrderItems.csv
+++ b/packages/bookstore/db/csv/sap.capire.bookstore-OrderItems.csv
@@ -0,0 +1,4 @@
+ID;amount;parent_ID;book_ID;netAmount
+301;1;401;201;11.11
+302;1;401;271;15
+303;2;402;252;28
--- a/packages/bookstore/db/csv/sap.capire.bookstore-Orders.csv
+++ b/packages/bookstore/db/csv/sap.capire.bookstore-Orders.csv
@@ -0,0 +1,3 @@
+ID;modifiedAt;createdAt;createdBy;modifiedBy;OrderNo;currency_code
+401;;2019-01-31;john.doe@test.com;;1;EUR
+402;;2019-01-30;christian.georgi@sap.com;;2;EUR
--- a/packages/bookstore/db/csv/sap.capire.products-Categories.csv
+++ b/packages/bookstore/db/csv/sap.capire.products-Categories.csv
@@ -0,0 +1,11 @@
+ID;parent_ID;name
+1;;Poetry
+2;;Biography
+3;;Fantasy
+4;;Science Fiction
+5;;Romance
+6;;Mystery
+7;;Thriller
+8;;Dystopia
+9;;Tragedy
+10;;Novel
--- a/packages/bookstore/db/csv/sap.capire.products-Products.csv
+++ b/packages/bookstore/db/csv/sap.capire.products-Products.csv
@@ -0,0 +1,6 @@
+ID;title;descr;author_ID;stock;price;currency_code;category_ID
+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;9
+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;10
+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;1
+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;5
+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;3
--- a/packages/bookstore/db/csv/sap.capire.products-Products_texts.csv
+++ b/packages/bookstore/db/csv/sap.capire.products-Products_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.
--- a/packages/bookstore/db/csv/sap.common-Currencies.csv
+++ b/packages/bookstore/db/csv/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 Britian Pound
+ILS;₪;Shekel;Israeli New Shekel
--- a/packages/bookstore/db/csv/sap.common-Currencies_texts.csv
+++ b/packages/bookstore/db/csv/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
--- a/packages/bookstore/db/schema.cds
+++ b/packages/bookstore/db/schema.cds
@@ -0,0 +1,35 @@
+namespace sap.capire.bookstore;
+
+// We reuse Products, which are Books in our domain
+using { sap.capire.products.Products as Books } from '@sap/capire-products';
+using { Currency, managed } from '@sap/cds/common';
+
+extend Books with {
+  author : Association to Authors;
+}
+
+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;
+}
+
+entity Orders : managed {
+  key ID : Integer;
+  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 : Integer;
+  parent    : Association to Orders;
+  book      : Association to Books;
+  amount    : Integer;
+  netAmount : Decimal(9,2);
+}
--- a/packages/bookstore/package.json
+++ b/packages/bookstore/package.json
@@ -0,0 +1,20 @@
+{
+    "name": "bookstore",
+    "description": "Generated by cds init",
+    "repository": "<Add your repository here>",
+    "license": "ISC",
+    "version": "1.0.0",
+    "engines": {
+        "node": "^8.9"
+    },
+    "dependencies": {
+        "@sap/capire-products": "^1.0.0",
+        "@sap/cds": "^3.17.4",
+        "express": "^4.17.1"
+    },
+    "scripts": {
+        "build": "cds build/all --clean",
+        "deploy": "cds deploy",
+        "start": "cds run"
+    }
+}
--- a/packages/bookstore/srv/services.cds
+++ b/packages/bookstore/srv/services.cds
@@ -0,0 +1,17 @@
+namespace sap.capire.bookstore;
+
+using { sap.capire.products.Products, sap.capire.bookstore as my } from '../db/schema';
+
+service CatalogService {
+  @readonly entity Books as projection on Products {
+    *, category.name as category, author.name
+  } excluding { createdBy, modifiedBy };
+
+  @insertonly entity Orders as projection on my.Orders;
+}
+
+// Reuse services from @sap/capire-products...
+using { sap.capire.products.AdminService } from '@sap/capire-products';
+extend service AdminService with {
+  entity Authors as projection on my.Authors;
+}
--- a/packages/bookstore/srv/services.js
+++ b/packages/bookstore/srv/services.js
@@ -0,0 +1,18 @@
+const cds = require('@sap/cds')
+module.exports = async (srv) => {
+
+  const { Books } = srv.entities
+  // Check all amounts against stock before activating
+  srv.before(['CREATE', 'UPDATE'], 'Orders', (req) => {
+    const tx = cds.transaction(req), order = req.data
+    return Promise.all(order.Items.map(each => tx.run(
+      UPDATE(Books).where({ ID: each.book_ID })
+        .and(`stock >=`, each.amount)
+        .set(`stock -=`, each.amount)
+    ).then(affectedRows => {
+      if (!affectedRows) {
+        req.error(409, `${each.amount} exceeds stock for book #${each.book_ID}`)
+      }
+    })))
+  })
+}
--- a/packages/officesupplies/.eslintrc
+++ b/packages/officesupplies/.eslintrc
@@ -1,24 +0,0 @@
-{
-    "extends": "eslint:recommended",
-    "env": {
-        "node": true,
-        "es6": true,
-        "jest": true
-    },
-    "parserOptions": {
-        "ecmaVersion": 2017
-    },
-    "globals": {
-        "SELECT": true,
-        "INSERT": true,
-        "UPDATE": true,
-        "DELETE": true,
-        "CREATE": true,
-        "DROP": true,
-        "cds": true
-    },
-    "rules": {
-        "no-console": "off",
-        "require-atomic-updates": "off"
-    }
-}
--- a/packages/officesupplies/.vscode/cds.js
+++ b/packages/officesupplies/.vscode/cds.js
@@ -1,4 +0,0 @@
-// used in launch.json to refer to an installed cds via an absolute path
-
-const cds = require('@sap/cds');
-cds.exec();
--- a/packages/officesupplies/.vscode/launch.json
+++ b/packages/officesupplies/.vscode/launch.json
@@ -1,19 +0,0 @@
-{
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "name": "cds run",
-      "type": "node",
-      "request": "launch",
-      "program": "${workspaceFolder}/.vscode/cds",
-      "args": [ "run", "--with-mocks", "--in-memory?" ],
-      "skipFiles": [ "<node_internals>/**" ],
-      "internalConsoleOptions": "openOnSessionStart",
-      "console": "internalConsole",
-      "autoAttachChildProcesses": true
-    }
-  ]
-}
--- a/packages/officesupplies/.vscode/settings.json
+++ b/packages/officesupplies/.vscode/settings.json
@@ -1,7 +0,0 @@
-{
-  "files.exclude": {
-    "**/.gitignore": true,
-    "**/.git": true,
-    "**/.vscode": true
-  }
-}
--- a/packages/officesupplies/.vscode/tasks.json
+++ b/packages/officesupplies/.vscode/tasks.json
@@ -1,23 +0,0 @@
-{
-  // See https://go.microsoft.com/fwlink/?LinkId=733558
-  // for the documentation about the tasks.json format
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "type": "shell",
-      "label": "cds watch",
-      "command": ["cds", "watch"],
-      "group": {
-        "kind": "build",
-        "isDefault": true
-      },
-      "problemMatcher": []
-    },
-    {
-      "type": "shell",
-      "label": "cds run",
-      "command": ["cds", "run", "--with-mocks", "--in-memory?"],
-      "problemMatcher": []
-    }
-  ]
-}
--- a/packages/officesupplies/README.md
+++ b/packages/officesupplies/README.md
@@ -1,25 +0,0 @@
-# Getting Started
-
-Welcome to your new project.
-
-It contains these folders and files, following our recommended project layout:
-
-File / Folder | Purpose
---------|----------
-`app/` | content for UI frontends go here
-`db/` | your domain models and data go here
-`srv/` | your service models and code go here
-`package.json` | project metadata and configuration
-`readme.md` | this getting started guide
-
-
-## Next Steps...
-
- Open a new terminal and run  `cds watch`
- ( in VSCode simply choose _**Terminal** > Run Task > cds watch_ )
- Start adding content, e.g. a [db/schema.cds](db/schema.cds), ...
-
-
-## Learn more...
-
-Learn more at https://cap.cloud.sap/docs/get-started/
--- a/packages/officesupplies/app/products/.npmrc
+++ b/packages/officesupplies/app/products/.npmrc
@@ -1,4 +0,0 @@
-@sap:registry=https://npm.sap.com
-@ui5:registry=https://registry.npmjs.org
-save = true
-save-exact = true
--- a/packages/officesupplies/app/products/README.md
+++ b/packages/officesupplies/app/products/README.md
@@ -1,21 +0,0 @@
-# products
-
-This is a my new Fiori elements app
-
-## Starting the generated app
-
-   This app has been generated using the SAP UX - App Generator, as part of the SAP UX Tools Suite.  In order to launch the generated app, simply run the following from the generated app root folder:
-
-```
-    npm start
-```
-
- Is it also possible to run the application using mock data that reflects the OData Service URL supplied during application generation.  In order to run the application with Mock Data, run the following from the generated app root folder:
-
-```
-    npm run start-mock
-```
-
-### Pre-requisites:
-
-1. Active NodeJS LTS (Long Term Support) version and associated supported NPM version.  (See https://nodejs.org)
--- a/packages/officesupplies/app/products/images/box.png
+++ b/packages/officesupplies/app/products/images/box.png
--- a/packages/officesupplies/app/products/images/envelopes.png
+++ b/packages/officesupplies/app/products/images/envelopes.png
--- a/packages/officesupplies/app/products/images/eraser.png
+++ b/packages/officesupplies/app/products/images/eraser.png
--- a/packages/officesupplies/app/products/images/hanger1.png
+++ b/packages/officesupplies/app/products/images/hanger1.png
--- a/packages/officesupplies/app/products/images/hanger2.png
+++ b/packages/officesupplies/app/products/images/hanger2.png
--- a/packages/officesupplies/app/products/images/hanger3.png
+++ b/packages/officesupplies/app/products/images/hanger3.png
--- a/packages/officesupplies/app/products/images/hanger4.png
+++ b/packages/officesupplies/app/products/images/hanger4.png
--- a/packages/officesupplies/app/products/images/magnets.png
+++ b/packages/officesupplies/app/products/images/magnets.png
--- a/packages/officesupplies/app/products/images/mug.png
+++ b/packages/officesupplies/app/products/images/mug.png
--- a/packages/officesupplies/app/products/images/pen.png
+++ b/packages/officesupplies/app/products/images/pen.png
--- a/packages/officesupplies/app/products/package.json
+++ b/packages/officesupplies/app/products/package.json
@@ -1,33 +0,0 @@
-{
-	"name": "products",
-	"version": "0.0.1",
-	"private": true,
-	"sapux": true,
-	"description": "This is a my new Fiori elements app",
-	"keywords": [
-		"ui5",
-		"openui5",
-		"sapui5"
-	],
-	"main": "webapp/index.html",
-	"scripts": {
-		"start": "npm run start-app-router",
-		"start-app-router": "npm run build && run-script-os",
-		"start-app-router:default": "destinations='[{\"name\":\"odata\",\"url\":\"http://localhost:4004\",\"strictSSL\":false}]' node node_modules/@sap/approuter/approuter.js",
-		"start-app-router:windows": "set destinations=[{\"name\":\"odata\",\"url\":\"http://localhost:4004\",\"strictSSL\":false}] && node node_modules/@sap/approuter/approuter.js",
-		"build": "rimraf dist && ui5 build -a --include-task=generateManifestBundle generateCachebusterInfo"
-	},
-	"remarkConfig": {
-		"plugins": [
-			"remark-preset-lint-consistent"
-		]
-	},
-	"dependencies": {
-		"@sap/approuter": "6.5.1",
-		"@ui5/cli": "1.8.0"
-	},
-	"devDependencies": {
-		"run-script-os": "1.0.7",
-		"rimraf": "3.0.0"
-	}
-}
--- a/packages/officesupplies/app/products/ui5.yaml
+++ b/packages/officesupplies/app/products/ui5.yaml
@@ -1,4 +0,0 @@
-specVersion: '1.0'
-metadata:
-  name: products
-type: application
--- a/packages/officesupplies/app/products/webapp/Component.js
+++ b/packages/officesupplies/app/products/webapp/Component.js
@@ -1,10 +0,0 @@
-/* global hasher */
-sap.ui.define(['sap/fe/AppComponent'], function(AppComponent) {
-    'use strict';
-
-    return AppComponent.extend('sap.uxfe.demo.products.Component', {
-        metadata: {
-            manifest: 'json'
-        }
-    });
-});
--- a/packages/officesupplies/app/products/webapp/WEB-INF/web.xml
+++ b/packages/officesupplies/app/products/webapp/WEB-INF/web.xml
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-							http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-		version="2.5"
-		xmlns="http://java.sun.com/xml/ns/javaee">
-
-	<display-name>OData v4</display-name>
-
-	<!-- ============================================================== -->
-	<!-- UI5 resource servlet used to handle application resources      -->
-	<!-- ============================================================== -->
-
-	<servlet>
-		<display-name>ResourceServlet</display-name>
-		<servlet-name>ResourceServlet</servlet-name>
-		<servlet-class>com.sap.ui5.resource.ResourceServlet</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>ResourceServlet</servlet-name>
-		<url-pattern>/resources/*</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>ResourceServlet</servlet-name>
-		<url-pattern>/test-resources/*</url-pattern>
-	</servlet-mapping>
-	
-	<!-- enable CORS -->
-	<context-param>
-		<param-name>com.sap.ui5.resource.ACCEPTED_ORIGINS</param-name>
-		<param-value>*</param-value>
-	</context-param>
-	
-	<!-- BEGIN: DEV MODE -->
-	<!-- DEV MODE switched off by default and can be switched on during development -->
-	<!-- but has to be switched off for productive use on a Java server! -->
-	<context-param>
-		<param-name>com.sap.ui5.resource.DEV_MODE</param-name>
-		<param-value>true</param-value>
-	</context-param>
-	<!-- END: DEV MODE -->
-
-
-	<!-- ============================================================== -->
-	<!-- Cache Control Filter to prevent caching of any resource        -->
-	<!-- ============================================================== -->
-
-	<filter>
-		<display-name>CacheControlFilter</display-name>
-		<filter-name>CacheControlFilter</filter-name>
-		<filter-class>com.sap.ui5.resource.CacheControlFilter</filter-class>
-	</filter>
-	<filter-mapping>
-		<filter-name>CacheControlFilter</filter-name>
-		<url-pattern>*.html</url-pattern>
-	</filter-mapping>
-	<filter-mapping>
-		<filter-name>CacheControlFilter</filter-name>
-		<url-pattern>*.js</url-pattern>
-	</filter-mapping>
-	<filter-mapping>
-		<filter-name>CacheControlFilter</filter-name>
-		<url-pattern>*.css</url-pattern>
-	</filter-mapping>
-	<filter-mapping>
-		<filter-name>CacheControlFilter</filter-name>
-		<url-pattern>*.json</url-pattern>
-	</filter-mapping>
-	<filter-mapping>
-		<filter-name>CacheControlFilter</filter-name>
-		<url-pattern>*.xml</url-pattern>
-	</filter-mapping>
-	<filter-mapping>
-		<filter-name>CacheControlFilter</filter-name>
-		<url-pattern>*.gif</url-pattern>
-	</filter-mapping>
-	<filter-mapping>
-		<filter-name>CacheControlFilter</filter-name>
-		<url-pattern>*.png</url-pattern>
-	</filter-mapping>
-	<filter-mapping>
-		<filter-name>CacheControlFilter</filter-name>
-		<url-pattern>*.jpg</url-pattern>
-	</filter-mapping>
-	<filter-mapping>
-		<filter-name>CacheControlFilter</filter-name>
-		<url-pattern>*.properties</url-pattern>
-	</filter-mapping>
-	<filter-mapping>
-		<filter-name>CacheControlFilter</filter-name>
-		<url-pattern>*.tmpl</url-pattern>
-	</filter-mapping>
-
-
-	<!-- ============================================================== -->
-	<!-- UI5 proxy servlet                                              -->
-	<!-- ============================================================== -->
-
-	<servlet>
-		<servlet-name>SimpleProxyServlet</servlet-name>
-		<servlet-class>com.sap.ui5.proxy.SimpleProxyServlet</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>SimpleProxyServlet</servlet-name>
-		<url-pattern>/proxy/*</url-pattern>
-	</servlet-mapping>
-
-
-	<!-- ============================================================== -->
-	<!-- Welcome file list                                              -->
-	<!-- ============================================================== -->
-
-	<welcome-file-list>
-		<welcome-file>test.html</welcome-file>
-	</welcome-file-list>
-
-
-</web-app>
--- a/packages/officesupplies/app/products/webapp/i18n/i18n.properties
+++ b/packages/officesupplies/app/products/webapp/i18n/i18n.properties
@@ -1,9 +0,0 @@
-# This is the resource bundle for products
-
-#Texts for manifest.json
-
-#XTIT: Application name
-appTitle=Products
-
-#YDES: Application description
-appDescription=This is a my new Fiori elements app
--- a/packages/officesupplies/app/products/webapp/index.html
+++ b/packages/officesupplies/app/products/webapp/index.html
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <title>{{appTitle}}</title>
-
-        <script>
-            window['sap-ushell-config'] = {
-                defaultRenderer: 'fiori2',
-                applications: {
-                    "fe-lrop-v4": {
-                        title: 'Products',
-                        description: 'This is a my new Fiori elements app',
-                        additionalInformation: 'SAPUI5.Component=sap.uxfe.demo.products',
-                        applicationType: 'URL',
-                        url: './',
-                        navigationMode: 'embedded'
-                    }
-                }
-            };
-        </script>
-
-        <script src="https://sapui5.hana.ondemand.com/1.71.0/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-        <script
-            src="https://sapui5.hana.ondemand.com/1.71.0/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-frameOptions="allow"
-        ></script>
-        <script>
-            sap.ui.getCore().attachInit(() => sap.ushell.Container.createRenderer().placeAt('content'));
-        </script>
-    </head>
-    <body class="sapUiBody" id="content"></body>
-</html>
--- a/packages/officesupplies/app/products/webapp/localService/metadata.xml
+++ b/packages/officesupplies/app/products/webapp/localService/metadata.xml
@@ -1,233 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<edmx:Edmx Version="4.0" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx">
-    <edmx:Reference Uri="https://oasis-tcs.github.io/odata-vocabularies/vocabularies/Org.OData.Capabilities.V1.xml">
-        <edmx:Include Alias="Capabilities" Namespace="Org.OData.Capabilities.V1"/>
-    </edmx:Reference>
-    <edmx:Reference Uri="https://wiki.scn.sap.com/wiki/download/attachments/448470974/Common.xml?api=v2">
-        <edmx:Include Alias="Common" Namespace="com.sap.vocabularies.Common.v1"/>
-    </edmx:Reference>
-    <edmx:Reference Uri="https://oasis-tcs.github.io/odata-vocabularies/vocabularies/Org.OData.Core.V1.xml">
-        <edmx:Include Alias="Core" Namespace="Org.OData.Core.V1"/>
-    </edmx:Reference>
-    <edmx:Reference Uri="https://wiki.scn.sap.com/wiki/download/attachments/448470968/UI.xml?api=v2">
-        <edmx:Include Alias="UI" Namespace="com.sap.vocabularies.UI.v1"/>
-    </edmx:Reference>
-    <edmx:DataServices>
-        <Schema Namespace="CatalogService" xmlns="http://docs.oasis-open.org/odata/ns/edm">
-            <EntityContainer Name="EntityContainer">
-                <EntitySet Name="Currencies" EntityType="CatalogService.Currencies">
-                    <NavigationPropertyBinding Path="texts" Target="Currencies_texts"/>
-                    <NavigationPropertyBinding Path="localized" Target="Currencies_texts"/>
-                </EntitySet>
-                <EntitySet Name="Currencies_texts" EntityType="CatalogService.Currencies_texts"/>
-                <EntitySet Name="Products" EntityType="CatalogService.Products">
-                    <NavigationPropertyBinding Path="currency" Target="Currencies"/>
-                    <NavigationPropertyBinding Path="supplier" Target="Suppliers"/>
-                    <NavigationPropertyBinding Path="texts" Target="Products_texts"/>
-                    <NavigationPropertyBinding Path="localized" Target="Products_texts"/>
-                </EntitySet>
-                <EntitySet Name="Products_texts" EntityType="CatalogService.Products_texts"/>
-                <EntitySet Name="Suppliers" EntityType="CatalogService.Suppliers">
-                    <NavigationPropertyBinding Path="products" Target="Products"/>
-                </EntitySet>
-            </EntityContainer>
-            <EntityType Name="Currencies">
-                <Key>
-                    <PropertyRef Name="code"/>
-                </Key>
-                <Property Name="name" Type="Edm.String" MaxLength="255"/>
-                <Property Name="descr" Type="Edm.String" MaxLength="1000"/>
-                <Property Name="code" Type="Edm.String" MaxLength="3" Nullable="false"/>
-                <Property Name="symbol" Type="Edm.String" MaxLength="2"/>
-                <NavigationProperty Name="texts" Type="Collection(CatalogService.Currencies_texts)">
-                    <OnDelete Action="Cascade"/>
-                </NavigationProperty>
-                <NavigationProperty Name="localized" Type="CatalogService.Currencies_texts">
-                    <ReferentialConstraint Property="code" ReferencedProperty="code"/>
-                </NavigationProperty>
-            </EntityType>
-            <EntityType Name="Currencies_texts">
-                <Key>
-                    <PropertyRef Name="locale"/>
-                    <PropertyRef Name="code"/>
-                </Key>
-                <Property Name="locale" Type="Edm.String" MaxLength="5" Nullable="false"/>
-                <Property Name="name" Type="Edm.String" MaxLength="255"/>
-                <Property Name="descr" Type="Edm.String" MaxLength="1000"/>
-                <Property Name="code" Type="Edm.String" MaxLength="3" Nullable="false"/>
-            </EntityType>
-            <EntityType Name="Products">
-                <Key>
-                    <PropertyRef Name="ID"/>
-                </Key>
-                <Property Name="ID" Type="Edm.Guid" Nullable="false"/>
-                <Property Name="identifier" Type="Edm.String"/>
-                <Property Name="title" Type="Edm.String"/>
-                <Property Name="description" Type="Edm.String"/>
-                <Property Name="availability" Type="Edm.Int32"/>
-                <Property Name="storageCapacity" Type="Edm.Int32"/>
-                <Property Name="criticality" Type="Edm.Int32"/>
-                <Property Name="price" Type="Edm.Decimal" Scale="2" Precision="9"/>
-                <NavigationProperty Name="currency" Type="CatalogService.Currencies">
-                    <ReferentialConstraint Property="currency_code" ReferencedProperty="code"/>
-                </NavigationProperty>
-                <NavigationProperty Name="supplier" Type="CatalogService.Suppliers" Partner="products">
-                    <ReferentialConstraint Property="supplier_ID" ReferencedProperty="ID"/>
-                </NavigationProperty>
-                <Property Name="image_url" Type="Edm.String"/>
-                <NavigationProperty Name="texts" Type="Collection(CatalogService.Products_texts)">
-                    <OnDelete Action="Cascade"/>
-                </NavigationProperty>
-                <NavigationProperty Name="localized" Type="CatalogService.Products_texts">
-                    <ReferentialConstraint Property="ID" ReferencedProperty="ID"/>
-                </NavigationProperty>
-                <Property Name="currency_code" Type="Edm.String" MaxLength="3"/>
-                <Property Name="supplier_ID" Type="Edm.Guid"/>
-            </EntityType>
-            <EntityType Name="Products_texts">
-                <Key>
-                    <PropertyRef Name="locale"/>
-                    <PropertyRef Name="ID"/>
-                </Key>
-                <Property Name="locale" Type="Edm.String" MaxLength="5" Nullable="false"/>
-                <Property Name="ID" Type="Edm.Guid" Nullable="false"/>
-                <Property Name="title" Type="Edm.String"/>
-                <Property Name="description" Type="Edm.String"/>
-            </EntityType>
-            <EntityType Name="Suppliers">
-                <Key>
-                    <PropertyRef Name="ID"/>
-                </Key>
-                <Property Name="ID" Type="Edm.Guid" Nullable="false"/>
-                <Property Name="identifier" Type="Edm.String"/>
-                <Property Name="name" Type="Edm.String"/>
-                <Property Name="phone" Type="Edm.String"/>
-                <Property Name="building" Type="Edm.String"/>
-                <Property Name="street" Type="Edm.String"/>
-                <Property Name="postCode" Type="Edm.String"/>
-                <Property Name="city" Type="Edm.String"/>
-                <Property Name="country" Type="Edm.String"/>
-                <NavigationProperty Name="products" Type="Collection(CatalogService.Products)" Partner="supplier"/>
-            </EntityType>
-            <Annotations Target="CatalogService.Currencies">
-                <Annotation Term="UI.Identification">
-                    <Collection>
-                        <Path>name</Path>
-                    </Collection>
-                </Annotation>
-            </Annotations>
-            <Annotations Target="CatalogService.Currencies/name">
-                <Annotation Term="Common.Label" String="Name"/>
-            </Annotations>
-            <Annotations Target="CatalogService.Currencies/descr">
-                <Annotation Term="Common.Label" String="Description"/>
-            </Annotations>
-            <Annotations Target="CatalogService.Currencies/code">
-                <Annotation Term="Common.Label" String="Currency Code"/>
-            </Annotations>
-            <Annotations Target="CatalogService.Currencies/symbol">
-                <Annotation Term="Common.Label" String="Currency Symbol"/>
-            </Annotations>
-            <Annotations Target="CatalogService.Currencies_texts/name">
-                <Annotation Term="Common.Label" String="Name"/>
-            </Annotations>
-            <Annotations Target="CatalogService.Currencies_texts/descr">
-                <Annotation Term="Common.Label" String="Description"/>
-            </Annotations>
-            <Annotations Target="CatalogService.Currencies_texts/code">
-                <Annotation Term="Common.Label" String="Currency Code"/>
-            </Annotations>
-            <Annotations Target="CatalogService.EntityContainer/Products">
-                <Annotation Term="Capabilities.DeleteRestrictions">
-                    <Record Type="Capabilities.DeleteRestrictionsType">
-                        <PropertyValue Property="Deletable" Bool="false"/>
-                    </Record>
-                </Annotation>
-                <Annotation Term="Capabilities.InsertRestrictions">
-                    <Record Type="Capabilities.InsertRestrictionsType">
-                        <PropertyValue Property="Insertable" Bool="false"/>
-                    </Record>
-                </Annotation>
-                <Annotation Term="Capabilities.UpdateRestrictions">
-                    <Record Type="Capabilities.UpdateRestrictionsType">
-                        <PropertyValue Property="Updatable" Bool="false"/>
-                    </Record>
-                </Annotation>
-            </Annotations>
-            <Annotations Target="CatalogService.Products/ID">
-                <Annotation Term="Common.Label" String="UUID"/>
-            </Annotations>
-            <Annotations Target="CatalogService.Products/identifier">
-                <Annotation Term="Common.Label" String="ID"/>
-            </Annotations>
-            <Annotations Target="CatalogService.Products/title">
-                <Annotation Term="Common.Label" String="Name"/>
-            </Annotations>
-            <Annotations Target="CatalogService.Products/currency">
-                <Annotation Term="Common.Label" String="Currency"/>
-                <Annotation Term="Common.ValueList">
-                    <Record Type="Common.ValueListType">
-                        <PropertyValue Property="Label" String="Currency"/>
-                        <PropertyValue Property="CollectionPath" String="Currencies"/>
-                        <PropertyValue Property="Parameters">
-                            <Collection>
-                                <Record Type="Common.ValueListParameterInOut">
-                                    <PropertyValue Property="LocalDataProperty" PropertyPath="currency_code"/>
-                                    <PropertyValue Property="ValueListProperty" String="code"/>
-                                </Record>
-                                <Record Type="Common.ValueListParameterDisplayOnly">
-                                    <PropertyValue Property="ValueListProperty" String="name"/>
-                                </Record>
-                            </Collection>
-                        </PropertyValue>
-                    </Record>
-                </Annotation>
-                <Annotation Term="Core.Description" String="A currency code as specified in ISO 4217"/>
-            </Annotations>
-            <Annotations Target="CatalogService.Products/currency_code">
-                <Annotation Term="Common.Label" String="Currency"/>
-                <Annotation Term="Common.ValueList">
-                    <Record Type="Common.ValueListType">
-                        <PropertyValue Property="Label" String="Currency"/>
-                        <PropertyValue Property="CollectionPath" String="Currencies"/>
-                        <PropertyValue Property="Parameters">
-                            <Collection>
-                                <Record Type="Common.ValueListParameterInOut">
-                                    <PropertyValue Property="LocalDataProperty" PropertyPath="currency_code"/>
-                                    <PropertyValue Property="ValueListProperty" String="code"/>
-                                </Record>
-                                <Record Type="Common.ValueListParameterDisplayOnly">
-                                    <PropertyValue Property="ValueListProperty" String="name"/>
-                                </Record>
-                            </Collection>
-                        </PropertyValue>
-                    </Record>
-                </Annotation>
-                <Annotation Term="Core.Description" String="A currency code as specified in ISO 4217"/>
-            </Annotations>
-            <Annotations Target="CatalogService.Products_texts/ID">
-                <Annotation Term="Common.Label" String="UUID"/>
-            </Annotations>
-            <Annotations Target="CatalogService.Products_texts/title">
-                <Annotation Term="Common.Label" String="Name"/>
-            </Annotations>
-            <Annotations Target="CatalogService.EntityContainer/Suppliers">
-                <Annotation Term="Capabilities.DeleteRestrictions">
-                    <Record Type="Capabilities.DeleteRestrictionsType">
-                        <PropertyValue Property="Deletable" Bool="false"/>
-                    </Record>
-                </Annotation>
-                <Annotation Term="Capabilities.InsertRestrictions">
-                    <Record Type="Capabilities.InsertRestrictionsType">
-                        <PropertyValue Property="Insertable" Bool="false"/>
-                    </Record>
-                </Annotation>
-                <Annotation Term="Capabilities.UpdateRestrictions">
-                    <Record Type="Capabilities.UpdateRestrictionsType">
-                        <PropertyValue Property="Updatable" Bool="false"/>
-                    </Record>
-                </Annotation>
-            </Annotations>
-        </Schema>
-    </edmx:DataServices>
-</edmx:Edmx>
--- a/packages/officesupplies/app/products/webapp/manifest.json
+++ b/packages/officesupplies/app/products/webapp/manifest.json
@@ -1,133 +0,0 @@
-{
-    "_version": "1.15.0",
-    "sap.app": {
-        "id": "sap.uxfe.demo.products",
-        "type": "application",
-        "i18n": "i18n/i18n.properties",
-        "applicationVersion": {
-            "version": "1.0"
-        },
-        "title": "{{appTitle}}",
-        "description": "{{appDescription}}",
-        "ach": "CA-UI5-FE",
-        "dataSources": {
-            "mainService": {
-                "uri": "/catalog/",
-                "type": "OData",
-                "settings": {
-                    "odataVersion": "4.0"
-                }
-            }
-        },
-        "offline": false,
-        "resources": "resources.json",
-        "sourceTemplate": {
-            "id": "ui5template.fiorielements.v4.lrop",
-            "version": "1.0.0"
-        }
-    },
-    "sap.ui": {
-        "technology": "UI5",
-        "icons": {
-            "icon": "",
-            "favIcon": "",
-            "phone": "",
-            "phone@2": "",
-            "tablet": "",
-            "tablet@2": ""
-        },
-        "deviceTypes": {
-            "desktop": true,
-            "tablet": true,
-            "phone": true
-        }
-    },
-    "sap.ui5": {
-        "resources": {
-            "js": [],
-            "css": []
-        },
-        "dependencies": {
-            "minUI5Version": "1.71.0",
-            "libs": {
-                "sap.fe": {}
-            }
-        },
-        "models": {
-            "i18n": {
-                "type": "sap.ui.model.resource.ResourceModel",
-                "uri": "i18n/i18n.properties"
-            },
-            "": {
-                "dataSource": "mainService",
-                "settings": {
-                    "synchronizationMode": "None",
-                    "operationMode": "Server",
-                    "autoExpandSelect": true,
-                    "earlyRequests": true
-                }
-            }
-        },
-        "routing": {
-            "routes": [
-                {
-                    "pattern": "",
-                    "name": "ProductsList",
-                    "target": "ProductsList"
-                },
-                {
-                    "pattern": "Products({key})",
-                    "name": "ProductsObjectPage",
-                    "target": "ProductsObjectPage"
-                }
-            ],
-            "targets": {
-                "ProductsList": {
-                    "type": "Component",
-                    "id": "ProductsList",
-                    "name": "sap.fe.templates.ListReport",
-                    "options": {
-                        "settings": {
-                            "entitySet": "Products",
-                            "variantManagement": "Page",
-                            "navigation": {
-                                "Products": {
-                                    "detail": {
-                                        "route": "ProductsObjectPage"
-                                    }
-                                }
-                            }
-                        }
-                    }
-                },
-                "ProductsObjectPage": {
-                    "type": "Component",
-                    "id": "ProductsObjectPage",
-                    "name": "sap.fe.templates.ObjectPage",
-                    "options": {
-                        "settings": {
-                            "entitySet": "Products"
-                        }
-                    }
-                }
-            }
-        },
-        "contentDensities": {
-            "compact": true,
-            "cozy": true
-        }
-    },
-    "sap.platform.abap": {
-        "_version": "1.1.0",
-        "uri": ""
-    },
-    "sap.platform.hcp": {
-        "_version": "1.1.0",
-        "uri": ""
-    },
-    "sap.fiori": {
-        "_version": "1.1.0",
-        "registrationIds": [],
-        "archeType": "transactional"
-    }
-}
--- a/packages/officesupplies/app/products/xs-app.json
+++ b/packages/officesupplies/app/products/xs-app.json
@@ -1,16 +0,0 @@
-{
-  "welcomeFile": "/index.html",
-  "authenticationMethod": "none",
-  "routes": [
-    {
-      "source": "^/catalog/(.*)$",
-      "target": "/catalog/$1",
-      "destination": "odata",
-      "csrfProtection": false
-    },
-    {
-      "source": "^(.*)",
-      "localDir": "webapp"
-    }
-  ]
-}
--- a/packages/officesupplies/app/suppliers/.npmrc
+++ b/packages/officesupplies/app/suppliers/.npmrc
@@ -1,4 +0,0 @@
-@sap:registry=https://npm.sap.com
-@ui5:registry=https://registry.npmjs.org
-save = true
-save-exact = true
--- a/packages/officesupplies/app/suppliers/README.md
+++ b/packages/officesupplies/app/suppliers/README.md
@@ -1,21 +0,0 @@
-# suppliers
-
-This is a my new Fiori elements app
-
-## Starting the generated app
-
-   This app has been generated using the SAP UX - App Generator, as part of the SAP UX Tools Suite.  In order to launch the generated app, simply run the following from the generated app root folder:
-
-```
-    npm start
-```
-
- Is it also possible to run the application using mock data that reflects the OData Service URL supplied during application generation.  In order to run the application with Mock Data, run the following from the generated app root folder:
-
-```
-    npm run start-mock
-```
-
-### Pre-requisites:
-
-1. Active NodeJS LTS (Long Term Support) version and associated supported NPM version.  (See https://nodejs.org)
--- a/packages/officesupplies/app/suppliers/package.json
+++ b/packages/officesupplies/app/suppliers/package.json
@@ -1,33 +0,0 @@
-{
-	"name": "suppliers",
-	"version": "0.0.1",
-	"private": true,
-	"sapux": true,
-	"description": "This is a my new Fiori elements app",
-	"keywords": [
-		"ui5",
-		"openui5",
-		"sapui5"
-	],
-	"main": "webapp/index.html",
-	"scripts": {
-		"start": "npm run start-app-router",
-		"start-app-router": "npm run build && run-script-os",
-		"start-app-router:default": "destinations='[{\"name\":\"odata\",\"url\":\"http://localhost:4004\",\"strictSSL\":false}]' node node_modules/@sap/approuter/approuter.js",
-		"start-app-router:windows": "set destinations=[{\"name\":\"odata\",\"url\":\"http://localhost:4004\",\"strictSSL\":false}] && node node_modules/@sap/approuter/approuter.js",
-		"build": "rimraf dist && ui5 build -a --include-task=generateManifestBundle generateCachebusterInfo"
-	},
-	"remarkConfig": {
-		"plugins": [
-			"remark-preset-lint-consistent"
-		]
-	},
-	"dependencies": {
-		"@sap/approuter": "6.5.1",
-		"@ui5/cli": "1.8.0"
-	},
-	"devDependencies": {
-		"run-script-os": "1.0.7",
-		"rimraf": "3.0.0"
-	}
-}
--- a/packages/officesupplies/app/suppliers/ui5.yaml
+++ b/packages/officesupplies/app/suppliers/ui5.yaml
@@ -1,4 +0,0 @@
-specVersion: '1.0'
-metadata:
-  name: suppliers
-type: application
--- a/packages/officesupplies/app/suppliers/webapp/Component.js
+++ b/packages/officesupplies/app/suppliers/webapp/Component.js
@@ -1,10 +0,0 @@
-/* global hasher */
-sap.ui.define(['sap/fe/AppComponent'], function(AppComponent) {
-    'use strict';
-
-    return AppComponent.extend('supplier.suppliers.Component', {
-        metadata: {
-            manifest: 'json'
-        }
-    });
-});
--- a/packages/officesupplies/app/suppliers/webapp/WEB-INF/web.xml
+++ b/packages/officesupplies/app/suppliers/webapp/WEB-INF/web.xml
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-							http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-		version="2.5"
-		xmlns="http://java.sun.com/xml/ns/javaee">
-
-	<display-name>OData v4</display-name>
-
-	<!-- ============================================================== -->
-	<!-- UI5 resource servlet used to handle application resources      -->
-	<!-- ============================================================== -->
-
-	<servlet>
-		<display-name>ResourceServlet</display-name>
-		<servlet-name>ResourceServlet</servlet-name>
-		<servlet-class>com.sap.ui5.resource.ResourceServlet</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>ResourceServlet</servlet-name>
-		<url-pattern>/resources/*</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-		<servlet-name>ResourceServlet</servlet-name>
-		<url-pattern>/test-resources/*</url-pattern>
-	</servlet-mapping>
-	
-	<!-- enable CORS -->
-	<context-param>
-		<param-name>com.sap.ui5.resource.ACCEPTED_ORIGINS</param-name>
-		<param-value>*</param-value>
-	</context-param>
-	
-	<!-- BEGIN: DEV MODE -->
-	<!-- DEV MODE switched off by default and can be switched on during development -->
-	<!-- but has to be switched off for productive use on a Java server! -->
-	<context-param>
-		<param-name>com.sap.ui5.resource.DEV_MODE</param-name>
-		<param-value>true</param-value>
-	</context-param>
-	<!-- END: DEV MODE -->
-
-
-	<!-- ============================================================== -->
-	<!-- Cache Control Filter to prevent caching of any resource        -->
-	<!-- ============================================================== -->
-
-	<filter>
-		<display-name>CacheControlFilter</display-name>
-		<filter-name>CacheControlFilter</filter-name>
-		<filter-class>com.sap.ui5.resource.CacheControlFilter</filter-class>
-	</filter>
-	<filter-mapping>
-		<filter-name>CacheControlFilter</filter-name>
-		<url-pattern>*.html</url-pattern>
-	</filter-mapping>
-	<filter-mapping>
-		<filter-name>CacheControlFilter</filter-name>
-		<url-pattern>*.js</url-pattern>
-	</filter-mapping>
-	<filter-mapping>
-		<filter-name>CacheControlFilter</filter-name>
-		<url-pattern>*.css</url-pattern>
-	</filter-mapping>
-	<filter-mapping>
-		<filter-name>CacheControlFilter</filter-name>
-		<url-pattern>*.json</url-pattern>
-	</filter-mapping>
-	<filter-mapping>
-		<filter-name>CacheControlFilter</filter-name>
-		<url-pattern>*.xml</url-pattern>
-	</filter-mapping>
-	<filter-mapping>
-		<filter-name>CacheControlFilter</filter-name>
-		<url-pattern>*.gif</url-pattern>
-	</filter-mapping>
-	<filter-mapping>
-		<filter-name>CacheControlFilter</filter-name>
-		<url-pattern>*.png</url-pattern>
-	</filter-mapping>
-	<filter-mapping>
-		<filter-name>CacheControlFilter</filter-name>
-		<url-pattern>*.jpg</url-pattern>
-	</filter-mapping>
-	<filter-mapping>
-		<filter-name>CacheControlFilter</filter-name>
-		<url-pattern>*.properties</url-pattern>
-	</filter-mapping>
-	<filter-mapping>
-		<filter-name>CacheControlFilter</filter-name>
-		<url-pattern>*.tmpl</url-pattern>
-	</filter-mapping>
-
-
-	<!-- ============================================================== -->
-	<!-- UI5 proxy servlet                                              -->
-	<!-- ============================================================== -->
-
-	<servlet>
-		<servlet-name>SimpleProxyServlet</servlet-name>
-		<servlet-class>com.sap.ui5.proxy.SimpleProxyServlet</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>SimpleProxyServlet</servlet-name>
-		<url-pattern>/proxy/*</url-pattern>
-	</servlet-mapping>
-
-
-	<!-- ============================================================== -->
-	<!-- Welcome file list                                              -->
-	<!-- ============================================================== -->
-
-	<welcome-file-list>
-		<welcome-file>test.html</welcome-file>
-	</welcome-file-list>
-
-
-</web-app>
--- a/packages/officesupplies/app/suppliers/webapp/i18n/i18n.properties
+++ b/packages/officesupplies/app/suppliers/webapp/i18n/i18n.properties
@@ -1,9 +0,0 @@
-# This is the resource bundle for suppliers
-
-#Texts for manifest.json
-
-#XTIT: Application name
-appTitle=suppliers
-
-#YDES: Application description
-appDescription=This is a my new Fiori elements app
--- a/packages/officesupplies/app/suppliers/webapp/index.html
+++ b/packages/officesupplies/app/suppliers/webapp/index.html
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <title>{{appTitle}}</title>
-
-        <script>
-            window['sap-ushell-config'] = {
-                defaultRenderer: 'fiori2',
-                applications: {
-                    "fe-lrop-v4": {
-                        title: 'suppliers',
-                        description: 'This is a my new Fiori elements app',
-                        additionalInformation: 'SAPUI5.Component=supplier.suppliers',
-                        applicationType: 'URL',
-                        url: './',
-                        navigationMode: 'embedded'
-                    }
-                }
-            };
-        </script>
-
-        <script src="https://sapui5.hana.ondemand.com/1.71.0/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-        <script
-            src="https://sapui5.hana.ondemand.com/1.71.0/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-frameOptions="allow"
-        ></script>
-        <script>
-            sap.ui.getCore().attachInit(() => sap.ushell.Container.createRenderer().placeAt('content'));
-        </script>
-    </head>
-    <body class="sapUiBody" id="content"></body>
-</html>
--- a/packages/officesupplies/app/suppliers/webapp/localService/metadata.xml
+++ b/packages/officesupplies/app/suppliers/webapp/localService/metadata.xml
@@ -1,346 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<edmx:Edmx Version="4.0" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx">
-    <edmx:Reference Uri="https://wiki.scn.sap.com/wiki/download/attachments/448470974/Common.xml?api=v2">
-        <edmx:Include Alias="Common" Namespace="com.sap.vocabularies.Common.v1"/>
-    </edmx:Reference>
-    <edmx:Reference Uri="https://oasis-tcs.github.io/odata-vocabularies/vocabularies/Org.OData.Core.V1.xml">
-        <edmx:Include Alias="Core" Namespace="Org.OData.Core.V1"/>
-    </edmx:Reference>
-    <edmx:Reference Uri="https://oasis-tcs.github.io/odata-vocabularies/vocabularies/Org.OData.Measures.V1.xml">
-        <edmx:Include Alias="Measures" Namespace="Org.OData.Measures.V1"/>
-    </edmx:Reference>
-    <edmx:Reference Uri="https://wiki.scn.sap.com/wiki/download/attachments/448470968/UI.xml?api=v2">
-        <edmx:Include Alias="UI" Namespace="com.sap.vocabularies.UI.v1"/>
-    </edmx:Reference>
-    <edmx:DataServices>
-        <Schema Namespace="CatalogService" xmlns="http://docs.oasis-open.org/odata/ns/edm">
-            <EntityContainer Name="EntityContainer">
-                <EntitySet Name="Currencies" EntityType="CatalogService.Currencies">
-                    <NavigationPropertyBinding Path="texts" Target="Currencies_texts"/>
-                    <NavigationPropertyBinding Path="localized" Target="Currencies_texts"/>
-                </EntitySet>
-                <EntitySet Name="Currencies_texts" EntityType="CatalogService.Currencies_texts"/>
-                <EntitySet Name="Products" EntityType="CatalogService.Products">
-                    <NavigationPropertyBinding Path="currency" Target="Currencies"/>
-                    <NavigationPropertyBinding Path="supplier" Target="Suppliers"/>
-                    <NavigationPropertyBinding Path="texts" Target="Products_texts"/>
-                    <NavigationPropertyBinding Path="localized" Target="Products_texts"/>
-                </EntitySet>
-                <EntitySet Name="Products_texts" EntityType="CatalogService.Products_texts"/>
-                <EntitySet Name="Suppliers" EntityType="CatalogService.Suppliers">
-                    <NavigationPropertyBinding Path="products" Target="Products"/>
-                </EntitySet>
-            </EntityContainer>
-            <EntityType Name="Currencies">
-                <Key>
-                    <PropertyRef Name="code"/>
-                </Key>
-                <Property Name="name" Type="Edm.String" MaxLength="255"/>
-                <Property Name="descr" Type="Edm.String" MaxLength="1000"/>
-                <Property Name="code" Type="Edm.String" MaxLength="3" Nullable="false"/>
-                <Property Name="symbol" Type="Edm.String" MaxLength="2"/>
-                <NavigationProperty Name="texts" Type="Collection(CatalogService.Currencies_texts)">
-                    <OnDelete Action="Cascade"/>
-                </NavigationProperty>
-                <NavigationProperty Name="localized" Type="CatalogService.Currencies_texts">
-                    <ReferentialConstraint Property="code" ReferencedProperty="code"/>
-                </NavigationProperty>
-            </EntityType>
-            <EntityType Name="Currencies_texts">
-                <Key>
-                    <PropertyRef Name="locale"/>
-                    <PropertyRef Name="code"/>
-                </Key>
-                <Property Name="locale" Type="Edm.String" MaxLength="5" Nullable="false"/>
-                <Property Name="name" Type="Edm.String" MaxLength="255"/>
-                <Property Name="descr" Type="Edm.String" MaxLength="1000"/>
-                <Property Name="code" Type="Edm.String" MaxLength="3" Nullable="false"/>
-            </EntityType>
-            <EntityType Name="Products">
-                <Key>
-                    <PropertyRef Name="ID"/>
-                </Key>
-                <Property Name="ID" Type="Edm.Guid" Nullable="false"/>
-                <Property Name="identifier" Type="Edm.String"/>
-                <Property Name="title" Type="Edm.String"/>
-                <Property Name="description" Type="Edm.String"/>
-                <Property Name="availability" Type="Edm.Int32"/>
-                <Property Name="storageCapacity" Type="Edm.Int32"/>
-                <Property Name="criticality" Type="Edm.Int32"/>
-                <Property Name="price" Type="Edm.Decimal" Scale="2" Precision="9"/>
-                <NavigationProperty Name="currency" Type="CatalogService.Currencies">
-                    <ReferentialConstraint Property="currency_code" ReferencedProperty="code"/>
-                </NavigationProperty>
-                <NavigationProperty Name="supplier" Type="CatalogService.Suppliers" Partner="products">
-                    <ReferentialConstraint Property="supplier_ID" ReferencedProperty="ID"/>
-                </NavigationProperty>
-                <Property Name="image_url" Type="Edm.String"/>
-                <NavigationProperty Name="texts" Type="Collection(CatalogService.Products_texts)">
-                    <OnDelete Action="Cascade"/>
-                </NavigationProperty>
-                <NavigationProperty Name="localized" Type="CatalogService.Products_texts">
-                    <ReferentialConstraint Property="ID" ReferencedProperty="ID"/>
-                </NavigationProperty>
-                <Property Name="currency_code" Type="Edm.String" MaxLength="3"/>
-                <Property Name="supplier_ID" Type="Edm.Guid"/>
-            </EntityType>
-            <EntityType Name="Products_texts">
-                <Key>
-                    <PropertyRef Name="locale"/>
-                    <PropertyRef Name="ID"/>
-                </Key>
-                <Property Name="locale" Type="Edm.String" MaxLength="5" Nullable="false"/>
-                <Property Name="ID" Type="Edm.Guid" Nullable="false"/>
-                <Property Name="title" Type="Edm.String"/>
-                <Property Name="description" Type="Edm.String"/>
-            </EntityType>
-            <EntityType Name="Suppliers">
-                <Key>
-                    <PropertyRef Name="ID"/>
-                </Key>
-                <Property Name="ID" Type="Edm.Guid" Nullable="false"/>
-                <Property Name="identifier" Type="Edm.String"/>
-                <Property Name="name" Type="Edm.String"/>
-                <Property Name="phone" Type="Edm.String"/>
-                <Property Name="building" Type="Edm.String"/>
-                <Property Name="street" Type="Edm.String"/>
-                <Property Name="postCode" Type="Edm.String"/>
-                <Property Name="city" Type="Edm.String"/>
-                <Property Name="country" Type="Edm.String"/>
-                <NavigationProperty Name="products" Type="Collection(CatalogService.Products)" Partner="supplier"/>
-            </EntityType>
-            <Annotations Target="CatalogService.Currencies">
-                <Annotation Term="UI.Identification">
-                    <Collection>
-                        <Path>name</Path>
-                    </Collection>
-                </Annotation>
-            </Annotations>
-            <Annotations Target="CatalogService.Currencies/name">
-                <Annotation Term="Common.Label" String="Name"/>
-            </Annotations>
-            <Annotations Target="CatalogService.Currencies/descr">
-                <Annotation Term="Common.Label" String="Description"/>
-            </Annotations>
-            <Annotations Target="CatalogService.Currencies/code">
-                <Annotation Term="Common.Label" String="Currency Code"/>
-            </Annotations>
-            <Annotations Target="CatalogService.Currencies/symbol">
-                <Annotation Term="Common.Label" String="Currency Symbol"/>
-            </Annotations>
-            <Annotations Target="CatalogService.Currencies_texts/name">
-                <Annotation Term="Common.Label" String="Name"/>
-            </Annotations>
-            <Annotations Target="CatalogService.Currencies_texts/descr">
-                <Annotation Term="Common.Label" String="Description"/>
-            </Annotations>
-            <Annotations Target="CatalogService.Currencies_texts/code">
-                <Annotation Term="Common.Label" String="Currency Code"/>
-            </Annotations>
-            <Annotations Target="CatalogService.Products">
-                <Annotation Term="UI.DataPoint" Qualifier="Price">
-                    <Record Type="UI.DataPointType">
-                        <PropertyValue Property="Title" String="Price"/>
-                        <PropertyValue Property="Value" Path="price"/>
-                    </Record>
-                </Annotation>
-                <Annotation Term="UI.Facets">
-                    <Collection>
-                        <Record Type="UI.CollectionFacet">
-                            <PropertyValue Property="Label" String="Product Information"/>
-                            <PropertyValue Property="Facets">
-                                <Collection>
-                                    <Record Type="UI.ReferenceFacet">
-                                        <PropertyValue Property="Target" AnnotationPath="@UI.FieldGroup#Description"/>
-                                        <PropertyValue Property="Label" String="Description"/>
-                                    </Record>
-                                </Collection>
-                            </PropertyValue>
-                        </Record>
-                    </Collection>
-                </Annotation>
-                <Annotation Term="UI.FieldGroup" Qualifier="Description">
-                    <Record Type="UI.FieldGroupType">
-                        <PropertyValue Property="Data">
-                            <Collection>
-                                <Record Type="UI.DataField">
-                                    <PropertyValue Property="Value" Path="description"/>
-                                </Record>
-                            </Collection>
-                        </PropertyValue>
-                    </Record>
-                </Annotation>
-                <Annotation Term="UI.FieldGroup" Qualifier="ProductDetail">
-                    <Record Type="UI.FieldGroupType">
-                        <PropertyValue Property="Data">
-                            <Collection>
-                                <Record Type="UI.DataField">
-                                    <PropertyValue Property="Value" Path="identifier"/>
-                                </Record>
-                                <Record Type="UI.DataField">
-                                    <PropertyValue Property="Value" Path="availability"/>
-                                </Record>
-                            </Collection>
-                        </PropertyValue>
-                    </Record>
-                </Annotation>
-                <Annotation Term="UI.FieldGroup" Qualifier="SupplierDetail">
-                    <Record Type="UI.FieldGroupType">
-                        <PropertyValue Property="Data">
-                            <Collection>
-                                <Record Type="UI.DataField">
-                                    <PropertyValue Property="Value" Path="supplier/identifier"/>
-                                </Record>
-                                <Record Type="UI.DataField">
-                                    <PropertyValue Property="Value" Path="supplier/postCode"/>
-                                </Record>
-                                <Record Type="UI.DataField">
-                                    <PropertyValue Property="Value" Path="supplier/phone"/>
-                                </Record>
-                            </Collection>
-                        </PropertyValue>
-                    </Record>
-                </Annotation>
-                <Annotation Term="UI.HeaderFacets">
-                    <Collection>
-                        <Record Type="UI.ReferenceFacet">
-                            <PropertyValue Property="Target" AnnotationPath="@UI.FieldGroup#ProductDetail"/>
-                            <PropertyValue Property="Label" String="Details"/>
-                        </Record>
-                        <Record Type="UI.ReferenceFacet">
-                            <PropertyValue Property="Target" AnnotationPath="@UI.FieldGroup#SupplierDetail"/>
-                            <PropertyValue Property="Label" String="Supplier"/>
-                        </Record>
-                        <Record Type="UI.ReferenceFacet">
-                            <PropertyValue Property="Target" AnnotationPath="@UI.DataPoint#Price"/>
-                        </Record>
-                    </Collection>
-                </Annotation>
-                <Annotation Term="UI.HeaderInfo">
-                    <Record Type="UI.HeaderInfoType">
-                        <PropertyValue Property="Title">
-                            <Record Type="UI.DataField">
-                                <PropertyValue Property="Value" Path="title"/>
-                            </Record>
-                        </PropertyValue>
-                        <PropertyValue Property="TypeName" String="Product"/>
-                        <PropertyValue Property="TypeNamePlural" String="Products"/>
-                    </Record>
-                </Annotation>
-                <Annotation Term="UI.LineItem">
-                    <Collection>
-                        <Record Type="UI.DataField">
-                            <PropertyValue Property="Value" Path="image_url"/>
-                        </Record>
-                        <Record Type="UI.DataField">
-                            <PropertyValue Property="Value" Path="identifier"/>
-                        </Record>
-                        <Record Type="UI.DataField">
-                            <PropertyValue Property="Value" Path="title"/>
-                        </Record>
-                        <Record Type="UI.DataField">
-                            <PropertyValue Property="Value" Path="availability"/>
-                        </Record>
-                        <Record Type="UI.DataField">
-                            <PropertyValue Property="Value" Path="price"/>
-                        </Record>
-                    </Collection>
-                </Annotation>
-                <Annotation Term="UI.SelectionFields">
-                    <Collection>
-                        <PropertyPath>identifier</PropertyPath>
-                        <PropertyPath>title</PropertyPath>
-                        <PropertyPath>availability</PropertyPath>
-                        <PropertyPath>price</PropertyPath>
-                    </Collection>
-                </Annotation>
-            </Annotations>
-            <Annotations Target="CatalogService.Products/ID">
-                <Annotation Term="Common.Label" String="ProductID"/>
-            </Annotations>
-            <Annotations Target="CatalogService.Products/identifier">
-                <Annotation Term="Common.Label" String="ID"/>
-            </Annotations>
-            <Annotations Target="CatalogService.Products/title">
-                <Annotation Term="Common.Label" String="Name"/>
-            </Annotations>
-            <Annotations Target="CatalogService.Products/description">
-                <Annotation Term="Common.Label" String="Description"/>
-            </Annotations>
-            <Annotations Target="CatalogService.Products/availability">
-                <Annotation Term="Common.Label" String="In Stock"/>
-            </Annotations>
-            <Annotations Target="CatalogService.Products/price">
-                <Annotation Term="Common.Label" String="Price"/>
-                <Annotation Term="Measures.ISOCurrency" Path="currency_code"/>
-            </Annotations>
-            <Annotations Target="CatalogService.Products/currency">
-                <Annotation Term="Common.Label" String="Currency"/>
-                <Annotation Term="Common.ValueList">
-                    <Record Type="Common.ValueListType">
-                        <PropertyValue Property="Label" String="Currency"/>
-                        <PropertyValue Property="CollectionPath" String="Currencies"/>
-                        <PropertyValue Property="Parameters">
-                            <Collection>
-                                <Record Type="Common.ValueListParameterInOut">
-                                    <PropertyValue Property="LocalDataProperty" PropertyPath="currency_code"/>
-                                    <PropertyValue Property="ValueListProperty" String="code"/>
-                                </Record>
-                                <Record Type="Common.ValueListParameterDisplayOnly">
-                                    <PropertyValue Property="ValueListProperty" String="name"/>
-                                </Record>
-                            </Collection>
-                        </PropertyValue>
-                    </Record>
-                </Annotation>
-                <Annotation Term="Core.Description" String="A currency code as specified in ISO 4217"/>
-            </Annotations>
-            <Annotations Target="CatalogService.Products/image_url">
-                <Annotation Term="Common.Label" String="Image"/>
-                <Annotation Term="UI.IsImageURL" Bool="true"/>
-            </Annotations>
-            <Annotations Target="CatalogService.Products/currency_code">
-                <Annotation Term="Common.Label" String="Currency"/>
-                <Annotation Term="Common.ValueList">
-                    <Record Type="Common.ValueListType">
-                        <PropertyValue Property="Label" String="Currency"/>
-                        <PropertyValue Property="CollectionPath" String="Currencies"/>
-                        <PropertyValue Property="Parameters">
-                            <Collection>
-                                <Record Type="Common.ValueListParameterInOut">
-                                    <PropertyValue Property="LocalDataProperty" PropertyPath="currency_code"/>
-                                    <PropertyValue Property="ValueListProperty" String="code"/>
-                                </Record>
-                                <Record Type="Common.ValueListParameterDisplayOnly">
-                                    <PropertyValue Property="ValueListProperty" String="name"/>
-                                </Record>
-                            </Collection>
-                        </PropertyValue>
-                    </Record>
-                </Annotation>
-                <Annotation Term="Core.Description" String="A currency code as specified in ISO 4217"/>
-            </Annotations>
-            <Annotations Target="CatalogService.Products_texts/ID">
-                <Annotation Term="Common.Label" String="UUID"/>
-            </Annotations>
-            <Annotations Target="CatalogService.Products_texts/title">
-                <Annotation Term="Common.Label" String="Name"/>
-            </Annotations>
-            <Annotations Target="CatalogService.Suppliers/identifier">
-                <Annotation Term="Common.Label" String="Name"/>
-                <Annotation Term="Common.Text" Path="name">
-                    <Annotation Term="UI.TextArrangement" EnumMember="UI.TextArrangementType/TextFirst"/>
-                </Annotation>
-            </Annotations>
-            <Annotations Target="CatalogService.Suppliers/phone">
-                <Annotation Term="Common.Label" String="Phone"/>
-            </Annotations>
-            <Annotations Target="CatalogService.Suppliers/postCode">
-                <Annotation Term="Common.Label" String="City"/>
-                <Annotation Term="Common.Text" Path="city">
-                    <Annotation Term="UI.TextArrangement" EnumMember="UI.TextArrangementType/TextFirst"/>
-                </Annotation>
-            </Annotations>
-        </Schema>
-    </edmx:DataServices>
-</edmx:Edmx>
--- a/packages/officesupplies/app/suppliers/webapp/manifest.json
+++ b/packages/officesupplies/app/suppliers/webapp/manifest.json
@@ -1,155 +0,0 @@
-{
-    "_version": "1.15.0",
-    "sap.app": {
-        "id": "supplier.suppliers",
-        "type": "application",
-        "i18n": "i18n/i18n.properties",
-        "applicationVersion": {
-            "version": "1.0"
-        },
-        "title": "{{appTitle}}",
-        "description": "{{appDescription}}",
-        "ach": "CA-UI5-FE",
-        "dataSources": {
-            "mainService": {
-                "uri": "/catalog/",
-                "type": "OData",
-                "settings": {
-                    "odataVersion": "4.0"
-                }
-            }
-        },
-        "offline": false,
-        "resources": "resources.json",
-        "sourceTemplate": {
-            "id": "ui5template.fiorielements.v4.lrop",
-            "version": "1.0.0"
-        }
-    },
-    "sap.ui": {
-        "technology": "UI5",
-        "icons": {
-            "icon": "",
-            "favIcon": "",
-            "phone": "",
-            "phone@2": "",
-            "tablet": "",
-            "tablet@2": ""
-        },
-        "deviceTypes": {
-            "desktop": true,
-            "tablet": true,
-            "phone": true
-        }
-    },
-    "sap.ui5": {
-        "resources": {
-            "js": [],
-            "css": []
-        },
-        "dependencies": {
-            "minUI5Version": "1.71.0",
-            "libs": {
-                "sap.fe": {}
-            }
-        },
-        "models": {
-            "i18n": {
-                "type": "sap.ui.model.resource.ResourceModel",
-                "uri": "i18n/i18n.properties"
-            },
-            "": {
-                "dataSource": "mainService",
-                "settings": {
-                    "synchronizationMode": "None",
-                    "operationMode": "Server",
-                    "autoExpandSelect": true,
-                    "earlyRequests": true
-                }
-            }
-        },
-        "routing": {
-            "routes": [
-                {
-                    "pattern": "",
-                    "name": "SuppliersList",
-                    "target": "SuppliersList"
-                },
-                {
-                    "pattern": "Suppliers({key})",
-                    "name": "SuppliersObjectPage",
-                    "target": "SuppliersObjectPage"
-                },
-                    {
-                        "pattern": "Suppliers({key})/texts({key2})",
-                        "name": "Currencies_textsObjectPage",
-                        "target": "Currencies_textsObjectPage"
-                    }
-            ],
-            "targets": {
-                "SuppliersList": {
-                    "type": "Component",
-                    "id": "SuppliersList",
-                    "name": "sap.fe.templates.ListReport",
-                    "options": {
-                        "settings": {
-                            "entitySet": "Suppliers",
-                            "variantManagement": "Page",
-                            "navigation": {
-                                "Suppliers": {
-                                    "detail": {
-                                        "route": "SuppliersObjectPage"
-                                    }
-                                }
-                            }
-                        }
-                    }
-                },
-                "SuppliersObjectPage": {
-                    "type": "Component",
-                    "id": "SuppliersObjectPage",
-                    "name": "sap.fe.templates.ObjectPage",
-                    "options": {
-                        "settings": {
-                            "entitySet": "Suppliers",
-                                "navigation": {
-                                    "texts": {
-                                        "detail": {
-                                            "route": "Currencies_textsObjectPage"
-                                        }
-                                    }
-                                }
-                        }
-                    }
-                },
-                    "Currencies_textsObjectPage": {
-                        "type": "Component",
-                        "id": "Currencies_textsObjectPage",
-                        "name": "sap.fe.templates.ObjectPage",
-                        "options": {
-                            "settings": {
-                                "entitySet": "Currencies_texts"
-                            }
-                        }
-                    }
-            }
-        },
-        "contentDensities": {
-            "compact": true,
-            "cozy": true
-        }
-    },
-    "sap.platform.abap": {
-        "_version": "1.1.0",
-        "uri": ""
-    },
-    "sap.platform.hcp": {
-        "_version": "1.1.0",
-        "uri": ""
-    },
-    "sap.fiori": {
-        "_version": "1.1.0",
-        "registrationIds": [],
-        "archeType": "transactional"
-    }
-}
--- a/packages/officesupplies/app/suppliers/xs-app.json
+++ b/packages/officesupplies/app/suppliers/xs-app.json
@@ -1,16 +0,0 @@
-{
-  "welcomeFile": "/index.html",
-  "authenticationMethod": "none",
-  "routes": [
-    {
-      "source": "^/catalog/(.*)$",
-      "target": "/catalog/$1",
-      "destination": "odata",
-      "csrfProtection": false
-    },
-    {
-      "source": "^(.*)",
-      "localDir": "webapp"
-    }
-  ]
-}
--- a/packages/officesupplies/db/csv/sap.capire.officesupplies-Products.csv
+++ b/packages/officesupplies/db/csv/sap.capire.officesupplies-Products.csv
@@ -1,7 +0,0 @@
-ID,IDENTIFIER,TITLE,DESCRIPTION,AVAILABILITY,STORAGE_CAPACITY,CRITICALITY,PRICE,CURRENCY_CODE,SUPPLIER_ID,IMAGE_URL
-844ede5c-071e-34ed-907f-f99cb3a4693d,MC-CM-1003,Tea- / Coffee-Mug,Robust high-quality ceramic mug for every-day use in two unobstrusive colours.,153,200,0,2.65,USD,8b001df1-dab2-39a2-8b1a-89b6b445e237,../images/mug.png
-64d40922-ea0d-30f9-9b83-eb4448ee4c2e,MC-CH-1000,Coat Hangers,"Set of high-quality hangers with coated surface, trouser bar - anti slip. Super slim design - space saving - The hooks can be rotated through 360 degree rotation, practical for various room situations. Material: ABS (plastic); Colour: turquoise.",10,200,3,2.6,USD,12726eec-165c-3713-a674-3d2fc4f5127f,../images/hanger1.png
-a6756d40-792e-34c9-8b2e-df3acb0c54b4,MC-CH-1001,Coat Hangers,"Set of high-quality hangers with coated surface, trouser bar - anti slip. Super slim design - space saving - The hooks can be rotated through 360 degree rotation, practical for various room situations. Material: ABS (plastic); Colour: assorted (2 of each pink, grey, blue green, black).",34,200,2,21.73,USD,12726eec-165c-3713-a674-3d2fc4f5127f,../images/hanger2.png
-37f028f0-1dd5-30ae-9cdd-a7f543e4d61d,MC-CH-1002,Wooden Coat Hangers - Pack of 5,"Pack of 5 quality wooden hangers with trouser bar. Slim design for space saving - The hooks can be rotated through 360 degree rotation, practical for various room situations. Material: ABS (plastic); Colour: assorted (2 of each pink, grey, blue green, black).",5,200,2,6.4,USD,8b001df1-dab2-39a2-8b1a-89b6b445e237,../images/hanger3.png
-a376e380-00e8-3d90-ba9f-c332c2df0f28,MC-CH-1003,Designer Coat Hooks - Pack of 3,Pack of 3 designer coat hook. Heavy-duty stainless steel hooks in a stylish shape.,6,200,1,6.49,USD,8b001df1-dab2-39a2-8b1a-89b6b445e237,../images/hanger4.png
-fc16c43d-bb4e-30db-8b7e-98b3fdc7f0b9,MC-CH-1004,Vacuum Wall Hook - Pack of 6,"Big suction cup with diameter of 70mm, can load more than 10kg; bright contemporary colour; Principle of work: Atmospheric pressure, safely and easy to install and tear off, no need to drill a hole or add glue, without any damage to the surface; can be used on a variety of surfaces, including paint, glasses, wood, ceramic tile, gypsum, and any other smooth surface.",17,200,0,5.76,USD,12726eec-165c-3713-a674-3d2fc4f5127f,../images/hanger4.png
--- a/packages/officesupplies/db/csv/sap.capire.officesupplies-Suppliers.csv
+++ b/packages/officesupplies/db/csv/sap.capire.officesupplies-Suppliers.csv
@@ -1,16 +0,0 @@
-ID,IDENTIFIER,NAME,COUNTRY,POSTCODE,CITY,STREET,BUILDING,PHONE
-12726eec-165c-3713-a674-3d2fc4f5127f,OFFIPOR,OffiPOR,PR,Guaynabo,PR 00968,City View Plaza,301,+1 787-38515864
-9655e5b6-bd8c-31ee-b94a-0651449721a0,POLIRADO,POLirado,PL,Warszawa,02-675,Ul. Woloska,5,+48 883 77522087
-f1fd8dd5-3156-3469-b4f1-a03ff5041080,REGULCUST,Regular Custom Ltd,GB,Knutsford,WA16 6DW,King Street,25,+44 1565  47759991
-bb2fa1e5-5c3a-3d26-b5c1-ed53f3e08622,OFFICEGURU,Office-Guru AG,DE,Siegen,57078,Birlenbacher Str.,19-21,+49 271 7722547
-b91f077f-2086-3517-8244-d3b50835651b,MEINRESSORT,Mein Ressort GmbH,CH,Regensdorf,8105,Althardstrasse,80,+41 44 84008483
-8b001df1-dab2-39a2-8b1a-89b6b445e237,OFFICELINE,Office Line Prag,CZ,Praha,140 00,Vyskocilova,1481/4,+420 776 9487923
-3c7e6cbb-ea0f-35d2-a2ce-c85057a57916,DEPOT4ALL,Depot-4All,DE,Freiberg a. N.,71691,Grundelbachstrasse,10,+49 7141 2463585
-41b46958-5ad7-30b6-9884-b547c1e26b7e,ITELOFFICE,ITeL-Office,DE,Dresden,01187,Chemnitzer Strasse,48,+49 351 31915489
-7c5a5e3a-6dfa-35d3-8bf4-0cadbddb761a,FAMOUSUS,FamousUS,US,Houston,TX 77098,2601 Westheimer Road,Suite C250,+1 713-12001085
-36de419f-0a4c-3a5a-b285-188979ce13ec,CHINACHAIN,ChinaChain,CN,Guangzhou,510613,No. 233 Tien He Road North,6402-6403,+86 20 86454650
-41b922ad-35d9-352d-80c7-ee63ba1c007c,FAMOUSUS1,FamousUS (LV),US,Las Vegas,NV 89118,W Sunset Rd,3620,+1 702-486454400
-b4b3188c-fa27-3467-a38a-f36ede8acc18,FAMOUSUS2,FamousUS (SF),US,South San Francisco,CA 94080,Forbes Blvd,401,+1 650-486454500
-b5f1b294-a102-38e1-88c5-9b4d9ff0dd33,FAMOUSUS3,FamousUS (NY),US,New York,NY 10128,3rd Ave,1588,+1 212-486454600
-391da904-9acd-334b-885e-4b4da38f3c6e,FAMOUSUS4,FamousUS (ORL),US,Orlando,FL 32806,W Sturtevant St,47,+1 407-486454700
-1f6aed3b-bac0-39e5-ba5b-c091b0d18f40,FAMOUSUS5,FamousUS (NSH),US,Nashville,TN 37211,Space Park S Dr,486-810,+1 615-486454800
--- a/packages/officesupplies/db/csv/sap.common-Currencies.csv
+++ b/packages/officesupplies/db/csv/sap.common-Currencies.csv
@@ -1,5 +0,0 @@
-"SYMBOL";"DESCR";"NAME";"CODE"
-"€";"Euro";"Euro";"EUR"
-"£";"British Pound";"British Pound";"GBP"
-"₹";"Indian Rupee";"Indian Rupee";"INR"
-"$";"US Dollar";"US Dollar";"USD"
--- a/packages/officesupplies/db/schema.cds
+++ b/packages/officesupplies/db/schema.cds
@@ -1,30 +0,0 @@
-namespace sap.capire.officesupplies;
-using { Currency } from '@sap/cds/common';
-
-entity Products {
-    @Common.Label   : 'UUID'
-    key ID          : UUID;
-    identifier      : String @Common.Label : 'ID';
-    title           : localized String @( Common.Label : 'Name' );
-    description     : localized String;
-    availability    : Integer;
-    storage_capacity: Integer;
-    criticality     : Integer;
-    price           : Decimal(9,2);
-    currency        : Currency;
-    supplier        : Association to Suppliers;
-    image_url       : String;
-}
-
-entity Suppliers {
-    key ID    : UUID;
-    identifier: String;
-    name      : String;
-    phone     : String;
-    building  : String;
-    street    : String @multiline;
-    postCode  : String;
-    city      : String;
-    country   : String;
-    products  : Composition of many Products on products.supplier = $self;
-}
--- a/packages/officesupplies/i18n/i18n.properties
+++ b/packages/officesupplies/i18n/i18n.properties
@@ -1,19 +0,0 @@
-Cat.ProductID=ProductID
-Cat.ProductStock=In Stock
-Cat.ProductPrice=Price
-Cat.ProductTitle=Title
-Cat.ProductDescr=Description
-Cat.ProductImage=Image
-Cat.SuppliersIdentifier=Name
-Cat.SuppliersPostCode=City
-Cat.SuppliersPhone=Phone
-
-Cat.HeaderFacetDetails=Details
-Cat.HeaderFacetSupplier=Supplier
-Cat.HeaderPrice=Price
-
-Cat.FacetProductInformation=Product Information
-Cat.FacetSectionDescription=Description
-
-Cat.TypeName=Product
-Cat.TypeNamePlural=Products
--- a/packages/officesupplies/package.json
+++ b/packages/officesupplies/package.json
@@ -1,14 +0,0 @@
-{
-  "name": "officesupplies",
-  "version": "1.0.0",
-  "description": "A simple CAP project.",
-  "repository": "<Add your repository here>",
-  "license": "ISC",
-  "dependencies": {
-    "@sap/cds": "^3",
-    "express": "^4"
-  },
-  "scripts": {
-    "start": "npx cds run"
-  }
-}
--- a/packages/officesupplies/srv/cat-service.cds
+++ b/packages/officesupplies/srv/cat-service.cds
@@ -1,72 +0,0 @@
-using sap.capire.officesupplies from '../db/schema';
-
-@path:'/catalog'
-service CatalogService {
-    entity Products as projection on officesupplies.Products;
-    entity Suppliers as projection on officesupplies.Suppliers;
-};
-
-annotate CatalogService.Products with @(
-    UI: {
-      HeaderInfo: {
-        TypeName: '{i18n>Cat.TypeName}',
-        TypeNamePlural: '{i18n>Cat.TypeNamePlural}',
-        Title: { $Type: 'UI.DataField', Value: title }
-      },    
-      SelectionFields: [ identifier, title, availability, price],      
-      LineItem: [
-        {$Type: 'UI.DataField', Value: image_url},
-        {$Type: 'UI.DataField', Value: identifier},
-        {$Type: 'UI.DataField', Value: title},
-        {$Type: 'UI.DataField', Value: availability},
-        {$Type: 'UI.DataField', Value: price}
-      ],
-      HeaderFacets: [       
-        {$Type: 'UI.ReferenceFacet', Target: '@UI.FieldGroup#ProductDetail', Label:'{i18n>Cat.HeaderFacetDetails}' },
-        {$Type: 'UI.ReferenceFacet', Target: '@UI.FieldGroup#SupplierDetail', Label:'{i18n>Cat.HeaderFacetSupplier}' },
-        {$Type: 'UI.ReferenceFacet', Target: '@UI.DataPoint#Price'}
-      ],
-      Facets: [
-        {
-          $Type: 'UI.CollectionFacet',
-          Label: '{i18n>Cat.FacetProductInformation}',
-          Facets: [
-            {$Type: 'UI.ReferenceFacet', Target: '@UI.FieldGroup#Description', Label: '{i18n>Cat.FacetSectionDescription}'},
-          ]
-        }
-      ],
-      DataPoint#Price: {Value: price, Title: '{i18n>Cat.HeaderPrice}'},
-      FieldGroup#Description: {
-        Data:[
-            {$Type: 'UI.DataField', Value: description}
-        ]
-      },          
-      FieldGroup#ProductDetail: {
-        Data:[
-          {$Type: 'UI.DataField', Value: identifier},
-          {$Type: 'UI.DataField', Value: availability}
-        ]
-      },
-      FieldGroup#SupplierDetail: {
-        Data:[
-          {$Type: 'UI.DataField', Value: supplier.identifier},
-          {$Type: 'UI.DataField', Value: supplier.postCode},
-          {$Type: 'UI.DataField', Value: supplier.phone}
-        ]
-      }
-    }
-);
-
-annotate CatalogService.Products with {
-  ID @( Common: { Label: '{i18n>Cat.ProductID}'} );
-  availability @( Common.Label: '{i18n>Cat.ProductStock}' );
-  price @( Common.Label: '{i18n>Cat.ProductPrice}', Measures.ISOCurrency: currency_code );
-  description @( Common.Label: '{i18n>Cat.ProductDescr}' );
-  image_url @( Common.Label: '{i18n>Cat.ProductImage}', UI.IsImageURL: true);
-}
-
-annotate CatalogService.Suppliers with {
-  identifier @( Common : { Label: '{i18n>Cat.SuppliersIdentifier}', Text: name,  TextArrangement: #TextFirst } );
-  postCode @( Common : { Label: '{i18n>Cat.SuppliersPostCode}', Text: city, TextArrangement: #TextFirst } );
-  phone @Common.Label: '{i18n>Cat.SuppliersPhone}';
-}
--- a/packages/products-service/.gitignore
+++ b/packages/products-service/.gitignore
@@ -0,0 +1,12 @@
+gen/
+.gen/
+node_modules/
+target/
+*.db
+.DS_Store
+_out
+.che/
+.cds_gen.log
+package-lock.json
+*.orig
+mta_archives/
--- a/packages/products-service/db/schema.cds
+++ b/packages/products-service/db/schema.cds
@@ -0,0 +1,19 @@
+namespace sap.capire.products;
+
+using { Currency, cuid, managed, sap.common.CodeList } from '@sap/cds/common';
+
+entity Products : cuid, managed {
+  key ID   : String(36);
+  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;
+}
--- a/packages/products-service/index.cds
+++ b/packages/products-service/index.cds
@@ -0,0 +1,2 @@
+using from './db/schema';
+using from './srv/admin-service';
--- a/packages/products-service/package.json
+++ b/packages/products-service/package.json
@@ -0,0 +1,16 @@
+{
+  "name": "@sap/capire-products",
+  "version": "1.0.0",
+  "description": "A reuse package providing domain models and services to manage product catalogs.",
+  "repository": "https://github.wdf.sap.corp/caps/products-service.git",
+  "license": "ISC",
+  "dependencies": {
+    "@sap/cds": "^3.17.4",
+    "express": "^4.17.1"
+  },
+  "files": [
+    "db",
+    "srv",
+    "index.cds"
+  ]
+}
--- a/packages/products-service/srv/admin-service.cds
+++ b/packages/products-service/srv/admin-service.cds
@@ -0,0 +1,7 @@
+using { sap.capire.products as db } from '../db/schema';
+namespace sap.capire.products;
+
+service AdminService @(_requires:'admin') {
+  entity Products as projection on db.Products;
+  entity Categories as projection on db.Categories;
+}
--- a/packages/products-service/tests/categories.test.js
+++ b/packages/products-service/tests/categories.test.js
@@ -0,0 +1,68 @@
+const cds = require ('@sap/cds')
+
+describe('reading/writing hierarchies', ()=>{
+
+    it ('should prepare to sqlite in-memory', async()=>{
+        await cds.deploy (__dirname+'/../db') .to ('sqlite::memory:')
+        expect (cds.model) .toBeDefined()
+    })
+
+    it ('should insert hierarchy of categories', ()=>{
+        const { Categories } = cds.entities
+        return INSERT.into (Categories) .entries (
+            { ID:100, name:'Some Sample Categories...', children:[
+                { ID:101, name:'Cat', children:[
+                    { ID:102, name:'Kitty', children:[
+                        { ID:103, name:'Kitty Cat', children:[
+                            { ID:104, name:'Aristocat' } ]},
+                        { ID:105, name:'Kitty Bat' } ]},
+                    { ID:106, name:'Catwoman', children:[
+                        { ID:107, name:'Catalina' } ]} ]},
+                { ID:108, name:'Catweazle' }
+            ]}
+        )
+    })
+
+    it ('should read categories with children', async()=>{
+        const { Categories } = cds.entities
+        expect (await
+
+            SELECT.one.from (Categories, c=>{
+                c.ID, c.name.as('parent'), c.children (c=>{
+                    c.name.as('child')
+                })
+            }) .where ({name:'Cat'})
+
+        ) .toMatchObject (
+
+            { ID:101, parent:'Cat', children:[
+                { child:'Kitty' },
+                { child:'Catwoman' },
+            ]}
+
+        )
+    })
+
+    it ('should read hierarchy of categories', async()=>{
+        const { Categories } = cds.entities
+        expect (await
+
+            SELECT.one.from (Categories, c=>{
+                c.ID, c.name, c.children (c=>{ c.name },{levels:3})
+            }) .where ({name:'Cat'})
+
+        ) .toMatchObject (
+
+            { ID:101, name:'Cat', children:[
+                { name:'Kitty', children:[
+                    { name:'Kitty Cat', children:[
+                        { name:'Aristocat' }, ]},
+                    { name:'Kitty Bat' }, ]},
+                { name:'Catwoman', children:[
+                    { name:'Catalina' } ]},
+            ]}
+
+        )
+    })
+
+})
--- a/packages/products-service/tests/data/sap.capire.products-Categories.csv
+++ b/packages/products-service/tests/data/sap.capire.products-Categories.csv
@@ -0,0 +1,10 @@
+ID;parent_ID;name
+0;;Some Sample Categories...
+1;;Cat
+2;1;Kitty
+3;2;Kitty Cat
+4;3;Aristocat
+5;2;Kitty Bat
+6;1;Catwoman
+7;6;Catalina
+8;;Catweazle
--- a/packages/products-service/tests/postman.json
+++ b/packages/products-service/tests/postman.json
@@ -0,0 +1,157 @@
+{
+	"info": {
+		"_postman_id": "0f8d4e79-a1c2-47fe-aeab-0319fb4ce180",
+		"name": "@sap/capire-products",
+		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+	},
+			"item": [
+				{
+					"name": "Categories",
+					"request": {
+						"method": "POST",
+						"header": [
+							{
+								"key": "Content-Type",
+								"value": "application/json"
+							}
+						],
+						"body": {
+							"mode": "raw",
+							"raw": "{ \"ID\":0, \"name\":\"Some Sample Categories...\", \"children\":[\n    { \"ID\":1, \"name\":\"Cat\", \"children\":[\n        { \"ID\":2, \"name\":\"Kitty\", \"children\":[\n            { \"ID\":3, \"name\":\"Kitty Cat\", \"children\":[\n                { \"ID\":4, \"name\":\"Aristocat\" }\n            ]},\n            { \"ID\":5, \"name\":\"Kitty Bat\" }\n        ]},\n        { \"ID\":6, \"name\":\"Catwoman\", \"children\":[\n            { \"ID\":7, \"name\":\"Catalina\" }\n        ]}\n    ] },\n    { \"ID\":8, \"name\":\"Catweazle\" }\n]}\n"
+						},
+						"url": {
+							"raw": "http://localhost:4004/admin/cats",
+							"protocol": "http",
+							"host": [
+								"localhost"
+							],
+							"port": "4004",
+							"path": [
+								"admin",
+								"cats"
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "Categories",
+					"request": {
+						"method": "GET",
+						"header": [],
+						"body": {
+							"mode": "raw",
+							"raw": ""
+						},
+						"url": {
+							"raw": "http://localhost:4004/admin/cats/0?$expand=children($expand=children($expand=children($expand=children)))",
+							"protocol": "http",
+							"host": [
+								"localhost"
+							],
+							"port": "4004",
+							"path": [
+								"admin",
+								"cats",
+								"0"
+							],
+							"query": [
+								{
+									"key": "$expand",
+									"value": "children($expand=children($expand=children($expand=children)))"
+								}
+							]
+						}
+					},
+					"response": [
+						{
+							"name": "Categories",
+							"originalRequest": {
+								"method": "GET",
+								"header": [],
+								"body": {
+									"mode": "raw",
+									"raw": ""
+								},
+								"url": {
+									"raw": "http://localhost:4004/admin/cats/0?$expand=children($expand=children($expand=children($expand=children)))",
+									"protocol": "http",
+									"host": [
+										"localhost"
+									],
+									"port": "4004",
+									"path": [
+										"admin",
+										"cats",
+										"0"
+									],
+									"query": [
+										{
+											"key": "$expand",
+											"value": "children($expand=children($expand=children($expand=children)))"
+										}
+									]
+								}
+							},
+							"status": "OK",
+							"code": 200,
+							"_postman_previewlanguage": "json",
+							"header": [
+								{
+									"key": "X-Powered-By",
+									"value": "Express"
+								},
+								{
+									"key": "OData-Version",
+									"value": "4.0"
+								},
+								{
+									"key": "content-type",
+									"value": "application/json;odata.metadata=minimal"
+								},
+								{
+									"key": "Date",
+									"value": "Tue, 21 May 2019 19:20:24 GMT"
+								},
+								{
+									"key": "Connection",
+									"value": "keep-alive"
+								},
+								{
+									"key": "Content-Length",
+									"value": "767"
+								}
+							],
+							"cookie": [],
+							"body": "{\n    \"@odata.context\": \"$metadata#cats(children(children(children(children()))))/$entity\",\n    \"@odata.metadataEtag\": \"W/\\\"+AAp4JKNOcr+OusjrdQo55RCfM+UHKpTh8EbhsxyPhM=\\\"\",\n    \"name\": \"Some Sample Categories...\",\n    \"descr\": null,\n    \"ID\": 0,\n    \"parent_ID\": null,\n    \"children\": [\n        {\n            \"name\": \"Cat\",\n            \"descr\": null,\n            \"ID\": 1,\n            \"parent_ID\": 0,\n            \"children\": [\n                {\n                    \"name\": \"Kitty\",\n                    \"descr\": null,\n                    \"ID\": 2,\n                    \"parent_ID\": 1,\n                    \"children\": [\n                        {\n                            \"name\": \"Kitty Cat\",\n                            \"descr\": null,\n                            \"ID\": 3,\n                            \"parent_ID\": 2,\n                            \"children\": [\n                                {\n                                    \"name\": \"Aristocat\",\n                                    \"descr\": null,\n                                    \"ID\": 4,\n                                    \"parent_ID\": 3\n                                }\n                            ]\n                        },\n                        {\n                            \"name\": \"Kitty Bat\",\n                            \"descr\": null,\n                            \"ID\": 5,\n                            \"parent_ID\": 2,\n                            \"children\": []\n                        }\n                    ]\n                },\n                {\n                    \"name\": \"Catwoman\",\n                    \"descr\": null,\n                    \"ID\": 6,\n                    \"parent_ID\": 1,\n                    \"children\": [\n                        {\n                            \"name\": \"Catalina\",\n                            \"descr\": null,\n                            \"ID\": 7,\n                            \"parent_ID\": 6,\n                            \"children\": []\n                        }\n                    ]\n                }\n            ]\n        },\n        {\n            \"name\": \"Catweazle\",\n            \"descr\": null,\n            \"ID\": 8,\n            \"parent_ID\": 0,\n            \"children\": []\n        }\n    ]\n}"
+						}
+					]
+				},
+				{
+					"name": "Categories",
+					"request": {
+						"method": "DELETE",
+						"header": [],
+						"body": {
+							"mode": "raw",
+							"raw": ""
+						},
+						"url": {
+							"raw": "http://localhost:4004/admin/cats/0",
+							"protocol": "http",
+							"host": [
+								"localhost"
+							],
+							"port": "4004",
+							"path": [
+								"admin",
+								"cats",
+								"0"
+							]
+						}
+					},
+					"response": []
+				}
+			]
+
+}
--- a/packages/reviews-service/.cdsrc.json
+++ b/packages/reviews-service/.cdsrc.json
@@ -0,0 +1,6 @@
+{
+    "build": {
+        "target": ".",
+        "tasks": []
+    }
+}
--- a/packages/reviews-service/.gitignore
+++ b/packages/reviews-service/.gitignore
@@ -0,0 +1,15 @@
+.che/
+.gen/
+gen/
+mta_archives/
+node_modules/
+target/
+
+.cds_gen.log
+connection.properties
+*.db
+.DS_Store
+*.orig
+_out
+default-*.json
+package-lock.json
--- a/packages/reviews-service/.vscode/launch.json
+++ b/packages/reviews-service/.vscode/launch.json
@@ -0,0 +1,16 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "cds run",
+            "request": "launch",
+            "type": "node", "runtimeExecutable": "npx","runtimeArgs": [ "-n" ],
+            "args": [ "--","cds","run","--in-memory?" ], // the leading "--" arg ensures it works with as well as without debugging
+            "console": "integratedTerminal",
+            "skipFiles": [ "<node_internals>/**" ]
+        }
+    ]
+}
--- a/packages/reviews-service/db/schema.cds
+++ b/packages/reviews-service/db/schema.cds
@@ -0,0 +1,30 @@
+namespace sap.capire.reviews;
+using { User } from '@sap/cds/common';
+
+// Reviewed subjects can be any entity that is uniquely identified
+type ReviewedSubject : String(111);
+
+entity Reviews {
+  key ID   : String(36);
+  subject  : ReviewedSubject;
+  reviewer : User;
+  rating   : Rating;
+  title    : String(111);
+  text     : String(1111);
+  date     : DateTime;
+  likes    : Composition of many Likes on likes.review = $self;
+  liked    : Integer default 0; // counter for likes as helpful review (count of all _likes belonging to this review)
+}
+
+type Rating : Integer enum {
+  Best  = 5;
+  Good  = 4;
+  Avg   = 3;
+  Poor  = 2;
+  Worst = 1;
+}
+
+entity Likes {
+  key review : Association to Reviews;
+  key user   : User;
+}
--- a/packages/reviews-service/index.cds
+++ b/packages/reviews-service/index.cds
@@ -0,0 +1 @@
+using from './srv/reviews-service';
--- a/packages/reviews-service/package.json
+++ b/packages/reviews-service/package.json
@@ -0,0 +1,19 @@
+{
+    "name": "reviews-service",
+    "version": "1.0.0",
+    "description": "Generated by cds init",
+    "repository": "<Add your repository here>",
+    "license": "ISC",
+    "dependencies": {
+        "@sap/cds": "^3.17.4",
+        "express": "^4.17.1"
+    },
+    "engines": {
+        "node": "^8.9"
+    },
+    "scripts": {
+        "build": "cds build/all --clean",
+        "deploy": "cds deploy",
+        "start": "cds run"
+    }
+}
--- a/packages/reviews-service/srv/reviews-service.cds
+++ b/packages/reviews-service/srv/reviews-service.cds
@@ -0,0 +1,26 @@
+namespace sap.capire.reviews;
+using { sap.capire.reviews as my } from '../db/schema';
+
+service ReviewsService {
+
+  event reviewed : { subject:String; rating: Decimal(2,1) };
+
+  // API
+  entity Reviews as projection on my.Reviews excluding { likes }
+  action like (review:Reviews.ID);
+  action unlike (review:Reviews.ID);  
+
+  // Input validation
+  annotate Reviews with {
+    subject  @mandatory;
+    title    @mandatory;
+    rating   @mandatory @assert.enum;
+  }
+
+  // Auto-fill reviewers and review dates
+  annotate Reviews with {
+    reviewer @cds.on.insert:$user;
+    date     @cds.on.insert:$now;
+    date     @cds.on.update:$now;
+  }
+}
--- a/packages/reviews-service/srv/reviews-service.js
+++ b/packages/reviews-service/srv/reviews-service.js
@@ -0,0 +1,40 @@
+const cds = require('@sap/cds')
+module.exports = cds.service.impl((srv) => {
+
+  // Get the CSN definition for Reviews from the db schema for sub-sequent queries
+  // ( Note: we explicitly specify the namespace to support embedded reuse )
+  const { Reviews, Likes } = cds.entities('sap.capire.reviews')
+
+  // Increment counter for reviews considered helpful
+  srv.on ('like', (req) => {
+     if (!req.user)  return req.reject(400, 'You must be identified to like a review')
+     const {review} = req.data, {user} = req
+     const tx = cds.transaction(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'))
+  })
+
+  // Delete a former like by the same user
+  srv.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 tx = cds.transaction(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 }))
+   })
+
+  // Emit an event to inform subscribers about new avg ratings for reviewed subjects
+  // ( Note: req.on.succeeded ensures we only do that if there's no error )
+  srv.after(['CREATE', 'UPDATE', 'DELETE'], 'Reviews', async (_, req) => {
+    const { subject } = req.data
+    const { rating } = await cds.transaction(req).run(
+      SELECT.one(['avg(rating) as rating']).from(Reviews).where({ subject })
+    )
+    req.on('succeeded', () => {
+      srv.emit('reviewed', { subject, rating })
+      console.log(`Reviewed event was emitted for book "${subject}" with rating ${rating}.`)
+    })
+  })
+})
--- a/shared/dev-env/package.json
+++ b/shared/dev-env/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "dev-env",
+  "author": "daniel.hutzel@sap.com",
+  "dependencies": {
+    "@sap/cds": "^3.17.4"
+  },
+  "devDependencies": {
+    "sqlite3": "^4.0.7"
+  },
+  "license": "ISC"
+}
--- a/shared/tests-env/package.json
+++ b/shared/tests-env/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "tests-env",
+  "author": "daniel.hutzel@sap.com",
+  "devDependencies": {
+    "@types/jest": "*",
+    "jest": "^24.8.0",
+    "supertest": "^4.0.2"
+  },
+  "license": "ISC"
+}
Author	SHA1	Message	Date
johannes-vogel	162bdb5b90	Update README.md	2019-09-23 14:12:30 +02:00
d045778	fb8f6acac7	final state of exercise 2	2019-09-23 13:25:44 +02:00
d045778	1e28cb217f	final state of exercise 1	2019-09-23 13:19:24 +02:00
d045778	2fc2cea260	add sap registry to npmrc	2019-09-23 13:06:09 +02:00
johannes-vogel	bfaaf36e14	Fix Key in Products	2019-09-22 13:32:18 +02:00
johannes-vogel	33b24c8d96	Use version 3.17.4 (#1 )	2019-09-21 11:36:45 +02:00
i079695	387b25b1bf	Add initial branch for CAA265	2019-09-11 11:07:11 +02:00