Make test more robust against future model changes

Compare subset of JSON, not full JSON.
Fix locale handling
2023-04-11 15:38:58 +02:00 · 2022-09-12 10:50:47 +02:00 · 2021-04-23 13:58:46 +02:00 · 2020-04-07 13:58:59 +02:00 · 2020-04-07 13:41:50 +02:00 · 2020-04-07 13:40:25 +02:00
37 changed files with 6531 additions and 123 deletions
--- a/.eslintrc
+++ b/.eslintrc
@@ -6,7 +6,7 @@
        "jest": true
    },
    "parserOptions": {
-        "ecmaVersion": 2018
+        "ecmaVersion": 2017
    },
    "globals": {
        "SELECT": true,
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@ target/
 connection.properties
 default-env.json
 packages/messageBox
+*.db
+
--- a/.npmrc
+++ b/.npmrc
@@ -1 +1 @@
-@sap:registry=https://npm.sap.com
+@sap:registry=https://npm.sap.com
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -5,18 +5,30 @@
  "version": "0.2.0",
  "configurations": [
    {
-      "name": "bookshop", "request": "launch", "type": "node", "runtimeExecutable": "npx", "runtimeArgs": [ "-n" ],
-      "args": [ "--", "cds", "run", "--in-memory" ],
-      "cwd": "${workspaceFolder}/packages/bookshop",
-      "console": "integratedTerminal",
-      "skipFiles": ["<node_internals>/**"]
-    },
-    {
-      "name": "cds run ...", "request": "launch", "type": "node", "runtimeExecutable": "npx", "runtimeArgs": [ "-n" ],
-      "args": [ "--", "cds", "run", "--with-mocks", "--in-memory?" ],
+      "name": "cds run",
+      "request": "launch",
+      "type": "node",
+      "runtimeExecutable": "npx",
+      "runtimeArgs": [
+        "-n"
+      ],
+      "args": [
+        "--",
+        "cds",
+        "run",
+        "--with-mocks",
+        "--in-memory"
+      ], // the leading "--" arg ensures it works with as well as without debugging
      "cwd": "${workspaceFolder}/packages/${input:service}",
      "console": "integratedTerminal",
-      "skipFiles": ["<node_internals>/**"]
+      "serverReadyAction": {
+        "pattern": "server listening on (https?://\\S+|[0-9]+)",
+        "uriFormat": "http://localhost:%s",
+        "action": "openExternally"
+      },
+      "skipFiles": [
+        "<node_internals>/**"
+      ]
    }
  ],
  "inputs": [
@@ -29,9 +41,12 @@
        "bookstore",
        "media-server",
        "office-supplies",
-        "reviews-service"
+        "orders-service",
+        "products-service",
+        "reviews-service",
+        "user-service"
      ],
      "default": "bookshop"
    }
  ]
-}
+}
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,6 +1,7 @@
 {
  "files.exclude": {
-    "**/.gitignore": true,
-    "**/.vscode": true
+    "**/.gitignore": false,
+    "**/.git": false,
+    "**/.vscode": false
  }
 }
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -4,14 +4,23 @@
    "version": "2.0.0",
    "tasks": [
        {
-            "type": "npm", "script": "watch", "path": "packages/bookshop/",
-            "options": { "env": { "PORT": "4004" }},
-            "presentation": { "group": "A" }
+            "type": "shell", "label": "cds run bookshop",
+            "command": "npx", "args": [ "cds", "watch", "packages/bookshop" ],
+            "presentation": { "group": "A" },
+            "problemMatcher": []
        },
        {
-            "type": "npm", "script": "watch", "path": "packages/reviews-service/",
-            "options": { "env": { "PORT": "5005" }},
-            "presentation": { "group": "A" }
+            "type": "shell", "label": "cds run bookshop-enhanced",
+            "command": "npx", "args": [ "cds", "watch", "packages/bookshop-enhanced" ],
+            "presentation": { "group": "A" },
+            "problemMatcher": []
+        },
+        {
+            "type": "shell", "label": "cds run reviews-service",
+            "command": "npx", "args": [ "cds", "watch", "packages/reviews-service" ],
+            "options": {"env": { "PORT":"5005" }},
+            "presentation": { "group": "A" },
+            "problemMatcher": []
        }
    ]
 }
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ In SAP Business Application Studio, open a terminal.
 Then clone the repo with this specific branch:

 ```sh
-git clone https://github.com/sap-samples/cloud-cap-samples projects/cloud-cap-samples -b openSAP-week2-unit2
+git clone https://github.com/sap-samples/cloud-cap-samples projects/cloud-cap-samples -b openSAP-week2-unit4567
 cd projects/cloud-cap-samples
 ```

@@ -20,6 +20,16 @@ In the `cloud-cap-samples` folder run:
 npm install
 ```

+### Cloud Foundry Login
+This is required later in the demo.  In Studio's terminal, execute:
+```sh
+cf login
+```
+As input, provide
+- The Cloud Foundry API endpoint, which is usally `https://api.cf.eu10.hana.ondemand.com`.  It can be obtained from the Overview page of your Subaccount in Cloud Cockpit.
+- Your user's email address and password
+- The name of your trial organization and space
+
 ## Run

 Now you're ready to run the samples, for example:
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -5,9 +5,10 @@
  "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",
+    "install": "(npm -s run lerna) && lerna bootstrap --hoist",
+    "lerna": "npx --no-install lerna -v > /dev/null || npm i lerna --no-save",
+    "test": "jest",
    "bookshop": "cds watch packages/bookshop"
  },
  "dependencies": {
@@ -15,11 +16,11 @@
    "express": "^4"
  },
  "devDependencies": {
-    "sqlite3": "*"
-  },
-  "--add-these-to-devDependencies-for-tests": {
    "@types/jest": "*",
-    "jest": "*"
+    "sqlite3": "*",
+    "jest": "*",
+    "supertest": "^4.0.2",
+    "@sap/hdi-deploy": "3.7.0"
  },
  "license": "SAP SAMPLE CODE LICENSE"
 }
