Use version v28 of the pipeline

cleaned up start scripts

.eslintrc

@@ -6,7 +6,7 @@
         "jest": true
     },
     "parserOptions": {
-        "ecmaVersion": 2017
+        "ecmaVersion": 2018
     },
     "globals": {
         "SELECT": true,

.vscode/launch.json

@@ -5,19 +5,17 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "cds run",
+      "name": "bookshop", "request": "launch", "type": "node", "runtimeExecutable": "npx", "runtimeArgs": [ "-n" ],
-      "request": "launch",
+      "args": [ "--", "cds", "run", "--in-memory" ],
-      "type": "node",
+      "cwd": "${workspaceFolder}/packages/bookshop",
-      "runtimeExecutable": "npx",
+      "console": "integratedTerminal",
-      "runtimeArgs": ["-n"],
+      "skipFiles": ["<node_internals>/**"]
-      "args": ["--", "cds", "run", "--with-mocks", "--in-memory?"], // the leading "--" arg ensures it works with as well as without debugging
+    },
+    {
+      "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>/**"]
     }
   ],
@@ -31,12 +29,9 @@
         "bookstore",
         "media-server",
         "office-supplies",
-        "orders-service",
+        "reviews-service"
-        "products-service",
-        "reviews-service",
-        "user-service"
       ],
-      "default": "bookstore"
+      "default": "bookshop"
     }
   ]
 }

.vscode/settings.json

@@ -1,7 +1,6 @@
 {
   "files.exclude": {
-    "**/.gitignore": false,
+    "**/.gitignore": true,
-    "**/.git": false,
+    "**/.vscode": true
-    "**/.vscode": false
   }
 }

.vscode/tasks.json

@@ -4,23 +4,14 @@
     "version": "2.0.0",
     "tasks": [
         {
-            "type": "shell", "label": "cds run bookshop",
+            "type": "npm", "script": "watch", "path": "packages/bookshop/",
-            "command": "npx", "args": [ "cds", "watch", "packages/bookshop" ],
+            "options": { "env": { "PORT": "4004" }},
-            "presentation": { "group": "A" },
+            "presentation": { "group": "A" }
-            "problemMatcher": []
         },
         {
-            "type": "shell", "label": "cds run bookshop-enhanced",
+            "type": "npm", "script": "watch", "path": "packages/reviews-service/",
-            "command": "npx", "args": [ "cds", "watch", "packages/bookshop-enhanced" ],
+            "options": { "env": { "PORT": "5005" }},
-            "presentation": { "group": "A" },
+            "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": []
         }
     ]
 }

Jenkinsfile

@@ -0,0 +1,24 @@
+#!/usr/bin/env groovy
+
+/*
+ * This file bootstraps the codified Continuous Delivery pipeline for extensions of SAP solutions, such as SAP S/4HANA.
+ * The pipeline helps you to deliver software changes quickly and in a reliable manner.
+ * A suitable Jenkins instance is required to run the pipeline.
+ * The Jenkins can easily be bootstraped using the life-cycle script located inside the 'cx-server' directory.
+ *
+ * More information on getting started with Continuous Delivery can be found in the following places:
+ *   - GitHub repository: https://github.com/SAP/cloud-s4-sdk-pipeline
+ *   - Blog Post: https://blogs.sap.com/2017/09/20/continuous-integration-and-delivery
+ */
+
+/*
+ * Set pipelineVersion to a fixed released version (e.g. "v15") when running in a productive environment.
+ * To find out about available versions and release notes, visit: https://github.com/SAP/cloud-s4-sdk-pipeline/releases
+ */
+String pipelineVersion = "v28"
+
+node {
+    deleteDir()
+    sh "git clone --depth 1 https://github.com/SAP/cloud-s4-sdk-pipeline.git -b ${pipelineVersion} pipelines"
+    load './pipelines/s4sdk-pipeline.groovy'
+}

README.md

