From aa28804a511d8b4cd1532b814724d0629313ad2b Mon Sep 17 00:00:00 2001 From: Daniel Hutzel Date: Sat, 29 Jan 2022 23:49:30 +0100 Subject: [PATCH] Basic bookshop w/o reuse deps (#312) --- bookshop/app/services.cds | 2 -- bookshop/db/init.js | 24 ++++++++++++++++++++++++ bookshop/package.json | 1 - bookstore/srv/mashup.cds | 3 +++ common/index.cds | 2 +- 5 files changed, 28 insertions(+), 4 deletions(-) delete mode 100644 bookshop/app/services.cds create mode 100644 bookshop/db/init.js diff --git a/bookshop/app/services.cds b/bookshop/app/services.cds deleted file mode 100644 index ce737b46..00000000 --- a/bookshop/app/services.cds +++ /dev/null @@ -1,2 +0,0 @@ -// Incorporate pre-build extensions from... -using from '@capire/common'; diff --git a/bookshop/db/init.js b/bookshop/db/init.js new file mode 100644 index 00000000..0db736ca --- /dev/null +++ b/bookshop/db/init.js @@ -0,0 +1,24 @@ +/** + * In order to keep basic bookshop sample as simple as possible, we don't add + * reuse dependencies. This db/init.js ensures we still have a minimum set of + * currencies, if not obtained through @capire/common. + */ + +module.exports = async (db)=>{ + + const has_common = db.model.definitions['sap.common.Currencies'].elements.numcode + if (has_common) return + + const already_filled = await db.exists('sap.common.Currencies',{code:'EUR'}) + if (already_filled) return + + await INSERT.into ('sap.common.Currencies') .columns ( + 'code','symbol','name' + ) .rows ( + [ 'EUR','€','Euro' ], + [ 'USD','$','US Dollar' ], + [ 'GBP','£','British Pound' ], + [ 'ILS','₪','Shekel' ], + [ 'JPY','¥','Yen' ], + ) +} diff --git a/bookshop/package.json b/bookshop/package.json index e7125251..1eb86ded 100644 --- a/bookshop/package.json +++ b/bookshop/package.json @@ -3,7 +3,6 @@ "version": "1.0.0", "description": "A simple self-contained bookshop service.", "dependencies": { - "@capire/common": "*", "@sap/cds": "^5.0.4", "express": "^4.17.1", "passport": "0.4.1" diff --git a/bookstore/srv/mashup.cds b/bookstore/srv/mashup.cds index 5bcc4446..061418c0 100644 --- a/bookstore/srv/mashup.cds +++ b/bookstore/srv/mashup.cds @@ -33,3 +33,6 @@ 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/common/index.cds b/common/index.cds index 39e42d28..cb89e28d 100644 --- a/common/index.cds +++ b/common/index.cds @@ -20,7 +20,7 @@ extend sap.common.Currencies with { * annotate sap.common.Countries with @cds.persistence.skip:false; */ -context sap.common_countries { +context sap.common.countries { extend sap.common.Countries { regions : Composition of many Regions on regions._parent = $self.code;