composites
This commit is contained in:
@@ -7,6 +7,8 @@ using CatalogService from '@capire/bookshop';
|
||||
annotate CatalogService.Books with @(
|
||||
UI: {
|
||||
HeaderInfo: {
|
||||
TypeName: 'Book',
|
||||
TypeNamePlural: 'Books',
|
||||
Description: {Value: author}
|
||||
},
|
||||
HeaderFacets: [
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
navigationMode: "embedded"
|
||||
},
|
||||
"manage-orders": {
|
||||
title: "Order Books",
|
||||
title: "Manage Orders",
|
||||
description: "... testing FE v42",
|
||||
additionalInformation: "SAPUI5.Component=orders",
|
||||
applicationType : "URL",
|
||||
@@ -4,7 +4,9 @@
|
||||
|
||||
using from './admin/fiori-service';
|
||||
using from './browse/fiori-service';
|
||||
using from './orders/fiori-service';
|
||||
using from './common';
|
||||
|
||||
using from '@capire/common';
|
||||
|
||||
// only works in case of embedded orders service
|
||||
using from '@capire/orders/app/orders/fiori-service';
|
||||
|
||||
@@ -1,120 +0,0 @@
|
||||
using OrdersService from '@capire/orders/srv/orders-service';
|
||||
|
||||
annotate OrdersService.Books with {
|
||||
price @Common.FieldControl: #ReadOnly;
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Common
|
||||
//
|
||||
annotate OrdersService.OrderItems with {
|
||||
book @(
|
||||
Common: {
|
||||
Text: book.title,
|
||||
FieldControl: #Mandatory
|
||||
},
|
||||
ValueList.entity:'Books',
|
||||
);
|
||||
amount @(
|
||||
Common.FieldControl: #Mandatory
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@odata.draft.enabled
|
||||
annotate OrdersService.Orders with @(
|
||||
UI: {
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Lists of Orders
|
||||
//
|
||||
SelectionFields: [ createdAt, createdBy ],
|
||||
LineItem: [
|
||||
{Value: createdBy, Label:'Customer'},
|
||||
{Value: createdAt, Label:'Date'}
|
||||
],
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Order Details
|
||||
//
|
||||
HeaderInfo: {
|
||||
TypeName: 'Order', TypeNamePlural: 'Orders',
|
||||
Title: {
|
||||
Label: 'Order number ', //A label is possible but it is not considered on the ObjectPage yet
|
||||
Value: OrderNo
|
||||
},
|
||||
Description: {Value: createdBy}
|
||||
},
|
||||
Identification: [ //Is the main field group
|
||||
{Value: createdBy, Label:'Customer'},
|
||||
{Value: createdAt, Label:'Date'},
|
||||
{Value: OrderNo },
|
||||
],
|
||||
HeaderFacets: [
|
||||
{$Type: 'UI.ReferenceFacet', Label: '{i18n>Created}', Target: '@UI.FieldGroup#Created'},
|
||||
{$Type: 'UI.ReferenceFacet', Label: '{i18n>Modified}', Target: '@UI.FieldGroup#Modified'},
|
||||
],
|
||||
Facets: [
|
||||
{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Details'},
|
||||
{$Type: 'UI.ReferenceFacet', Label: '{i18n>OrderItems}', Target: 'Items/@UI.LineItem'},
|
||||
],
|
||||
FieldGroup#Details: {
|
||||
Data: [
|
||||
{Value: currency_code, Label:'Currency'}
|
||||
]
|
||||
},
|
||||
FieldGroup#Created: {
|
||||
Data: [
|
||||
{Value: createdBy},
|
||||
{Value: createdAt},
|
||||
]
|
||||
},
|
||||
FieldGroup#Modified: {
|
||||
Data: [
|
||||
{Value: modifiedBy},
|
||||
{Value: modifiedAt},
|
||||
]
|
||||
},
|
||||
},
|
||||
) {
|
||||
createdAt @UI.HiddenFilter:false;
|
||||
createdBy @UI.HiddenFilter:false;
|
||||
};
|
||||
|
||||
|
||||
|
||||
//The enity types name is OrdersService.my_bookshop_OrderItems
|
||||
//The annotations below are not generated in edmx WHY?
|
||||
annotate OrdersService.OrderItems with @(
|
||||
UI: {
|
||||
HeaderInfo: {
|
||||
TypeName: 'Order Item', TypeNamePlural: ' ',
|
||||
Title: {
|
||||
Value: book.title
|
||||
},
|
||||
Description: {Value: book.descr}
|
||||
},
|
||||
// There is no filterbar for items so the selctionfileds is not needed
|
||||
SelectionFields: [ book_ID ],
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Lists of OrderItems
|
||||
//
|
||||
LineItem: [
|
||||
{Value: book_ID, Label:'Book'},
|
||||
//The following entry is only used to have the assoication followed in the read event
|
||||
{Value: book.price, Label:'Book Price'},
|
||||
{Value: amount, Label:'Quantity'},
|
||||
],
|
||||
Identification: [ //Is the main field group
|
||||
//{Value: ID, Label:'ID'}, //A guid shouldn't be on the UI
|
||||
{Value: book_ID, Label:'Book'},
|
||||
{Value: amount, Label:'Amount'},
|
||||
],
|
||||
Facets: [
|
||||
{$Type: 'UI.ReferenceFacet', Label: '{i18n>OrderItems}', Target: '@UI.Identification'},
|
||||
],
|
||||
},
|
||||
);
|
||||
@@ -1,8 +0,0 @@
|
||||
sap.ui.define(["sap/fe/core/AppComponent"], function(AppComponent) {
|
||||
"use strict";
|
||||
return AppComponent.extend("orders.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 Sample
|
||||
|
||||
# JCI app descriptor contains lower case DESCRIPTION
|
||||
appSubTitle=CAP Sample Application
|
||||
|
||||
# JCI app descriptor contains lower case DESCRIPTION
|
||||
appDescription=CDS Sample Service
|
||||
@@ -1,170 +0,0 @@
|
||||
{
|
||||
"_version": "1.8.0",
|
||||
"sap.app": {
|
||||
"id": "orders",
|
||||
"type": "application",
|
||||
"title": "Order Books",
|
||||
"description": "Sample Application",
|
||||
"i18n": "i18n/i18n.properties",
|
||||
"dataSources": {
|
||||
"OrdersService": {
|
||||
"uri": "/orders/",
|
||||
"type": "OData",
|
||||
"settings": {
|
||||
"odataVersion": "4.0"
|
||||
}
|
||||
}
|
||||
},
|
||||
"-sourceTemplate": {
|
||||
"id": "ui5template.basicSAPUI5ApplicationProject",
|
||||
"-id": "ui5template.smartTemplate",
|
||||
"-version": "1.40.12"
|
||||
}
|
||||
},
|
||||
"sap.ui5": {
|
||||
"dependencies": {
|
||||
"libs": {
|
||||
"sap.fe.templates": {}
|
||||
}
|
||||
},
|
||||
"models": {
|
||||
"i18n": {
|
||||
"type": "sap.ui.model.resource.ResourceModel",
|
||||
"uri": "i18n/i18n.properties"
|
||||
},
|
||||
"": {
|
||||
"dataSource": "OrdersService",
|
||||
"settings": {
|
||||
"synchronizationMode": "None",
|
||||
"operationMode": "Server",
|
||||
"autoExpandSelect" : true,
|
||||
"earlyRequests": true,
|
||||
"groupProperties": {
|
||||
"default": {
|
||||
"submit": "Auto"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"routing": {
|
||||
"routes": [
|
||||
{
|
||||
"pattern": ":?query:",
|
||||
"name": "OrdersList",
|
||||
"target": "OrdersList"
|
||||
},
|
||||
{
|
||||
"pattern": "Orders({key}):?query:",
|
||||
"name": "OrdersDetails",
|
||||
"target": "OrdersDetails"
|
||||
},
|
||||
{
|
||||
"pattern": "Orders({boo})/Items({boo2}):?query:",
|
||||
"name": "OrderItemsDetails",
|
||||
"target": "OrderItemsDetails"
|
||||
},
|
||||
{
|
||||
"pattern": "Books({key}):?query:",
|
||||
"name": "BooksDetails",
|
||||
"target": "BooksDetails"
|
||||
}
|
||||
],
|
||||
"targets": {
|
||||
"OrdersList": {
|
||||
"type": "Component",
|
||||
"id": "OrdersList",
|
||||
"name": "sap.fe.templates.ListReport",
|
||||
"options": {
|
||||
"settings" : {
|
||||
"entitySet" : "Orders",
|
||||
"navigation" : {
|
||||
"Orders" : {
|
||||
"detail" : {
|
||||
"route" : "OrdersDetails"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"OrdersDetails": {
|
||||
"type": "Component",
|
||||
"id": "OrdersDetails",
|
||||
"name": "sap.fe.templates.ObjectPage",
|
||||
"options": {
|
||||
"settings" : {
|
||||
"entitySet": "Orders",
|
||||
"navigation" : {
|
||||
"Items": {
|
||||
"detail": {
|
||||
"route": "OrderItemsDetails"
|
||||
}
|
||||
},
|
||||
"book": {
|
||||
"detail": {
|
||||
"route": "BooksDetails"
|
||||
}
|
||||
},
|
||||
"dummy": {
|
||||
"detail": {
|
||||
"route": "BooksDetails"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"OrderItemsDetails": {
|
||||
"type": "Component",
|
||||
"id": "OrderItemsDetails",
|
||||
"name": "sap.fe.templates.ObjectPage",
|
||||
"options": {
|
||||
"settings" : {
|
||||
"entitySet": "OrderItems"
|
||||
}
|
||||
}
|
||||
},
|
||||
"BooksDetails": {
|
||||
"type": "Component",
|
||||
"id": "BooksDetails",
|
||||
"name": "sap.fe.templates.ObjectPage",
|
||||
"options": {
|
||||
"settings" : {
|
||||
"entitySet": "Books",
|
||||
"navigation": {
|
||||
"author": {
|
||||
"detail": {
|
||||
"route": "AuthorsDetails"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"AuthorsDetails": {
|
||||
"type": "Component",
|
||||
"id": "AuthorsDetails",
|
||||
"name": "sap.fe.templates.ObjectPage",
|
||||
"options": {
|
||||
"settings" : {
|
||||
"entitySet": "Authors"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"contentDensities": {
|
||||
"compact": true,
|
||||
"cozy": true
|
||||
}
|
||||
},
|
||||
"sap.ui": {
|
||||
"technology": "UI5",
|
||||
"fullWidth": false
|
||||
},
|
||||
"sap.fiori": {
|
||||
"registrationIds": [],
|
||||
"archeType": "transactional"
|
||||
}
|
||||
}
|
||||
1
fiori/app/vue/index.html
Normal file
1
fiori/app/vue/index.html
Normal file
@@ -0,0 +1 @@
|
||||
<!-- This is just a dummy to be detected by the automatically generated /index.html -->
|
||||
@@ -1,3 +0,0 @@
|
||||
// Proxy for importing schema from bookshop sample
|
||||
using from '@capire/bookshop';
|
||||
namespace sap.capire.bookshop;
|
||||
@@ -3,6 +3,7 @@
|
||||
"version": "1.0.0",
|
||||
"dependencies": {
|
||||
"@capire/bookshop": "*",
|
||||
"@capire/reviews": "*",
|
||||
"@capire/orders": "*",
|
||||
"@capire/common": "*",
|
||||
"@sap/cds": "^4",
|
||||
@@ -15,6 +16,12 @@
|
||||
},
|
||||
"cds": {
|
||||
"requires": {
|
||||
"ReviewsService": {
|
||||
"kind": "odata", "model": "@capire/reviews"
|
||||
},
|
||||
"OrdersService": {
|
||||
"kind": "odata", "model": "@capire/orders"
|
||||
},
|
||||
"db": {
|
||||
"kind": "sql"
|
||||
}
|
||||
|
||||
17
fiori/server.js
Normal file
17
fiori/server.js
Normal file
@@ -0,0 +1,17 @@
|
||||
const express = require ('express')
|
||||
const cds = require ('@sap/cds')
|
||||
|
||||
const _imported = (path,file) => express.static(
|
||||
require.resolve(`${path}/${file}`).slice(0,-1-file.length)
|
||||
)
|
||||
|
||||
cds.once('bootstrap',(app)=>{
|
||||
// serving the orders app imported from @capire/orders
|
||||
app.use ('/orders/webapp', _imported('@capire/orders/app/orders/webapp','manifest.json'))
|
||||
// serving the vue.js app imported from @capire/bookshop
|
||||
app.use ('/vue', _imported('@capire/bookshop/app/vue','index.html'))
|
||||
})
|
||||
|
||||
cds.once('served', require('./srv/mashup'))
|
||||
|
||||
module.exports = cds.server
|
||||
@@ -1,3 +0,0 @@
|
||||
// Proxy for importing services from bookshop sample
|
||||
using from '@capire/bookshop';
|
||||
annotate AdminService with @impl:'srv/admin-service.js';
|
||||
@@ -1,8 +0,0 @@
|
||||
const cds = require('@sap/cds')
|
||||
|
||||
module.exports = cds.service.impl (async function() {
|
||||
const {Books} = cds.entities
|
||||
const {ID} = await SELECT.one.from(Books).columns('max(ID) as ID')
|
||||
let newID = ID - ID % 100 + 100
|
||||
this.before ('NEW','Books', req => req.data.ID = ++newID)
|
||||
})
|
||||
25
fiori/srv/mashup.cds
Normal file
25
fiori/srv/mashup.cds
Normal file
@@ -0,0 +1,25 @@
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Mashing up imported models...
|
||||
//
|
||||
|
||||
using { sap.capire.bookshop.Books } from '@capire/bookshop';
|
||||
|
||||
//
|
||||
// Extend Books with access to Reviews and average ratings
|
||||
//
|
||||
|
||||
using { ReviewsService.Reviews } from '@capire/reviews';
|
||||
extend Books with {
|
||||
reviews : Composition of many Reviews on reviews.subject = $self.ID;
|
||||
rating : Decimal;
|
||||
}
|
||||
|
||||
//
|
||||
// Extend Orders with Books as articles
|
||||
//
|
||||
|
||||
using { sap.capire.orders.OrderItems } from '@capire/orders';
|
||||
extend OrderItems with {
|
||||
book : Association to Books on article = book.ID
|
||||
}
|
||||
59
fiori/srv/mashup.js
Normal file
59
fiori/srv/mashup.js
Normal file
@@ -0,0 +1,59 @@
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Mashing up provided and required services...
|
||||
//
|
||||
module.exports = async()=>{ // called by server.js
|
||||
|
||||
const cds = require('@sap/cds')
|
||||
const CatalogService = await cds.connect.to ('CatalogService')
|
||||
const ReviewsService = await cds.connect.to ('ReviewsService')
|
||||
const OrdersService = await cds.connect.to ('OrdersService')
|
||||
const db = await cds.connect.to ('db')
|
||||
|
||||
// reflect entity definitions used below...
|
||||
const { Books } = db.entities ('sap.capire.bookshop')
|
||||
|
||||
//
|
||||
// Delegate requests to read reviews to the ReviewsService
|
||||
// Note: prepend is neccessary to intercept generic default handler
|
||||
//
|
||||
CatalogService.prepend (srv => srv.on ('READ', 'Books/reviews', (req) => {
|
||||
console.debug ('> delegating request to ReviewsService')
|
||||
const [id] = req.params, { columns, limit } = req.query.SELECT
|
||||
return ReviewsService.tx(req).read ('Reviews',columns).limit(limit).where({subject:String(id)})
|
||||
}))
|
||||
|
||||
//
|
||||
// Create an order with the OrdersService when CatalogService signals a new order
|
||||
//
|
||||
CatalogService.on ('OrderedBook', async (msg) => {
|
||||
const { book, amount, buyer } = msg.data
|
||||
const { title, price } = await db.tx(msg).read (Books, book, b => { b.title, b.price })
|
||||
return OrdersService.tx(msg).create ('Orders').entries({
|
||||
OrderNo: 'Order at '+ (new Date).toLocaleString(),
|
||||
Items: [{ article:`${book}`, title, price, amount }],
|
||||
buyer, createdBy: buyer
|
||||
})
|
||||
})
|
||||
|
||||
//
|
||||
// Update Books' average ratings when ReviewsService signals updatd reviews
|
||||
//
|
||||
ReviewsService.on ('reviewed', (msg) => {
|
||||
console.debug ('> received:', msg.event, msg.data)
|
||||
const { subject, rating } = msg.data
|
||||
return UPDATE(Books,subject).with({rating})
|
||||
// ^ Note: the framework will execute this and take care for db.tx
|
||||
})
|
||||
|
||||
//
|
||||
// Reduce stock of ordered books for orders are created from Orders admin UI
|
||||
//
|
||||
OrdersService.on ('OrderChanged', async (msg) => {
|
||||
console.debug ('> received:', msg.event, msg.data)
|
||||
const { article, deltaAmount } = msg.data
|
||||
return UPDATE (Books) .where ('ID =', article)
|
||||
.and ('stock >=', deltaAmount)
|
||||
.set ('stock -=', deltaAmount)
|
||||
})
|
||||
}
|
||||
54
fiori/test/requests.http
Normal file
54
fiori/test/requests.http
Normal file
@@ -0,0 +1,54 @@
|
||||
|
||||
@me = {{$processEnv USER}}:
|
||||
@bookshop = http://localhost:4004
|
||||
@reviews-service = {{bookshop}}/reviews
|
||||
|
||||
# Uncomment this when running separate reviews service
|
||||
# @reviews-service = http://localhost:5005/reviews
|
||||
|
||||
|
||||
|
||||
#################################################
|
||||
#
|
||||
# To ReviewsService
|
||||
#
|
||||
# move the right down:
|
||||
|
||||
### Get all reviews
|
||||
GET {{reviews-service}}/Reviews
|
||||
|
||||
### Add a new review (with random rating)
|
||||
POST {{reviews-service}}/Reviews
|
||||
Content-Type: application/json;IEEE754Compatible=true
|
||||
Authorization: Basic {{me}}
|
||||
|
||||
{"subject":"201", "title":"boo" }
|
||||
|
||||
|
||||
|
||||
#################################################
|
||||
#
|
||||
# Bookshop Requests involving reviews
|
||||
# (both in-process as well as separate one)
|
||||
#
|
||||
|
||||
### Request to CatalogService > delegated to ReviewsService
|
||||
GET {{bookshop}}/browse/Books(201)/reviews?
|
||||
&$select=rating,date,reviewer,title
|
||||
|
||||
### Alternative OData URL
|
||||
GET {{bookshop}}/browse/Books/201/reviews?
|
||||
&$select=rating,date,title
|
||||
&$top=3
|
||||
|
||||
###
|
||||
GET {{bookshop}}/browse/Books(201)?
|
||||
&$select=ID,title,rating
|
||||
&$expand=reviews
|
||||
# Note: the $expand only works in case of ReviewsService in same process
|
||||
|
||||
|
||||
|
||||
###
|
||||
|
||||
GET {{bookshop}}/orders/Orders
|
||||
Reference in New Issue
Block a user