From f1927f184ec8df17d4f4a8057c057a531773e971 Mon Sep 17 00:00:00 2001 From: Wolfgang Koch Date: Fri, 14 May 2021 11:32:50 +0200 Subject: [PATCH] namespace correction --- ...p.extension-Z_CustomerPostalAddresses._csv | 5 - ...op.extension-Z_CustomerPostalAddresses.csv | 10 +- db/data/Z_bookshop.extension-Z_Customers._csv | 3 - db/data/Z_bookshop.extension-Z_Customers.csv | 6 +- .../Z_bookshop.extension-Z_SalesRegion.csv | 8 +- db/data/sap.capire.orders-Orders._csv | 3 - db/data/sap.capire.orders-Orders.csv | 6 +- db/extension.cds | 52 ++++--- srv/extension_service_ui.cds | 137 +++++++++--------- 9 files changed, 108 insertions(+), 122 deletions(-) delete mode 100644 db/data/Z_bookshop.extension-Z_CustomerPostalAddresses._csv delete mode 100644 db/data/Z_bookshop.extension-Z_Customers._csv delete mode 100644 db/data/sap.capire.orders-Orders._csv diff --git a/db/data/Z_bookshop.extension-Z_CustomerPostalAddresses._csv b/db/data/Z_bookshop.extension-Z_CustomerPostalAddresses._csv deleted file mode 100644 index 7bafa31b..00000000 --- a/db/data/Z_bookshop.extension-Z_CustomerPostalAddresses._csv +++ /dev/null @@ -1,5 +0,0 @@ -ID;modifiedAt;createdAt;createdBy;modifiedBy;Z_Customer_ID;Z_description;Z_street;Z_town;Z_country_code -1e2f2640-6866-4dcf-8f4d-3027aa831cad;2019-04-04;2019-01-31;admin@business.com;admin@business.com;8e2f2640-6866-4dcf-8f4d-3027aa831cad;Home;Hauptstrasse 11;Berlin;DE -24e718c9-ff99-47f1-8ca3-950c850777d4;2019-04-04;2019-01-30;admin@business.com;admin@business.com;74e718c9-ff99-47f1-8ca3-950c850777d4;Home;Main Street 22;London;GB -3e2f2640-6866-4dcf-8f4d-3027aa831cad;2019-04-04;2019-01-31;admin@business.com;admin@business.com;8e2f2640-6866-4dcf-8f4d-3027aa831cad;Work;Siemensstrasse 21;Berlin;DE -44e718c9-ff99-47f1-8ca3-950c850777d4;2019-04-04;2019-01-30;admin@business.com;admin@business.com;74e718c9-ff99-47f1-8ca3-950c850777d4;Work;Work Street 34;London;GB diff --git a/db/data/Z_bookshop.extension-Z_CustomerPostalAddresses.csv b/db/data/Z_bookshop.extension-Z_CustomerPostalAddresses.csv index c8632cf1..c4ebd778 100644 --- a/db/data/Z_bookshop.extension-Z_CustomerPostalAddresses.csv +++ b/db/data/Z_bookshop.extension-Z_CustomerPostalAddresses.csv @@ -1,5 +1,5 @@ -Z_ID;Z_Customer_Z_ID;Z_description;Z_street;Z_town;Z_country_code -1e2f2640-6866-4dcf-8f4d-3027aa831cad;8e2f2640-6866-4dcf-8f4d-3027aa831cad;Home;Hauptstrasse 11;Berlin;DE -24e718c9-ff99-47f1-8ca3-950c850777d4;74e718c9-ff99-47f1-8ca3-950c850777d4;Home;Main Street 22;London;GB -3e2f2640-6866-4dcf-8f4d-3027aa831cad;8e2f2640-6866-4dcf-8f4d-3027aa831cad;Work;Siemensstrasse 21;Berlin;DE -44e718c9-ff99-47f1-8ca3-950c850777d4;74e718c9-ff99-47f1-8ca3-950c850777d4;Work;Work Street 34;London;GB +ID;modifiedAt;createdAt;createdBy;modifiedBy;Customer_ID;description;street;town;country_code +1e2f2640-6866-4dcf-8f4d-3027aa831cad;2019-04-04;2019-01-31;admin@business.com;admin@business.com;8e2f2640-6866-4dcf-8f4d-3027aa831cad;Home;Hauptstrasse 11;Berlin;DE +24e718c9-ff99-47f1-8ca3-950c850777d4;2019-04-04;2019-01-30;admin@business.com;admin@business.com;74e718c9-ff99-47f1-8ca3-950c850777d4;Home;Main Street 22;London;GB +3e2f2640-6866-4dcf-8f4d-3027aa831cad;2019-04-04;2019-01-31;admin@business.com;admin@business.com;8e2f2640-6866-4dcf-8f4d-3027aa831cad;Work;Siemensstrasse 21;Berlin;DE +44e718c9-ff99-47f1-8ca3-950c850777d4;2019-04-04;2019-01-30;admin@business.com;admin@business.com;74e718c9-ff99-47f1-8ca3-950c850777d4;Work;Work Street 34;London;GB diff --git a/db/data/Z_bookshop.extension-Z_Customers._csv b/db/data/Z_bookshop.extension-Z_Customers._csv deleted file mode 100644 index b490b075..00000000 --- a/db/data/Z_bookshop.extension-Z_Customers._csv +++ /dev/null @@ -1,3 +0,0 @@ -ID;modifiedAt;createdAt;createdBy;modifiedBy;Z_email;Z_firstName;Z_lastName;Z_creditCardNo;Z_dateOfBirth;Z_status;Z_creditScore -8e2f2640-6866-4dcf-8f4d-3027aa831cad;2019-04-04;2019-01-31;admin@business.com;admin@business.com;john.doe@test.com;John;Doe;9977-6655-4433-2211;1970-01-01;gold;80.0 -74e718c9-ff99-47f1-8ca3-950c850777d4;2019-04-04;2019-01-30;admin@business.com;admin@business.com;jane.doe@sap.com;Jane;Doe;2211-3344-5566-7788;1980-11-11;platinum;100.0 \ No newline at end of file diff --git a/db/data/Z_bookshop.extension-Z_Customers.csv b/db/data/Z_bookshop.extension-Z_Customers.csv index adf464dd..9359a945 100644 --- a/db/data/Z_bookshop.extension-Z_Customers.csv +++ b/db/data/Z_bookshop.extension-Z_Customers.csv @@ -1,3 +1,3 @@ -Z_ID;Z_email;Z_firstName;Z_lastName;Z_creditCardNo;Z_dateOfBirth;Z_status;Z_creditScore -8e2f2640-6866-4dcf-8f4d-3027aa831cad;john.doe@test.com;John;Doe;9977-6655-4433-2211;1970-01-01;gold;80.0 -74e718c9-ff99-47f1-8ca3-950c850777d4;jane.doe@sap.com;Jane;Doe;2211-3344-5566-7788;1980-11-11;platinum;100.0 \ No newline at end of file +ID;modifiedAt;createdAt;createdBy;modifiedBy;email;firstName;lastName;creditCardNo;dateOfBirth;status;creditScore +8e2f2640-6866-4dcf-8f4d-3027aa831cad;2019-04-04;2019-01-31;admin@business.com;admin@business.com;john.doe@test.com;John;Doe;9977-6655-4433-2211;1970-01-01;gold;80.0 +74e718c9-ff99-47f1-8ca3-950c850777d4;2019-04-04;2019-01-30;admin@business.com;admin@business.com;jane.doe@sap.com;Jane;Doe;2211-3344-5566-7788;1980-11-11;platinum;100.0 \ No newline at end of file diff --git a/db/data/Z_bookshop.extension-Z_SalesRegion.csv b/db/data/Z_bookshop.extension-Z_SalesRegion.csv index 39187885..e05b5c42 100644 --- a/db/data/Z_bookshop.extension-Z_SalesRegion.csv +++ b/db/data/Z_bookshop.extension-Z_SalesRegion.csv @@ -1,4 +1,4 @@ -Z_regionCode -AMER -EMEA -APJ \ No newline at end of file +regionCode;name;descr +AMER;Americas;North, Central and South America +EMEA;Europe, the Middle East and Africa;Europe, the Middle East and Africa +APJ;Asia Pacific and Japan;Asia Pacific and Japan \ No newline at end of file diff --git a/db/data/sap.capire.orders-Orders._csv b/db/data/sap.capire.orders-Orders._csv deleted file mode 100644 index 141d9cb3..00000000 --- a/db/data/sap.capire.orders-Orders._csv +++ /dev/null @@ -1,3 +0,0 @@ -ID;createdAt;createdBy;buyer;OrderNo;currency_code;Z_Customer_ID;Z_priority -7e2f2640-6866-4dcf-8f4d-3027aa831cad;2019-01-31;john.doe@test.com;john.doe@test.com;1;EUR;8e2f2640-6866-4dcf-8f4d-3027aa831cad;high -64e718c9-ff99-47f1-8ca3-950c850777d4;2019-01-30;jane.doe@test.com;jane.doe@test.com;2;EUR;74e718c9-ff99-47f1-8ca3-950c850777d4;low \ No newline at end of file diff --git a/db/data/sap.capire.orders-Orders.csv b/db/data/sap.capire.orders-Orders.csv index 09acc6b9..dec45190 100644 --- a/db/data/sap.capire.orders-Orders.csv +++ b/db/data/sap.capire.orders-Orders.csv @@ -1,3 +1,3 @@ -ID;createdAt;createdBy;buyer;OrderNo;currency_code;Z_Customer_Z_ID;Z_priority -7e2f2640-6866-4dcf-8f4d-3027aa831cad;2019-01-31;john.doe@test.com;john.doe@test.com;1;EUR;8e2f2640-6866-4dcf-8f4d-3027aa831cad;high -64e718c9-ff99-47f1-8ca3-950c850777d4;2019-01-30;jane.doe@test.com;jane.doe@test.com;2;EUR;74e718c9-ff99-47f1-8ca3-950c850777d4;low \ No newline at end of file +ID;createdAt;createdBy;buyer;OrderNo;currency_code;Z_Customer_ID;Z_priority;Z_SalesRegion_regionCode +7e2f2640-6866-4dcf-8f4d-3027aa831cad;2019-01-31;john.doe@test.com;john.doe@test.com;1;EUR;8e2f2640-6866-4dcf-8f4d-3027aa831cad;high;EMEA +64e718c9-ff99-47f1-8ca3-950c850777d4;2019-01-30;jane.doe@test.com;jane.doe@test.com;2;EUR;74e718c9-ff99-47f1-8ca3-950c850777d4;low;APJ \ No newline at end of file diff --git a/db/extension.cds b/db/extension.cds index 8c613d22..9c57ca04 100644 --- a/db/extension.cds +++ b/db/extension.cds @@ -10,58 +10,56 @@ using { namespace Z_bookshop.extension; + // extend existing entity extend orders.Orders with { Z_Customer : Association to one Z_Customers; Z_SalesRegion : Association to one Z_SalesRegion; Z_priority : String @assert.range enum {high; medium; low} default 'medium'; - Z_Remarks : Composition of many Z_Remarks on Z_Remarks.Z_parent = $self; + // Z_Remarks : Composition of many Z_Remarks on Z_Remarks.parent = $self; } + // new entity - as association target -entity Z_Customers // : cuid, managed +entity Z_Customers : cuid, managed { - key Z_ID : UUID; // workaround - Z_email : String; - Z_firstName : String; - Z_lastName : String; - Z_creditCardNo : String; - Z_dateOfBirth : Date; - Z_status : String @assert.range enum {platinum; gold; silver; bronze} default 'bronze'; - Z_creditScore : Decimal @assert.range: [ 1.0, 100.0 ] default 50.0; - Z_PostalAddresses : Composition of many Z_CustomerPostalAddresses on Z_PostalAddresses.Z_Customer = $self; + email : String; + firstName : String; + lastName : String; + creditCardNo : String; + dateOfBirth : Date; + status : String @assert.range enum {platinum; gold; silver; bronze} default 'bronze'; + creditScore : Decimal @assert.range: [ 1.0, 100.0 ] default 50.0; + PostalAddresses : Composition of many Z_CustomerPostalAddresses on PostalAddresses.Customer = $self; } // new unique constraint (secondary index) -annotate Z_Customers with @assert.unique: { Z_email: [ Z_email ] } +annotate Z_Customers with @assert.unique: { email: [ email ] } { - Z_email @mandatory; // mandatory check + email @mandatory; // mandatory check } // new entity - as composition target -entity Z_CustomerPostalAddresses // : +entity Z_CustomerPostalAddresses : cuid, managed { - key Z_ID : UUID; // workaround - Z_Customer : Association to one Z_Customers; - Z_description : String; - Z_street : String; - Z_town : String; - Z_country : Country; + Customer : Association to one Z_Customers; + description : String; + street : String; + town : String; + country : Country; } // new entity - as code list entity Z_SalesRegion: CodeList { - key Z_regionCode : String(11); + key regionCode : String(11); } // new entity - as composition target -entity Z_Remarks // : cuid, managed +entity Z_Remarks : cuid, managed { - key Z_ID : UUID; // workaround - Z_parent : Association to one orders.Orders; - // number : Integer; // try without Z_ - Z_number : Integer; - Z_remarksLine : String; + parent : Association to one orders.Orders; + number : Integer; + remarksLine : String; } diff --git a/srv/extension_service_ui.cds b/srv/extension_service_ui.cds index e803b714..dd5b2c66 100644 --- a/srv/extension_service_ui.cds +++ b/srv/extension_service_ui.cds @@ -10,41 +10,40 @@ annotate OrdersService.Z_SalesRegion with @odata.draft.enabled; // new entity -- titles annotate OrdersService.Z_Customers with { - Z_ID @( // workaround + ID @( UI.Hidden, - Common : {Text : Z_email} + Common : {Text : email} ); - Z_firstName @title : 'First Name'; - Z_lastName @title : 'Last Name'; - Z_email @title : 'Email'; - Z_creditCardNo @title : 'Credit Card No'; - Z_dateOfBirth @title : 'Date of Birth'; - Z_status @title : 'Status'; - Z_creditScore @title : 'Credit Score'; + firstName @title : 'First Name'; + lastName @title : 'Last Name'; + email @title : 'Email'; + creditCardNo @title : 'Credit Card No'; + dateOfBirth @title : 'Date of Birth'; + status @title : 'Status'; + creditScore @title : 'Credit Score'; } // new entity -- titles annotate OrdersService.Z_CustomerPostalAddresses with { - Z_ID @( // workaround + ID @( UI.Hidden, - Common : {Text : Z_description} + Common : {Text : description} ); - Z_description @title : 'Description'; - Z_street @title : 'Street'; - Z_town @title : 'Town'; - Z_country @title : 'Country'; + description @title : 'Description'; + street @title : 'Street'; + town @title : 'Town'; + country @title : 'Country'; } // new entity -- titles annotate OrdersService.Z_SalesRegion with { - Z_regionCode @title: 'Region Code'; + regionCode @title: 'Region Code'; } // new entity -- titles annotate OrdersService.Z_Remarks with { -// number @title: 'Remark Number'; - Z_number @title: 'Remark Number'; - Z_remarksLine @title: 'Remark'; + number @title: 'Remark Number'; + remarksLine @title: 'Remark'; } @@ -55,26 +54,26 @@ annotate OrdersService.Z_Customers with @(UI : { TypeNamePlural : 'Customers', Title : { $Type : 'UI.DataField', - Value : Z_email + Value : email } }, LineItem : [ - {Value : Z_firstName}, - {Value : Z_lastName}, - {Value : Z_email}, - {Value : Z_status}, - {Value : Z_creditScore} + {Value : firstName}, + {Value : lastName}, + {Value : email}, + {Value : status}, + {Value : creditScore} ], Facets : [ {$Type: 'UI.ReferenceFacet', Label: 'Main', Target : '@UI.FieldGroup#Main'}, - {$Type: 'UI.ReferenceFacet', Label: 'Customer Postal Addresses', Target: 'Z_PostalAddresses/@UI.LineItem'} + {$Type: 'UI.ReferenceFacet', Label: 'Customer Postal Addresses', Target: 'PostalAddresses/@UI.LineItem'} ], FieldGroup #Main : {Data : [ - {Value : Z_firstName}, - {Value : Z_lastName}, - {Value : Z_email}, - {Value : Z_status}, - {Value : Z_creditScore} + {Value : firstName}, + {Value : lastName}, + {Value : email}, + {Value : status}, + {Value : creditScore} ]} } ) ; @@ -85,23 +84,23 @@ annotate OrdersService.Z_CustomerPostalAddresses with @(UI : { TypeNamePlural : 'CustomerPostalAddresses', Title : { $Type : 'UI.DataField', - Value : Z_description + Value : description } }, LineItem : [ - {Value : Z_description}, - {Value : Z_street}, - {Value : Z_town}, - {Value : Z_country_code} + {Value : description}, + {Value : street}, + {Value : town}, + {Value : country_code} ], Facets : [ {$Type: 'UI.ReferenceFacet', Label: 'Main', Target : '@UI.FieldGroup#Main'} ], FieldGroup #Main : {Data : [ - {Value : Z_description}, - {Value : Z_street}, - {Value : Z_town}, - {Value : Z_country_code} + {Value : description}, + {Value : street}, + {Value : town}, + {Value : country_code} ]} }, ) { @@ -115,18 +114,22 @@ annotate OrdersService.Z_SalesRegion with @( TypeNamePlural: 'Sales Regions', Title : { $Type : 'UI.DataField', - Value : Z_regionCode + Value : regionCode } }, LineItem: [ - {Value: Z_regionCode} + {Value: regionCode} //, + // {Value: name}, + // {Value: descr} ], Facets: [ {$Type: 'UI.ReferenceFacet', Label: 'Main', Target: '@UI.FieldGroup#Main'} ], FieldGroup#Main: { Data: [ - {Value: Z_regionCode} + {Value: regionCode} //, + // {Value: name}, + // {Value: descr} ] } }, @@ -143,23 +146,20 @@ annotate OrdersService.Z_Remarks with @( TypeNamePlural: 'Remarks', Title : { $Type : 'UI.DataField', - Value : Z_number - // Value : number + Value : number } }, LineItem: [ - {Value: Z_number}, - // {Value: number}, - {Value: Z_remarksLine} + {Value: number}, + {Value: remarksLine} ], Facets: [ {$Type: 'UI.ReferenceFacet', Label: 'Main', Target: '@UI.FieldGroup#Main'} ], FieldGroup#Main: { Data: [ - {Value: Z_number}, - // {Value: number}, - {Value: Z_remarksLine} + {Value: number}, + {Value: remarksLine} ] } }, @@ -167,7 +167,6 @@ annotate OrdersService.Z_Remarks with @( }; - // extend existing entity Orders with new extension fields and new composition @odata.draft.enabled @@ -176,9 +175,9 @@ annotate OrdersService.Orders with @( SelectionFields: [ createdAt, createdBy ], LineItem: [ {Value: OrderNo, Label:'OrderNo'}, - {Value: Z_Customer_Z_ID, Label:'Customer'}, // workaround - extension field - {Value: Z_SalesRegion_Z_regionCode, Label:'Sales Region'}, // workaround - extension field - {Value: Z_priority, Label:'Priority'}, // extension field + {Value: Z_Customer_ID, Label:'Customer'}, // extension field + {Value: Z_SalesRegion_regionCode, Label:'Sales Region'}, // extension field + {Value: Z_priority, Label:'Priority'}, // extension field {Value: createdAt, Label:'Date'} ], HeaderInfo: { @@ -200,15 +199,15 @@ annotate OrdersService.Orders with @( ], Facets: [ {$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}', Target: '@UI.FieldGroup#Details'}, - {$Type: 'UI.ReferenceFacet', Label: '{i18n>OrderItems}', Target: 'Items/@UI.LineItem'}, - {$Type: 'UI.ReferenceFacet', Label: 'Remarks', Target: 'Z_Remarks/@UI.LineItem'} // new composition + {$Type: 'UI.ReferenceFacet', Label: '{i18n>OrderItems}', Target: 'Items/@UI.LineItem'} //, + // {$Type: 'UI.ReferenceFacet', Label: 'Remarks', Target: 'Z_Remarks/@UI.LineItem'} // new composition ], FieldGroup#Details: { Data: [ - {Value: currency_code, Label:'Currency'}, // correction - {Value: Z_Customer_Z_ID, Label:'Customer'}, // workaround - extension field - {Value: Z_SalesRegion_Z_regionCode, Label:'Sales Region'}, // workaround - extension field - {Value: Z_priority, Label:'Priority'} // extension field + {Value: currency_code, Label:'Currency'}, + {Value: Z_Customer_ID, Label:'Customer'}, // extension field + {Value: Z_SalesRegion_regionCode, Label:'Sales Region'}, // extension field + {Value: Z_priority, Label:'Priority'} // extension field ] }, FieldGroup#Created: { @@ -226,10 +225,10 @@ annotate OrdersService.Orders with @( }, ) -//{ -// createdAt @UI.HiddenFilter:false; -// createdBy @UI.HiddenFilter:false; -//} +{ + createdAt @UI.HiddenFilter:false; + createdBy @UI.HiddenFilter:false; +} ; @@ -239,17 +238,17 @@ annotate OrdersService.Orders with @( Z_Customer @( Common: { //show email, not id for Customer in the context of Orders - Text: Z_Customer.Z_email , TextArrangement: #TextOnly, + Text: Z_Customer.email , TextArrangement: #TextOnly, ValueList: { Label: 'Customers', CollectionPath: 'Z_Customers', Parameters: [ { $Type: 'Common.ValueListParameterInOut', - LocalDataProperty: Z_Customer_Z_ID, // workaround - ValueListProperty: 'Z_ID' // workaround + LocalDataProperty: Z_Customer_ID, + ValueListProperty: 'ID' }, { $Type: 'Common.ValueListParameterDisplayOnly', - ValueListProperty: 'Z_email' + ValueListProperty: 'email' } ] }