Better clone path

.vscode/launch.json

@@ -5,18 +5,45 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "bookshop", "request": "launch", "type": "node", "runtimeExecutable": "npx", "runtimeArgs": [ "-n" ],
-      "args": [ "--", "cds", "run", "--in-memory" ],
+      "name": "bookshop",
+      "request": "launch",
+      "type": "node",
+      "runtimeExecutable": "npx",
+      "runtimeArgs": [
+        "-n"
+      ],
+      "args": [
+        "--",
+        "cds",
+        "run",
+        "--in-memory"
+      ],
       "cwd": "${workspaceFolder}/packages/bookshop",
       "console": "integratedTerminal",
-      "skipFiles": ["<node_internals>/**"]
+      "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?"
+      ],
       "cwd": "${workspaceFolder}/packages/${input:service}",
       "console": "integratedTerminal",
-      "skipFiles": ["<node_internals>/**"]
+      "skipFiles": [
+        "<node_internals>/**"
+      ]
     }
   ],
   "inputs": [
@@ -34,4 +61,4 @@
       "default": "bookshop"
     }
   ]
-}
+}

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

package.json

@@ -8,11 +8,7 @@
     "lerna": "npx --no-install lerna -v > /dev/null || npm i lerna --no-save",
     "install": "(npm -s run lerna) && lerna bootstrap --hoist",
     "cleanup": "lerna clean -y && rm -fr node_modules",
-    "bookshop": "cds watch packages/bookshop",
-    "bookshop-enhanced": "cds watch packages/bookshop-enhanced",
-    "reviews-service": "cds watch packages/reviews-service",
-    "bookstore": "cds watch packages/bookstore",
-    "media-server": "cds watch packages/media-server"
+    "bookshop": "cds watch packages/bookshop"
   },
   "dependencies": {
     "@sap/cds": "^3",

packages/bookshop/app/admin/webapp/Component.js

@@ -1,4 +1,4 @@
-sap.ui.define(["sap/fe/core/AppComponent"], ac => ac.extend("admin.Component", {
+sap.ui.define(["sap/fe/AppComponent"], ac => ac.extend("admin.Component", {
     metadata:{ manifest:'json' }
 }))
 

packages/bookshop/app/admin/webapp/manifest.json

@@ -24,9 +24,7 @@
     "sap.ui5": {
         "dependencies": {
             "libs": {
-                "sap.fe.core": {},
-                "sap.fe.macros": {},
-                "sap.fe.templates": {}
+                "sap.fe": {}
             }
         },
         "models": {

packages/bookshop/app/browse/webapp/Component.js

@@ -1,4 +1,4 @@
-sap.ui.define(["sap/fe/core/AppComponent"], ac => ac.extend("bookshop.Component", {
+sap.ui.define(["sap/fe/AppComponent"], ac => ac.extend("bookshop.Component", {
     metadata:{ manifest:'json' }
 }))
 

packages/bookshop/app/browse/webapp/manifest.json

@@ -24,9 +24,7 @@
   "sap.ui5": {
     "dependencies": {
       "libs": {
-        "sap.fe.core": {},
-        "sap.fe.macros": {},
-         "sap.fe.templates": {}
+        "sap.fe": {}
       }
     },
     "models": {

packages/bookshop/app/orders/webapp/Component.js

@@ -1,4 +1,4 @@
-sap.ui.define(["sap/fe/core/AppComponent"], ac => ac.extend("orders.Component", {
+sap.ui.define(["sap/fe/AppComponent"], ac => ac.extend("orders.Component", {
     metadata:{ manifest:'json' }
 }))
 

packages/bookshop/app/orders/webapp/manifest.json

@@ -24,9 +24,7 @@
 	"sap.ui5": {
         "dependencies": {
             "libs": {
-                "sap.fe.core": {},
-                "sap.fe.macros": {},
-                "sap.fe.templates": {}
+                "sap.fe": {}
             }
         },
 		"models": {

packages/bookshop/mta.yaml

@@ -1,44 +0,0 @@
-####### Generated mta.yaml based on template version 0.2.0
-####### appName = capire-bookshop
-####### language=nodejs; multiTenant=false
-####### approuter=
-
-_schema-version: '3.1'
-ID: sap.capire-bookshop
-version: 1.0.0
-description: "A simple bookshop application, build in a self-contained all-in-one fashion, i.e. w/o reusing other packages."
-
-build-parameters:
-  before-all:
-   - builder: custom
-     commands:
-      - npm install
-      - cds build/all
-
-parameters:
-  enable-parallel-deployments: true  
-
-modules:
- ##############    SERVER MODULE   ##########################
- - name: capire-bookshop-srv
-   type: nodejs
-   path: gen/srv
-   properties:
-     EXIT: 1  # required by deploy.js task to terminate 
-
-   
-   
- ############################################################
-
- ##############    SIDECAR MODULE   #########################
- - name: db
-    
-   type: hdb
-   path: gen/db  
-   parameters:
-     app-name: capire-bookshop-db  
-   requires:
-    #### Hana and xsuaa resources extracted from CAP configuration ####
- ############################################################
-
-

packages/bookshop/package.json

@@ -1,22 +1,25 @@
 {
-  "name": "@sap/capire-bookshop",
-  "version": "1.0.0",
-  "description": "A simple bookshop application, build in a self-contained all-in-one fashion, i.e. w/o reusing other packages.",
-  "license": "SAP SAMPLE CODE LICENSE",
-  "dependencies": {
-    "@sap/cds": "^3",
-    "express": "^4",
-    "sqlite3": "^5.0.0"
-  },
-  "scripts": {
-    "start": "cds run --in-memory?",
-    "watch": "cds watch"
-  },
-  "cds": {
-    "requires": {
-      "db": {
-        "kind": "sql"
-      }
+    "name": "@sap/capire-bookshop",
+    "version": "1.0.0",
+    "description": "A simple bookshop application, build in a self-contained all-in-one fashion, i.e. w/o reusing other packages.",
+    "license": "SAP SAMPLE CODE LICENSE",
+    "dependencies": {
+      "@sap/cds": "^3",
+      "express": "^4"
+    },
+    "scripts": {
+        "start": "cds run --in-memory?",
+        "watch": "cds watch"
+    },
+    "cds": {
+        "requires": {
+            "db": {
+                "model": [
+                    "db",
+                    "srv"
+                ],
+                "kind": "sqlite"
+            }
+        }
     }
-  }
 }

packages/bookshop/srv/admin-service.cds

@@ -10,7 +10,7 @@ service AdminService @(_requires:'authenticated-user') {
 annotate AdminService.Orders with @odata.draft.enabled;
 // annotate AdminService.Books with @odata.draft.enabled;
 
-// Temporary workaround -> cap/issues#3121
+// Temporary workaround -> https://github.wdf.sap.corp/cap/issues/issues/3121
 extend service AdminService with {
   entity OrderItems as select from my.OrderItems;
 }

packages/bookshop/srv/cat-service.js

@@ -23,4 +23,4 @@ async function _reduceStock (req) {
       `${OrderItems[i].amount} exceeds stock for book #${OrderItems[i].book_ID}`
     )
   }))
-}
+}