Better clone path

Add package-lock.json, fix readme
Update readme
2020-04-20 17:08:34 +02:00 · 2020-04-02 15:39:08 +02:00 · 2020-03-23 17:06:23 +01:00 · 2020-02-10 17:34:11 +01:00 · 2020-02-10 17:24:24 +01:00 · 2020-02-10 16:26:31 +01:00
37 changed files with 121 additions and 6529 deletions
--- a/.eslintrc
+++ b/.eslintrc
@@ -6,7 +6,7 @@
        "jest": true
    },
    "parserOptions": {
-        "ecmaVersion": 2017
+        "ecmaVersion": 2018
    },
    "globals": {
        "SELECT": true,
--- a/.gitignore
+++ b/.gitignore
@@ -13,5 +13,3 @@ 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,30 +5,18 @@
  "version": "0.2.0",
  "configurations": [
    {
-      "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
+      "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",
-      "serverReadyAction": {
-        "pattern": "server listening on (https?://\\S+|[0-9]+)",
-        "uriFormat": "http://localhost:%s",
-        "action": "openExternally"
-      },
-      "skipFiles": [
-        "<node_internals>/**"
-      ]
+      "skipFiles": ["<node_internals>/**"]
    }
  ],
  "inputs": [
@@ -41,12 +29,9 @@
        "bookstore",
        "media-server",
        "office-supplies",
-        "orders-service",
-        "products-service",
-        "reviews-service",
-        "user-service"
+        "reviews-service"
      ],
      "default": "bookshop"
    }
  ]
-}
+}
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,7 +1,6 @@
 {
  "files.exclude": {
-    "**/.gitignore": false,
-    "**/.git": false,
-    "**/.vscode": false
+    "**/.gitignore": true,
+    "**/.vscode": true
  }
 }
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -4,23 +4,14 @@
    "version": "2.0.0",
    "tasks": [
        {
-            "type": "shell", "label": "cds run bookshop",
-            "command": "npx", "args": [ "cds", "watch", "packages/bookshop" ],
-            "presentation": { "group": "A" },
-            "problemMatcher": []
+            "type": "npm", "script": "watch", "path": "packages/bookshop/",
+            "options": { "env": { "PORT": "4004" }},
+            "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": []
+            "type": "npm", "script": "watch", "path": "packages/reviews-service/",
+            "options": { "env": { "PORT": "5005" }},
+            "presentation": { "group": "A" }
        }
    ]
 }
--- 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-unit4567
+git clone https://github.com/sap-samples/cloud-cap-samples projects/cloud-cap-samples -b openSAP-week2-unit2
 cd projects/cloud-cap-samples
 ```

@@ -20,16 +20,6 @@ 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,10 +5,9 @@
  "author": "daniel.hutzel@sap.com",
  "private": true,
  "scripts": {
-    "cleanup": "lerna clean -y && rm -fr node_modules",
-    "install": "(npm -s run lerna) && lerna bootstrap --hoist",
    "lerna": "npx --no-install lerna -v > /dev/null || npm i lerna --no-save",
-    "test": "jest",
+    "install": "(npm -s run lerna) && lerna bootstrap --hoist",
+    "cleanup": "lerna clean -y && rm -fr node_modules",
    "bookshop": "cds watch packages/bookshop"
  },
  "dependencies": {
@@ -16,11 +15,11 @@
    "express": "^4"
  },
  "devDependencies": {
+    "sqlite3": "*"
+  },
+  "--add-these-to-devDependencies-for-tests": {
    "@types/jest": "*",
-    "sqlite3": "*",
-    "jest": "*",
-    "supertest": "^4.0.2",
-    "@sap/hdi-deploy": "3.7.0"
+    "jest": "*"
  },
  "license": "SAP SAMPLE CODE LICENSE"
 }
--- a/packages/bookshop/.vscode/launch.json
+++ b/packages/bookshop/.vscode/launch.json
@@ -1,31 +0,0 @@
-{
-  // 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
@@ -1,13 +0,0 @@
-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
@@ -1,13 +0,0 @@
-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
@@ -1,37 +0,0 @@
-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
@@ -1,22 +0,0 @@
-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
@@ -1,11 +0,0 @@
-# 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
@@ -1,128 +0,0 @@
-{
-    "_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
@@ -1,47 +0,0 @@
-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
@@ -1,22 +0,0 @@
-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
@@ -1,11 +0,0 @@
-# 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
@@ -1,106 +0,0 @@
-{
-  "_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
@@ -1,74 +0,0 @@
-/*
-  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
@@ -1,55 +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>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
@@ -1,8 +0,0 @@
-/*
-  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
@@ -1,117 +0,0 @@
-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
@@ -1,22 +0,0 @@
-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
@@ -1,11 +0,0 @@
-# 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
@@ -1,170 +0,0 @@
-{
-	"_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,6 +1,8 @@
 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);
@@ -9,6 +11,14 @@ 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,14 +5,17 @@
  "license": "SAP SAMPLE CODE LICENSE",
  "dependencies": {
    "@sap/cds": "^3",
-    "express": "^4",
-    "hdb": "^0.17.1"
-  },
-  "devDependencies": {
-    "jest": "*"
+    "express": "^4"
  },
  "scripts": {
-    "start": "npx cds run",
-    "test": "jest"
+    "start": "cds run --in-memory?",
+    "watch": "cds watch"
+  },
+  "cds": {
+    "requires": {
+      "db": {
+        "kind": "sql"
+      }
+    }
  }
 }
--- a/packages/bookshop/srv/admin-service.cds
+++ b/packages/bookshop/srv/admin-service.cds
@@ -8,6 +8,7 @@ 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
@@ -1,22 +0,0 @@
-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,7 +1,6 @@
 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,27 +2,25 @@ const cds = require('@sap/cds')
 const { Books } = cds.entities

 /** Service implementation for CatalogService */
-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) })
+module.exports = cds.service.impl(function() {
+  this.after ('READ', 'Books', each => each.stock > 111 && _addDiscount2(each,11))
+  this.before ('CREATE', 'Orders', _reduceStock)
 })

 /** Add some discount for overstocked books */
 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 (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}`)