--- a/packages/bookshop/.vscode/launch.json
+++ b/packages/bookshop/.vscode/launch.json
@@ -0,0 +1,31 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Run bookshop",
+      "request": "launch",
+      "type": "node",
+      "cwd": "/home/user/projects/cloud-cap-samples/packages/bookshop",
+      "runtimeExecutable": "npx",
+      "runtimeArgs": [
+        "-n"
+      ],
+      "args": [
+        "--",
+        "cds",
+        "run",
+        "--in-memory?"
+      ],
+      "console": "internalConsole",
+      "internalConsoleOptions": "openOnSessionStart",
+      "skipFiles": [
+        "<node_internals>/**"
+      ],
+      "env": {
+        "run.config": "{\"handlerId\":\"cap_run_config_handler_id\",\"runnableId\":\"/home/user/projects/cloud-cap-samples/packages/bookshop\"}"
+      }
+    }
+  ]
+}
--- a/packages/bookshop/app/_i18n/i18n.properties
+++ b/packages/bookshop/app/_i18n/i18n.properties
@@ -0,0 +1,13 @@
+Books = Books
+Book = Book
+ID = ID
+Title = Title
+Author = Author
+AuthorID = Author ID
+Stock = Stock
+Name = Name
+AuthorName = Author's Name
+Authors = Authors
+Order = Order
+Orders = Orders
+Price = Price
--- a/packages/bookshop/app/_i18n/i18n_de.properties
+++ b/packages/bookshop/app/_i18n/i18n_de.properties
@@ -0,0 +1,13 @@
+Books = Bücher
+Book = Buch
+ID = ID
+Title = Titel
+Authors = Autoren
+Author = Autor
+AuthorID = ID des Autors
+AuthorName = Name des Autors
+Name = Name
+Stock = Bestand
+Order = Bestellung
+Orders = Bestellungen
+Price = Preis
--- a/packages/bookshop/app/admin/fiori-service.cds
+++ b/packages/bookshop/app/admin/fiori-service.cds
@@ -0,0 +1,37 @@
+using AdminService from '../../srv/admin-service';
+
+////////////////////////////////////////////////////////////////////////////
+//
+//	Books Object Page
+//
+annotate AdminService.Books with @(
+	UI: {
+		Facets: [
+			{$Type: 'UI.ReferenceFacet', Label: '{i18n>General}', Target: '@UI.FieldGroup#General'},
+			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Details'},
+			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Admin}', Target: '@UI.FieldGroup#Admin'},
+		],
+		FieldGroup#General: {
+			Data: [
+				{Value: title},
+				{Value: author_ID},
+				{Value: descr},
+			]
+		},
+		FieldGroup#Details: {
+			Data: [
+				{Value: stock},
+				{Value: price},
+				{Value: currency_code, Label: '{i18n>Currency}'},
+			]
+		},
+		FieldGroup#Admin: {
+			Data: [
+				{Value: createdBy},
+				{Value: createdAt},
+				{Value: modifiedBy},
+				{Value: modifiedAt}
+			]
+		}
+	}
+);
--- a/packages/bookshop/app/admin/webapp/Component.js
+++ b/packages/bookshop/app/admin/webapp/Component.js
@@ -0,0 +1,22 @@
+sap.ui.define(["sap/fe/AppComponent"], ac => ac.extend("admin.Component", {
+    metadata:{ manifest:'json' }
+}))
+
+// sap.ui.define (["sap/ui/core/UIComponent"], ui5 => ui5.extend("bookshop.Component", {
+//     metadata: { manifest: "json" }
+// }))
+// sap.ui.define (["sap/ui/generic/app/AppComponent"], ui5 => ui5.extend("bookshop.Component", {
+//     metadata: { manifest: "json" }
+// }))
+
+// jQuery.sap.declare("bookshop.Component");
+// sap.ui.getCore().loadLibrary("sap.ui.generic.app");
+// jQuery.sap.require("sap.ui.generic.app.AppComponent");
+
+// sap.ui.generic.app.AppComponent.extend("bookshop.Component", {
+// 	metadata: {
+// 		manifest: "json"
+// 	}
+// });
+
+/* eslint no-undef:0 */
--- a/packages/bookshop/app/admin/webapp/i18n/i18n.properties
+++ b/packages/bookshop/app/admin/webapp/i18n/i18n.properties
@@ -0,0 +1,11 @@
+# This is the resource bundle of itelo
+# __ldi.translation.uuid=c3431418-9caf-11e8-98d0-529269fb1459
+
+# JCI app descriptor contains lower case TITLE
+appTitle=Bookshop Sample
+
+# JCI app descriptor contains lower case DESCRIPTION
+appSubTitle=CAP Sample Application
+
+# JCI app descriptor contains lower case DESCRIPTION
+appDescription=CDS Sample Service
--- a/packages/bookshop/app/admin/webapp/manifest.json
+++ b/packages/bookshop/app/admin/webapp/manifest.json
@@ -0,0 +1,128 @@
+{
+    "_version": "1.8.0",
+    "sap.app": {
+        "id": "admin",
+        "type": "application",
+        "title": "Manage Books",
+        "description": "Sample Application",
+        "i18n": "i18n/i18n.properties",
+        "dataSources": {
+            "AdminService": {
+                "uri": "/admin/",
+                "type": "OData",
+                "settings": {
+                    "odataVersion": "4.0"
+                }
+            }
+        },
+        "-sourceTemplate": {
+            "id": "ui5template.basicSAPUI5ApplicationProject",
+            "-id": "ui5template.smartTemplate",
+            "-version": "1.40.12"
+        }
+    },
+    "sap.ui5": {
+        "dependencies": {
+            "libs": {
+                "sap.fe": {}
+            }
+        },
+        "models": {
+            "i18n": {
+                "type": "sap.ui.model.resource.ResourceModel",
+                "uri": "i18n/i18n.properties"
+            },
+            "": {
+                "dataSource": "AdminService",
+                "settings": {
+                    "synchronizationMode": "None",
+                    "operationMode": "Server",
+                    "autoExpandSelect" : true,
+                    "earlyRequests": true,
+                    "groupProperties": {
+                        "default": {
+                            "submit": "Auto"
+                        }
+                    }
+                }
+            }
+        },
+        "routing": {
+            "routes": [
+                {
+                    "pattern": ":?query:",
+                    "name": "BooksList",
+                    "target": "BooksList"
+                },
+                {
+                    "pattern": "Books({key}):?query:",
+                    "name": "BooksDetails",
+                    "target": "BooksDetails"
+                },
+                {
+                    "pattern": "Books({key}/author({key2}):?query:",
+                    "name": "AuthorsDetails",
+                    "target": "AuthorsDetails"
+                }
+            ],
+            "targets": {
+                "BooksList": {
+                    "type": "Component",
+                    "id": "BooksList",
+                    "name": "sap.fe.templates.ListReport",
+                    "options": {
+                        "settings" : {
+                            "entitySet" : "Books",
+                            "navigation" : {
+                                "Books" : {
+                                    "detail" : {
+                                        "route" : "BooksDetails"
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
+                "BooksDetails": {
+                    "type": "Component",
+                    "id": "BooksDetailsList",
+                    "name": "sap.fe.templates.ObjectPage",
+                    "options": {
+                        "settings" : {
+                            "entitySet" : "Books",
+                            "navigation" : {
+                                "Authors" : {
+                                    "detail" : {
+                                        "route" : "AuthorsDetails"
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
+                "AuthorsDetails": {
+                    "type": "Component",
+                    "id": "AuthorsDetailsList",
+                    "name": "sap.fe.templates.ObjectPage",
+                    "options": {
+                        "settings" : {
+                            "entitySet" : "Authors"
+                        }
+                    }
+                }
+            }
+        },
+        "contentDensities": {
+            "compact": true,
+            "cozy": true
+        }
+    },
+    "sap.ui": {
+        "technology": "UI5",
+        "fullWidth": false
+    },
+    "sap.fiori": {
+        "registrationIds": [],
+        "archeType": "transactional"
+    }
+}
--- a/packages/bookshop/app/browse/fiori-service.cds
+++ b/packages/bookshop/app/browse/fiori-service.cds
@@ -0,0 +1,47 @@
+using CatalogService from '../../srv/cat-service';
+
+////////////////////////////////////////////////////////////////////////////
+//
+//	Books Object Page
+//
+annotate CatalogService.Books with @(
+	UI: {
+  	HeaderInfo: {
+  		Description: {Value: author}
+  	},
+		HeaderFacets: [
+			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Description}', Target: '@UI.FieldGroup#Descr'},
+		],
+		Facets: [
+			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Price'},
+		],
+		FieldGroup#Descr: {
+			Data: [
+				{Value: descr},
+			]
+		},
+		FieldGroup#Price: {
+			Data: [
+				{Value: price},
+				{Value: currency.symbol, Label: '{i18n>Currency}'},
+			]
+		},
+	}
+);
+
+
+////////////////////////////////////////////////////////////////////////////
+//
+//	Books Object Page
+//
+annotate CatalogService.Books with @(
+	UI: {
+	  SelectionFields: [ ID, price, currency_code ],
+		LineItem: [
+			{Value: title},
+			{Value: author, Label:'{i18n>Author}'},
+			{Value: price},
+			{Value: currency.symbol, Label:' '},
+		]
+	},
+);
--- a/packages/bookshop/app/browse/webapp/Component.js
+++ b/packages/bookshop/app/browse/webapp/Component.js
@@ -0,0 +1,22 @@
+sap.ui.define(["sap/fe/AppComponent"], ac => ac.extend("bookshop.Component", {
+    metadata:{ manifest:'json' }
+}))
+
+// sap.ui.define (["sap/ui/core/UIComponent"], ui5 => ui5.extend("bookshop.Component", {
+//     metadata: { manifest: "json" }
+// }))
+// sap.ui.define (["sap/ui/generic/app/AppComponent"], ui5 => ui5.extend("bookshop.Component", {
+//     metadata: { manifest: "json" }
+// }))
+
+// jQuery.sap.declare("bookshop.Component");
+// sap.ui.getCore().loadLibrary("sap.ui.generic.app");
+// jQuery.sap.require("sap.ui.generic.app.AppComponent");
+
+// sap.ui.generic.app.AppComponent.extend("bookshop.Component", {
+// 	metadata: {
+// 		manifest: "json"
+// 	}
+// });
+
+/* eslint no-undef:0 */
--- a/packages/bookshop/app/browse/webapp/i18n/i18n.properties
+++ b/packages/bookshop/app/browse/webapp/i18n/i18n.properties
@@ -0,0 +1,11 @@
+# This is the resource bundle of itelo
+# __ldi.translation.uuid=c3431418-9caf-11e8-98d0-529269fb1459
+
+# JCI app descriptor contains lower case TITLE
+appTitle=Bookshop Sample
+
+# JCI app descriptor contains lower case DESCRIPTION
+appSubTitle=CAP Sample Application
+
+# JCI app descriptor contains lower case DESCRIPTION
+appDescription=CDS Sample Service
--- a/packages/bookshop/app/browse/webapp/manifest.json
+++ b/packages/bookshop/app/browse/webapp/manifest.json
@@ -0,0 +1,106 @@
+{
+  "_version": "1.8.0",
+  "sap.app": {
+    "id": "bookshop",
+    "type": "application",
+    "title": "Browse Books",
+    "description": "Sample Application",
+    "i18n": "i18n/i18n.properties",
+    "dataSources": {
+      "CatalogService": {
+        "uri": "/browse/",
+        "type": "OData",
+        "settings": {
+          "odataVersion": "4.0"
+        }
+      }
+    },
+    "-sourceTemplate": {
+      "id": "ui5template.basicSAPUI5ApplicationProject",
+      "-id": "ui5template.smartTemplate",
+      "-version": "1.40.12"
+    }
+  },
+  "sap.ui5": {
+    "dependencies": {
+      "libs": {
+        "sap.fe": {}
+      }
+    },
+    "models": {
+      "i18n": {
+        "type": "sap.ui.model.resource.ResourceModel",
+        "uri": "i18n/i18n.properties"
+      },
+      "": {
+        "dataSource": "CatalogService",
+        "settings": {
+          "synchronizationMode": "None",
+          "operationMode": "Server",
+          "autoExpandSelect": true,
+          "earlyRequests": true,
+          "groupProperties": {
+            "default": {
+              "submit": "Auto"
+            }
+          }
+        }
+      }
+    },
+    "routing": {
+      "routes": [
+        {
+          "pattern": ":?query:",
+          "name": "BooksList",
+          "target": "BooksList"
+        },
+        {
+          "pattern": "Books({key}):?query:",
+          "name": "BooksDetails",
+          "target": "BooksDetails"
+        }
+      ],
+      "targets": {
+        "BooksList": {
+          "type": "Component",
+          "id": "BooksList",
+          "name": "sap.fe.templates.ListReport",
+          "options": {
+            "settings": {
+              "entitySet": "Books",
+              "navigation": {
+                "Books": {
+                  "detail": {
+                    "route": "BooksDetails"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "BooksDetails": {
+          "type": "Component",
+          "id": "BooksDetailsList",
+          "name": "sap.fe.templates.ObjectPage",
+          "options": {
+            "settings": {
+              "entitySet": "Books"
+            }
+          }
+        }
+      }
+    },
+    "contentDensities": {
+      "compact": true,
+      "cozy": true
+    }
+  },
+  "sap.ui": {
+    "technology": "UI5",
+    "fullWidth": false
+  },
+  "sap.fiori": {
+    "registrationIds": [],
+    "archeType": "transactional"
+  }
+}
--- a/packages/bookshop/app/common.cds
+++ b/packages/bookshop/app/common.cds
@@ -0,0 +1,74 @@
+/*
+  Common Annotations shared by all apps
+*/
+
+using { sap.capire.bookshop as my } from '../db/schema';
+
+
+////////////////////////////////////////////////////////////////////////////
+//
+//	Books Lists
+//
+annotate my.Books with @(
+	UI: {
+		Identification: [{Value:title}],
+	  SelectionFields: [ ID, author_ID, price, currency_code ],
+		LineItem: [
+			{Value: ID},
+			{Value: title},
+			{Value: author.name, Label:'{i18n>Author}'},
+			{Value: stock},
+			{Value: price},
+			{Value: currency.symbol, Label:' '},
+		]
+	}
+) {
+	author @ValueList.entity:'Authors';
+};
+
+annotate my.Authors with @(
+	UI: {
+		Identification: [{Value:name}],
+	}
+);
+
+
+////////////////////////////////////////////////////////////////////////////
+//
+//	Books Details
+//
+annotate my.Books with @(
+	UI: {
+  	HeaderInfo: {
+  		TypeName: '{i18n>Book}',
+  		TypeNamePlural: '{i18n>Books}',
+  		Title: {Value: title},
+  		Description: {Value: author.name}
+  	},
+	}
+);
+
+
+
+////////////////////////////////////////////////////////////////////////////
+//
+//	Books Elements
+//
+annotate my.Books with {
+	ID @title:'{i18n>ID}' @UI.HiddenFilter;
+	title @title:'{i18n>Title}';
+	author @title:'{i18n>AuthorID}';
+	price @title:'{i18n>Price}';
+	stock @title:'{i18n>Stock}';
+	descr @UI.MultiLineText;
+}
+
+
+////////////////////////////////////////////////////////////////////////////
+//
+//	Authors Elements
+//
+annotate my.Authors with {
+	ID @title:'{i18n>ID}' @UI.HiddenFilter;
+	name @title:'{i18n>AuthorName}';
+}
--- a/packages/bookshop/app/fiori.html
+++ b/packages/bookshop/app/fiori.html
@@ -0,0 +1,55 @@
+<!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>Bookshop</title>
+
+	<script>
+		window["sap-ushell-config"] = {
+			defaultRenderer: "fiori2",
+			applications: {
+				"browse-books": {
+					title: "Browse Books",
+					description: "... testing FE v42",
+					additionalInformation: "SAPUI5.Component=bookshop",
+					applicationType : "URL",
+					url: "/browse/webapp",
+					navigationMode: "embedded"
+				},
+				"manage-books": {
+					title: "Manage Books",
+					description: "... testing FE v42",
+					additionalInformation: "SAPUI5.Component=admin",
+					applicationType : "URL",
+					url: "/admin/webapp",
+					navigationMode: "embedded"
+				},
+				"manage-orders": {
+					title: "Manage Orders",
+					description: "... testing FE v42",
+					additionalInformation: "SAPUI5.Component=orders",
+					applicationType : "URL",
+					url: "/orders/webapp",
+					navigationMode: "embedded"
+				}
+			}
+		};
+	</script>
+
+	<script src="https://sapui5.hana.ondemand.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
+	<script src="https://sapui5.hana.ondemand.com/resources/sap-ui-core.js"
+    	data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
+    	data-sap-ui-compatVersion="edge"
+    	data-sap-ui-theme="sap_fiori_3"
+    	data-sap-ui-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/bookshop/app/index.cds
+++ b/packages/bookshop/app/index.cds
@@ -0,0 +1,8 @@
+/*
+  This model controls what gets served to Fiori frontends...
+*/
+
+using from './admin/fiori-service';
+using from './browse/fiori-service';
+using from './orders/fiori-service';
+using from './common';
--- a/packages/bookshop/app/orders/fiori-service.cds
+++ b/packages/bookshop/app/orders/fiori-service.cds
@@ -0,0 +1,117 @@
+using AdminService from '../../srv/admin-service';
+
+annotate AdminService.Books with {
+	price @Common.FieldControl: #ReadOnly;
+}
+////////////////////////////////////////////////////////////////////////////
+//
+//	Common
+//
+annotate AdminService.OrderItems with {
+	book @(
+		Common: {
+			Text: book.title,
+			FieldControl: #Mandatory
+		},
+		ValueList.entity:'Books',
+	);
+	amount @(
+		Common.FieldControl: #Mandatory
+	);
+}
+
+
+annotate AdminService.Orders with @(
+	UI: {
+		////////////////////////////////////////////////////////////////////////////
+		//
+		//	Lists of Orders
+		//
+		SelectionFields: [ createdAt, createdBy ],
+		LineItem: [
+			{Value: createdBy, Label:'Customer'},
+			{Value: createdAt, Label:'Date'}
+		],
+		////////////////////////////////////////////////////////////////////////////
+		//
+		//	Order Details
+		//
+		HeaderInfo: {
+			TypeName: 'Order', TypeNamePlural: 'Orders',
+			Title: {
+				Label: 'Order number ', //A label is possible but it is not considered on the ObjectPage yet
+				Value: OrderNo
+			},
+			Description: {Value: createdBy}
+		},
+		Identification: [ //Is the main field group
+			{Value: createdBy, Label:'Customer'},
+			{Value: createdAt, Label:'Date'},
+			{Value: OrderNo },
+		],
+		HeaderFacets: [
+			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Created}', Target: '@UI.FieldGroup#Created'},
+			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Modified}', Target: '@UI.FieldGroup#Modified'},
+		],
+		Facets: [
+			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Details'},
+			{$Type: 'UI.ReferenceFacet', Label: '{i18n>OrderItems}', Target: 'Items/@UI.LineItem'},
+		],
+		FieldGroup#Details: {
+			Data: [
+				{Value: currency_code, Label:'Currency'}
+			]
+		},
+		FieldGroup#Created: {
+			Data: [
+				{Value: createdBy},
+				{Value: createdAt},
+			]
+		},
+		FieldGroup#Modified: {
+			Data: [
+				{Value: modifiedBy},
+				{Value: modifiedAt},
+			]
+		},
+	},
+) {
+	createdAt @UI.HiddenFilter:false;
+	createdBy @UI.HiddenFilter:false;
+};
+
+
+
+//The enity types name is AdminService.my_bookshop_OrderItems
+//The annotations below are not generated in edmx WHY?
+annotate AdminService.OrderItems with @(
+	UI: {
+		HeaderInfo: {
+			TypeName: 'Order Item', TypeNamePlural: '	',
+			Title: {
+				Value: book.title
+			},
+			Description: {Value: book.descr}
+		},
+		// There is no filterbar for items so the selctionfileds is not needed
+		SelectionFields: [ book_ID ],
+		////////////////////////////////////////////////////////////////////////////
+		//
+		//	Lists of OrderItems
+		//
+		LineItem: [
+			{Value: book_ID, Label:'Book'},
+			//The following entry is only used to have the assoication followed in the read event
+			{Value: book.price, Label:'Book Price'},
+			{Value: amount, Label:'Quantity'},
+		],
+		Identification: [ //Is the main field group
+			//{Value: ID, Label:'ID'}, //A guid shouldn't be on the UI
+			{Value: book_ID, Label:'Book'},
+			{Value: amount, Label:'Amount'},
+		],
+		Facets: [
+			{$Type: 'UI.ReferenceFacet', Label: '{i18n>OrderItems}', Target: '@UI.Identification'},
+		],
+	},
+);
--- a/packages/bookshop/app/orders/webapp/Component.js
+++ b/packages/bookshop/app/orders/webapp/Component.js
@@ -0,0 +1,22 @@
+sap.ui.define(["sap/fe/AppComponent"], ac => ac.extend("orders.Component", {
+    metadata:{ manifest:'json' }
+}))
+
+// sap.ui.define (["sap/ui/core/UIComponent"], ui5 => ui5.extend("bookshop.Component", {
+//     metadata: { manifest: "json" }
+// }))
+// sap.ui.define (["sap/ui/generic/app/AppComponent"], ui5 => ui5.extend("bookshop.Component", {
+//     metadata: { manifest: "json" }
+// }))
+
+// jQuery.sap.declare("bookshop.Component");
+// sap.ui.getCore().loadLibrary("sap.ui.generic.app");
+// jQuery.sap.require("sap.ui.generic.app.AppComponent");
+
+// sap.ui.generic.app.AppComponent.extend("bookshop.Component", {
+// 	metadata: {
+// 		manifest: "json"
+// 	}
+// });
+
+/* eslint no-undef:0 */
--- a/packages/bookshop/app/orders/webapp/i18n/i18n.properties
+++ b/packages/bookshop/app/orders/webapp/i18n/i18n.properties
@@ -0,0 +1,11 @@
+# This is the resource bundle of itelo
+# __ldi.translation.uuid=c3431418-9caf-11e8-98d0-529269fb1459
+
+# JCI app descriptor contains lower case TITLE
+appTitle=Bookshop Sample
+
+# JCI app descriptor contains lower case DESCRIPTION
+appSubTitle=CAP Sample Application
+
+# JCI app descriptor contains lower case DESCRIPTION
+appDescription=CDS Sample Service
--- a/packages/bookshop/app/orders/webapp/manifest.json
+++ b/packages/bookshop/app/orders/webapp/manifest.json
@@ -0,0 +1,170 @@
+{
+	"_version": "1.8.0",
+	"sap.app": {
+		"id": "orders",
+		"type": "application",
+		"title": "Manage Orders",
+		"description": "Sample Application",
+		"i18n": "i18n/i18n.properties",
+		"dataSources": {
+			"AdminService": {
+				"uri": "/admin/",
+				"type": "OData",
+				"settings": {
+					"odataVersion": "4.0"
+				}
+			}
+		},
+        "-sourceTemplate": {
+            "id": "ui5template.basicSAPUI5ApplicationProject",
+			"-id": "ui5template.smartTemplate",
+			"-version": "1.40.12"
+		}
+	},
+	"sap.ui5": {
+        "dependencies": {
+            "libs": {
+                "sap.fe": {}
+            }
+        },
+		"models": {
+			"i18n": {
+				"type": "sap.ui.model.resource.ResourceModel",
+				"uri": "i18n/i18n.properties"
+			},
+			"": {
+				"dataSource": "AdminService",
+				"settings": {
+                    "synchronizationMode": "None",
+                    "operationMode": "Server",
+                    "autoExpandSelect" : true,
+                    "earlyRequests": true,
+                    "groupProperties": {
+                        "default": {
+                          "submit": "Auto"
+                        }
+                    }
+				}
+			}
+		},
+        "routing": {
+            "routes": [
+                {
+                    "pattern": ":?query:",
+                    "name": "OrdersList",
+                    "target": "OrdersList"
+                },
+                {
+                    "pattern": "Orders({key}):?query:",
+                    "name": "OrdersDetails",
+                    "target": "OrdersDetails"
+                },
+                {
+                    "pattern": "Orders({boo})/Items({boo2}):?query:",
+                    "name": "OrderItemsDetails",
+                    "target": "OrderItemsDetails"
+                },
+                {
+                    "pattern": "Books({key}):?query:",
+                    "name": "BooksDetails",
+                    "target": "BooksDetails"
+                }
+            ],
+            "targets": {
+                "OrdersList": {
+                    "type": "Component",
+                    "id": "OrdersList",
+                    "name": "sap.fe.templates.ListReport",
+                    "options": {
+						"settings" : {
+							"entitySet" : "Orders",
+							"navigation" : {
+								"Orders" : {
+									"detail" : {
+										"route" : "OrdersDetails"
+										}
+								}
+							}
+						}
+					}
+                },
+                "OrdersDetails": {
+                    "type": "Component",
+                    "id": "OrdersDetails",
+                    "name": "sap.fe.templates.ObjectPage",
+                    "options": {
+                        "settings" : {
+                            "entitySet": "Orders",
+							"navigation" : {
+								"Items": {
+                                    "detail": {
+                                        "route": "OrderItemsDetails"
+                                    }
+                                },
+                                "book": {
+                                    "detail": {
+                                        "route": "BooksDetails"
+                                    }
+                                },
+                                "dummy": {
+                                    "detail": {
+                                        "route": "BooksDetails"
+                                    }
+                                }
+							}
+						}
+					}
+                },
+                "OrderItemsDetails": {
+                    "type": "Component",
+                    "id": "OrderItemsDetails",
+                    "name": "sap.fe.templates.ObjectPage",
+                    "options": {
+                        "settings" : {
+                            "entitySet": "OrderItems"
+                        }
+                    }
+                },
+                "BooksDetails": {
+                    "type": "Component",
+                    "id": "BooksDetails",
+                    "name": "sap.fe.templates.ObjectPage",
+                    "options": {
+                        "settings" : {
+                            "entitySet": "Books",
+                            "navigation": {
+                                "author": {
+                                    "detail": {
+                                        "route": "AuthorsDetails"
+                                    }
+                                }
+                            }
+                        }
+                    }                    
+                },
+                "AuthorsDetails": {
+                    "type": "Component",
+                    "id": "AuthorsDetails",
+                    "name": "sap.fe.templates.ObjectPage",
+                    "options": {
+                        "settings" : {
+                            "entitySet": "Authors"
+                        }
+                    }
+                }
+            }
+        },
+		"contentDensities": {
+			"compact": true,
+			"cozy": true
+		}
+	},
+	"sap.ui": {
+		"technology": "UI5",
+		"fullWidth": false
+	},
+	"sap.fiori": {
+		"registrationIds": [],
+		"archeType": "transactional"
+	}
+}
--- a/packages/bookshop/db/schema.cds
+++ b/packages/bookshop/db/schema.cds
@@ -1,8 +1,6 @@
 namespace sap.capire.bookshop;
 using { Currency, managed, cuid } from '@sap/cds/common';
-using { sap.capire.products.Products } from '../../products';

-/*
 entity Books : managed {
  key ID : Integer;
  title  : localized String(111);
@@ -11,14 +9,6 @@ entity Books : managed {
  stock  : Integer;
  price  : Decimal(9,2);
  currency : Currency;
-} */
-
-entity Books : Products {
-  author : Association to Authors;
-}
-
-entity Magazines : Products {
-  publisher : String;
 }

 entity Authors : managed {
--- a/packages/bookshop/package.json
+++ b/packages/bookshop/package.json
@@ -5,17 +5,14 @@
  "license": "SAP SAMPLE CODE LICENSE",
  "dependencies": {
    "@sap/cds": "^3",
-    "express": "^4"
+    "express": "^4",
+    "hdb": "^0.17.1"
+  },
+  "devDependencies": {
+    "jest": "*"
  },
  "scripts": {
-    "start": "cds run --in-memory?",
-    "watch": "cds watch"
-  },
-  "cds": {
-    "requires": {
-      "db": {
-        "kind": "sql"
-      }
-    }
+    "start": "npx cds run",
+    "test": "jest"
  }
 }
--- a/packages/bookshop/srv/admin-service.cds
+++ b/packages/bookshop/srv/admin-service.cds
@@ -8,7 +8,6 @@ service AdminService @(_requires:'authenticated-user') {

 // Enable Fiori Draft for Orders
 annotate AdminService.Orders with @odata.draft.enabled;
-// annotate AdminService.Books with @odata.draft.enabled;

 // Temporary workaround -> cap/issues#3121
 extend service AdminService with {
--- a/packages/bookshop/srv/admin-service.js
+++ b/packages/bookshop/srv/admin-service.js
@@ -0,0 +1,22 @@
+const cds = require('@sap/cds')
+
+/** Service implementation for AdminService */
+module.exports = cds.service.impl(srv => {
+  const { OrderItems } = srv.entities ('sap.capire.bookshop')
+
+  srv.after (['READ','EDIT'], 'Orders', _calculateTotals)
+ 
+  // on-the-fly calculate the total Order price based on the OrderItems' netAmounts
+  async function _calculateTotals (orders, req) {
+    const ordersByID = Array.isArray(orders)
+      ? orders.reduce ((all,o) => { (all[o.ID] = o).total=0; return all },{})
+      : { [orders.ID]: orders }
+    return cds.transaction(req) .run (
+      SELECT.from(OrderItems) .columns ('parent_ID', 'netAmount')
+       .where ({ parent_ID: {in: Object.keys(ordersByID)} })
+    ) .then (items =>
+      items.forEach (item => ordersByID [item.parent_ID] .total += item.netAmount)
+    )
+  }
+
+})
--- a/packages/bookshop/srv/cat-service.cds
+++ b/packages/bookshop/srv/cat-service.cds
@@ -1,6 +1,7 @@
 using { sap.capire.bookshop as my } from '../db/schema';

@path:'/browse'
+// @impl: './cat-service.js'
 service CatalogService {

  @readonly entity Books as SELECT from my.Books {*,
--- a/packages/bookshop/srv/cat-service.js
+++ b/packages/bookshop/srv/cat-service.js
@@ -2,25 +2,27 @@ const cds = require('@sap/cds')
 const { Books } = cds.entities

 /** Service implementation for CatalogService */
-module.exports = cds.service.impl(function() {
-  this.after ('READ', 'Books', each => each.stock > 111 && _addDiscount2(each,11))
-  this.before ('CREATE', 'Orders', _reduceStock)
+module.exports = cds.service.impl(srv => {
+  srv.after ('READ', 'Books', each => each.stock > 111 && _addDiscount2(each,11))
+  srv.before ('CREATE', 'Orders', _reduceStock)
+  // srv.before ('*', (req) => { console.debug ('>>>', req.method, req.target.name) })
 })

 /** Add some discount for overstocked books */
 function _addDiscount2 (each,discount) {
  each.title += ` -- ${discount}% discount!`
 }
-
 /** Reduce stock of ordered books if available stock suffices */
 async function _reduceStock (req) {
-  const { Items: OrderItems } = req.data
-  return cds.transaction(req) .run (()=> OrderItems.map (order =>
-    UPDATE (Books) .set ('stock -=', order.amount)
-    .where ('ID =', order.book_ID) .and ('stock >=', order.amount)
-  )) .then (all => all.forEach ((affectedRows,i) => {
-    if (affectedRows === 0)  req.error (409,
-      `${OrderItems[i].amount} exceeds stock for book #${OrderItems[i].book_ID}`
-    )
+  const { Items: orderItems } = req.data
+
+  return cds.transaction(req) .run (()=> orderItems.map (item =>
+    UPDATE (Books)
+      .set ('stock -=', item.amount)
+      .where ('ID =', item.book_ID) .and ('stock >=', item.amount)
+  )).then (all => all.forEach ((affectedRows,i) => {
+    if (affectedRows === 0) {
+      req.error (409, `${orderItems[i].amount} exceeds stock for book #${orderItems[i].book_ID}`)
+    }
  }))
-}
+}
--- a/packages/bookshop/tests/bookshop.test.js
+++ b/packages/bookshop/tests/bookshop.test.js
@@ -0,0 +1,79 @@
+
+const cds = require('@sap/cds')
+
+describe('Bookshop: OData Protocol Level Testing', () => {
+  jest.setTimeout(20*1000)
+  const app = require('express')()
+  const request = require('supertest')(app)
+
+  beforeAll(async () => {
+    await cds.deploy(__dirname + '/../srv/cat-service').to('sqlite::memory:')
+    await cds.serve('CatalogService').from(__dirname + '/../srv/cat-service').in(app)
+  })
+
+  it('Service $metadata document', async () => {
+    const response = await request
+      .get('/browse/$metadata')
+      .expect('Content-Type', /^application\/xml/)
+      .expect(200)
+
+    const expectedVersion = '<edmx:Edmx Version="4.0" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx">'
+    const expectedBooksEntitySet = '<EntitySet Name="Books" EntityType="CatalogService.Books">'
+    expect(response.text.includes(expectedVersion)).toBeTruthy()
+    expect(response.text.includes(expectedBooksEntitySet)).toBeTruthy()
+  })
+
+
+  it('Get with select, expand and localized', async () => {
+    const response = await request
+      .get('/browse/Books?$select=title,author&$expand=currency')
+      .set('Accept-Language', 'de')
+      .expect('Content-Type', /^application\/json/)
+      .expect(200)
+
+    expect(response.body.value).toMatchObject([
+      {
+        ID: 201, title: "Sturmhöhe", author: "Emily Brontë",
+        currency: { name: "Pfund", descr: "Britische Pfund", code: "GBP", symbol: "£" }
+      },
+      {
+        ID: 207, title: "Jane Eyre", author: "Charlotte Brontë",
+        currency: { name: "Pfund", descr: "Britische Pfund", code: "GBP", symbol: "£" }
+      },
+      {
+        ID: 251, title: "The Raven", author: "Edgar Allen Poe",
+        currency: { name: "US-Dollar", descr: "United States Dollar", code: "USD", symbol: "$" }
+      },
+      {
+        ID: 252, title: "Eleonora", author: "Edgar Allen Poe",
+        currency: { name: "US-Dollar", descr: "United States Dollar", code: "USD", symbol: "$" }
+      },
+      {
+        ID: 271, title: "Catweazle", author: "Richard Carpenter",
+        currency: { name: "Euro", descr: "European Euro", code: "EUR", symbol: "€" }
+      }
+    ])
+  })
+})
+
+describe('Bookshop: CDS Service Level Testing', () => {
+  let srv, Books
+
+  beforeAll(async () => {
+    srv = await cds.serve('CatalogService').from(__dirname + '/../srv/cat-service')
+    Books = srv.entities.Books
+    expect(Books).toBeDefined()
+  })
+
+  it('GETs all books', async () => {
+    const books = await srv.read(Books, b => { b.title })
+
+    expect(books).toMatchObject([
+      { title: 'Wuthering Heights' },
+      { title: 'Jane Eyre' },
+      { title: 'The Raven' },
+      { title: 'Eleonora' },
+      { title: 'Catweazle' }
+    ])
+  })
+})
--- a/packages/products/db/schema.cds
+++ b/packages/products/db/schema.cds
@@ -1,19 +0,0 @@
-namespace sap.capire.products;
-
-using { Currency, managed, sap.common.CodeList } from '@sap/cds/common';
-
-entity Products : managed {
-  key ID   : String;
-  title    : localized String(111);
-  descr    : localized String(1111);
-  stock    : Integer;
-  price    : Decimal(9,2);
-  currency : Currency;
-  category : Association to Categories;
-}
-
-entity Categories : CodeList {
-  key ID   : Integer;
-  parent   : Association to Categories;
-  children : Composition of many Categories on children.parent = $self;
-}
--- a/packages/products/index.cds
+++ b/packages/products/index.cds
@@ -1 +0,0 @@
-using from './db/schema';
--- a/packages/products/package.json
+++ b/packages/products/package.json
@@ -1,15 +0,0 @@
-{
-  "name": "@sap/products",
-  "version": "1.0.0",
-  "description": "A reuse package providing domain models and services to manage product catalogs.",
-  "repository": "https://github.com/SAP-samples/cloud-cap-samples.git",
-  "license": "SAP SAMPLE CODE LICENSE",
-  "dependencies": {
-    "@sap/cds": "^3",
-    "express": "^4"
-  },
-  "files": [
-    "db",
-    "index.cds"
-  ]
-}
Author	SHA1	Message	Date
Christian Georgi	2a1a7b1f2b	Make test more robust against future model changes Compare subset of JSON, not full JSON.	2023-04-11 15:38:58 +02:00
Dr. David A. Kunz	a560e12106	Fix locale handling	2022-09-12 10:50:47 +02:00
Christian Georgi	3dccfc30f0	Increase test timeout	2021-04-23 13:58:46 +02:00
Christian Georgi	cc0be09341	Add CF login instructions	2020-04-07 13:58:59 +02:00
Christian Georgi	175a183f27	Update README.md	2020-04-07 13:41:50 +02:00
Christian Georgi	a1d663a717	Update README.md	2020-04-07 13:40:25 +02:00
Christian Georgi	e75cc7a0a5	Add package-lock.json, fix readme	2020-04-02 15:52:37 +02:00
Christian Georgi	37ed881102	Change localhost link in BAS	2020-03-23 09:33:11 +01:00
Harini Gunabalan	a3ab8cd51f	Update README.md	2020-03-20 17:35:06 +01:00
Christian Georgi	6c1f06a06c	New readme	2020-03-20 16:23:01 +01:00
Christian Georgi	e9a18c9938	Add launch for bookshop	2020-02-11 11:26:28 +00:00
Christian Georgi	eb5334cafc	Cosmetics 2	2020-02-11 07:55:46 +00:00
Christian Georgi	d54b16bd94	Cosmetics	2020-02-11 07:54:27 +00:00
Christian Georgi	ba054305a6	Use beforeAll in tests	2020-02-10 22:44:31 +00:00
Christian Georgi	e89fc1d9bb	Test cosmetics	2020-02-10 22:24:37 +00:00
Christian Georgi	659fe52509	Cosmetics	2020-02-10 22:19:14 +00:00
Christian Georgi	4ad21a47d6	Some more code, cosmetics	2020-02-10 22:09:14 +01:00
Christian Georgi	7b5b2210ae	Bring old HANA driver back for the moment	2020-02-10 10:05:28 +00:00
Christian Georgi	c20c1609a7	Add Jest as dev dependency to bookshop	2020-02-10 09:30:26 +00:00
Christian Georgi	ffc9fbd5f5	Test cosmetics	2020-02-10 08:03:38 +00:00
Christian Georgi	11957c93d8	Remove scripts	2020-02-09 13:44:12 +00:00
Christian Georgi	2ca71b0f7d	Cosmetics	2020-02-09 12:03:46 +00:00
Christian Georgi	452b442246	More handlers for demo	2020-02-07 13:14:16 +00:00
Christian Georgi	bf21d0220c	Test cosmetics, remove obsolete stuff	2020-02-07 12:32:39 +00:00
Christian Georgi	b65be0cb41	Fix tests to use productive cds model Also remove strange whitespace	2020-02-07 12:06:08 +00:00
tieyan.fu@sap.com	c3c778b2be	Merge branch 'OpenSAP-week2-unit4567' of github.com:SAP-samples/cloud-cap-samples into OpenSAP-week2-unit4567	2020-02-06 13:22:39 +01:00
tieyan.fu@sap.com	c38c5d832c	add model into tests folder (avoid?)	2020-02-06 13:17:41 +01:00
Christian Georgi	5929d22f98	Merge branch 'OpenSAP-week2-unit4567' of https://github.com/SAP-samples/cloud-cap-samples into OpenSAP-week2-unit4567	2020-02-05 14:05:41 +00:00
Christian Georgi	4030173bbc	Delete unused files, add package-lock.json	2020-02-05 14:04:58 +00:00
tieyan.fu@sap.com	74ce1a5fd1	add odata test	2020-02-05 09:17:51 +01:00
d049740	cbb27132ec	upload code for uweek2unit7 testing	2020-02-03 01:13:19 +01:00
d049740	72a17ffcf7	remove auto generated cds requires section	2019-12-19 15:44:27 +01:00
d049740	0e2218a5f1	add hdb depencies	2019-12-19 15:42:14 +01:00
d049740	fa8a7861d5	delete unneeded test files	2019-12-19 15:09:29 +01:00
d049740	ceb5487e75	adapt bookshop for openSAP course	2019-12-19 15:08:34 +01:00