From 8a55c2e68b8b6e0cbfadc2f841c279dae19615b5 Mon Sep 17 00:00:00 2001
From: Daniel <daniel.hutzel@sap.com>
Date: Thu, 30 Apr 2020 17:00:54 +0200
Subject: [PATCH] Testing new compiler features

---
 .env                                                |  3 ++-
 ...ems.csv => sap.capire.bookshop-Orders.Items.csv} |  8 ++++----
 orders/db/schema.cds                                | 13 +++++--------
 3 files changed, 11 insertions(+), 13 deletions(-)
 rename orders/db/data/{sap.capire.bookshop-OrderItems.csv => sap.capire.bookshop-Orders.Items.csv} (66%)

diff --git a/.env b/.env
index 01ade12c..9325d83b 100644
--- a/.env
+++ b/.env
@@ -1 +1,2 @@
-cds.features.snapi = y
\ No newline at end of file
+cds.features.snapi = y
+cds.cdsc.beta.aspectCompositions = true
\ No newline at end of file
diff --git a/orders/db/data/sap.capire.bookshop-OrderItems.csv b/orders/db/data/sap.capire.bookshop-Orders.Items.csv
similarity index 66%
rename from orders/db/data/sap.capire.bookshop-OrderItems.csv
rename to orders/db/data/sap.capire.bookshop-Orders.Items.csv
index 25edab7a..0bf812a5 100644
--- a/orders/db/data/sap.capire.bookshop-OrderItems.csv
+++ b/orders/db/data/sap.capire.bookshop-Orders.Items.csv
@@ -1,4 +1,4 @@
-ID;amount;parent_ID;book_ID;netAmount
-58040e66-1dcd-4ffb-ab10-fdce32028b79;1;7e2f2640-6866-4dcf-8f4d-3027aa831cad;201;11.11
-64e718c9-ff99-47f1-8ca3-950c850777d4;1;7e2f2640-6866-4dcf-8f4d-3027aa831cad;271;15
-e9641166-e050-4261-bfee-d1e797e6cb7f;2;64e718c9-ff99-47f1-8ca3-950c850777d4;252;28
\ No newline at end of file
+ID;amount;parent_ID;book_ID
+58040e66-1dcd-4ffb-ab10-fdce32028b79;1;7e2f2640-6866-4dcf-8f4d-3027aa831cad;201
+64e718c9-ff99-47f1-8ca3-950c850777d4;1;7e2f2640-6866-4dcf-8f4d-3027aa831cad;271
+e9641166-e050-4261-bfee-d1e797e6cb7f;2;64e718c9-ff99-47f1-8ca3-950c850777d4;252
\ No newline at end of file
diff --git a/orders/db/schema.cds b/orders/db/schema.cds
index 048aba28..abef8574 100644
--- a/orders/db/schema.cds
+++ b/orders/db/schema.cds
@@ -4,13 +4,10 @@ namespace sap.capire.bookshop;
 
 entity Orders : cuid, managed {
   OrderNo  : String @title:'Order Number'; //> readable key
-  Items    : Composition of many OrderItems on Items.parent = $self;
+  Items    : Composition of many {
+    key pos : Integer;
+    book    : Association to Books;
+    amount  : Integer;
+  };
   currency : Currency;
 }
-
-entity OrderItems : cuid {
-  parent    : Association to Orders;
-  book      : Association to Books;
-  amount    : Integer;
-  netAmount : Decimal(9,2);
-}