-    }
+  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}`
+    )
  }))
-}
+}
--- a/packages/bookshop/tests/bookshop.test.js
+++ b/packages/bookshop/tests/bookshop.test.js
@@ -1,79 +0,0 @@
-
-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
@@ -0,0 +1,19 @@
+namespace sap.capire.products;
+
+using { Currency, managed, sap.common.CodeList } from '@sap/cds/common';
+
+entity Products : managed {
+  key ID   : String;
+  title    : localized String(111);
+  descr    : localized String(1111);
+  stock    : Integer;
+  price    : Decimal(9,2);
+  currency : Currency;
+  category : Association to Categories;
+}
+
+entity Categories : CodeList {
+  key ID   : Integer;
+  parent   : Association to Categories;
+  children : Composition of many Categories on children.parent = $self;
+}
--- a/packages/products/index.cds
+++ b/packages/products/index.cds
@@ -0,0 +1 @@
+using from './db/schema';
--- a/packages/products/package.json
+++ b/packages/products/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "@sap/products",
+  "version": "1.0.0",
+  "description": "A reuse package providing domain models and services to manage product catalogs.",
+  "repository": "https://github.com/SAP-samples/cloud-cap-samples.git",
+  "license": "SAP SAMPLE CODE LICENSE",
+  "dependencies": {
+    "@sap/cds": "^3",
+    "express": "^4"
+  },
+  "files": [
+    "db",
+    "index.cds"
+  ]
+}
Author	SHA1	Message	Date
Christian Georgi	27ed4b7af2	Better clone path	2020-04-20 17:08:34 +02:00
Christian Georgi	0601038f0f	Add package-lock.json, fix readme	2020-04-02 15:39:08 +02:00
Christian Georgi	e657e2c398	Update readme	2020-03-23 17:06:23 +01:00
Elena Oresharova	f7a5809576	Delete app folder	2020-02-10 17:34:11 +01:00
Elena Oresharova	64adf115f3	Update code sample	2020-02-10 17:24:24 +01:00
Elena Oresharova	b7aee4e0e0	Add code for unit 2	2020-02-10 16:26:31 +01:00
Christian Georgi	13480ad99e	Added issue URL again	2020-02-04 09:11:28 +01:00
Daniel	8071faa62d	Adding requires.db: {kind:'sql'}	2020-02-03 07:55:56 +01:00
johannes-vogel	9ea294586a	remove link	2020-01-31 08:49:54 +01:00
Lakshmi C Rajeev	a56a11ff3e	Create index.cds	2020-01-28 10:58:24 +05:30
Matthias Bühl	b4084b45cb	rollback change in master	2020-01-27 15:33:14 +01:00
Matthias Bühl	26e3c0d753	check autthorization in cat service	2020-01-27 15:29:43 +01:00
Lakshmi C Rajeev	6d0194acc0	Merge pull request #12 from LakshmiCR/master Media-server implementation	2020-01-17 15:02:15 +05:30
Lakshmi C Rajeev	db75a99808	Merge branch 'master' into master	2020-01-17 15:01:59 +05:30
Volker Buzek	a04755efed	feat(npm): add .npmrc for @sap-scope - `npm set @sap...` is unnecessary - update README.md accordingly	2020-01-14 14:55:36 +01:00
Daniel	6a9a1bc4d6	cleaned up dot files	2020-01-04 07:27:19 +01:00
Daniel	a0847e603f	settings.json restored	2020-01-04 07:24:11 +01:00
Daniel	b1270bc0eb	fixed launch scripts	2020-01-04 07:16:05 +01:00
Lakshmi C Rajeev	ba72d7f478	Update package.json	2020-01-03 14:29:53 +05:30
Lakshmi C Rajeev	cd808c76dd	Update media-service.js	2020-01-03 14:07:17 +05:30
Daniel	3a77707f49	Merge pull request #17 from SAP-samples/cleanup cleaned up start scripts	2020-01-03 03:03:23 +01:00
Daniel	583c97a494	cleaned up start scripts	2020-01-03 02:59:27 +01:00
Daniel	eb7431afed	fixed: dev dependency to sqlite3	2019-12-30 13:32:02 +01:00
Lakshmi C Rajeev	630bb2b19c	Update package.json	2019-12-19 10:59:57 +05:30
Lakshmi C Rajeev	f9a7aa59de	Update media-service.js	2019-12-19 10:43:22 +05:30
Lakshmi C Rajeev	9205e0893a	Update media-service.js	2019-12-02 15:27:38 +05:30
Lakshmi C Rajeev	7137bf227e	Media-server	2019-11-29 12:30:07 +05:30