diff --git a/db/data/Z_bookshop.extension-Z_CustomerPostalAddresses.csv b/db/data/Z_bookshop.extension-Z_CustomerPostalAddresses.csv index c4ebd778..7bafa31b 100644 --- a/db/data/Z_bookshop.extension-Z_CustomerPostalAddresses.csv +++ b/db/data/Z_bookshop.extension-Z_CustomerPostalAddresses.csv @@ -1,4 +1,4 @@ -ID;modifiedAt;createdAt;createdBy;modifiedBy;Customer_ID;description;street;town;country_code +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 diff --git a/db/data/Z_bookshop.extension-Z_Customers.csv b/db/data/Z_bookshop.extension-Z_Customers.csv index 9359a945..b490b075 100644 --- a/db/data/Z_bookshop.extension-Z_Customers.csv +++ b/db/data/Z_bookshop.extension-Z_Customers.csv @@ -1,3 +1,3 @@ -ID;modifiedAt;createdAt;createdBy;modifiedBy;email;firstName;lastName;creditCardNo;dateOfBirth;status;creditScore +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/extension.cds b/db/extension.cds index 845ce679..f43bc945 100644 --- a/db/extension.cds +++ b/db/extension.cds @@ -12,42 +12,42 @@ namespace Z_bookshop.extension; // extend existing entity extend orders.Orders with { Z_Customer : Association to one Z_Customers; - Z_Remarks : Composition of many Z_Remarks on Z_Remarks.parent = $self; + Z_Remarks : Composition of many Z_Remarks on Z_Remarks.Z_parent = $self; Z_priority : String @assert.range enum {high; medium; low} default 'medium'; } // new entity - as association target entity Z_Customers : cuid, managed { - 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; + 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; } // new unique constraint (secondary index) -annotate Z_Customers with @assert.unique: { email: [ email ] } +annotate Z_Customers with @assert.unique: { Z_email: [ Z_email ] } { - email @mandatory; // mandatory check + Z_email @mandatory; // mandatory check } // new entity - as composition target entity Z_CustomerPostalAddresses : cuid, managed { - Customer : Association to one Z_Customers; - description : String; - street : String; - town : String; - country : Country; + Z_Customer : Association to one Z_Customers; + Z_description : String; + Z_street : String; + Z_town : String; + Z_country : Country; }; // new entity - as composition target entity Z_Remarks : cuid, managed { - parent : Association to one orders.Orders; - number : Integer; - remarksLine : String; + Z_parent : Association to one orders.Orders; + Z_number : Integer; + Z_remarksLine : String; } diff --git a/srv/extension_service_ui.cds b/srv/extension_service_ui.cds index 67ec78ff..f322f8d0 100644 --- a/srv/extension_service_ui.cds +++ b/srv/extension_service_ui.cds @@ -9,33 +9,33 @@ annotate OrdersService.Z_Customers with @odata.draft.enabled; annotate OrdersService.Z_Customers with { ID @( UI.Hidden, - Common : {Text : email} + Common : {Text : Z_email} ); - 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'; + 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'; } // new entity -- titles annotate OrdersService.Z_CustomerPostalAddresses with { ID @( UI.Hidden, - Common : {Text : description} + Common : {Text : Z_description} ); - description @title : 'Description'; - street @title : 'Street'; - town @title : 'Town'; - country @title : 'Country'; + Z_description @title : 'Description'; + Z_street @title : 'Street'; + Z_town @title : 'Town'; + Z_country @title : 'Country'; } // new entity -- titles annotate OrdersService.Z_Remarks with { - number @title: 'Remark Number'; - remarksLine @title: 'Remark'; + Z_number @title: 'Remark Number'; + Z_remarksLine @title: 'Remark'; } // new entity in service -- UI @@ -45,26 +45,26 @@ annotate OrdersService.Z_Customers with @(UI : { TypeNamePlural : 'Customers', Title : { $Type : 'UI.DataField', - Value : email + Value : Z_email } }, LineItem : [ - {Value : firstName}, - {Value : lastName}, - {Value : email}, - {Value : status}, - {Value : creditScore} + {Value : Z_firstName}, + {Value : Z_lastName}, + {Value : Z_email}, + {Value : Z_status}, + {Value : Z_creditScore} ], Facets : [ {$Type: 'UI.ReferenceFacet', Label: 'Main', Target : '@UI.FieldGroup#Main'}, - {$Type: 'UI.ReferenceFacet', Label: 'Customer Postal Addresses', Target: 'PostalAddresses/@UI.LineItem'} + {$Type: 'UI.ReferenceFacet', Label: 'Customer Postal Addresses', Target: 'Z_PostalAddresses/@UI.LineItem'} ], FieldGroup #Main : {Data : [ - {Value : firstName}, - {Value : lastName}, - {Value : email}, - {Value : status}, - {Value : creditScore} + {Value : Z_firstName}, + {Value : Z_lastName}, + {Value : Z_email}, + {Value : Z_status}, + {Value : Z_creditScore} ]} } ) ; @@ -75,23 +75,23 @@ annotate OrdersService.Z_CustomerPostalAddresses with @(UI : { TypeNamePlural : 'CustomerPostalAddresses', Title : { $Type : 'UI.DataField', - Value : description + Value : Z_description } }, LineItem : [ - {Value : description}, - {Value : street}, - {Value : town}, - {Value : country_code} + {Value : Z_description}, + {Value : Z_street}, + {Value : Z_town}, + {Value : Z_country_code} ], Facets : [ {$Type: 'UI.ReferenceFacet', Label: 'Main', Target : '@UI.FieldGroup#Main'} ], FieldGroup #Main : {Data : [ - {Value : description}, - {Value : street}, - {Value : town}, - {Value : country_code} + {Value : Z_description}, + {Value : Z_street}, + {Value : Z_town}, + {Value : Z_country_code} ]} }, ) { @@ -107,20 +107,20 @@ annotate OrdersService.Z_Remarks with @( TypeNamePlural: 'Remarks', Title : { $Type : 'UI.DataField', - Value : number + Value : Z_number } }, LineItem: [ - {Value: number}, - {Value: remarksLine} + {Value: Z_number}, + {Value: Z_remarksLine} ], Facets: [ {$Type: 'UI.ReferenceFacet', Label: 'Main', Target: '@UI.FieldGroup#Main'} ], FieldGroup#Main: { Data: [ - {Value: number}, - {Value: remarksLine} + {Value: Z_number}, + {Value: Z_remarksLine} ] } }, @@ -193,7 +193,7 @@ annotate OrdersService.Orders with @( Z_Customer @( Common: { //show email, not id for Customer in the context of Orders - Text: Z_Customer.email , TextArrangement: #TextOnly, + Text: Z_Customer.Z_email , TextArrangement: #TextOnly, ValueList: { Label: 'Customers', CollectionPath: 'Z_Customers', @@ -203,7 +203,7 @@ annotate OrdersService.Orders with @( ValueListProperty: 'ID' }, { $Type: 'Common.ValueListParameterDisplayOnly', - ValueListProperty: 'email' + ValueListProperty: 'Z_email' } ] }