Merge branch 'main' into dependabot/npm_and_yarn/axios-1.6.0

SAP-samples · Nov 6, 2023 · 3abcff1 · 3abcff1
2 parents df27d08 + 1ff14d3
commit 3abcff1
Show file tree

Hide file tree

Showing 8 changed files with 380 additions and 152 deletions.
diff --git a/README.md b/README.md
@@ -1,10 +1,16 @@
 # Welcome to cap/samples
 
-Find here a collection of samples for the [SAP Cloud Application Programming Model](https://cap.cloud.sap) organized in a simplistic [monorepo setup](samples.md#all-in-one-monorepo). &rarr; See [**Overview** of contained samples](samples.md)
+Find here a collection of samples for the [SAP Cloud Application Programming Model](https://cap.cloud.sap) organized in a simplistic [monorepo setup](samples.md#all-in-one-monorepo).
+
+[See **Overview** of contained samples](samples.md):
+
+![](etc/samples.drawio.svg)
 
 ![](https://github.com/SAP-samples/cloud-cap-samples/workflows/CI/badge.svg)
 [![REUSE status](https://api.reuse.software/badge/github.com/SAP-samples/cloud-cap-samples)](https://api.reuse.software/info/github.com/SAP-samples/cloud-cap-samples)
 
+
+
 ### Preliminaries
 
 1. Ensure you have the latest LTS version of Node.js installed (see [Getting Started](https://cap.cloud.sap/docs/get-started/))

diff --git a/bookshop/db/schema.cds b/bookshop/db/schema.cds
@@ -2,25 +2,25 @@ using { Currency, managed, sap } from '@sap/cds/common';
 namespace sap.capire.bookshop;
 
 entity Books : managed {
-  key ID : Integer;
-  title  : localized String(111) @mandatory ;
-  descr  : localized String(1111);
-  author : Association to Authors @mandatory;
-  genre  : Association to Genres;
-  stock  : Integer;
-  price  : Decimal;
+  key ID   : Integer;
+  title    : localized String(111)  @mandatory;
+  descr    : localized String(1111);
+  author   : Association to Authors @mandatory;
+  genre    : Association to Genres;
+  stock    : Integer;
+  price    : Decimal;
   currency : Currency;
-  image : LargeBinary @Core.MediaType : 'image/png';
+  image    : LargeBinary @Core.MediaType: 'image/png';
 }
 
 entity Authors : managed {
-  key ID : Integer;
-  name   : String(111) @mandatory;
+  key ID       : Integer;
+  name         : String(111) @mandatory;
   dateOfBirth  : Date;
   dateOfDeath  : Date;
   placeOfBirth : String;
   placeOfDeath : String;
-  books  : Association to many Books on books.author = $self;
+  books        : Association to many Books on books.author = $self;
 }
 
 /** Hierarchically organized Code List for Genres */

diff --git a/bookshop/srv/admin-service.js b/bookshop/srv/admin-service.js
@@ -8,6 +8,6 @@ module.exports = class AdminService extends cds.ApplicationService { init(){
 
 /** Generate primary keys for target entity in request */
 async function genid (req) {
-  const {ID} = await cds.tx(req).run (SELECT.one.from(req.target).columns('max(ID) as ID'))
-  req.data.ID = ID - ID % 100 + 100 + 1
+  const {id} = await SELECT.one.from(req.target).columns('max(ID) as id')
+  req.data.ID = id - id % 100 + 100 + 1
 }
diff --git a/bookstore/srv/mashup.cds b/bookstore/srv/mashup.cds
@@ -4,39 +4,28 @@
 //    respective reuse packages and services
 //
 
-using { sap.capire.bookshop.Books } from '@capire/bookshop';
 
 //
 //  Extend Books with access to Reviews and average ratings
 //
+using { sap.capire.bookshop.Books } from '@capire/bookshop';
 using { ReviewsService.Reviews } from '@capire/reviews';
 extend Books with {
   reviews : Composition of many Reviews on reviews.subject = $self.ID;
-
-  @Common.Label : '{i18n>Rating}'
-  rating  : Decimal;
-
-  @Common.Label : '{i18n>NumberOfReviews}'
-  numberOfReviews : Integer;
+  rating  : type of Reviews:rating; // average rating
+  numberOfReviews : Integer @title : '{i18n>NumberOfReviews}';
 }
 
 
 //
 //  Extend Orders with Books as Products
 //
 using { sap.capire.orders.Orders } from '@capire/orders';
-extend Orders with {
-  extend Items with {
-    book : Association to Books on product.ID = book.ID
-  }
+extend Orders:Items with {
+  book : Association to Books on product.ID = book.ID
 }
 
-
-// Add orders fiori app (in case of embedded orders service)
+// Ensure models from all imported packages are loaded
 using from '@capire/orders/app/fiori';
-
-// Add data browser
 using from '@capire/data-viewer';
-
-// Incorporate pre-build extensions from...
 using from '@capire/common';
diff --git a/etc/dark.drawio.svg b/etc/dark.drawio.svg
diff --git a/etc/incidents.drawio.svg b/etc/incidents.drawio.svg
diff --git a/etc/samples.drawio.svg b/etc/samples.drawio.svg
diff --git a/samples.md b/samples.md
@@ -3,6 +3,8 @@
 The following list gives an overview of the samples provided in subdirectories.
 Each sub directory essentially is an individual npm package arranged in an [all-in-one monorepo](#all-in-one-monorepo) umbrella setup.
 
+![](etc/samples.drawio.svg)
+
 
 ## [@capire/hello-world](hello)