@@ -2,6 +2,20 @@
 
 Find here the samples for the openSAP course [Building Applications with the SAP Cloud Application Programming Model](https://open.sap.com/courses/cp7).
 
+## Notes on the Demo in Week 4 Unit 4
+To add all pipeline specific file to your project, run the following command:
+
+```sh
+cds add pipeline
+```
+
+Details on how to start your Jenkins in your own environment can be found in the [Operations Guide](https://github.com/SAP/devops-docker-cx-server/blob/master/docs/operations/cx-server-operations-guide.md).
+
+Please note that other than shown in the video Jenkins now is secured by default with an admin user and password.
+After you have started Jenkins with the command `cx-server start`, you can get the initial password by running `./cx-server initial-credentials`.
+
+The pipeline documentation can be found [here](https://sap.github.io/jenkins-library/pipelines/cloud-sdk/introduction/).
+
 ## Get Access to SAP Business Application Studio
 The recommended environment for the course is SAP Business Application Studio.  Watch [unit 2 of week 1](https://open.sap.com/courses/cp7/items/51pzQUzbXHr2kdbOmVs6jI) for how to get access.
 
@@ -11,8 +25,8 @@ 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-week4-unit3-final
+git clone https://github.com/sap-samples/cloud-cap-samples -b openSAP-week4-unit4
-cd projects/cloud-cap-samples
+cd cloud-cap-samples
 ```
 
 In the `cloud-cap-samples` folder run:
@@ -20,17 +34,6 @@ In the `cloud-cap-samples` folder run:
 npm install
 ```
 
-## Run
-
-Now you're ready to run the samples, for example:
-```sh
-cd packages/bookshop
-cds watch
-```
-
-After that, watch out for the little popup in the lower right corner of SAP Business Application Studio that asks you to open the application in your browser.
-
-
 ## Get Support
 
 Check out the cap docs at https://cap.cloud.sap. <br>

app/fiori.html

@@ -43,7 +43,7 @@
 	<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_belize"
+    	data-sap-ui-theme="sap_fiori_3"
     	data-sap-ui-frameOptions="allow"
 	></script>
 	<script>

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

@@ -0,0 +1,3 @@
+ID;modifiedAt;createdAt;createdBy;modifiedBy;OrderNo;currency_code
+7e2f2640-6866-4dcf-8f4d-3027aa831cad;;2019-01-31;john.doe@test.com;;1;EUR
+64e718c9-ff99-47f1-8ca3-950c850777d4;;2019-01-30;jane.doe@test.com;;2;EUR

db/schema.cds

@@ -0,0 +1,35 @@
+namespace sap.capire.bookshop;
+using { Currency, managed, cuid } from '@sap/cds/common';
+
+entity Books : managed {
+  key ID : Integer;
+  title  : localized String(111);
+  descr  : localized String(1111);
+  author : Association to Authors;
+  stock  : Integer;
+  price  : Decimal(9,2);
+  currency : Currency;
+}
+
+entity Authors : managed {
+  key ID : Integer;
+  name   : String(111);
+  dateOfBirth  : Date;
+  dateOfDeath  : Date;
+  placeOfBirth : String;
+  placeOfDeath : String;
+  books  : Association to many Books on books.author = $self;
+}
+
+entity Orders : cuid, managed {
+  OrderNo  : String @title:'Order Number'; //> readable key
+  Items    : Composition of many OrderItems on Items.parent = $self;
+  total    : Decimal(9,2) @readonly;
+  currency : Currency;
+}
+entity OrderItems : cuid {
+  parent    : Association to Orders;
+  book      : Association to Books;
+  amount    : Integer;
+  netAmount : Decimal(9,2);
+}

lerna.json

@@ -1 +0,0 @@
-{"packages":["packages/*"],"version":"1.0.0"}

mta.yaml

@@ -0,0 +1,64 @@
+####### Generated mta.yaml based on template version 0.2.0
+####### appName = capire-bookshop
+####### language=nodejs; multiTenant=
+####### 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 
+
+   
+   requires:
+    #### Resources extracted from CAP configuration ####
+    - name: capire-bookshop-db
+
+   provides:
+    - name: srv-binding    # required by consumers of CAP services (e.g. approuter)
+      properties:
+        srv-url: ${default-url}
+
+ ############################################################
+
+ ##############    SIDECAR MODULE   #########################
+ - name: db
+    
+   type: hdb
+   path: gen/db  
+   parameters:
+     app-name: capire-bookshop-db  
+   requires:
+    #### Hana and xsuaa resources extracted from CAP configuration ####
+    - name: capire-bookshop-db
+ ############################################################
+
+
+##############  RESOURCES  ##################################
+resources:
+ ##### Services extracted from CAP configuration  ####
+ ##### 'service-plan' can be configured via 'cds.requires.<name>.vcap.plan'
+ - name: capire-bookshop-db
+   type: com.sap.xs.hdi-container 
+   
+   parameters:
+   properties:
+     hdi-service-name: ${service-name}   # required for Java case
+############################################################

package.json

@@ -1,28 +1,29 @@
 {
-  "name": "@sap/capire-samples",
+  "name": "@sap/capire-bookshop",
-  "description": "The umbrella project for all samples to easily setup for local development and tests.",
+  "version": "1.0.0",
-  "repository": "https://github.com/SAP-samples/cloud-cap-samples.git",
+  "description": "A simple bookshop application, build in a self-contained all-in-one fashion, i.e. w/o reusing other packages.",
-  "author": "daniel.hutzel@sap.com",
+  "license": "SAP SAMPLE CODE LICENSE",
-  "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",
-    "bookshop-enhanced": "cds watch packages/bookshop-enhanced",
-    "bookshop": "cds watch packages/bookshop",
-    "bookstore": "cds watch packages/bookstore",
-    "products-service": "cds watch packages/products-service",
-    "reviews-service": "cds watch packages/reviews-service"
-  },
   "dependencies": {
     "@sap/cds": "^3",
-    "express": "^4"
+    "express": "^4",
+    "@sap/hana-client": "^2.4.182"
   },
-  "--add-these-to-devDependencies-for-tests": {
+  "devDependencies": {
-    "@types/jest": "*",
+    "sqlite3": "^4.1.1"
-    "sqlite3": "*",
-    "jest": "*"
   },
-  "license": "SAP SAMPLE CODE LICENSE"
+  "scripts": {
+    "start": "cds run",
+    "watch": "cds watch"
+  },
+  "cds": {
+    "requires": {
+      "db": {
+        "kind": "hana",
+        "model": [
+          "db",
+          "srv"
+        ]
+      }
+    }
+  }
 }

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

@@ -1,5 +0,0 @@
-ID;modifiedAt;createdAt;createdBy;modifiedBy;OrderNo;currency_code;status
-da86efd0-4ba1-4078-b7f0-5c9c530297f7;;2019-01-31;ALICE;;1;EUR;processing
-2f2f2640-6866-4dcf-8f4d-3027aa831cad;;2019-03-25;ALICE;;10;EUR;completed
-64e718c9-ff99-47f1-8ca3-950c850777d4;;2019-01-30;BOB;;2;EUR;processing
-1af3322d-3cb1-46be-b312-0ae9ec311537;;2019-03-16;BOB;;9;EUR;completed

packages/bookshop/db/schema.cds

@@ -1,50 +0,0 @@
-namespace sap.capire.bookshop;
-
-using {
-  Currency,
-  managed,
-  cuid
-} from '@sap/cds/common';
-
-type Status : String enum {
-  completed;
-  processing;
-  blocked;
-}
-
-entity Books : managed {
-  key ID       : Integer;
-      title    : localized String(111);
-      descr    : localized String(1111);
-      author   : Association to Authors;
-      stock    : Integer;
-      price    : Decimal(9, 2);
-      currency : Currency;
-}
-
-entity Authors : managed {
-  key ID           : Integer;
-      name         : String(111);
-      dateOfBirth  : Date;
-      dateOfDeath  : Date;
-      placeOfBirth : String;
-      placeOfDeath : String;
-      books        : Association to many Books
-                       on books.author = $self;
-}
-
-entity Orders : cuid, managed {
-  OrderNo  : String       @title : 'Order Number'; //> readable key
-   status   : Status default 'processing';
-   Items    : Composition of many OrderItems
-               on Items.parent = $self;
-  total    : Decimal(9, 2)@readonly;
-  currency : Currency;
-}
-
-entity OrderItems : cuid {
-  parent    : Association to Orders;
-  book      : Association to Books;
-  amount    : Integer;
-  netAmount : Decimal(9, 2);
-}

packages/bookshop/package.json

@@ -1,32 +0,0 @@
-{
-  "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",
-    "@sap/xb-msg-amqp-v100": "^0.9.35"
-  },
-  "devDependencies": {
-    "sqlite3": "^4.1.1"
-  },
-  "scripts": {
-    "start": "npx cds run"
-  },
-  "cds": {
-    "requires": {
-      "API_BUSINESS_PARTNER": {
-        "kind": "odata",
-        "model": "srv/external/API_BUSINESS_PARTNER",
-        "--credentials": {
-          "prefix": "sap/S4HANAOD/c098/BO",
-          "destination": "cap-api098"
-        }
-      },
-      "--messaging": {
-        "kind": "enterprise-messaging"
-      }
-    }
-  }
-}

packages/bookshop/req.http

@@ -1,6 +0,0 @@
-PATCH http://localhost:4004/api-business-partner/A_BusinessPartner('ALICE')
-Content-Type: application/json
-
-{
-    "BusinessPartnerIsBlocked": true
-}

packages/bookshop/srv/cat-service.cds

@@ -1,26 +0,0 @@
-using { sap.capire.bookshop as my } from '../db/schema';
-using { API_BUSINESS_PARTNER as external } from './external/API_BUSINESS_PARTNER.csn';
-
-@path:'/browse'
-service CatalogService {
-
-  @readonly entity Books as SELECT from my.Books {*,
-    author.name as author
-  } excluding { createdBy, modifiedBy };
-
-  @readonly entity BusinessPartners as projection on external.A_BusinessPartner {
-    key BusinessPartner as ID,
-    FirstName,
-    MiddleName,
-    LastName,
-    BusinessPartnerIsBlocked
-  };
-
-  event OrderBlocked {
-    ID: UUID;
-  };
-
-  @requires_: 'authenticated-user'
-  @insertonly entity Orders as projection on my.Orders;
-
-}

packages/bookshop/srv/cat-service.js

@@ -1,41 +0,0 @@
-const cds = require('@sap/cds')
-
-/** Service implementation for CatalogService */
-module.exports = cds.service.impl(async function () {
-  const { Books, Orders, BusinessPartners } = this.entities
-  const bupaSrv = await cds.connect.to('API_BUSINESS_PARTNER')
-  this.after('READ', Books, each => each.stock > 111 && _addDiscount2(each, 11))
-  this.before('CREATE', Orders, _reduceStock)
-  this.on('READ', BusinessPartners, req => bupaSrv.tx(req).run(req.query))
-
-  /** Block orders if business partner is blocked */
-  bupaSrv.on('BusinessPartner/Changed', async msg => {
-    console.log('>> Received BusinessPartner/Changed', msg.data)
-    const BUSINESSPARTNER = msg.data.KEY[0].BUSINESSPARTNER
-    const tx = cds.tx(msg)
-    const orders = await tx.run(SELECT('ID').from(Orders).where({ createdBy: BUSINESSPARTNER, status: 'processing' }))
-    if (!orders.length) return
-    const businessPartner = await bupaSrv.tx(msg).run(SELECT.one('BusinessPartnerIsBlocked').from(BusinessPartners).where({ ID: BUSINESSPARTNER }))
-    if (!businessPartner || !businessPartner.BusinessPartnerIsBlocked) return
-    await Promise.all(orders.map(order => tx.run(UPDATE(Orders).where(order).set({ status: 'blocked' }))))
-    orders.forEach(order => this.emit('OrderBlocked', order) && console.log('>> Emitted OrderBlocked', order))
-  })
-
-  /** Add some discount for overstocked books */
-  function _addDiscount2(each, discount) {
-    each.title += ` -- ${discount}% discount!`
-  }
-
-  /** Reduce stock of ordered books if available stock suffices */
-  async function _reduceStock(req) {
-    const { Items: OrderItems } = req.data
-    return cds.transaction(req).run(() => OrderItems.map(order =>
-      UPDATE(Books).set('stock -=', order.amount)
-        .where('ID =', order.book_ID).and('stock >=', order.amount)
-    )).then(all => all.forEach((affectedRows, i) => {
-      if (affectedRows === 0) req.error(409,
-        `${OrderItems[i].amount} exceeds stock for book #${OrderItems[i].book_ID}`
-      )
-    }))
-  }
-})

packages/bookshop/srv/external/API_BUSINESS_PARTNER.js

@@ -1,9 +0,0 @@
-module.exports = srv => {
-    srv.on(['CREATE', 'UPDATE', 'DELETE'], req => {
-        const payload = {
-            KEY: [{ BUSINESSPARTNER: req.data.BusinessPartner }]
-        }
-        srv.emit('BusinessPartner/Changed', payload)
-        console.log('<< Emitted BusinessPartner/Changed', payload)
-    })
-}

packages/bookshop/srv/external/data/API_BUSINESS_PARTNER-A_BusinessPartner.csv

@@ -1,4 +0,0 @@
-BusinessPartner;FirstName;MiddleName;LastName;BusinessPartnerIsBlocked
-ALICE;Alice;In;Wonderland;false
-BOB;Bob;The;Builder;false
-JABBA;Jabba;The;Hutt;true

pipeline_config.yml

@@ -0,0 +1,47 @@
+###
+# This file configures the SAP Cloud SDK Continuous Delivery pipeline of your project.
+# For a reference of the configuration concept and available options, please have a look into its documentation.
+#
+# The documentation for the most recent pipeline version can always be found at:
+#    https://github.com/SAP/cloud-s4-sdk-pipeline/blob/master/configuration.md
+# If you are using a fixed version of the pipeline, please make sure to view the corresponding version from the tag
+# list of GitHub (e.g. "v15" when you configured pipelineVersion = "v15" in the Jenkinsfile).
+#
+# For general information on how to get started with Continuous Delivery, visit:
+#    https://blogs.sap.com/2017/09/20/continuous-integration-and-delivery
+#
+# We aim to keep the pipeline configuration as stable as possible. However, major changes might also imply breaking
+# changes in the configuration. Before doing an update, please check the the release notes of all intermediate releases
+# and adapt this file if necessary.
+#
+# This is a YAML-file. YAML is a indentation-sensitive file format. Please make sure to properly indent changes to it.
+###
+
+
+
+### General project setup
+general:
+  productiveBranch: 'openSAP-week4-unit4'
+
+### Step-specific configuration
+steps:
+
+
+### Stage-specific configuration
+stages:
+
+#  integrationTests:
+#    credentials:
+#      - alias: 'mySystemAlias'
+#        credentialId: 'mySystemCredentialsId'
+
+#  s4SdkQualityChecks:
+#    nonErpDestinations:
+#      - 'myCustomDestination'
+
+#   productionDeployment:
+#     cfTargets:
+#       - org: 'myOrg'
+#         space: 'mySpace'
+#         apiEndpoint: 'https://api.cf.eu10.hana.ondemand.com'
+#         credentialsId: 'cf-deploy-sap'

srv/cat-service.cds

@@ -0,0 +1,13 @@
+using { sap.capire.bookshop as my } from '../db/schema';
+
+@path:'/browse'
+service CatalogService {
+
+  @readonly entity Books as SELECT from my.Books {*,
+    author.name as author
+  } excluding { createdBy, modifiedBy };
+
+  @requires_: 'authenticated-user'
+  @insertonly entity Orders as projection on my.Orders;
+
+}

srv/cat-service.js

@@ -0,0 +1,26 @@
+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)
+})
+
+/** 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}`
+    )
+  }))
+}