Compare commits
1 Commits
use-db-con
...
data-load
| Author | SHA1 | Date | |
|---|---|---|---|
|
11f3b357e4 |
@@ -1,24 +1,18 @@
|
|||||||
const { exec } = require ('child_process')
|
const { exec } = require ('child_process')
|
||||||
const isWin = process.platform === 'win32'
|
|
||||||
const express = require ('express')
|
const express = require ('express')
|
||||||
const fs = require ('fs')
|
const fs = require ('fs')
|
||||||
const app = express()
|
const app = express()
|
||||||
|
|
||||||
const { PORT=4444 } = process.env
|
const { PORT=4444 } = process.env
|
||||||
const [,,port=PORT,scope='@capire'] = process.argv
|
const [,,port=PORT] = process.argv
|
||||||
const cwd = __dirname
|
const cwd = __dirname
|
||||||
|
|
||||||
// clean up on start (exit handler might not complete on Windows)
|
|
||||||
exec(isWin ? 'del *.tgz' : 'rm *.tgz', {cwd})
|
|
||||||
|
|
||||||
|
|
||||||
app.use('/-/:tarball', (req,res,next) => {
|
app.use('/-/:tarball', (req,res,next) => {
|
||||||
console.debug ('GET', req.params)
|
console.debug ('GET', req.params)
|
||||||
try {
|
try {
|
||||||
const { tarball } = req.params
|
const { tarball } = req.params
|
||||||
const [, pkg ] = /^\w+-(\w+)/.exec(tarball)
|
const [, pkg ] = /^capire-(\w+)/.exec(tarball)
|
||||||
fs.lstat(tarball,(err => {
|
fs.lstat(tarball,(err => {
|
||||||
if (err) console.debug (`npm pack ../${pkg}`)
|
|
||||||
if (err) exec(`npm pack ../${pkg}`,{cwd},next)
|
if (err) exec(`npm pack ../${pkg}`,{cwd},next)
|
||||||
else next()
|
else next()
|
||||||
}))
|
}))
|
||||||
@@ -31,14 +25,12 @@ app.use('/-/:tarball', (req,res,next) => {
|
|||||||
app.use('/-', express.static(__dirname))
|
app.use('/-', express.static(__dirname))
|
||||||
|
|
||||||
app.get('/*', (req,res)=>{
|
app.get('/*', (req,res)=>{
|
||||||
const urlRegex = /^\/(@\w+)\/(\w+)/
|
|
||||||
const url = decodeURIComponent(req.url)
|
const url = decodeURIComponent(req.url)
|
||||||
console.debug ('GET',url)
|
console.debug ('GET',url)
|
||||||
try {
|
try {
|
||||||
if (!urlRegex.test(url)) return res.sendStatus(404)
|
const [, capire, pkg ] = /^\/(@capire)\/(\w+)/.exec(url)
|
||||||
const [, scpe, pkg ] = urlRegex.exec(url)
|
const package = require (`${capire}/${pkg}/package.json`)
|
||||||
const package = require (`${scpe}/${pkg}/package.json`)
|
const tarball = `capire-${pkg}-${package.version}.tgz`
|
||||||
const tarball = `${scpe.slice(1)}-${pkg}-${package.version}.tgz`
|
|
||||||
// https://github.com/npm/registry/blob/master/docs/responses/package-metadata.md
|
// https://github.com/npm/registry/blob/master/docs/responses/package-metadata.md
|
||||||
res.json({
|
res.json({
|
||||||
"name": package.name,
|
"name": package.name,
|
||||||
@@ -50,30 +42,29 @@ app.get('/*', (req,res)=>{
|
|||||||
"name": package.name,
|
"name": package.name,
|
||||||
"version": package.version,
|
"version": package.version,
|
||||||
"dist": {
|
"dist": {
|
||||||
"tarball": `${server.url}/-/${tarball}`
|
"tarball": `http://localhost:${port}/-/${tarball}`
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
if (e.code === 'MODULE_NOT_FOUND') return res.sendStatus(404)
|
console.error(e)
|
||||||
console.error(e); throw e
|
res.sendStatus(404)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
const server = app.listen(port, ()=>{
|
app.listen(port, ()=>{
|
||||||
const url = server.url = `http://localhost:${server.address().port}`
|
console.log (`npm set @capire:registry=http://localhost:${port}`)
|
||||||
console.log (`npm set ${scope}:registry=${url}`)
|
console.log (`@capire registry listening on http://localhost:${port}`)
|
||||||
exec(`npm set ${scope}:registry=${url}`)
|
exec(`npm set @capire:registry=http://localhost:${port}`)
|
||||||
console.log (`${scope} registry listening on ${url}`)
|
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
const _exit = ()=>{
|
const _exit = ()=>{
|
||||||
server.close()
|
console.log ('\nnpm conf rm @capire:registry')
|
||||||
exec(`npm conf rm "${scope}:registry"`, ()=> { process.exit() })
|
exec('npm conf rm @capire:registry')
|
||||||
|
exec('rm *.tgz')
|
||||||
|
process.exit()
|
||||||
}
|
}
|
||||||
|
|
||||||
process.on ('SIGTERM',_exit)
|
process.on ('SIGTERM',_exit)
|
||||||
process.on ('SIGHUP',_exit)
|
process.on ('SIGHUP',_exit)
|
||||||
process.on ('SIGINT',_exit)
|
process.on ('SIGINT',_exit)
|
||||||
|
|||||||
@@ -68,35 +68,26 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"file": "fiori/package.json",
|
"file": "fiori/package.json",
|
||||||
"description": "#### Configuration\n\nThe `cds.requires` section in `package.json` is a place to configure which of the `db/sqlite` and `db/hana` folders are used for which database.\n\nWe use [Node.js profiles](https://cap.cloud.sap/docs/node.js/cds-env#profiles) to separate the configuration.\nIn the `development` profile, you can see that `db/sqlite` is set as the model, while the `db/hana` folder is configured in the `production` profile. `db-ext` is a pseudo datasource, its name doesn't matter.\n\nSee [`cds.resolve`](https://cap.cloud.sap/docs/node.js/cds-compile#cds-resolve) to learn more about how models are found.",
|
"description": "#### Configuration\n\nThe `cds` section in `package.json` is a place to configure which of the `db/sqlite` and `db/hana` folders are used for which database.\nWe use [Node.js profiles](https://cap.cloud.sap/docs/node.js/cds-env#profiles) to separate the configuration.\nIn the `development` profile, you can see that `db/sqlite` is set as the model, while the `db/hana` folder is configured in the `production` profile.",
|
||||||
"selection": {
|
"line": 17,
|
||||||
"start": {
|
|
||||||
"line": 41,
|
|
||||||
"character": 1
|
|
||||||
},
|
|
||||||
"end": {
|
|
||||||
"line": 48,
|
|
||||||
"character": 1
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"title": "Configuration"
|
"title": "Configuration"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"file": "fiori/package.json",
|
"file": "fiori/package.json",
|
||||||
"description": "#### Run with SQLite\n\nTo run with `development` and an in-memory SQLite database, you don't need to do anything special, because it's activated by default. Just run:\n\n>> cds watch fiori\n\nThen open [http://localhost:4004/admin/Authors](http://localhost:4004/admin/Authors) to see the two new fields.\n",
|
"description": "#### Run with SQLite\n\nTo run with `development` and an in-memory SQLite database, you don't need to do anything special, because it's activated by default. Just run:\n\n>> cds watch fiori\n\nThen open [http://localhost:4004/admin/Authors](http://localhost:4004/admin/Authors) to see the two new fields.\n",
|
||||||
"line": 43,
|
"line": 28,
|
||||||
"title": "Run with SQLite"
|
"title": "Run with SQLite"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"file": "fiori/package.json",
|
"file": "fiori/package.json",
|
||||||
"description": "#### Deploy the CDS Model to SAP HANA\n\nTo 'activate' SAP HANA through the `production` profile, you can use the global `--production` flag:\n\n>> cd fiori; cds deploy --to hana --production\n\n[Learn more about SAP HANA deployment](https://cap.cloud.sap/docs/guides/databases#get-hana)\n\n#### Run the Application\n\n>> cd fiori; cds watch --production\n\nThe service on [http://localhost:4004/admin/Authors](http://localhost:4004/admin/Authors) is the same as before, but this time the `Authors` entity is backed by a database view with an SAP HANA function.\n\n#### More\n\nIf you don't see data, you can add some in the next step.",
|
"description": "#### Deploy the CDS Model to SAP HANA\n\nTo 'activate' SAP HANA through the `production` profile, you can use the global `--production` flag:\n\n>> cd fiori; cds deploy --to hana --production\n\n[Learn more about SAP HANA deployment](https://cap.cloud.sap/docs/guides/databases#get-hana)\n\n#### Run the Application\n\n>> cd fiori; cds watch --production\n\nThe service on [http://localhost:4004/admin/Authors](http://localhost:4004/admin/Authors) is the same as before, but this time the `Authors` entity is backed by a database view with an SAP HANA function.\n\n#### More\n\nIf you don't see data, you can add some in the next step.",
|
||||||
"line": 46,
|
"line": 31,
|
||||||
"title": "Run with SAP HANA"
|
"title": "Run with SAP HANA"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"file": "fiori/test/requests.http",
|
"file": "fiori/test/requests.http",
|
||||||
"description": "### Add More Data\n\nOptionally you can add some `Authors` data by clicking on the _Send Request_ link (provided by the [REST client](https://marketplace.visualstudio.com/items?itemName=humao.rest-client) extension).",
|
"description": "### Add More Data\n\nOptionally you can add some `Authors` data by clicking on the _Send Request_ link (provided by the [REST client](https://marketplace.visualstudio.com/items?itemName=humao.rest-client) extension).",
|
||||||
"line": 72,
|
"line": 68,
|
||||||
"selection": {
|
"selection": {
|
||||||
"start": {
|
"start": {
|
||||||
"line": 67,
|
"line": 67,
|
||||||
@@ -113,5 +104,6 @@
|
|||||||
"title": "Wrap-up",
|
"title": "Wrap-up",
|
||||||
"description": "### Summary\n\nThat's it! You have seen: \n- How to integrate database-specific functions in a CDS model.\n- How to switch between the two implementations for SQLite and SAP HANA."
|
"description": "### Summary\n\nThat's it! You have seen: \n- How to integrate database-specific functions in a CDS model.\n- How to switch between the two implementations for SQLite and SAP HANA."
|
||||||
}
|
}
|
||||||
]
|
],
|
||||||
|
"ref": "main"
|
||||||
}
|
}
|
||||||
@@ -19,7 +19,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"file": "hello/srv/world.cds",
|
"file": "hello/world.cds",
|
||||||
"description": "### Hello World!\n\nThis is a simplistic [Hello World](https://cap.cloud.sap/docs/get-started/hello-world) service using [CDS](https://cap.cloud.sap/docs/cds/) and [cds.services](https://cap.cloud.sap/docs/node.js/api#services-api).",
|
"description": "### Hello World!\n\nThis is a simplistic [Hello World](https://cap.cloud.sap/docs/get-started/hello-world) service using [CDS](https://cap.cloud.sap/docs/cds/) and [cds.services](https://cap.cloud.sap/docs/node.js/api#services-api).",
|
||||||
"line": 2,
|
"line": 2,
|
||||||
"selection": {
|
"selection": {
|
||||||
@@ -68,7 +68,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"file": "orders/db/schema.cds",
|
"file": "orders/db/schema.cds",
|
||||||
"description": "### Orders - Compositions and Serving Documents\n\nA standalone orders management service, demonstrating:\n- Using [Compositions](https://cap.cloud.sap/docs/cds/cdl#compositions) in [Domain Models](https://cap.cloud.sap/docs/guides/domain-models), along with\n- [Serving deeply nested documents](https://cap.cloud.sap/docs/guides/generic-providers#serving-structured-data)\n",
|
"description": "### Compositions and Serving Documents\n\nA standalone orders management service, demonstrating:\n- Using [Compositions](https://cap.cloud.sap/docs/cds/cdl#compositions) in [Domain Models](https://cap.cloud.sap/docs/guides/domain-models), along with\n- [Serving deeply nested documents](https://cap.cloud.sap/docs/guides/generic-providers#serving-structured-data)\n",
|
||||||
"line": 1,
|
"line": 1,
|
||||||
"selection": {
|
"selection": {
|
||||||
"start": {
|
"start": {
|
||||||
@@ -84,7 +84,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"file": "reviews/db/schema.cds",
|
"file": "reviews/db/schema.cds",
|
||||||
"description": "### Reviews - More Modularity\n\nShows how to implement a modular service to manage product reviews, including:\n- Consuming other services synchronously and asynchronously\n- Serving requests synchronously\n- Emitting events asynchronously\n- Grow as you go, with:\n- Mocking app services\n- Running service meshes\n- Late-cut Micro Services\n- As well as managed data, input validations, and authorization\n",
|
"description": "### More Modularity\n\nShows how to implement a modular service to manage product reviews, including:\n- Consuming other services synchronously and asynchronously\n- Serving requests synchronously\n- Emitting events asynchronously\n- Grow as you go, with:\n- Mocking app services\n- Running service meshes\n- Late-cut Micro Services\n- As well as managed data, input validations, and authorization\n",
|
||||||
"line": 1,
|
"line": 1,
|
||||||
"selection": {
|
"selection": {
|
||||||
"start": {
|
"start": {
|
||||||
@@ -99,12 +99,8 @@
|
|||||||
"title": "Reviews"
|
"title": "Reviews"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"title": "Bookstore",
|
"file": "fiori/app/index.cds",
|
||||||
"description": "### Bookstore - Reuse and UI\n\n- A [composite app, reusing and combining](https://cap.cloud.sap/docs/guides/reuse-and-compose) these packages:\n - [@capire/bookshop](bookshop)\n - [@capire/reviews](reviews)\n - [@capire/orders](orders)\n - [@capire/common](common)\n- [The Vue.js app](bookshop/app/vue) imported from bookshop is served as well\n- [The Vue.js app](reviews/app/vue) imported from reviews is served as well\n- [The Fiori app](orders/app) imported from orders is served as well\n- [OpenAPI export + Swagger UI](https://cap.cloud.sap/docs/advanced/openapi)"
|
"description": "### Annotations for SAP Fiori Elements\n\nA [composite app, reusing and combining](https://cap.cloud.sap/docs/guides/verticalize) these packages:\n - [@capire/bookshop](bookshop)\n - [@capire/reviews](reviews)\n - [@capire/orders](orders)\n - [@capire/common](common)\n\n[Adds a SAP Fiori elements application](https://cap.cloud.sap/docs/guides/fiori/) to bookshop, thereby introducing to:\n - [OData Annotations](https://cap.cloud.sap/docs/guides/fiori#adding-odata-annotations) in `.cds` files\n - Support for [Fiori Draft](https://cap.cloud.sap/docs/guides/fiori#draft)\n - Support for [Value Helps](https://cap.cloud.sap/docs/guides/fiori#value-help)\n - Serving SAP Fiori apps locally\n\n[The Vue.js app](bookshop/app/vue) imported from bookshop is served as well.\n",
|
||||||
},
|
|
||||||
{
|
|
||||||
"file": "fiori/app/services.cds",
|
|
||||||
"description": "### Annotations for SAP Fiori Elements\n\n- [Adds an SAP Fiori elements application](https://cap.cloud.sap/docs/guides/fiori/) to bookstore, thereby introducing to:\n- [OData Annotations](https://cap.cloud.sap/docs/guides/fiori#adding-odata-annotations) in `.cds` files\n- Support for [Fiori Draft](https://cap.cloud.sap/docs/guides/fiori#draft)\n- Support for [Value Helps](https://cap.cloud.sap/docs/guides/fiori#value-help)\n- Serving SAP Fiori apps locally\n",
|
|
||||||
"line": 1,
|
"line": 1,
|
||||||
"selection": {
|
"selection": {
|
||||||
"start": {
|
"start": {
|
||||||
@@ -121,13 +117,14 @@
|
|||||||
{
|
{
|
||||||
"file": "package.json",
|
"file": "package.json",
|
||||||
"description": "### All-in-one Monorepo\n\nEach sample sub directory essentially is a standard npm package, some with standard npm dependencies to other samples. The root folder's [package.json](package.json) has local links to the sub folders, such that an `npm install` populates a local `node_modules` folder acts like a local npm registry to the individual sample packages.\n",
|
"description": "### All-in-one Monorepo\n\nEach sample sub directory essentially is a standard npm package, some with standard npm dependencies to other samples. The root folder's [package.json](package.json) has local links to the sub folders, such that an `npm install` populates a local `node_modules` folder acts like a local npm registry to the individual sample packages.\n",
|
||||||
|
"line": 8,
|
||||||
"selection": {
|
"selection": {
|
||||||
"start": {
|
"start": {
|
||||||
"line": 8,
|
"line": 8,
|
||||||
"character": 1
|
"character": 1
|
||||||
},
|
},
|
||||||
"end": {
|
"end": {
|
||||||
"line": 16,
|
"line": 15,
|
||||||
"character": 1
|
"character": 1
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -34,7 +34,7 @@
|
|||||||
<td>{{ book.author }}</td>
|
<td>{{ book.author }}</td>
|
||||||
<td>{{ book.genre.name }}</td>
|
<td>{{ book.genre.name }}</td>
|
||||||
<td class="rating-stars">
|
<td class="rating-stars">
|
||||||
{{ ('★'.repeat(Math.round(book.rating))+'☆☆☆☆☆').slice(0,5) }} ({{ book.numberOfReviews }})
|
{{ ('★'.repeat(Math.round(book.rating))+'☆☆☆☆☆').slice(0,5) }}
|
||||||
</td>
|
</td>
|
||||||
<td>{{ book.currency && book.currency.symbol }} {{ book.price }}</td>
|
<td>{{ book.currency && book.currency.symbol }} {{ book.price }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
@@ -1,2 +1 @@
|
|||||||
const { CatalogService } = require('./srv/cat-service')
|
exports.CatalogService = require('./srv/cat-service')
|
||||||
module.exports = { CatalogService }
|
|
||||||
|
|||||||
@@ -18,9 +18,6 @@
|
|||||||
"db": {
|
"db": {
|
||||||
"kind": "sql"
|
"kind": "sql"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"features": {
|
|
||||||
"assert_integrity": "db"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,18 +1,18 @@
|
|||||||
const cds = require('@sap/cds')
|
const cds = require('@sap/cds')
|
||||||
|
const { Books } = cds.entities ('sap.capire.bookshop')
|
||||||
|
|
||||||
class CatalogService extends cds.ApplicationService { init(){
|
class CatalogService extends cds.ApplicationService { init(){
|
||||||
|
|
||||||
const { Books } = cds.entities ('sap.capire.bookshop')
|
|
||||||
|
|
||||||
// Reduce stock of ordered books if available stock suffices
|
// Reduce stock of ordered books if available stock suffices
|
||||||
this.on ('submitOrder', async req => {
|
this.on ('submitOrder', async req => {
|
||||||
const {book,quantity} = req.data
|
const {book,quantity} = req.data
|
||||||
if (quantity < 1) return req.reject (400,`quantity has to be 1 or more`)
|
|
||||||
let {stock} = await SELECT `stock` .from (Books,book)
|
let {stock} = await SELECT `stock` .from (Books,book)
|
||||||
if (quantity > stock) return req.reject (409,`${quantity} exceeds stock for book #${book}`)
|
if (stock >= quantity) {
|
||||||
await UPDATE (Books,book) .with ({ stock: stock -= quantity })
|
await UPDATE (Books,book) .with (`stock -=`, quantity)
|
||||||
await this.emit ('OrderedBook', { book, quantity, buyer:req.user.id })
|
await this.emit ('OrderedBook', { book, quantity, buyer:req.user.id })
|
||||||
return { stock }
|
return { stock }
|
||||||
|
}
|
||||||
|
else return req.error (409,`${quantity} exceeds stock for book #${book}`)
|
||||||
})
|
})
|
||||||
|
|
||||||
// Add some discount for overstocked books
|
// Add some discount for overstocked books
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ GET {{server}}/browse/$metadata
|
|||||||
### ------------------------------------------------------------------------
|
### ------------------------------------------------------------------------
|
||||||
# Browse Books as any user
|
# Browse Books as any user
|
||||||
GET {{server}}/browse/Books?
|
GET {{server}}/browse/Books?
|
||||||
&$select=title,stock,author
|
# &$select=title,stock
|
||||||
# &$expand=currency
|
# &$expand=currency
|
||||||
# &sap-language=de
|
# &sap-language=de
|
||||||
{{me}}
|
{{me}}
|
||||||
@@ -32,19 +32,6 @@ GET {{server}}/admin/Authors?
|
|||||||
# &sap-language=de
|
# &sap-language=de
|
||||||
Authorization: Basic alice:
|
Authorization: Basic alice:
|
||||||
|
|
||||||
### ------------------------------------------------------------------------
|
|
||||||
# Create Author
|
|
||||||
POST {{server}}/admin/Authors
|
|
||||||
Content-Type: application/json;IEEE754Compatible=true
|
|
||||||
Authorization: Basic alice:
|
|
||||||
|
|
||||||
{
|
|
||||||
"ID": 112,
|
|
||||||
"name": "Shakespeeeeere",
|
|
||||||
"age": 22
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
### ------------------------------------------------------------------------
|
### ------------------------------------------------------------------------
|
||||||
# Create book
|
# Create book
|
||||||
POST {{server}}/admin/Books
|
POST {{server}}/admin/Books
|
||||||
@@ -62,22 +49,6 @@ Authorization: Basic alice:
|
|||||||
"currency": { "code": "USD" }
|
"currency": { "code": "USD" }
|
||||||
}
|
}
|
||||||
|
|
||||||
### ------------------------------------------------------------------------
|
|
||||||
# Create book with invalid author ID -> will fail
|
|
||||||
POST {{server}}/admin/Books
|
|
||||||
Content-Type: application/json;IEEE754Compatible=true
|
|
||||||
Authorization: Basic alice:
|
|
||||||
|
|
||||||
{
|
|
||||||
"ID": 34,
|
|
||||||
"title": "Let constraints do the magic",
|
|
||||||
"descr": "Database constraints are helpful little things that prevent messing up your data.",
|
|
||||||
"author": { "ID": 777 },
|
|
||||||
"genre": { "ID": 14 },
|
|
||||||
"stock": 4,
|
|
||||||
"price": "19.99",
|
|
||||||
"currency": { "code": "USD" }
|
|
||||||
}
|
|
||||||
|
|
||||||
### ------------------------------------------------------------------------
|
### ------------------------------------------------------------------------
|
||||||
# Put image to books
|
# Put image to books
|
||||||
|
|||||||
@@ -1,2 +0,0 @@
|
|||||||
namespace sap.capire.bookshop; //> important for reflection
|
|
||||||
using from './srv/mashup';
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "@capire/bookstore",
|
|
||||||
"version": "1.0.0",
|
|
||||||
"dependencies": {
|
|
||||||
"@capire/bookshop": "*",
|
|
||||||
"@capire/reviews": "*",
|
|
||||||
"@capire/orders": "*",
|
|
||||||
"@capire/common": "*",
|
|
||||||
"@sap/cds": "^5",
|
|
||||||
"express": "^4.17.1"
|
|
||||||
},
|
|
||||||
"cds": {
|
|
||||||
"requires": {
|
|
||||||
"ReviewsService": {
|
|
||||||
"kind": "odata",
|
|
||||||
"model": "@capire/reviews"
|
|
||||||
},
|
|
||||||
"OrdersService": {
|
|
||||||
"kind": "odata",
|
|
||||||
"model": "@capire/orders"
|
|
||||||
},
|
|
||||||
"messaging": {
|
|
||||||
"[development]": { "kind": "file-based-messaging" },
|
|
||||||
"[hybrid]": { "kind": "enterprise-messaging-shared" },
|
|
||||||
"[production]": { "kind": "enterprise-messaging" }
|
|
||||||
},
|
|
||||||
"db": {
|
|
||||||
"kind": "sql"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"log": { "service": true }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
const cds = require ('@sap/cds')
|
|
||||||
|
|
||||||
// Add mashup logic
|
|
||||||
cds.once('served', require('./srv/mashup'))
|
|
||||||
|
|
||||||
// Add routes to UIs from imported packages
|
|
||||||
cds.once('bootstrap',(app)=>{
|
|
||||||
app.serve ('/bookshop') .from ('@capire/bookshop','app/vue')
|
|
||||||
app.serve ('/reviews') .from ('@capire/reviews','app/vue')
|
|
||||||
app.serve ('/orders') .from('@capire/orders','app/orders')
|
|
||||||
})
|
|
||||||
|
|
||||||
// Add Swagger UI
|
|
||||||
require('./srv/swagger-ui')
|
|
||||||
|
|
||||||
// Returning cds.server
|
|
||||||
module.exports = cds.server
|
|
||||||
|
|
||||||
// For didactic reasons in capire
|
|
||||||
const { ReviewsService, OrdersService } = cds.requires
|
|
||||||
if (!ReviewsService.credentials && !OrdersService.credentials) cds.requires.messaging = false
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
|
|
||||||
// -----------------------------------------------------------------------
|
|
||||||
// Adding Swagger UI - see https://cap.cloud.sap/docs/advanced/openapi
|
|
||||||
const cds = require ('@sap/cds')
|
|
||||||
try {
|
|
||||||
const cds_swagger = require ('cds-swagger-ui-express')
|
|
||||||
cds.once ('bootstrap', app => app.use (cds_swagger()) )
|
|
||||||
} catch (err) {
|
|
||||||
if (err.code !== 'MODULE_NOT_FOUND') throw err
|
|
||||||
}
|
|
||||||
2
fiori/.env
Normal file
2
fiori/.env
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
# cds.requires.messaging.kind = file-based-messaging
|
||||||
|
PORT = 4004
|
||||||
@@ -1,47 +0,0 @@
|
|||||||
using {AdminService} from '@capire/bookshop';
|
|
||||||
|
|
||||||
annotate AdminService.Authors with @odata.draft.enabled;
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////
|
|
||||||
//
|
|
||||||
// Authors Object Page
|
|
||||||
//
|
|
||||||
annotate AdminService.Authors with @(UI : {
|
|
||||||
HeaderInfo : {
|
|
||||||
TypeName : 'Author',
|
|
||||||
TypeNamePlural : 'Authors',
|
|
||||||
Description : {Value : lifetime}
|
|
||||||
},
|
|
||||||
Facets : [
|
|
||||||
{
|
|
||||||
$Type : 'UI.ReferenceFacet',
|
|
||||||
Label : '{i18n>Details}',
|
|
||||||
Target : '@UI.FieldGroup#Details'
|
|
||||||
},
|
|
||||||
{
|
|
||||||
$Type : 'UI.ReferenceFacet',
|
|
||||||
Label : '{i18n>Books}',
|
|
||||||
Target : 'books/@UI.LineItem'
|
|
||||||
},
|
|
||||||
],
|
|
||||||
FieldGroup #Details : {Data : [
|
|
||||||
{Value : placeOfBirth},
|
|
||||||
{Value : placeOfDeath},
|
|
||||||
{Value : dateOfBirth},
|
|
||||||
{Value : dateOfDeath},
|
|
||||||
{
|
|
||||||
Value : age,
|
|
||||||
Label : '{i18n>Age}'
|
|
||||||
},
|
|
||||||
]},
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
// Workaround to avoid errors for unknown db-specific calculated fields above
|
|
||||||
extend sap.capire.bookshop.Authors with {
|
|
||||||
virtual age : Integer;
|
|
||||||
virtual lifetime : String;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Workaround for Fiori popup for asking user to enter a new UUID on Create
|
|
||||||
annotate AdminService.Authors with { ID @Core.Computed; }
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
sap.ui.define(["sap/fe/core/AppComponent"], function (AppComponent) {
|
|
||||||
"use strict";
|
|
||||||
return AppComponent.extend("authors.Component", {
|
|
||||||
metadata: { manifest: "json" },
|
|
||||||
});
|
|
||||||
});
|
|
||||||
/* eslint no-undef:0 */
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
# This is the resource bundle of itelo
|
|
||||||
# __ldi.translation.uuid=c3431418-9caf-11e8-98d0-529269fb1459
|
|
||||||
|
|
||||||
# JCI app descriptor contains lower case TITLE
|
|
||||||
appTitle=Bookshop Authors
|
|
||||||
|
|
||||||
# JCI app descriptor contains lower case DESCRIPTION
|
|
||||||
appSubTitle=Bookshop Authors
|
|
||||||
|
|
||||||
# JCI app descriptor contains lower case DESCRIPTION
|
|
||||||
appDescription=Bookshop Authors
|
|
||||||
@@ -1,141 +0,0 @@
|
|||||||
{
|
|
||||||
"_version": "1.28.0",
|
|
||||||
"sap.app": {
|
|
||||||
"id": "authors",
|
|
||||||
"type": "application",
|
|
||||||
"title": "Manage Authors",
|
|
||||||
"description": "Sample Application",
|
|
||||||
"i18n": "i18n/i18n.properties",
|
|
||||||
"applicationVersion": {
|
|
||||||
"version": "1.0.0"
|
|
||||||
},
|
|
||||||
"dataSources": {
|
|
||||||
"AdminService": {
|
|
||||||
"uri": "/admin/",
|
|
||||||
"type": "OData",
|
|
||||||
"settings": {
|
|
||||||
"odataVersion": "4.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"sourceTemplate": {
|
|
||||||
"id": "ui5template.basicSAPUI5ApplicationProject",
|
|
||||||
"-id": "ui5template.smartTemplate",
|
|
||||||
"version": "1.40.12"
|
|
||||||
},
|
|
||||||
"crossNavigation": {
|
|
||||||
"inbounds": {
|
|
||||||
"intent1": {
|
|
||||||
"signature": {
|
|
||||||
"parameters": {
|
|
||||||
"Books.author.ID":{
|
|
||||||
"renameTo": "ID"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"additionalParameters": "ignored"
|
|
||||||
},
|
|
||||||
"semanticObject": "Authors",
|
|
||||||
"action": "display",
|
|
||||||
"title": "{{appTitle}}",
|
|
||||||
"info": "{{appInfo}}",
|
|
||||||
"subTitle": "{{appSubTitle}}",
|
|
||||||
"icon": "sap-icon://SAP-icons-TNT/user",
|
|
||||||
"indicatorDataSource": {
|
|
||||||
"dataSource": "AdminService",
|
|
||||||
"path": "Authors/$count",
|
|
||||||
"refresh": 1800
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"sap.ui5": {
|
|
||||||
"dependencies": {
|
|
||||||
"minUI5Version": "1.81.0",
|
|
||||||
"libs": {
|
|
||||||
"sap.fe.templates": {}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"models": {
|
|
||||||
"i18n": {
|
|
||||||
"type": "sap.ui.model.resource.ResourceModel",
|
|
||||||
"uri": "i18n/i18n.properties"
|
|
||||||
},
|
|
||||||
"": {
|
|
||||||
"dataSource": "AdminService",
|
|
||||||
"settings": {
|
|
||||||
"synchronizationMode": "None",
|
|
||||||
"operationMode": "Server",
|
|
||||||
"autoExpandSelect": true,
|
|
||||||
"earlyRequests": true,
|
|
||||||
"groupProperties": {
|
|
||||||
"default": {
|
|
||||||
"submit": "Auto"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"routing": {
|
|
||||||
"routes": [
|
|
||||||
{
|
|
||||||
"pattern": ":?query:",
|
|
||||||
"name": "AuthorsList",
|
|
||||||
"target": "AuthorsList"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"pattern": "Authors({key}):?query:",
|
|
||||||
"name": "AuthorsDetails",
|
|
||||||
"target": "AuthorsDetails"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"targets": {
|
|
||||||
"AuthorsList": {
|
|
||||||
"type": "Component",
|
|
||||||
"id": "AuthorsList",
|
|
||||||
"name": "sap.fe.templates.ListReport",
|
|
||||||
"options": {
|
|
||||||
"settings": {
|
|
||||||
"entitySet": "Authors",
|
|
||||||
"initialLoad": true,
|
|
||||||
"navigation": {
|
|
||||||
"Authors": {
|
|
||||||
"detail": {
|
|
||||||
"route": "AuthorsDetails"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"AuthorsDetails": {
|
|
||||||
"type": "Component",
|
|
||||||
"id": "AuthorsDetailsList",
|
|
||||||
"name": "sap.fe.templates.ObjectPage",
|
|
||||||
"options": {
|
|
||||||
"settings": {
|
|
||||||
"entitySet": "Authors"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"contentDensities": {
|
|
||||||
"compact": true,
|
|
||||||
"cozy": true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"sap.ui": {
|
|
||||||
"technology": "UI5",
|
|
||||||
"fullWidth": false,
|
|
||||||
"deviceTypes":{
|
|
||||||
"desktop": true,
|
|
||||||
"tablet": true,
|
|
||||||
"phone": true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"sap.fiori": {
|
|
||||||
"registrationIds": [],
|
|
||||||
"archeType": "transactional"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -10,7 +10,32 @@
|
|||||||
<script>
|
<script>
|
||||||
window["sap-ushell-config"] = {
|
window["sap-ushell-config"] = {
|
||||||
defaultRenderer: "fiori2",
|
defaultRenderer: "fiori2",
|
||||||
applications: {}
|
applications: {
|
||||||
|
"browse-books": {
|
||||||
|
title: "Browse Books",
|
||||||
|
description: "w/ SAP Fiori Elements",
|
||||||
|
additionalInformation: "SAPUI5.Component=bookshop",
|
||||||
|
applicationType : "URL",
|
||||||
|
url: "/browse/webapp",
|
||||||
|
navigationMode: "embedded"
|
||||||
|
},
|
||||||
|
"manage-books": {
|
||||||
|
title: "Manage Books",
|
||||||
|
description: "w/ SAP Fiori Elements",
|
||||||
|
additionalInformation: "SAPUI5.Component=admin",
|
||||||
|
applicationType : "URL",
|
||||||
|
url: "/admin/webapp",
|
||||||
|
navigationMode: "embedded"
|
||||||
|
},
|
||||||
|
"manage-orders": {
|
||||||
|
title: "Manage Orders",
|
||||||
|
description: "w/ SAP Fiori Elements",
|
||||||
|
additionalInformation: "SAPUI5.Component=orders",
|
||||||
|
applicationType : "URL",
|
||||||
|
url: "/orders/webapp",
|
||||||
|
navigationMode: "embedded"
|
||||||
|
}
|
||||||
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
using { AdminService } from '@capire/bookstore';
|
using { AdminService } from '../../db/schema';
|
||||||
using from '../common'; // to help UI linter get the complete annotations
|
using from '../common'; // to help UI linter get the complete annotations
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////
|
||||||
@@ -40,6 +40,27 @@ annotate AdminService.Books with @(
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
annotate AdminService.Authors with @(
|
||||||
|
UI: {
|
||||||
|
HeaderInfo: {
|
||||||
|
Description: {Value: lifetime}
|
||||||
|
},
|
||||||
|
Facets: [
|
||||||
|
{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Details'},
|
||||||
|
{$Type: 'UI.ReferenceFacet', Label: '{i18n>Books}', Target: 'books/@UI.LineItem'},
|
||||||
|
],
|
||||||
|
FieldGroup#Details: {
|
||||||
|
Data: [
|
||||||
|
{Value: placeOfBirth},
|
||||||
|
{Value: placeOfDeath},
|
||||||
|
{Value: dateOfBirth},
|
||||||
|
{Value: dateOfDeath},
|
||||||
|
{Value: age, Label: '{i18n>Age}'},
|
||||||
|
]
|
||||||
|
},
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
@@ -64,14 +85,10 @@ annotate AdminService.Books.texts with @(
|
|||||||
|
|
||||||
// Add Value Help for Locales
|
// Add Value Help for Locales
|
||||||
annotate AdminService.Books.texts {
|
annotate AdminService.Books.texts {
|
||||||
locale @ValueList:{entity:'Languages'};
|
locale @ValueList:{entity:'Languages',type:#fixed}
|
||||||
locale @Common.ValueListWithFixedValues:true; //show as drop down, not a dialog
|
|
||||||
}
|
}
|
||||||
// In addition we need to expose Languages through AdminService as a target for ValueList
|
// In addition we need to expose Languages through AdminService as a target for ValueList
|
||||||
using { sap } from '@sap/cds/common';
|
using { sap } from '@sap/cds/common';
|
||||||
extend service AdminService {
|
extend service AdminService {
|
||||||
@readonly entity Languages as projection on sap.common.Languages;
|
@readonly entity Languages as projection on sap.common.Languages;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Workaround for Fiori popup for asking user to enter a new UUID on Create
|
|
||||||
annotate AdminService.Books with { ID @Core.Computed; }
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
sap.ui.define(["sap/fe/core/AppComponent"], function(AppComponent) {
|
sap.ui.define(["sap/fe/core/AppComponent"], function(AppComponent) {
|
||||||
"use strict";
|
"use strict";
|
||||||
return AppComponent.extend("books.Component", {
|
return AppComponent.extend("admin.Component", {
|
||||||
metadata: { manifest: "json" }
|
metadata: { manifest: "json" }
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"_version": "1.8.0",
|
"_version": "1.8.0",
|
||||||
"sap.app": {
|
"sap.app": {
|
||||||
"id": "books",
|
"id": "admin",
|
||||||
"type": "application",
|
"type": "application",
|
||||||
"title": "Manage Books",
|
"title": "Manage Books",
|
||||||
"description": "Sample Application",
|
"description": "Sample Application",
|
||||||
@@ -73,7 +73,6 @@
|
|||||||
"options": {
|
"options": {
|
||||||
"settings" : {
|
"settings" : {
|
||||||
"entitySet" : "Books",
|
"entitySet" : "Books",
|
||||||
"initialLoad": true,
|
|
||||||
"navigation" : {
|
"navigation" : {
|
||||||
"Books" : {
|
"Books" : {
|
||||||
"detail" : {
|
"detail" : {
|
||||||
@@ -1,142 +0,0 @@
|
|||||||
{
|
|
||||||
"services": {
|
|
||||||
"LaunchPage": {
|
|
||||||
"adapter": {
|
|
||||||
"config": {
|
|
||||||
"catalogs": [],
|
|
||||||
"groups": [
|
|
||||||
{
|
|
||||||
"id": "Bookshop",
|
|
||||||
"title": "Bookshop",
|
|
||||||
"isPreset": true,
|
|
||||||
"isVisible": true,
|
|
||||||
"isGroupLocked": false,
|
|
||||||
"tiles": [
|
|
||||||
{
|
|
||||||
"id": "BrowseBooks",
|
|
||||||
"tileType": "sap.ushell.ui.tile.StaticTile",
|
|
||||||
"properties": {
|
|
||||||
"title": "Browse Books",
|
|
||||||
"targetURL": "#Books-display"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "Administration",
|
|
||||||
"title": "Administration",
|
|
||||||
"isPreset": true,
|
|
||||||
"isVisible": true,
|
|
||||||
"isGroupLocked": false,
|
|
||||||
"tiles": [
|
|
||||||
{
|
|
||||||
"id": "ManageBooks",
|
|
||||||
"tileType": "sap.ushell.ui.tile.StaticTile",
|
|
||||||
"properties": {
|
|
||||||
"title": "Manage Books",
|
|
||||||
"targetURL": "#Books-manage"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "ManageAuthors",
|
|
||||||
"tileType": "sap.ushell.ui.tile.StaticTile",
|
|
||||||
"properties": {
|
|
||||||
"title": "Manage Authors",
|
|
||||||
"targetURL": "#Authors-display"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "ManageOrders",
|
|
||||||
"tileType": "sap.ushell.ui.tile.StaticTile",
|
|
||||||
"properties": {
|
|
||||||
"title": "Manage Orders",
|
|
||||||
"targetURL": "#Orders-manage"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"NavTargetResolution": {
|
|
||||||
"config": {
|
|
||||||
"enableClientSideTargetResolution": true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"ClientSideTargetResolution": {
|
|
||||||
"adapter": {
|
|
||||||
"config": {
|
|
||||||
"inbounds": {
|
|
||||||
"BrowseBooks": {
|
|
||||||
"semanticObject": "Books",
|
|
||||||
"action": "display",
|
|
||||||
"title": "Browse Books",
|
|
||||||
"signature": {
|
|
||||||
"parameters": {
|
|
||||||
"Books.ID": {
|
|
||||||
"renameTo": "ID"
|
|
||||||
},
|
|
||||||
"Authors.books.ID": {
|
|
||||||
"renameTo": "ID"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"additionalParameters": "ignored"
|
|
||||||
},
|
|
||||||
"resolutionResult": {
|
|
||||||
"applicationType": "SAPUI5",
|
|
||||||
"additionalInformation": "SAPUI5.Component=bookshop",
|
|
||||||
"url": "/browse/webapp"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"BrowseAuthors": {
|
|
||||||
"semanticObject": "Authors",
|
|
||||||
"action": "display",
|
|
||||||
"title": "Browse Authors",
|
|
||||||
"signature": {
|
|
||||||
"parameters": {
|
|
||||||
"Books.author.ID":{
|
|
||||||
"renameTo": "ID"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"additionalParameters": "ignored"
|
|
||||||
},
|
|
||||||
"resolutionResult": {
|
|
||||||
"applicationType": "SAPUI5",
|
|
||||||
"additionalInformation": "SAPUI5.Component=authors",
|
|
||||||
"url": "/admin-authors/webapp"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"ManageBooks": {
|
|
||||||
"semanticObject": "Books",
|
|
||||||
"action": "manage",
|
|
||||||
"title": "Manage Books",
|
|
||||||
"signature": {
|
|
||||||
"parameters": {},
|
|
||||||
"additionalParameters": "allowed"
|
|
||||||
},
|
|
||||||
"resolutionResult": {
|
|
||||||
"applicationType": "SAPUI5",
|
|
||||||
"additionalInformation": "SAPUI5.Component=books",
|
|
||||||
"url": "/admin-books/webapp"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"ManageOrders": {
|
|
||||||
"semanticObject": "Orders",
|
|
||||||
"action": "manage",
|
|
||||||
"signature": {
|
|
||||||
"parameters": {},
|
|
||||||
"additionalParameters": "allowed"
|
|
||||||
},
|
|
||||||
"resolutionResult": {
|
|
||||||
"applicationType": "SAPUI5",
|
|
||||||
"additionalInformation": "SAPUI5.Component=orders",
|
|
||||||
"url": "/orders/webapp"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
3
fiori/app/bookshop.html
Normal file
3
fiori/app/bookshop.html
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
<head>
|
||||||
|
<meta http-equiv="refresh" content="0;url=bookshop/index.html">
|
||||||
|
</head>
|
||||||
@@ -1,60 +1,50 @@
|
|||||||
using CatalogService from '@capire/bookstore';
|
using CatalogService from '@capire/bookshop';
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
// Books Object Page
|
// Books Object Page
|
||||||
//
|
//
|
||||||
annotate CatalogService.Books with @(UI : {
|
annotate CatalogService.Books with @(
|
||||||
|
UI: {
|
||||||
HeaderInfo: {
|
HeaderInfo: {
|
||||||
TypeName: 'Book',
|
TypeName: 'Book',
|
||||||
TypeNamePlural: 'Books',
|
TypeNamePlural: 'Books',
|
||||||
Description: {Value: author}
|
Description: {Value: author}
|
||||||
},
|
},
|
||||||
HeaderFacets : [{
|
HeaderFacets: [
|
||||||
$Type : 'UI.ReferenceFacet',
|
{$Type: 'UI.ReferenceFacet', Label: '{i18n>Description}', Target: '@UI.FieldGroup#Descr'},
|
||||||
Label : '{i18n>Description}',
|
],
|
||||||
Target : '@UI.FieldGroup#Descr'
|
Facets: [
|
||||||
}, ],
|
{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Price'},
|
||||||
Facets : [{
|
],
|
||||||
$Type : 'UI.ReferenceFacet',
|
FieldGroup#Descr: {
|
||||||
Label : '{i18n>Details}',
|
Data: [
|
||||||
Target : '@UI.FieldGroup#Price'
|
{Value: descr},
|
||||||
}, ],
|
]
|
||||||
FieldGroup #Descr : {Data : [{Value : descr}, ]},
|
|
||||||
FieldGroup #Price : {Data : [
|
|
||||||
{Value : price},
|
|
||||||
{
|
|
||||||
Value : currency.symbol,
|
|
||||||
Label : '{i18n>Currency}'
|
|
||||||
},
|
},
|
||||||
]},
|
FieldGroup#Price: {
|
||||||
});
|
Data: [
|
||||||
|
{Value: price},
|
||||||
|
{Value: currency.symbol, Label: '{i18n>Currency}'},
|
||||||
|
]
|
||||||
|
},
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
// Books Object Page
|
// Books Object Page
|
||||||
//
|
//
|
||||||
annotate CatalogService.Books with @(UI : {
|
annotate CatalogService.Books with @(
|
||||||
SelectionFields : [
|
UI: {
|
||||||
ID,
|
SelectionFields: [ ID, price, currency_code ],
|
||||||
price,
|
|
||||||
currency_code
|
|
||||||
],
|
|
||||||
LineItem: [
|
LineItem: [
|
||||||
{
|
{Value: title},
|
||||||
Value : ID,
|
{Value: author, Label:'{i18n>Author}'},
|
||||||
Label : '{i18n>Title}'
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Value : author,
|
|
||||||
Label : '{i18n>Author}'
|
|
||||||
},
|
|
||||||
{Value: genre.name},
|
{Value: genre.name},
|
||||||
{Value: price},
|
{Value: price},
|
||||||
{
|
{Value: currency.symbol, Label:' '},
|
||||||
Value : currency.symbol,
|
|
||||||
Label : ' '
|
|
||||||
},
|
|
||||||
]
|
]
|
||||||
}, );
|
},
|
||||||
|
);
|
||||||
|
|||||||
@@ -1,14 +1,11 @@
|
|||||||
{
|
{
|
||||||
"_version": "1.28.0",
|
"_version": "1.8.0",
|
||||||
"sap.app": {
|
"sap.app": {
|
||||||
"id": "bookshop",
|
"id": "bookshop",
|
||||||
"type": "application",
|
"type": "application",
|
||||||
"title": "Browse Books",
|
"title": "Browse Books",
|
||||||
"description": "Sample Application",
|
"description": "Sample Application",
|
||||||
"i18n": "i18n/i18n.properties",
|
"i18n": "i18n/i18n.properties",
|
||||||
"applicationVersion": {
|
|
||||||
"version": "1.0.0"
|
|
||||||
},
|
|
||||||
"dataSources": {
|
"dataSources": {
|
||||||
"CatalogService": {
|
"CatalogService": {
|
||||||
"uri": "/browse/",
|
"uri": "/browse/",
|
||||||
@@ -18,43 +15,14 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"sourceTemplate": {
|
"-sourceTemplate": {
|
||||||
"id": "ui5template.basicSAPUI5ApplicationProject",
|
"id": "ui5template.basicSAPUI5ApplicationProject",
|
||||||
"-id": "ui5template.smartTemplate",
|
"-id": "ui5template.smartTemplate",
|
||||||
"version": "1.40.12"
|
"-version": "1.40.12"
|
||||||
},
|
|
||||||
"crossNavigation": {
|
|
||||||
"inbounds": {
|
|
||||||
"intent1": {
|
|
||||||
"signature": {
|
|
||||||
"parameters": {
|
|
||||||
"Books.ID":{
|
|
||||||
"renameTo": "ID"
|
|
||||||
},
|
|
||||||
"Authors.books.ID": {
|
|
||||||
"renameTo": "ID"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"additionalParameters": "ignored"
|
|
||||||
},
|
|
||||||
"semanticObject": "Books",
|
|
||||||
"action": "display",
|
|
||||||
"title": "{{appTitle}}",
|
|
||||||
"info": "{{appInfo}}",
|
|
||||||
"subTitle": "{{appSubTitle}}",
|
|
||||||
"icon": "sap-icon://course-book",
|
|
||||||
"indicatorDataSource": {
|
|
||||||
"dataSource": "CatalogService",
|
|
||||||
"path": "Books/$count",
|
|
||||||
"refresh": 1800
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"sap.ui5": {
|
"sap.ui5": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"minUI5Version": "1.81.0",
|
|
||||||
"libs": {
|
"libs": {
|
||||||
"sap.fe.templates": {}
|
"sap.fe.templates": {}
|
||||||
}
|
}
|
||||||
@@ -100,7 +68,6 @@
|
|||||||
"options": {
|
"options": {
|
||||||
"settings": {
|
"settings": {
|
||||||
"entitySet": "Books",
|
"entitySet": "Books",
|
||||||
"initialLoad": true,
|
|
||||||
"navigation": {
|
"navigation": {
|
||||||
"Books": {
|
"Books": {
|
||||||
"detail": {
|
"detail": {
|
||||||
@@ -130,12 +97,7 @@
|
|||||||
},
|
},
|
||||||
"sap.ui": {
|
"sap.ui": {
|
||||||
"technology": "UI5",
|
"technology": "UI5",
|
||||||
"fullWidth": false,
|
"fullWidth": false
|
||||||
"deviceTypes":{
|
|
||||||
"desktop": true,
|
|
||||||
"tablet": true,
|
|
||||||
"phone": true
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"sap.fiori": {
|
"sap.fiori": {
|
||||||
"registrationIds": [],
|
"registrationIds": [],
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
Common Annotations shared by all apps
|
Common Annotations shared by all apps
|
||||||
*/
|
*/
|
||||||
|
|
||||||
using { sap.capire.bookshop as my } from '@capire/bookstore';
|
using { sap.capire.bookshop as my } from '@capire/bookshop';
|
||||||
using { sap.common } from '@capire/common';
|
using { sap.common } from '@capire/common';
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////
|
||||||
@@ -10,39 +10,21 @@ using { sap.common } from '@capire/common';
|
|||||||
// Books Lists
|
// Books Lists
|
||||||
//
|
//
|
||||||
annotate my.Books with @(
|
annotate my.Books with @(
|
||||||
Common.SemanticKey : [ID],
|
Common.SemanticKey: [title],
|
||||||
UI: {
|
UI: {
|
||||||
Identification: [{Value:title}],
|
Identification: [{Value:title}],
|
||||||
SelectionFields : [
|
SelectionFields: [ ID, author_ID, price, currency_code ],
|
||||||
ID,
|
|
||||||
author_ID,
|
|
||||||
price,
|
|
||||||
currency_code
|
|
||||||
],
|
|
||||||
LineItem: [
|
LineItem: [
|
||||||
{
|
{Value: ID},
|
||||||
Value : ID,
|
{Value: title},
|
||||||
Label : '{i18n>Title}'
|
{Value: author.name, Label:'{i18n>Author}'},
|
||||||
},
|
|
||||||
{
|
|
||||||
Value : author.ID,
|
|
||||||
Label : '{i18n>Author}'
|
|
||||||
},
|
|
||||||
{Value: genre.name},
|
{Value: genre.name},
|
||||||
{Value: stock},
|
{Value: stock},
|
||||||
{Value: price},
|
{Value: price},
|
||||||
{
|
{Value: currency.symbol, Label:' '},
|
||||||
Value : currency.symbol,
|
|
||||||
Label : ' '
|
|
||||||
},
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
) {
|
) {
|
||||||
ID @Common: {
|
|
||||||
SemanticObject : 'Books',
|
|
||||||
Text: title,
|
|
||||||
TextArrangement : #TextOnly
|
|
||||||
};
|
|
||||||
author @ValueList.entity:'Authors';
|
author @ValueList.entity:'Authors';
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -50,12 +32,17 @@ annotate my.Books with @(
|
|||||||
//
|
//
|
||||||
// Books Details
|
// Books Details
|
||||||
//
|
//
|
||||||
annotate my.Books with @(UI : {HeaderInfo : {
|
annotate my.Books with @(
|
||||||
|
UI: {
|
||||||
|
HeaderInfo: {
|
||||||
TypeName: '{i18n>Book}',
|
TypeName: '{i18n>Book}',
|
||||||
TypeNamePlural: '{i18n>Books}',
|
TypeNamePlural: '{i18n>Books}',
|
||||||
Title: {Value: title},
|
Title: {Value: title},
|
||||||
Description: {Value: author.name}
|
Description: {Value: author.name}
|
||||||
}, });
|
},
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////
|
||||||
@@ -63,16 +50,10 @@ annotate my.Books with @(UI : {HeaderInfo : {
|
|||||||
// Books Elements
|
// Books Elements
|
||||||
//
|
//
|
||||||
annotate my.Books with {
|
annotate my.Books with {
|
||||||
ID @title : '{i18n>ID}';
|
ID @title:'{i18n>ID}' @UI.HiddenFilter;
|
||||||
title @title:'{i18n>Title}';
|
title @title:'{i18n>Title}';
|
||||||
genre @title : '{i18n>Genre}' @Common : {
|
genre @title:'{i18n>Genre}' @Common: { Text: genre.name, TextArrangement: #TextOnly };
|
||||||
Text : genre.name,
|
author @title:'{i18n>Author}' @Common: { Text: author.name, TextArrangement: #TextOnly };
|
||||||
TextArrangement : #TextOnly
|
|
||||||
};
|
|
||||||
author @title : '{i18n>Author}' @Common : {
|
|
||||||
Text : author.name,
|
|
||||||
TextArrangement : #TextOnly
|
|
||||||
};
|
|
||||||
price @title:'{i18n>Price}' @Measures.ISOCurrency: currency_code;
|
price @title:'{i18n>Price}' @Measures.ISOCurrency: currency_code;
|
||||||
stock @title:'{i18n>Stock}';
|
stock @title:'{i18n>Stock}';
|
||||||
descr @UI.MultiLineText;
|
descr @UI.MultiLineText;
|
||||||
@@ -88,10 +69,7 @@ annotate my.Genres with @(
|
|||||||
SelectionFields: [ name ],
|
SelectionFields: [ name ],
|
||||||
LineItem:[
|
LineItem:[
|
||||||
{Value: name},
|
{Value: name},
|
||||||
{
|
{Value: parent.name, Label: 'Main Genre'},
|
||||||
Value : parent.name,
|
|
||||||
Label : 'Main Genre'
|
|
||||||
},
|
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
@@ -100,7 +78,8 @@ annotate my.Genres with @(
|
|||||||
//
|
//
|
||||||
// Genre Details
|
// Genre Details
|
||||||
//
|
//
|
||||||
annotate my.Genres with @(UI : {
|
annotate my.Genres with @(
|
||||||
|
UI: {
|
||||||
Identification: [{Value:name}],
|
Identification: [{Value:name}],
|
||||||
HeaderInfo: {
|
HeaderInfo: {
|
||||||
TypeName: '{i18n>Genre}',
|
TypeName: '{i18n>Genre}',
|
||||||
@@ -108,12 +87,11 @@ annotate my.Genres with @(UI : {
|
|||||||
Title: {Value: name},
|
Title: {Value: name},
|
||||||
Description: {Value: ID}
|
Description: {Value: ID}
|
||||||
},
|
},
|
||||||
Facets : [{
|
Facets: [
|
||||||
$Type : 'UI.ReferenceFacet',
|
{$Type: 'UI.ReferenceFacet', Label: '{i18n>SubGenres}', Target: 'children/@UI.LineItem'},
|
||||||
Label : '{i18n>SubGenres}',
|
],
|
||||||
Target : 'children/@UI.LineItem'
|
}
|
||||||
}, ],
|
);
|
||||||
});
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
@@ -129,42 +107,38 @@ annotate my.Genres with {
|
|||||||
// Authors List
|
// Authors List
|
||||||
//
|
//
|
||||||
annotate my.Authors with @(
|
annotate my.Authors with @(
|
||||||
Common.SemanticKey : [ID],
|
Common.SemanticKey: [name],
|
||||||
UI: {
|
UI: {
|
||||||
Identification: [{Value:name}],
|
Identification: [{Value:name}],
|
||||||
SelectionFields: [ name ],
|
SelectionFields: [ name ],
|
||||||
LineItem:[
|
LineItem:[
|
||||||
{Value: ID},
|
{Value: ID},
|
||||||
|
{Value: name},
|
||||||
{Value: dateOfBirth},
|
{Value: dateOfBirth},
|
||||||
{Value: dateOfDeath},
|
{Value: dateOfDeath},
|
||||||
{Value: placeOfBirth},
|
{Value: placeOfBirth},
|
||||||
{Value: placeOfDeath},
|
{Value: placeOfDeath},
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
) {
|
);
|
||||||
ID @Common: {
|
|
||||||
SemanticObject : 'Authors',
|
|
||||||
Text: name,
|
|
||||||
TextArrangement : #TextOnly,
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
// Author Details
|
// Author Details
|
||||||
//
|
//
|
||||||
annotate my.Authors with @(UI : {
|
annotate my.Authors with @(
|
||||||
|
UI: {
|
||||||
HeaderInfo: {
|
HeaderInfo: {
|
||||||
TypeName: '{i18n>Author}',
|
TypeName: '{i18n>Author}',
|
||||||
TypeNamePlural: '{i18n>Authors}',
|
TypeNamePlural: '{i18n>Authors}',
|
||||||
Title: {Value: name},
|
Title: {Value: name},
|
||||||
Description: {Value: dateOfBirth}
|
Description: {Value: dateOfBirth}
|
||||||
},
|
},
|
||||||
Facets : [{
|
Facets: [
|
||||||
$Type : 'UI.ReferenceFacet',
|
{$Type: 'UI.ReferenceFacet', Target: 'books/@UI.LineItem'},
|
||||||
Target : 'books/@UI.LineItem'
|
],
|
||||||
}, ],
|
}
|
||||||
});
|
);
|
||||||
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////
|
||||||
@@ -172,7 +146,7 @@ annotate my.Authors with @(UI : {
|
|||||||
// Authors Elements
|
// Authors Elements
|
||||||
//
|
//
|
||||||
annotate my.Authors with {
|
annotate my.Authors with {
|
||||||
ID @title : '{i18n>ID}';
|
ID @title:'{i18n>ID}' @UI.HiddenFilter;
|
||||||
name @title:'{i18n>Name}';
|
name @title:'{i18n>Name}';
|
||||||
dateOfBirth @title:'{i18n>DateOfBirth}';
|
dateOfBirth @title:'{i18n>DateOfBirth}';
|
||||||
dateOfDeath @title:'{i18n>DateOfDeath}';
|
dateOfDeath @title:'{i18n>DateOfDeath}';
|
||||||
@@ -188,10 +162,7 @@ annotate common.Languages with @(
|
|||||||
Common.SemanticKey: [code],
|
Common.SemanticKey: [code],
|
||||||
Identification: [{Value:code}],
|
Identification: [{Value:code}],
|
||||||
UI: {
|
UI: {
|
||||||
SelectionFields : [
|
SelectionFields: [ name, descr ],
|
||||||
name,
|
|
||||||
descr
|
|
||||||
],
|
|
||||||
LineItem:[
|
LineItem:[
|
||||||
{Value: code},
|
{Value: code},
|
||||||
{Value: name},
|
{Value: name},
|
||||||
@@ -203,24 +174,26 @@ annotate common.Languages with @(
|
|||||||
//
|
//
|
||||||
// Language Details
|
// Language Details
|
||||||
//
|
//
|
||||||
annotate common.Languages with @(UI : {
|
annotate common.Languages with @(
|
||||||
|
UI: {
|
||||||
HeaderInfo: {
|
HeaderInfo: {
|
||||||
TypeName: '{i18n>Language}',
|
TypeName: '{i18n>Language}',
|
||||||
TypeNamePlural: '{i18n>Languages}',
|
TypeNamePlural: '{i18n>Languages}',
|
||||||
Title: {Value: name},
|
Title: {Value: name},
|
||||||
Description: {Value: descr}
|
Description: {Value: descr}
|
||||||
},
|
},
|
||||||
Facets : [{
|
Facets: [
|
||||||
$Type : 'UI.ReferenceFacet',
|
{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Details'},
|
||||||
Label : '{i18n>Details}',
|
],
|
||||||
Target : '@UI.FieldGroup#Details'
|
FieldGroup#Details: {
|
||||||
}, ],
|
Data: [
|
||||||
FieldGroup #Details : {Data : [
|
|
||||||
{Value: code},
|
{Value: code},
|
||||||
{Value: name},
|
{Value: name},
|
||||||
{Value: descr}
|
{Value: descr}
|
||||||
]},
|
]
|
||||||
});
|
},
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
@@ -230,10 +203,7 @@ annotate common.Currencies with @(
|
|||||||
Common.SemanticKey: [code],
|
Common.SemanticKey: [code],
|
||||||
Identification: [{Value:code}],
|
Identification: [{Value:code}],
|
||||||
UI: {
|
UI: {
|
||||||
SelectionFields : [
|
SelectionFields: [ name, descr ],
|
||||||
name,
|
|
||||||
descr
|
|
||||||
],
|
|
||||||
LineItem:[
|
LineItem:[
|
||||||
{Value: descr},
|
{Value: descr},
|
||||||
{Value: symbol},
|
{Value: symbol},
|
||||||
@@ -246,7 +216,8 @@ annotate common.Currencies with @(
|
|||||||
//
|
//
|
||||||
// Currency Details
|
// Currency Details
|
||||||
//
|
//
|
||||||
annotate common.Currencies with @(UI : {
|
annotate common.Currencies with @(
|
||||||
|
UI: {
|
||||||
HeaderInfo: {
|
HeaderInfo: {
|
||||||
TypeName: '{i18n>Currency}',
|
TypeName: '{i18n>Currency}',
|
||||||
TypeNamePlural: '{i18n>Currencies}',
|
TypeNamePlural: '{i18n>Currencies}',
|
||||||
@@ -254,29 +225,26 @@ annotate common.Currencies with @(UI : {
|
|||||||
Description: {Value: code}
|
Description: {Value: code}
|
||||||
},
|
},
|
||||||
Facets: [
|
Facets: [
|
||||||
{
|
{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Details'},
|
||||||
$Type : 'UI.ReferenceFacet',
|
{$Type: 'UI.ReferenceFacet', Label: '{i18n>Extended}', Target: '@UI.FieldGroup#Extended'},
|
||||||
Label : '{i18n>Details}',
|
|
||||||
Target : '@UI.FieldGroup#Details'
|
|
||||||
},
|
|
||||||
{
|
|
||||||
$Type : 'UI.ReferenceFacet',
|
|
||||||
Label : '{i18n>Extended}',
|
|
||||||
Target : '@UI.FieldGroup#Extended'
|
|
||||||
},
|
|
||||||
],
|
],
|
||||||
FieldGroup #Details : {Data : [
|
FieldGroup#Details: {
|
||||||
|
Data: [
|
||||||
{Value: name},
|
{Value: name},
|
||||||
{Value: symbol},
|
{Value: symbol},
|
||||||
{Value: code},
|
{Value: code},
|
||||||
{Value: descr}
|
{Value: descr}
|
||||||
]},
|
]
|
||||||
FieldGroup #Extended : {Data : [
|
},
|
||||||
|
FieldGroup#Extended: {
|
||||||
|
Data: [
|
||||||
{Value: numcode},
|
{Value: numcode},
|
||||||
{Value: minor},
|
{Value: minor},
|
||||||
{Value: exponent}
|
{Value: exponent}
|
||||||
]},
|
]
|
||||||
});
|
},
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
|
|||||||
3
fiori/app/reviews.html
Normal file
3
fiori/app/reviews.html
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
<head>
|
||||||
|
<meta http-equiv="refresh" content="0;url=reviews/index.html">
|
||||||
|
</head>
|
||||||
@@ -2,8 +2,11 @@
|
|||||||
This model controls what gets served to Fiori frontends...
|
This model controls what gets served to Fiori frontends...
|
||||||
*/
|
*/
|
||||||
|
|
||||||
using from './admin-authors/fiori-service';
|
using from './admin/fiori-service';
|
||||||
using from './admin-books/fiori-service';
|
|
||||||
using from './browse/fiori-service';
|
using from './browse/fiori-service';
|
||||||
using from './common';
|
using from './common';
|
||||||
using from '@capire/bookstore/srv/mashup';
|
|
||||||
|
using from '@capire/common';
|
||||||
|
|
||||||
|
// only works in case of embedded orders service
|
||||||
|
using from '@capire/orders/app/orders/fiori-service';
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
// Add Author.age and .lifetime with a DB-specific function
|
// Add Author.age and .lifetime with a DB-specific function
|
||||||
//
|
//
|
||||||
|
|
||||||
using { AdminService } from '@capire/bookshop';
|
using { AdminService } from '../schema';
|
||||||
|
|
||||||
extend projection AdminService.Authors with {
|
extend projection AdminService.Authors with {
|
||||||
YEARS_BETWEEN(dateOfBirth, dateOfDeath) as age: Integer,
|
YEARS_BETWEEN(dateOfBirth, dateOfDeath) as age: Integer,
|
||||||
|
|||||||
8
fiori/db/schema.cds
Normal file
8
fiori/db/schema.cds
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
using { sap.capire.bookshop } from '@capire/bookshop';
|
||||||
|
|
||||||
|
// Forward-declare calculated fields to be filled in database-specific ways
|
||||||
|
// TODO find a better way to have 'default' fields that still can be overwritten.
|
||||||
|
extend bookshop.Authors with {
|
||||||
|
virtual age: Integer;
|
||||||
|
virtual lifetime: String;
|
||||||
|
}
|
||||||
@@ -2,7 +2,7 @@
|
|||||||
// Add Author.age and .lifetime with a DB-specific function
|
// Add Author.age and .lifetime with a DB-specific function
|
||||||
//
|
//
|
||||||
|
|
||||||
using { AdminService } from '@capire/bookshop';
|
using { AdminService } from '../schema';
|
||||||
|
|
||||||
extend projection AdminService.Authors with {
|
extend projection AdminService.Authors with {
|
||||||
strftime('%Y',dateOfDeath)-strftime('%Y',dateOfBirth) as age: Integer,
|
strftime('%Y',dateOfDeath)-strftime('%Y',dateOfBirth) as age: Integer,
|
||||||
|
|||||||
@@ -2,7 +2,10 @@
|
|||||||
"name": "@capire/fiori",
|
"name": "@capire/fiori",
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@capire/bookstore": "*",
|
"@capire/bookshop": "*",
|
||||||
|
"@capire/reviews": "*",
|
||||||
|
"@capire/orders": "*",
|
||||||
|
"@capire/common": "*",
|
||||||
"@sap/cds": "^5",
|
"@sap/cds": "^5",
|
||||||
"express": "^4.17.1",
|
"express": "^4.17.1",
|
||||||
"passport": "^0.4.1"
|
"passport": "^0.4.1"
|
||||||
@@ -12,6 +15,9 @@
|
|||||||
"watch": "cds watch"
|
"watch": "cds watch"
|
||||||
},
|
},
|
||||||
"cds": {
|
"cds": {
|
||||||
|
"hana": {
|
||||||
|
"deploy-format": "hdbtable"
|
||||||
|
},
|
||||||
"requires": {
|
"requires": {
|
||||||
"auth": {
|
"auth": {
|
||||||
"strategy": "dummy"
|
"strategy": "dummy"
|
||||||
@@ -24,30 +30,14 @@
|
|||||||
"kind": "odata",
|
"kind": "odata",
|
||||||
"model": "@capire/orders"
|
"model": "@capire/orders"
|
||||||
},
|
},
|
||||||
"messaging": {
|
|
||||||
"[production]": {
|
|
||||||
"kind": "enterprise-messaging"
|
|
||||||
},
|
|
||||||
"[development]": {
|
|
||||||
"kind": "file-based-messaging"
|
|
||||||
},
|
|
||||||
"[hybrid!]": {
|
|
||||||
"kind": "enterprise-messaging-shared"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"db": {
|
"db": {
|
||||||
"kind": "sql"
|
"kind": "sql",
|
||||||
},
|
|
||||||
"db-ext": {
|
|
||||||
"[development]": {
|
"[development]": {
|
||||||
"model": "db/sqlite"
|
"model": "db/sqlite"
|
||||||
},
|
},
|
||||||
"[production]": {
|
"[production]": {
|
||||||
"model": "db/hana"
|
"model": "db/hana"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"hana": {
|
|
||||||
"deploy-format": "hdbtable"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1 +1,25 @@
|
|||||||
module.exports = require('@capire/bookstore/server.js')
|
const cds = require ('@sap/cds')
|
||||||
|
module.exports = cds.server
|
||||||
|
|
||||||
|
cds.once('bootstrap',(app)=>{
|
||||||
|
app.use ('/orders/webapp', _from('@capire/orders/app/orders/webapp/manifest.json'))
|
||||||
|
app.use ('/bookshop', _from('@capire/bookshop/app/vue/index.html'))
|
||||||
|
app.use ('/reviews', _from('@capire/reviews/app/vue/index.html'))
|
||||||
|
})
|
||||||
|
|
||||||
|
cds.once('served', require('./srv/mashup'))
|
||||||
|
|
||||||
|
// Swagger UI - see https://cap.cloud.sap/docs/advanced/openapi
|
||||||
|
try {
|
||||||
|
const cds_swagger = require ('cds-swagger-ui-express')
|
||||||
|
cds.once ('bootstrap', app => app.use (cds_swagger()) )
|
||||||
|
} catch (err) {
|
||||||
|
if (err.code !== 'MODULE_NOT_FOUND') throw err
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// -----------------------------------------------------------------------
|
||||||
|
// Helper for serving static content from npm-installed packages
|
||||||
|
const {static} = require('express')
|
||||||
|
const {dirname} = require('path')
|
||||||
|
const _from = target => static (dirname (require.resolve(target)))
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
// Enhancing bookshop with Reviews and Orders provided through
|
// Mashing up imported models...
|
||||||
// respective reuse packages and services
|
|
||||||
//
|
//
|
||||||
|
|
||||||
using { sap.capire.bookshop.Books } from '@capire/bookshop';
|
using { sap.capire.bookshop.Books } from '@capire/bookshop';
|
||||||
@@ -9,24 +8,18 @@ using { sap.capire.bookshop.Books } from '@capire/bookshop';
|
|||||||
//
|
//
|
||||||
// Extend Books with access to Reviews and average ratings
|
// Extend Books with access to Reviews and average ratings
|
||||||
//
|
//
|
||||||
|
|
||||||
using { ReviewsService.Reviews } from '@capire/reviews';
|
using { ReviewsService.Reviews } from '@capire/reviews';
|
||||||
extend Books with {
|
extend Books with {
|
||||||
reviews : Composition of many Reviews on reviews.subject = $self.ID;
|
reviews : Composition of many Reviews on reviews.subject = $self.ID;
|
||||||
rating : Decimal;
|
rating : Decimal;
|
||||||
numberOfReviews : Integer;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// Extend Orders with Books as Products
|
// Extend Orders with Books as Products
|
||||||
//
|
//
|
||||||
using { sap.capire.orders.Orders } from '@capire/orders';
|
|
||||||
extend Orders with {
|
using { sap.capire.orders.Orders_Items } from '@capire/orders';
|
||||||
extend Items with {
|
extend Orders_Items with {
|
||||||
book : Association to Books on product.ID = book.ID
|
book : Association to Books on product.ID = book.ID
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Add orders fiori app (in case of embedded orders service)
|
|
||||||
using from '@capire/orders/app/fiori';
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
// Mashing up bookshop services with required services...
|
// Mashing up provided and required services...
|
||||||
//
|
//
|
||||||
module.exports = async()=>{ // called by server.js
|
module.exports = async()=>{ // called by server.js
|
||||||
|
|
||||||
@@ -20,7 +20,7 @@ module.exports = async()=>{ // called by server.js
|
|||||||
CatalogService.prepend (srv => srv.on ('READ', 'Books/reviews', (req) => {
|
CatalogService.prepend (srv => srv.on ('READ', 'Books/reviews', (req) => {
|
||||||
console.debug ('> delegating request to ReviewsService')
|
console.debug ('> delegating request to ReviewsService')
|
||||||
const [id] = req.params, { columns, limit } = req.query.SELECT
|
const [id] = req.params, { columns, limit } = req.query.SELECT
|
||||||
return ReviewsService.read ('Reviews',columns).limit(limit).where({subject:String(id)})
|
return ReviewsService.tx(req).read ('Reviews',columns).limit(limit).where({subject:String(id)})
|
||||||
}))
|
}))
|
||||||
|
|
||||||
//
|
//
|
||||||
@@ -37,12 +37,13 @@ module.exports = async()=>{ // called by server.js
|
|||||||
})
|
})
|
||||||
|
|
||||||
//
|
//
|
||||||
// Update Books' average ratings when ReviewsService signals updated reviews
|
// Update Books' average ratings when ReviewsService signals updatd reviews
|
||||||
//
|
//
|
||||||
ReviewsService.on ('reviewed', (msg) => {
|
ReviewsService.on ('reviewed', (msg) => {
|
||||||
console.debug ('> received:', msg.event, msg.data)
|
console.debug ('> received:', msg.event, msg.data)
|
||||||
const { subject, count, rating } = msg.data
|
const { subject, rating } = msg.data
|
||||||
return UPDATE(Books,subject).with({ numberOfReviews:count, rating })
|
return UPDATE(Books,subject).with({rating})
|
||||||
|
// ^ Note: the framework will execute this and take care for db.tx
|
||||||
})
|
})
|
||||||
|
|
||||||
//
|
//
|
||||||
@@ -1,3 +1,3 @@
|
|||||||
ID;createdAt;createdBy;buyer;OrderNo;currency_code
|
ID;createdAt;createdBy;buyer;OrderNo;currency_code;status_code
|
||||||
7e2f2640-6866-4dcf-8f4d-3027aa831cad;2019-01-31;john.doe@test.com;john.doe@test.com;1;EUR
|
7e2f2640-6866-4dcf-8f4d-3027aa831cad;2019-01-31;john.doe@test.com;john.doe@test.com;1;EUR;O
|
||||||
64e718c9-ff99-47f1-8ca3-950c850777d4;2019-01-30;jane.doe@test.com;jane.doe@test.com;2;EUR
|
64e718c9-ff99-47f1-8ca3-950c850777d4;2019-01-30;jane.doe@test.com;jane.doe@test.com;2;EUR;C
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
@bookshop = http://localhost:4004
|
@bookshop = http://localhost:4004
|
||||||
@reviews-service = {{bookshop}}/reviews
|
@reviews-service = {{bookshop}}/reviews
|
||||||
# Uncomment this when running a separate reviews service
|
# Uncomment this when running a separate reviews service
|
||||||
# @reviews-service = http://localhost:4005/reviews
|
@reviews-service = http://localhost:4005/reviews
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -7,8 +7,8 @@
|
|||||||
"start:ts": "cds-ts serve srv/world.cds"
|
"start:ts": "cds-ts serve srv/world.cds"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/jest": "^27.0.2",
|
"@types/jest": "^26.0.23",
|
||||||
"@types/node": "^16.11.6",
|
"@types/node": "^15.12.0",
|
||||||
"ts-jest": "^27.0.2",
|
"ts-jest": "^27.0.2",
|
||||||
"typescript": "^4.3.5"
|
"typescript": "^4.3.5"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
import type { Request } from "@sap/cds/apis/services"
|
|
||||||
|
|
||||||
module.exports = class say {
|
module.exports = class say {
|
||||||
hello(req: Request) {
|
hello(req: any) {
|
||||||
return `Hello ${req.data.to} from a TypeScript file!`
|
return `Hello ${req.data.to} from a TypeScript file!`
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
5
orders/app/index.cds
Normal file
5
orders/app/index.cds
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
/*
|
||||||
|
This model controls what gets served to Fiori frontends...
|
||||||
|
*/
|
||||||
|
|
||||||
|
using from './orders/fiori-service';
|
||||||
@@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
using { OrdersService } from '../srv/orders-service';
|
using { OrdersService } from '../../srv/orders-service';
|
||||||
|
|
||||||
|
|
||||||
@odata.draft.enabled
|
@odata.draft.enabled
|
||||||
@@ -45,7 +45,8 @@ annotate OrdersService.Orders with @(
|
|||||||
],
|
],
|
||||||
FieldGroup#Details: {
|
FieldGroup#Details: {
|
||||||
Data: [
|
Data: [
|
||||||
{Value: currency.code, Label:'Currency'}
|
{Value: currency.code, Label:'Currency'},
|
||||||
|
{Value: status.code, Label:'Status'},
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
FieldGroup#Created: {
|
FieldGroup#Created: {
|
||||||
@@ -66,9 +67,12 @@ annotate OrdersService.Orders with @(
|
|||||||
createdBy @UI.HiddenFilter:false;
|
createdBy @UI.HiddenFilter:false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
annotate OrdersService.OrderStatus with {
|
||||||
|
code @Common: { Text: name, TextArrangement: #TextOnly };
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
annotate OrdersService.Orders.Items with @(
|
annotate OrdersService.Orders_Items with @(
|
||||||
UI: {
|
UI: {
|
||||||
LineItem: [
|
LineItem: [
|
||||||
{Value: product_ID, Label:'Product ID'},
|
{Value: product_ID, Label:'Product ID'},
|
||||||
4
orders/db/data/sap.capire.orders-OrderStatus.csv
Normal file
4
orders/db/data/sap.capire.orders-OrderStatus.csv
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
code;name;descr
|
||||||
|
O;Open;Order is open
|
||||||
|
P;In Process;Order is about to be processed
|
||||||
|
C;Closed;Order is closed
|
||||||
|
@@ -1,24 +1,27 @@
|
|||||||
using { Currency, User, managed, cuid } from '@sap/cds/common';
|
using { Currency, User, managed, cuid, sap.common.CodeList } from '@sap/cds/common';
|
||||||
namespace sap.capire.orders;
|
namespace sap.capire.orders;
|
||||||
|
|
||||||
entity Orders : cuid, managed {
|
entity Orders : cuid, managed {
|
||||||
OrderNo : String @title:'Order Number'; //> readable key
|
OrderNo : String @title:'Order Number'; //> readable key
|
||||||
Items : Composition of many {
|
Items : Composition of many Orders_Items on Items.up_ = $self;
|
||||||
key ID : UUID;
|
|
||||||
product : Association to Products;
|
|
||||||
quantity : Integer;
|
|
||||||
title : String; //> intentionally replicated as snapshot from product.title
|
|
||||||
price : Double; //> materialized calculated field
|
|
||||||
};
|
|
||||||
buyer : User;
|
buyer : User;
|
||||||
currency : Currency;
|
currency : Currency;
|
||||||
|
status : Association to OrderStatus;
|
||||||
|
}
|
||||||
|
|
||||||
|
@cds.persistence.data.kind: 'config'
|
||||||
|
entity OrderStatus : CodeList { key code: String(1) }
|
||||||
|
|
||||||
|
entity Orders_Items {
|
||||||
|
key ID : UUID;
|
||||||
|
up_ : Association to Orders;
|
||||||
|
product : Association to Products @assert.integrity:false; // REVISIT: this is a temporary workaround for a glitch in cds-runtime
|
||||||
|
quantity : Integer;
|
||||||
|
title : String; //> intentionally replicated as snapshot from product.title
|
||||||
|
price : Double;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** This is a stand-in for arbitrary ordered Products */
|
/** This is a stand-in for arbitrary ordered Products */
|
||||||
entity Products @(cds.persistence.skip:'always') {
|
entity Products @(cds.persistence.skip:'always') {
|
||||||
key ID : String;
|
key ID : String;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// this is to ensure we have filled-in currencies
|
|
||||||
using from '@capire/common';
|
|
||||||
|
|||||||
@@ -2,12 +2,6 @@
|
|||||||
"name": "@capire/orders",
|
"name": "@capire/orders",
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@capire/common": "*",
|
|
||||||
"@sap/cds": "^5"
|
"@sap/cds": "^5"
|
||||||
},
|
|
||||||
"cds": {
|
|
||||||
"features": {
|
|
||||||
"assert_integrity": "db"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3,7 +3,7 @@ class OrdersService extends cds.ApplicationService {
|
|||||||
|
|
||||||
/** register custom handlers */
|
/** register custom handlers */
|
||||||
init(){
|
init(){
|
||||||
const { 'Orders.Items':OrderItems } = this.entities
|
const { Orders_Items:OrderItems } = this.entities
|
||||||
|
|
||||||
this.before ('UPDATE', 'Orders', async function(req) {
|
this.before ('UPDATE', 'Orders', async function(req) {
|
||||||
const { ID, Items } = req.data
|
const { ID, Items } = req.data
|
||||||
|
|||||||
11030
package-lock.json
generated
11030
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -5,7 +5,6 @@
|
|||||||
"repository": "https://github.com/sap-samples/cloud-cap-samples.git",
|
"repository": "https://github.com/sap-samples/cloud-cap-samples.git",
|
||||||
"author": "daniel.hutzel@sap.com",
|
"author": "daniel.hutzel@sap.com",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@capire/bookstore": "./bookstore",
|
|
||||||
"@capire/bookshop": "./bookshop",
|
"@capire/bookshop": "./bookshop",
|
||||||
"@capire/common": "./common",
|
"@capire/common": "./common",
|
||||||
"@capire/fiori": "./fiori",
|
"@capire/fiori": "./fiori",
|
||||||
@@ -13,7 +12,7 @@
|
|||||||
"@capire/media": "./media",
|
"@capire/media": "./media",
|
||||||
"@capire/orders": "./orders",
|
"@capire/orders": "./orders",
|
||||||
"@capire/reviews": "./reviews",
|
"@capire/reviews": "./reviews",
|
||||||
"@sap/cds": "^5.7.3"
|
"@sap/cds": "^5.5.3"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"chai": "^4.3.4",
|
"chai": "^4.3.4",
|
||||||
@@ -30,7 +29,6 @@
|
|||||||
"media": "cds watch media",
|
"media": "cds watch media",
|
||||||
"mocha": "npx mocha || echo",
|
"mocha": "npx mocha || echo",
|
||||||
"jest": "npx jest",
|
"jest": "npx jest",
|
||||||
"start": "cds watch fiori",
|
|
||||||
"test": "npm run jest -- --silent",
|
"test": "npm run jest -- --silent",
|
||||||
"test:hello": "cd hello && npm test"
|
"test:hello": "cd hello && npm test"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
# cds.requires.messaging.kind = file-based-messaging
|
cds.requires.messaging.kind = file-based-messaging
|
||||||
PORT = 4005
|
PORT = 4005
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
subject;rating;reviewer;title;text
|
subject;rating;title;text
|
||||||
201;5;adam;Intriguing;Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
|
201;5;Intriguing;Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
|
||||||
201;4;bob;Fascinating;Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Id diam maecenas ultricies mi eget mauris pharetra et. Risus at ultrices mi tempus imperdiet nulla malesuada pellentesque. Pulvinar mattis nunc sed blandit libero. Facilisis magna etiam tempor orci eu. Nec sagittis aliquam malesuada bibendum arcu. Eu consequat ac felis donec. Ultricies tristique nulla aliquet enim tortor at auctor urna nunc. Tortor posuere ac ut consequat semper viverra nam libero. Amet nisl suscipit adipiscing bibendum est ultricies integer quis auctor. Scelerisque purus semper eget duis at tellus. Elementum tempus egestas sed sed risus pretium. Arcu dictum varius duis at. Amet luctus venenatis lectus magna fringilla urna. Eget velit aliquet sagittis id consectetur purus ut faucibus. Vitae auctor eu augue ut lectus. Fermentum iaculis eu non diam phasellus vestibulum.
|
201;4;Fascinating;Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Id diam maecenas ultricies mi eget mauris pharetra et. Risus at ultrices mi tempus imperdiet nulla malesuada pellentesque. Pulvinar mattis nunc sed blandit libero. Facilisis magna etiam tempor orci eu. Nec sagittis aliquam malesuada bibendum arcu. Eu consequat ac felis donec. Ultricies tristique nulla aliquet enim tortor at auctor urna nunc. Tortor posuere ac ut consequat semper viverra nam libero. Amet nisl suscipit adipiscing bibendum est ultricies integer quis auctor. Scelerisque purus semper eget duis at tellus. Elementum tempus egestas sed sed risus pretium. Arcu dictum varius duis at. Amet luctus venenatis lectus magna fringilla urna. Eget velit aliquet sagittis id consectetur purus ut faucibus. Vitae auctor eu augue ut lectus. Fermentum iaculis eu non diam phasellus vestibulum.
|
||||||
207;2;bob;What is this?;Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Libero justo laoreet sit amet cursus sit amet dictum. Nunc faucibus a pellentesque sit. Dis parturient montes nascetur ridiculus mus mauris vitae ultricies. Enim nunc faucibus a pellentesque. Commodo quis imperdiet massa tincidunt nunc pulvinar sapien. Cras ornare arcu dui vivamus. Facilisi etiam dignissim diam quis enim lobortis. Et molestie ac feugiat sed. Urna neque viverra justo nec ultrices dui. Ullamcorper a lacus vestibulum sed arcu non. Volutpat ac tincidunt vitae semper quis. Dignissim sodales ut eu sem. Feugiat in fermentum posuere urna nec. At augue eget arcu dictum varius.
|
207;2;What is this?;Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Libero justo laoreet sit amet cursus sit amet dictum. Nunc faucibus a pellentesque sit. Dis parturient montes nascetur ridiculus mus mauris vitae ultricies. Enim nunc faucibus a pellentesque. Commodo quis imperdiet massa tincidunt nunc pulvinar sapien. Cras ornare arcu dui vivamus. Facilisi etiam dignissim diam quis enim lobortis. Et molestie ac feugiat sed. Urna neque viverra justo nec ultrices dui. Ullamcorper a lacus vestibulum sed arcu non. Volutpat ac tincidunt vitae semper quis. Dignissim sodales ut eu sem. Feugiat in fermentum posuere urna nec. At augue eget arcu dictum varius.
|
||||||
251;3;bob;It's dark...;Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Suscipit tellus mauris a diam. Velit aliquet sagittis id consectetur purus ut. Viverra adipiscing at in tellus integer. Vitae elementum curabitur vitae nunc. Mattis ullamcorper velit sed ullamcorper morbi. Diam quis enim lobortis scelerisque. Auctor neque vitae tempus quam pellentesque nec nam aliquam. Semper auctor neque vitae tempus. Quis eleifend quam adipiscing vitae proin. Neque convallis a cras semper auctor neque vitae. Imperdiet massa tincidunt nunc pulvinar sapien et ligula. Sit amet consectetur adipiscing elit ut aliquam purus. Pretium quam vulputate dignissim suspendisse.
|
251;3;It's dark...;Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Suscipit tellus mauris a diam. Velit aliquet sagittis id consectetur purus ut. Viverra adipiscing at in tellus integer. Vitae elementum curabitur vitae nunc. Mattis ullamcorper velit sed ullamcorper morbi. Diam quis enim lobortis scelerisque. Auctor neque vitae tempus quam pellentesque nec nam aliquam. Semper auctor neque vitae tempus. Quis eleifend quam adipiscing vitae proin. Neque convallis a cras semper auctor neque vitae. Imperdiet massa tincidunt nunc pulvinar sapien et ligula. Sit amet consectetur adipiscing elit ut aliquam purus. Pretium quam vulputate dignissim suspendisse.
|
||||||
|
@@ -10,17 +10,15 @@
|
|||||||
"@sap/cds": "^5",
|
"@sap/cds": "^5",
|
||||||
"express": "^4.17.1"
|
"express": "^4.17.1"
|
||||||
},
|
},
|
||||||
|
"scripts": {
|
||||||
|
"reviews-service": "cds watch",
|
||||||
|
"books-reviewed": "cds watch ../reviewed"
|
||||||
|
},
|
||||||
"cds": {
|
"cds": {
|
||||||
"requires": {
|
"requires": {
|
||||||
"messaging": {
|
"db": {
|
||||||
"[development]": { "kind": "file-based-messaging" },
|
"kind": "sql"
|
||||||
"[hybrid]": { "kind": "enterprise-messaging-shared" },
|
}
|
||||||
"[production]": { "kind": "enterprise-messaging" }
|
|
||||||
},
|
|
||||||
"db": { "kind": "sql" }
|
|
||||||
},
|
|
||||||
"features": {
|
|
||||||
"assert_integrity": "db"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -10,8 +10,7 @@ service ReviewsService {
|
|||||||
// Async API
|
// Async API
|
||||||
event reviewed : {
|
event reviewed : {
|
||||||
subject: type of Reviews:subject;
|
subject: type of Reviews:subject;
|
||||||
count : Integer;
|
rating: Decimal(2,1)
|
||||||
rating : Decimal;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Input validation
|
// Input validation
|
||||||
@@ -28,7 +27,14 @@ service ReviewsService {
|
|||||||
annotate ReviewsService.Reviews with @restrict:[
|
annotate ReviewsService.Reviews with @restrict:[
|
||||||
{ grant:'READ', to:'any' }, // everybody can read reviews
|
{ grant:'READ', to:'any' }, // everybody can read reviews
|
||||||
{ grant:'CREATE', to:'authenticated-user' }, // users must login to add reviews
|
{ grant:'CREATE', to:'authenticated-user' }, // users must login to add reviews
|
||||||
{ grant:'UPDATE', to:'authenticated-user', where:'reviewer=$user' },
|
/////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
// Temporarily disabling this due to glitch in CAP Node.js runtime:
|
||||||
|
// { grant:'UPDATE', to:'authenticated-user', where:'reviewer=$user' },
|
||||||
|
// -> reenable it when the issue is fixed
|
||||||
|
{ grant:'UPDATE', to:'authenticated-user' },
|
||||||
|
//
|
||||||
|
////////////////////////////////////////////////////
|
||||||
{ grant:'DELETE', to:'admin' },
|
{ grant:'DELETE', to:'admin' },
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@@ -12,11 +12,11 @@ module.exports = cds.service.impl (function(){
|
|||||||
// Emit an event to inform subscribers about new avg ratings for reviewed subjects
|
// Emit an event to inform subscribers about new avg ratings for reviewed subjects
|
||||||
this.after (['CREATE','UPDATE','DELETE'], 'Reviews', async function(_,req) {
|
this.after (['CREATE','UPDATE','DELETE'], 'Reviews', async function(_,req) {
|
||||||
const {subject} = req.data
|
const {subject} = req.data
|
||||||
const { count, rating } = await cds.tx(req) .run (
|
const {rating} = await cds.tx(req) .run (
|
||||||
SELECT.one `round(avg(rating),2) as rating, count(*) as count` .from (Reviews) .where ({subject})
|
SELECT.one (['round(avg(rating),2) as rating']) .from (Reviews) .where ({subject})
|
||||||
)
|
)
|
||||||
global.it || console.log ('< emitting:', 'reviewed', { subject, count, rating })
|
global.it || console.log ('< emitting:', 'reviewed', { subject, rating })
|
||||||
await this.emit ('reviewed', { subject, count, rating })
|
await this.emit ('reviewed', { subject, rating })
|
||||||
})
|
})
|
||||||
|
|
||||||
// Increment counter for reviews considered helpful
|
// Increment counter for reviews considered helpful
|
||||||
|
|||||||
15
samples.md
15
samples.md
@@ -51,27 +51,20 @@ Each sub directory essentially is an individual npm package arranged in an [all-
|
|||||||
- As well as managed data, input validations, and authorization
|
- As well as managed data, input validations, and authorization
|
||||||
|
|
||||||
|
|
||||||
## [@capire/bookstore](bookstore)
|
## [@capire/fiori](fiori)
|
||||||
|
|
||||||
- A [composite app, reusing and combining](https://cap.cloud.sap/docs/guides/verticalize) these packages:
|
- A [composite app, reusing and combining](https://cap.cloud.sap/docs/guides/verticalize) these packages:
|
||||||
- [@capire/bookshop](bookshop)
|
- [@capire/bookshop](bookshop)
|
||||||
- [@capire/reviews](reviews)
|
- [@capire/reviews](reviews)
|
||||||
- [@capire/orders](orders)
|
- [@capire/orders](orders)
|
||||||
- [@capire/common](common)
|
- [@capire/common](common)
|
||||||
- [The Vue.js app](bookshop/app/vue) imported from bookshop is served as well
|
- [Adds an SAP Fiori elements application](https://cap.cloud.sap/docs/guides/fiori/) to bookshop, thereby introducing to:
|
||||||
- [The Vue.js app](reviews/app/vue) imported from reviews is served as well
|
|
||||||
- [The Fiori app](orders/app) imported from orders is served as well
|
|
||||||
- [OpenAPI export + Swagger UI](https://cap.cloud.sap/docs/advanced/openapi)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## [@capire/fiori](fiori)
|
|
||||||
|
|
||||||
- [Adds an SAP Fiori elements application](https://cap.cloud.sap/docs/guides/fiori/) to bookstore, thereby introducing to:
|
|
||||||
- [OData Annotations](https://cap.cloud.sap/docs/guides/fiori#adding-odata-annotations) in `.cds` files
|
- [OData Annotations](https://cap.cloud.sap/docs/guides/fiori#adding-odata-annotations) in `.cds` files
|
||||||
- Support for [Fiori Draft](https://cap.cloud.sap/docs/guides/fiori#draft)
|
- Support for [Fiori Draft](https://cap.cloud.sap/docs/guides/fiori#draft)
|
||||||
- Support for [Value Helps](https://cap.cloud.sap/docs/guides/fiori#value-help)
|
- Support for [Value Helps](https://cap.cloud.sap/docs/guides/fiori#value-help)
|
||||||
- Serving SAP Fiori apps locally
|
- Serving SAP Fiori apps locally
|
||||||
|
- [The Vue.js app](bookshop/app/vue) imported from bookshop is served as well
|
||||||
|
- [OpenAPI export + Swagger UI](https://cap.cloud.sap/docs/advanced/openapi)
|
||||||
|
|
||||||
<br>
|
<br>
|
||||||
|
|
||||||
|
|||||||
@@ -42,132 +42,24 @@ describe('cds.ql → cqn', () => {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
if (each === 'SELECT')
|
|
||||||
test('SELECT ( Foo )', () => {
|
test('from Foo [<key>]', () => {
|
||||||
expect({
|
|
||||||
SELECT: { from: { ref: ['Foo'] } },
|
expect(cqn = SELECT`from Foo[11]`)
|
||||||
})
|
.to.eql(SELECT`from Foo[${11}]`)
|
||||||
.to.eql(CQL`SELECT from Foo`)
|
.to.eql(SELECT.from `Foo[11]`)
|
||||||
.to.eql(SELECT(Foo))
|
.to.eql(SELECT.from `Foo[${11}]`)
|
||||||
|
.to.eql(SELECT`Foo[11]`)
|
||||||
|
expect.plain(cqn)
|
||||||
|
.to.eql(CQL`SELECT from Foo[11]`)
|
||||||
|
.to.eql(srv.read`Foo[11]`)
|
||||||
|
.to.eql({
|
||||||
|
SELECT: { from: {
|
||||||
|
ref: [{ id: 'Foo', where: [{ val: 11 }] }]
|
||||||
|
}},
|
||||||
})
|
})
|
||||||
|
|
||||||
if (each === 'SELECT')
|
if (cdr) expect.plain (cqn)
|
||||||
test('SELECT ( Foo ) .from ( Bar )', () => {
|
|
||||||
|
|
||||||
expect({
|
|
||||||
SELECT: { columns:[{ref:['Foo']}], from: { ref: ['Bar'] } },
|
|
||||||
})
|
|
||||||
.to.eql(CQL`SELECT Foo from Bar`)
|
|
||||||
.to.eql(SELECT `Foo` .from `Bar`)
|
|
||||||
.to.eql(SELECT `Foo` .from('Bar'))
|
|
||||||
.to.eql(SELECT('Foo').from('Bar'))
|
|
||||||
.to.eql(SELECT(['Foo']).from('Bar'))
|
|
||||||
.to.eql(SELECT(['Foo']).from('Bar'))
|
|
||||||
.to.eql(SELECT `Bar` .columns `Foo`)
|
|
||||||
.to.eql(SELECT `Bar` .columns ('Foo'))
|
|
||||||
.to.eql(SELECT `Bar` .columns (['Foo']))
|
|
||||||
.to.eql(SELECT.from `Bar` .columns ('Foo'))
|
|
||||||
.to.eql(SELECT.from `Bar` .columns (['Foo']))
|
|
||||||
|
|
||||||
expect({
|
|
||||||
SELECT: { columns:[
|
|
||||||
{ref:['Foo']},
|
|
||||||
{ref:['Boo']},
|
|
||||||
], from: { ref: ['Bar'] } },
|
|
||||||
})
|
|
||||||
.to.eql(CQL`SELECT Foo, Boo from Bar`)
|
|
||||||
.to.eql(SELECT `Foo, Boo` .from `Bar`)
|
|
||||||
.to.eql(SELECT `Foo, Boo` .from('Bar'))
|
|
||||||
.to.eql(SELECT('Foo','Boo').from('Bar'))
|
|
||||||
.to.eql(SELECT(['Foo','Boo']).from('Bar'))
|
|
||||||
.to.eql(SELECT `Bar` .columns `Foo, Boo`)
|
|
||||||
.to.eql(SELECT `Bar` .columns ('Foo','Boo'))
|
|
||||||
.to.eql(SELECT `Bar` .columns (['Foo','Boo']))
|
|
||||||
.to.eql(SELECT.from `Bar` .columns ('Foo','Boo'))
|
|
||||||
.to.eql(SELECT.from `Bar` .columns (['Foo','Boo']))
|
|
||||||
|
|
||||||
expect({
|
|
||||||
SELECT: { columns:[
|
|
||||||
{ref:['Foo']},
|
|
||||||
{ref:['Boo']},
|
|
||||||
{ref:['Moo']},
|
|
||||||
], from: { ref: ['Bar'] } },
|
|
||||||
})
|
|
||||||
.to.eql(CQL`SELECT Foo, Boo, Moo from Bar`)
|
|
||||||
.to.eql(SELECT `Foo, Boo, Moo` .from `Bar`)
|
|
||||||
.to.eql(SELECT `Foo, Boo, Moo` .from('Bar'))
|
|
||||||
.to.eql(SELECT('Foo','Boo','Moo').from('Bar'))
|
|
||||||
.to.eql(SELECT(['Foo','Boo','Moo']).from('Bar'))
|
|
||||||
.to.eql(SELECT `Bar` .columns `Foo, Boo, Moo`)
|
|
||||||
.to.eql(SELECT `Bar` .columns ('Foo','Boo','Moo'))
|
|
||||||
.to.eql(SELECT `Bar` .columns (['Foo','Boo','Moo']))
|
|
||||||
.to.eql(SELECT.from `Bar` .columns ('Foo','Boo','Moo'))
|
|
||||||
.to.eql(SELECT.from `Bar` .columns (['Foo','Boo','Moo']))
|
|
||||||
|
|
||||||
|
|
||||||
expect({
|
|
||||||
SELECT: { one:true, columns:[{ref:['Foo']}], from: { ref: ['Bar'] } },
|
|
||||||
})
|
|
||||||
// .to.eql(CQL`SELECT one Foo from Bar`)
|
|
||||||
.to.eql(SELECT.one `Foo` .from `Bar`)
|
|
||||||
.to.eql(SELECT.one `Foo` .from('Bar'))
|
|
||||||
.to.eql(SELECT.one('Foo').from('Bar'))
|
|
||||||
.to.eql(SELECT.one(['Foo']).from('Bar'))
|
|
||||||
.to.eql(SELECT.one(['Foo']).from('Bar'))
|
|
||||||
.to.eql(SELECT.one('Bar',['Foo']))
|
|
||||||
.to.eql(SELECT.one `Bar` .columns `Foo`)
|
|
||||||
.to.eql(SELECT.one('Bar').columns('Foo'))
|
|
||||||
.to.eql(SELECT.one('Bar').columns(['Foo']))
|
|
||||||
.to.eql(SELECT.one.from('Bar',['Foo']))
|
|
||||||
.to.eql(SELECT.one.from('Bar').columns('Foo'))
|
|
||||||
.to.eql(SELECT.one.from('Bar').columns(['Foo']))
|
|
||||||
|
|
||||||
expect({
|
|
||||||
SELECT: { one:true, columns:[
|
|
||||||
{ref:['Foo']},
|
|
||||||
{ref:['Boo']},
|
|
||||||
], from: { ref: ['Bar'] } },
|
|
||||||
})
|
|
||||||
// .to.eql(CQL`SELECT Foo, Boo from Bar`)
|
|
||||||
.to.eql(SELECT.one `Foo, Boo` .from `Bar`)
|
|
||||||
.to.eql(SELECT.one `Foo, Boo` .from('Bar'))
|
|
||||||
.to.eql(SELECT.one('Foo','Boo').from('Bar'))
|
|
||||||
.to.eql(SELECT.one(['Foo','Boo']).from('Bar'))
|
|
||||||
.to.eql(SELECT.one('Bar',['Foo','Boo']))
|
|
||||||
.to.eql(SELECT.one `Bar` .columns `Foo, Boo`)
|
|
||||||
.to.eql(SELECT.one('Bar').columns('Foo','Boo'))
|
|
||||||
.to.eql(SELECT.one('Bar').columns(['Foo','Boo']))
|
|
||||||
.to.eql(SELECT.one.from('Bar',['Foo','Boo']))
|
|
||||||
.to.eql(SELECT.one.from('Bar').columns('Foo','Boo'))
|
|
||||||
.to.eql(SELECT.one.from('Bar').columns(['Foo','Boo']))
|
|
||||||
|
|
||||||
expect({
|
|
||||||
SELECT: { one:true, columns:[
|
|
||||||
{ref:['Foo']},
|
|
||||||
{ref:['Boo']},
|
|
||||||
{ref:['Moo']},
|
|
||||||
], from: { ref: ['Bar'] } },
|
|
||||||
})
|
|
||||||
// .to.eql(CQL`SELECT Foo, Boo, Moo from Bar`)
|
|
||||||
.to.eql(SELECT.one `Foo, Boo, Moo` .from `Bar`)
|
|
||||||
.to.eql(SELECT.one `Foo, Boo, Moo` .from('Bar'))
|
|
||||||
.to.eql(SELECT.one('Foo','Boo','Moo').from('Bar'))
|
|
||||||
.to.eql(SELECT.one(['Foo','Boo','Moo']).from('Bar'))
|
|
||||||
.to.eql(SELECT.one('Bar',['Foo','Boo','Moo']))
|
|
||||||
.to.eql(SELECT.one `Bar` .columns `Foo, Boo, Moo`)
|
|
||||||
.to.eql(SELECT.one('Bar').columns('Foo','Boo','Moo'))
|
|
||||||
.to.eql(SELECT.one('Bar').columns(['Foo','Boo','Moo']))
|
|
||||||
.to.eql(SELECT.one.from('Bar',['Foo','Boo','Moo']))
|
|
||||||
.to.eql(SELECT.one.from('Bar').columns('Foo','Boo','Moo'))
|
|
||||||
.to.eql(SELECT.one.from('Bar').columns(['Foo','Boo','Moo']))
|
|
||||||
|
|
||||||
})
|
|
||||||
|
|
||||||
if (each === 'SELECT')
|
|
||||||
test('from ( Foo )', () => {
|
|
||||||
expect({
|
|
||||||
SELECT: { from: {ref: [{ id:'Foo', where: [{val:11}] }] }}
|
|
||||||
})
|
|
||||||
.to.eql(srv.read`Foo[${11}]`)
|
.to.eql(srv.read`Foo[${11}]`)
|
||||||
.to.eql(SELECT`Foo[${11}]`)
|
.to.eql(SELECT`Foo[${11}]`)
|
||||||
|
|
||||||
@@ -194,15 +86,6 @@ describe('cds.ql → cqn', () => {
|
|||||||
.to.eql(SELECT.from(Foo,{ID:11}))
|
.to.eql(SELECT.from(Foo,{ID:11}))
|
||||||
.to.eql(SELECT.from(Foo).byKey(11))
|
.to.eql(SELECT.from(Foo).byKey(11))
|
||||||
.to.eql(SELECT.from(Foo).byKey({ID:11}))
|
.to.eql(SELECT.from(Foo).byKey({ID:11}))
|
||||||
if (cds.version >= '5.6.0') {
|
|
||||||
expect.one(cqn)
|
|
||||||
.to.eql({
|
|
||||||
SELECT: {
|
|
||||||
one: true,
|
|
||||||
from: { ref: [{ id: 'Foo', where: [{ ref: ['ID'] }, '=', { val: 11 }] }] },
|
|
||||||
},
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
expect.one(cqn)
|
expect.one(cqn)
|
||||||
.to.eql({
|
.to.eql({
|
||||||
SELECT: {
|
SELECT: {
|
||||||
@@ -211,7 +94,6 @@ describe('cds.ql → cqn', () => {
|
|||||||
where: [{ ref: ['ID'] }, '=', { val: 11 }],
|
where: [{ ref: ['ID'] }, '=', { val: 11 }],
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
}
|
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -249,17 +131,6 @@ describe('cds.ql → cqn', () => {
|
|||||||
// Test combination with key as second argument to .from
|
// Test combination with key as second argument to .from
|
||||||
expect(cqn = SELECT.from(Foo, 11, ['a']))
|
expect(cqn = SELECT.from(Foo, 11, ['a']))
|
||||||
.to.eql(SELECT.from(Foo, 11, foo => foo.a))
|
.to.eql(SELECT.from(Foo, 11, foo => foo.a))
|
||||||
|
|
||||||
if (cds.version >= '5.6.0') {
|
|
||||||
expect.one(cqn)
|
|
||||||
.to.eql({
|
|
||||||
SELECT: {
|
|
||||||
one: true,
|
|
||||||
from: { ref: [{ id: 'Foo', where: [{ ref: ['ID'] }, '=', { val: 11 }]}] },
|
|
||||||
columns: [{ ref: ['a'] }]
|
|
||||||
},
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
expect.one(cqn)
|
expect.one(cqn)
|
||||||
.to.eql({
|
.to.eql({
|
||||||
SELECT: {
|
SELECT: {
|
||||||
@@ -269,7 +140,6 @@ describe('cds.ql → cqn', () => {
|
|||||||
where: [{ ref: ['ID'] }, '=', { val: 11 }],
|
where: [{ ref: ['ID'] }, '=', { val: 11 }],
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
}
|
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -681,31 +551,21 @@ describe('cds.ql → cqn', () => {
|
|||||||
|
|
||||||
describe(`UPDATE...`, () => {
|
describe(`UPDATE...`, () => {
|
||||||
test('entity (..., <key>)', () => {
|
test('entity (..., <key>)', () => {
|
||||||
const cqnWhere = {
|
|
||||||
UPDATE: {
|
|
||||||
entity: 'capire.bookshop.Books',
|
|
||||||
where: [{ ref: ['ID'] }, '=', { val: 4711 }],
|
|
||||||
},
|
|
||||||
}
|
|
||||||
expect(UPDATE(Books).where({ ID: 4711 }))
|
|
||||||
.to.eql(UPDATE(Books).where(`ID=`, 4711))
|
|
||||||
.to.eql(cqnWhere)
|
|
||||||
|
|
||||||
const cqnKey = (cds.version >= '5.6.0') ?
|
|
||||||
{
|
|
||||||
UPDATE: {
|
|
||||||
entity: { ref: [{ id: 'capire.bookshop.Books', where: [{ ref: ['ID'] }, '=', { val: 4711 }] }] }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
: cqnWhere
|
|
||||||
expect(UPDATE(Books, 4711))
|
expect(UPDATE(Books, 4711))
|
||||||
.to.eql(UPDATE(Books, { ID: 4711 }))
|
.to.eql(UPDATE(Books, { ID: 4711 }))
|
||||||
.to.eql(UPDATE(Books).byKey(4711))
|
.to.eql(UPDATE(Books).byKey(4711))
|
||||||
.to.eql(UPDATE(Books).byKey({ ID: 4711 }))
|
.to.eql(UPDATE(Books).byKey({ ID: 4711 }))
|
||||||
|
.to.eql(UPDATE(Books).where({ ID: 4711 }))
|
||||||
|
.to.eql(UPDATE(Books).where(`ID=`, 4711))
|
||||||
.to.eql(UPDATE.entity(Books, 4711))
|
.to.eql(UPDATE.entity(Books, 4711))
|
||||||
.to.eql(UPDATE.entity(Books, { ID: 4711 }))
|
.to.eql(UPDATE.entity(Books, { ID: 4711 }))
|
||||||
// etc...
|
// etc...
|
||||||
.to.eql(cqnKey)
|
.to.eql({
|
||||||
|
UPDATE: {
|
||||||
|
entity: 'capire.bookshop.Books',
|
||||||
|
where: [{ ref: ['ID'] }, '=', { val: 4711 }],
|
||||||
|
},
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -756,29 +616,20 @@ describe('cds.ql → cqn', () => {
|
|||||||
|
|
||||||
describe(`DELETE...`, () => {
|
describe(`DELETE...`, () => {
|
||||||
test('from (..., <key>)', () => {
|
test('from (..., <key>)', () => {
|
||||||
const cqnWhere = {
|
|
||||||
DELETE: {
|
|
||||||
from: 'capire.bookshop.Books',
|
|
||||||
where: [{ ref: ['ID'] }, '=', { val: 4711 }],
|
|
||||||
},
|
|
||||||
}
|
|
||||||
expect(DELETE.from(Books).where({ ID: 4711 }))
|
|
||||||
.to.eql(DELETE.from(Books).where(`ID=`, 4711))
|
|
||||||
.to.eql(cqnWhere)
|
|
||||||
const cqnKey = (cds.version >= '5.6.0') ?
|
|
||||||
{
|
|
||||||
DELETE: {
|
|
||||||
from: { ref: [{ id: 'capire.bookshop.Books', where: [{ ref: ['ID'] }, '=', { val: 4711 }]}] }
|
|
||||||
},
|
|
||||||
} : cqnWhere
|
|
||||||
|
|
||||||
expect(DELETE(Books, 4711))
|
expect(DELETE(Books, 4711))
|
||||||
.to.eql(DELETE(Books, { ID: 4711 }))
|
.to.eql(DELETE(Books, { ID: 4711 }))
|
||||||
.to.eql(DELETE.from(Books, 4711))
|
.to.eql(DELETE.from(Books, 4711))
|
||||||
.to.eql(DELETE.from(Books, { ID: 4711 }))
|
.to.eql(DELETE.from(Books, { ID: 4711 }))
|
||||||
.to.eql(DELETE.from(Books).byKey(4711))
|
.to.eql(DELETE.from(Books).byKey(4711))
|
||||||
.to.eql(DELETE.from(Books).byKey({ ID: 4711 }))
|
.to.eql(DELETE.from(Books).byKey({ ID: 4711 }))
|
||||||
.to.eql(cqnKey)
|
.to.eql(DELETE.from(Books).where({ ID: 4711 }))
|
||||||
|
.to.eql(DELETE.from(Books).where(`ID=`, 4711))
|
||||||
|
.to.eql({
|
||||||
|
DELETE: {
|
||||||
|
from: 'capire.bookshop.Books',
|
||||||
|
where: [{ ref: ['ID'] }, '=', { val: 4711 }],
|
||||||
|
},
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
test('/w plain SQL', () => {
|
test('/w plain SQL', () => {
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
const cds = require('@sap/cds/lib')
|
const cds = require('@sap/cds/lib')
|
||||||
const {expect} = cds.test
|
const {expect} = cds.test
|
||||||
|
|
||||||
|
const { parse:cdr } = cds.ql
|
||||||
|
|
||||||
// should become cds.compile(...) when cds5 is released
|
// should become cds.compile(...) when cds5 is released
|
||||||
const model = cds.compile.to.csn (`
|
const model = cds.compile.to.csn (`
|
||||||
entity Categories {
|
entity Categories {
|
||||||
@@ -76,7 +78,9 @@ describe('Hierarchical Data', ()=>{
|
|||||||
{ ID:101, name:'Cat' },
|
{ ID:101, name:'Cat' },
|
||||||
{ ID:108, name:'Catweazle' }
|
{ ID:108, name:'Catweazle' }
|
||||||
]
|
]
|
||||||
expect ( await SELECT`ID,name`.from(Cats) ).to.eql (expected)
|
return 'skipped as this will be fixed in a newer cds version'
|
||||||
|
if (cdr) expect ( await SELECT.from(Cats) ).to.containSubset (expected)
|
||||||
|
else expect ( await SELECT.from(Cats) ).to.eql (expected)
|
||||||
})
|
})
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -60,11 +60,11 @@ describe('Messaging', ()=>{
|
|||||||
expect(M).equals(N)
|
expect(M).equals(N)
|
||||||
expect(received.length).equals(N)
|
expect(received.length).equals(N)
|
||||||
expect(received.map(m=>m.data)).to.deep.equal([
|
expect(received.map(m=>m.data)).to.deep.equal([
|
||||||
{ count: 1, subject: '201', rating: 1 },
|
{ subject: '201', rating: 1 },
|
||||||
{ count: 2, subject: '201', rating: 1.5 },
|
{ subject: '201', rating: 1.5 },
|
||||||
{ count: 3, subject: '201', rating: 2 },
|
{ subject: '201', rating: 2 },
|
||||||
{ count: 4, subject: '201', rating: 2.5 },
|
{ subject: '201', rating: 2.5 },
|
||||||
{ count: 5, subject: '201', rating: 3 },
|
{ subject: '201', rating: 3 },
|
||||||
])
|
])
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,54 +0,0 @@
|
|||||||
|
|
||||||
const { fork } = require('child_process')
|
|
||||||
const { resolve } = require('path')
|
|
||||||
const Axios = require('axios')
|
|
||||||
const verbose = process.env.CDS_TEST_VERBOSE
|
|
||||||
// ||true
|
|
||||||
|
|
||||||
describe('Local NPM registry', () => {
|
|
||||||
let registry
|
|
||||||
let axios
|
|
||||||
const cwd = resolve(__dirname, '..')
|
|
||||||
|
|
||||||
beforeAll(async ()=> {
|
|
||||||
const env = Object.assign(process.env, {PORT:'0'})
|
|
||||||
const res = await exec (resolve(cwd, '.registry/server.js'), {cwd, stdio: 'pipe', env})
|
|
||||||
registry = res.cp
|
|
||||||
axios = Axios.default.create ({ baseURL: res.url, validateStatus: (status)=>status<500 })
|
|
||||||
})
|
|
||||||
|
|
||||||
afterAll(() => { registry.kill() })
|
|
||||||
|
|
||||||
for (const mod of ['bookshop','fiori','orders','reviews']) {
|
|
||||||
it(`should serve ${mod}`, async () => {
|
|
||||||
const resp = await axios.get(`/@capire/${mod}`)
|
|
||||||
expect(resp.data).toMatchObject({name: `@capire/${mod}`, versions:{}})
|
|
||||||
const versions = Object.values(resp.data.versions)
|
|
||||||
await axios.get(versions[0].dist.tarball)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
it(`should return 404 for unknown packages`, async () => {
|
|
||||||
let resp = await axios.get(`/@capire/foo`)
|
|
||||||
expect(resp.status).toEqual(404)
|
|
||||||
resp = await axios.get(`/foo`)
|
|
||||||
expect(resp.status).toEqual(404)
|
|
||||||
})
|
|
||||||
|
|
||||||
})
|
|
||||||
|
|
||||||
function exec (script, opts) {
|
|
||||||
return new Promise((resolve, reject)=> {
|
|
||||||
const cp = fork (script, [], opts)
|
|
||||||
.on('error', err => reject(new Error(err)))
|
|
||||||
cp.stdout.on('data', chunk => {
|
|
||||||
if (verbose) console.log(chunk.toString())
|
|
||||||
if (chunk.toString().match(/listening.*(http:.*:\d+)/i)) {
|
|
||||||
resolve({cp, url:RegExp.$1})
|
|
||||||
}
|
|
||||||
})
|
|
||||||
cp.stderr.on('data', chunk => {
|
|
||||||
if (verbose) console.error(chunk.toString())
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user