From b298c9b708ff5c94e270c351271fbaea876318a3 Mon Sep 17 00:00:00 2001 From: D065023 Date: Wed, 11 Dec 2019 16:37:51 +0100 Subject: [PATCH] fixed a bug --- packages/bookshop/db/schema.cds | 2 +- packages/bookshop/package.json | 2 +- packages/bookshop/srv/admin-service.js | 12 ++-- ...INESS_PARTNER-A_BusinessPartnerAddress.csv | 3 + packages/bookshop/srv/external/init.js | 72 +++++++++++++++++++ packages/bookshop/srv/init.js | 72 ------------------- 6 files changed, 84 insertions(+), 79 deletions(-) create mode 100644 packages/bookshop/srv/external/csv/API_BUSINESS_PARTNER-A_BusinessPartnerAddress.csv create mode 100644 packages/bookshop/srv/external/init.js delete mode 100644 packages/bookshop/srv/init.js diff --git a/packages/bookshop/db/schema.cds b/packages/bookshop/db/schema.cds index deef3bb9..6ffc8f2d 100644 --- a/packages/bookshop/db/schema.cds +++ b/packages/bookshop/db/schema.cds @@ -1,6 +1,6 @@ namespace sap.capire.bookshop; using { Currency, managed, cuid } from '@sap/cds/common'; -using { API_BUSINESS_PARTNER.A_BusinessPartnerAddress as extAddresses } from '../srv/external/API_BUSINESS_PARTNER.csn'; +using { API_BUSINESS_PARTNER.A_BusinessPartnerAddress as extAddresses } from '../srv/external/API_BUSINESS_PARTNER'; entity Books : managed { key ID : Integer; diff --git a/packages/bookshop/package.json b/packages/bookshop/package.json index 0e70f35c..72dcf5b3 100644 --- a/packages/bookshop/package.json +++ b/packages/bookshop/package.json @@ -22,7 +22,7 @@ } }, "messaging": { - "kind": "file-based-messaging" + "kind": "enterprise-messaging" } }, "auth": { diff --git a/packages/bookshop/srv/admin-service.js b/packages/bookshop/srv/admin-service.js index 71f6eb3f..ca7bb347 100644 --- a/packages/bookshop/srv/admin-service.js +++ b/packages/bookshop/srv/admin-service.js @@ -54,11 +54,13 @@ bupaSrv.on('sap/messaging/ccf/BO/BusinessPartner/Changed', async msg => { try { const remoteAddresses = await txExt.run(selectQl) const qlsToUpdateDifferences = _qlsToUpdateDifferences(ownAddresses, remoteAddresses) - const tx2 = cds.transaction() - await Promise.all(qlsToUpdateDifferences.map(ql => - tx2.run(ql) - )) - tx2.commit() + if (qlsToUpdateDifferences.length) { + const tx2 = cds.transaction() + await Promise.all(qlsToUpdateDifferences.map(ql => + tx2.run(ql) + )) + tx2.commit() + } } catch (e) { console.error(e) } diff --git a/packages/bookshop/srv/external/csv/API_BUSINESS_PARTNER-A_BusinessPartnerAddress.csv b/packages/bookshop/srv/external/csv/API_BUSINESS_PARTNER-A_BusinessPartnerAddress.csv new file mode 100644 index 00000000..1d500480 --- /dev/null +++ b/packages/bookshop/srv/external/csv/API_BUSINESS_PARTNER-A_BusinessPartnerAddress.csv @@ -0,0 +1,3 @@ +BusinessPartner;AddressID;CityName;PostalCode;Country;StreetName;HouseNumber +ALICE;62640;Walldorf;69190;GER;Dietmer-Hopp-Allee;16 +ALICE;62641;Berlin;69390;GER;Berlin-Street;19 \ No newline at end of file diff --git a/packages/bookshop/srv/external/init.js b/packages/bookshop/srv/external/init.js new file mode 100644 index 00000000..f2ac9730 --- /dev/null +++ b/packages/bookshop/srv/external/init.js @@ -0,0 +1,72 @@ +// module.exports = db => { +// const { A_BusinessPartnerAddress: Addresses } = db.entities( +// 'API_BUSINESS_PARTNER' +// ) + +// DELETE.from(Addresses) +// INSERT.into(Addresses).entries( +// { +// BusinessPartner: 'ANONYMOUS', +// AddressID: '62640', +// CityName: 'Walldorf', +// PostalCode: '69190', +// Country: 'GER', +// StreetName: 'Dietmar-Hopp-Allee', +// HouseNumber: '16' +// }, +// { +// BusinessPartner: 'ANONYMOUS', +// AddressID: '22222', +// CityName: 'St. Leon-Rot', +// PostalCode: '68789', +// Country: 'GER', +// StreetName: 'SAP-Allee', +// HouseNumber: '25' +// }, +// { +// BusinessPartner: 'ALICE', +// AddressID: '62640', +// CityName: 'Walldorf', +// PostalCode: '69190', +// Country: 'GER', +// StreetName: 'Dietmar-Hopp-Allee', +// HouseNumber: '16' +// }, +// { +// BusinessPartner: 'ALICE', +// AddressID: '22222', +// CityName: 'St. Leon-Rot', +// PostalCode: '68789', +// Country: 'GER', +// StreetName: 'SAP-Allee', +// HouseNumber: '25' +// }, +// { +// BusinessPartner: '1003765', +// AddressID: '28241', +// CityName: 'Palo Alto', +// PostalCode: '94306', +// Country: 'USA', +// StreetName: 'Hillview Avenue', +// HouseNumber: '26' +// }, +// { +// BusinessPartner: '1003766', +// AddressID: '28244', +// CityName: 'Hallbergmoos', +// PostalCode: '85396', +// Country: 'GER', +// StreetName: 'Zeppelinstraße', +// HouseNumber: '93' +// }, +// { +// BusinessPartner: '1003767', +// AddressID: '28247', +// CityName: 'Potsdam', +// PostalCode: '14467', +// Country: 'GER', +// StreetName: 'Konrad-Zuse-Ring', +// HouseNumber: '29' +// } +// ) +// } diff --git a/packages/bookshop/srv/init.js b/packages/bookshop/srv/init.js deleted file mode 100644 index 20bb4273..00000000 --- a/packages/bookshop/srv/init.js +++ /dev/null @@ -1,72 +0,0 @@ -module.exports = db => { - const { A_BusinessPartnerAddress: Addresses } = db.entities( - 'API_BUSINESS_PARTNER' - ) - - DELETE.from(Addresses) - INSERT.into(Addresses).entries( - { - BusinessPartner: 'ANONYMOUS', - AddressID: '62640', - CityName: 'Walldorf', - PostalCode: '69190', - Country: 'GER', - StreetName: 'Dietmar-Hopp-Allee', - HouseNumber: '16' - }, - { - BusinessPartner: 'ANONYMOUS', - AddressID: '22222', - CityName: 'St. Leon-Rot', - PostalCode: '68789', - Country: 'GER', - StreetName: 'SAP-Allee', - HouseNumber: '25' - }, - { - BusinessPartner: 'ALICE', - AddressID: '62640', - CityName: 'Walldorf', - PostalCode: '69190', - Country: 'GER', - StreetName: 'Dietmar-Hopp-Allee', - HouseNumber: '16' - }, - { - BusinessPartner: 'ALICE', - AddressID: '22222', - CityName: 'St. Leon-Rot', - PostalCode: '68789', - Country: 'GER', - StreetName: 'SAP-Allee', - HouseNumber: '25' - }, - { - BusinessPartner: '1003765', - AddressID: '28241', - CityName: 'Palo Alto', - PostalCode: '94306', - Country: 'USA', - StreetName: 'Hillview Avenue', - HouseNumber: '26' - }, - { - BusinessPartner: '1003766', - AddressID: '28244', - CityName: 'Hallbergmoos', - PostalCode: '85396', - Country: 'GER', - StreetName: 'Zeppelinstraße', - HouseNumber: '93' - }, - { - BusinessPartner: '1003767', - AddressID: '28247', - CityName: 'Potsdam', - PostalCode: '14467', - Country: 'GER', - StreetName: 'Konrad-Zuse-Ring', - HouseNumber: '29' - } - ) -}