Merge branch 'main' of https://github.com/sap-tutorials/btp-dev-guidance

Author: slavipande

README.md

@@ -55,14 +55,14 @@ The guidance is divided into several groups of tutorials when published on the [
 
 - [Consume Remote Services from a Mock Server in Your Full-Stack CAP Application Following the SAP BTP Developer's Guide and Deploy to SAP BTP, Cloud Foundry Runtime](). This group includes the following tutorials:
     - [Introduction to Remote Service Connectivity](https://developers.sap.com/tutorials/remote-service-intro.html) 
-    - [Get the Business Partner API and Extend the Incident Management Application](https://developers.sap.com/tutorials/remote-service-extend-cf.html)
+    - [Get the Business Partner API and Extend the Incident Management Application](https://developers.sap.com/tutorials/remote-service-extend.html)
     - [Test the Extended Incident Management Application with the Business Partner API](https://developers.sap.com/tutorials/remote-service-run-dev-test.html)
     - [Install a Mock Server in the SAP BTP, Cloud Foundry Runtime](https://developers.sap.com/tutorials/remote-service-set-up-mock-cf.html)
     - [Deploy and Run the Incident Management Application in the SAP BTP, Cloud Foundry Runtime with a Mock Server](https://developers.sap.com/tutorials/remote-service-deploy-with-mock-cf.html)
 
 - [Consume Remote Services from S/4HANA Cloud in Your Full-Stack CAP Application Following the SAP BTP Developer's Guide and Deploy to SAP BTP, Cloud Foundry Runtime]() This group includes the following tutorials:
     - [Introduction to Remote Service Connectivity](https://developers.sap.com/tutorials/remote-service-intro.html) 
-    - [Get the Business Partner API and Extend the Incident Management Application](https://developers.sap.com/tutorials/remote-service-extend-cf.html)
+    - [Get the Business Partner API and Extend the Incident Management Application](https://developers.sap.com/tutorials/remote-service-extend.html)
     - [Test the Extended Incident Management Application with the Business Partner API](https://developers.sap.com/tutorials/remote-service-run-dev-test.html)
     - [Configure Connectivity Between SAP S/4HANA Cloud and SAP Business Technology Platform](https://developers.sap.com/tutorials/remote-service-configure-connectivity.html)
     - [Deploy and Run the Application on Cloud Foundry with SAP S/4HANA Cloud Backend](https://developers.sap.com/tutorials/remote-service-deploy-to-cf.html)

tutorials/add-custom-logic/add-custom-logic.md

@@ -51,21 +51,14 @@ In this tutorial, you add some custom code to the CAP application. Depending on
       }
 
       changeUrgencyDueToSubject(data) {
-        if (data) {
-          const incidents = Array.isArray(data) ? data : [data];
-          incidents.forEach((incident) => {
-            if (incident.title?.toLowerCase().includes("urgent")) {
-              incident.urgency = { code: "H", descr: "High" };
-            }
-          });
-        }
+        let urgent = data.title?.match(/urgent/i)
+        if (urgent) data.urgency_code = 'H'
       }
 
       /** Custom Validation */
       async onUpdate (req) {
-        const { status_code } = await SELECT.one(req.subject, i => i.status_code).where({ID: req.data.ID})
-        if (status_code === 'C')
-          return req.reject(`Can't modify a closed incident`)
+        let closed = await SELECT.one(1) .from (req.subject) .where `status.code = 'C'`
+        if (closed) req.reject `Can't modify a closed incident!`
       }
     }
     module.exports = { ProcessorService }

tutorials/build-cap-app/build-cap-app.md

@@ -206,7 +206,7 @@ You've configured the SAP Business Application Studio. Follow the steps in the [
     key ID        : String;
     firstName     : String;
     lastName      : String;
-    name          : String = firstName ||' '|| lastName;
+    name          : String = trim(firstName ||' '|| lastName);
     email         : EMailAddress;
     phone         : PhoneNumber;
     incidents     : Association to many Incidents on incidents.customer = $self;

tutorials/remote-service-extend/remote-service-extend.md

@@ -147,7 +147,7 @@ For this scenario, you use the Business Partner API from SAP S/4HANA Cloud.
 
     4. Add the custom handler implementation after the **init()** method:
 
-        ```js[9-37]
+        ```js[9-44]
         async init() {
           this.before("UPDATE", "Incidents", (req) => this.onUpdate(req));
           this.after("READ", "Incidents", (data) => this.changeUrgencyDueToSubject(data));
@@ -158,26 +158,33 @@ For this scenario, you use the Business Partner API from SAP S/4HANA Cloud.
 
         async onCustomerRead(req) {
           console.log('>> delegating to S4 service...', req.query);
-          const top = parseInt(req._queryOptions?.$top) || 100;
-          const skip = parseInt(req._queryOptions?.$skip) || 0;
-        
-          const { BusinessPartner } = this.remoteService.entities;
+          let { limit, one } = req.query.SELECT
+          if(!limit) limit = { rows: { val: 55 }, offset: { val: 0 } } //default limit to 55 rows
 
+          const { BusinessPartner } = this.remoteService.entities;
+          const query = SELECT.from(BusinessPartner, bp => {
+            bp('*');
+            bp.addresses(address => {
+              address('email');
+              address.email(emails => {
+                emails('email');
+              });
+            });
+          }).limit(limit)
+
+          if(one){
+            // support for single entity read
+            query.where({ ID: req.data.ID });
+          }
           // Expands are required as the runtime does not support path expressions for remote services
-          let result = await this.S4bupa.run(SELECT.from(BusinessPartner, bp => {
-            bp('*'),
-              bp.addresses(address => {
-                address('email'),
-                  address.email(emails => {
-                    emails('email');
-                  });
-              })
-          }).limit(top, skip));
-        
+          let result = await this.S4bupa.run(query);
+
           result = result.map((bp) => ({
             ID: bp.ID,
             name: bp.name,
-            email: bp.addresses[0]?.email[0]?.email
+            email: (bp.addresses[0]?.email[0]?.email || ''),
+            firstName: bp.firstName,
+            lastName: bp.lastName,
           }));
 
           // Explicitly set $count so the values show up in the value help in the UI
@@ -233,23 +240,23 @@ For this scenario, you use the Business Partner API from SAP S/4HANA Cloud.
           const newCustomerId = req.data.customer_ID;
           const result = await next();
           const { BusinessPartner } = this.remoteService.entities;
-          if (newCustomerId && (newCustomerId !== "") && ((req.event == "CREATE") || (req.event == "UPDATE"))) {
+          if (newCustomerId && newCustomerId !== "") {
             console.log('>> CREATE or UPDATE customer!');
 
             // Expands are required as the runtime does not support path expressions for remote services
             const customer = await this.S4bupa.run(SELECT.one(BusinessPartner, bp => {
-              bp('*'),
+              bp('*');
                 bp.addresses(address => {
-                  address('email', 'phoneNumber'),
+                  address('email', 'phoneNumber');
                     address.email(emails => {
                       emails('email')
-                    }),
+                    });
                     address.phoneNumber(phoneNumber => {
                       phoneNumber('phone')
                     })
                 })
             }).where({ ID: newCustomerId }));
-                                                                                      
+
             if(customer) {
               customer.email = customer.addresses[0]?.email[0]?.email;
               customer.phone = customer.addresses[0]?.phoneNumber[0]?.phone;