From 7bb08b2e5929980ab24a6de42b91cd6b1cafb5a0 Mon Sep 17 00:00:00 2001 From: Marc Becker Date: Fri, 14 Feb 2020 14:48:02 +0000 Subject: [PATCH] Adapt checkpoint to exercise update --- bookstore/manifest.yml | 4 ++-- bookstore/package.json | 4 ++-- bookstore/pom.xml | 7 ++++--- bookstore/srv/pom.xml | 1 + .../cap/bookstore/handlers/OrdersService.java | 18 +++++++++++------- .../bookstore/handlers/orderServiceTest.java | 2 +- products-service/package.json | 4 ++-- products-service/pom.xml | 7 ++++--- products-service/srv/pom.xml | 1 + 9 files changed, 28 insertions(+), 20 deletions(-) diff --git a/bookstore/manifest.yml b/bookstore/manifest.yml index d1fd861f..44391f73 100644 --- a/bookstore/manifest.yml +++ b/bookstore/manifest.yml @@ -1,7 +1,7 @@ --- applications: -- name: bookstore- +- name: bookstore path: srv/target/bookstore-1.0-SNAPSHOT.jar random-route: true services: - - bookstore-hana- + - bookstore-hana diff --git a/bookstore/package.json b/bookstore/package.json index 73eaa1dd..868bdc12 100644 --- a/bookstore/package.json +++ b/bookstore/package.json @@ -10,13 +10,13 @@ "deploy": "cds deploy" }, "dependencies": { - "@sap/cds": "3.17.4", + "@sap/cds": "3.21.2", "@sap/capire-products": "file:sap-capire-products-1.0.0.tgz", "hdb": "^0.17.1" }, "devDependencies": { "@sap/hdi-deploy": "3.7.0", - "sqlite3": "^4.1.0" + "sqlite3": "^4.1.1" }, "cds": { "build": { diff --git a/bookstore/pom.xml b/bookstore/pom.xml index e3af3ae8..2caf9591 100644 --- a/bookstore/pom.xml +++ b/bookstore/pom.xml @@ -16,9 +16,9 @@ 1.8 - 1.0.1 - 1.2.1 - 2.1.7.RELEASE + 1.2.0 + 1.6.0 + 2.2.3.RELEASE v10.4.1 https://nodejs.org/dist/ @@ -128,6 +128,7 @@ ${spring.boot.version} true + false diff --git a/bookstore/srv/pom.xml b/bookstore/srv/pom.xml index afee7e4f..6be82533 100644 --- a/bookstore/srv/pom.xml +++ b/bookstore/srv/pom.xml @@ -94,6 +94,7 @@ ${cds4j.version} ${project.basedir}/src/gen + cds.gen diff --git a/bookstore/srv/src/main/java/com/sap/teched/cap/bookstore/handlers/OrdersService.java b/bookstore/srv/src/main/java/com/sap/teched/cap/bookstore/handlers/OrdersService.java index ee059b68..12843f43 100644 --- a/bookstore/srv/src/main/java/com/sap/teched/cap/bookstore/handlers/OrdersService.java +++ b/bookstore/srv/src/main/java/com/sap/teched/cap/bookstore/handlers/OrdersService.java @@ -19,11 +19,11 @@ import com.sap.cds.services.handler.annotations.Before; import com.sap.cds.services.handler.annotations.ServiceName; import com.sap.cds.services.persistence.PersistenceService; -import ordersservice.OrderItems; -import ordersservice.Orders; -import sap.capire.bookstore.Books; -import sap.capire.bookstore.Books_; -import sap.capire.bookstore.OrderItems_; +import cds.gen.ordersservice.OrderItems; +import cds.gen.ordersservice.Orders; +import cds.gen.sap.capire.bookstore.Books; +import cds.gen.sap.capire.bookstore.Books_; +import cds.gen.sap.capire.bookstore.OrderItems_; @Component @ServiceName("OrdersService") @@ -58,7 +58,9 @@ public class OrdersService implements EventHandler { @Before(event = CdsService.EVENT_CREATE, entity = "OrdersService.Orders") public void validateBookAndDecreaseStockViaOrders(List orders) { for(Orders order : orders) { - validateBookAndDecreaseStock(order.getItems()); + if(order.getItems() != null) { + validateBookAndDecreaseStock(order.getItems()); + } } } @@ -80,7 +82,9 @@ public class OrdersService implements EventHandler { public void calculateTotal(List orders) { for (Orders order : orders) { // calculate net amount for expanded items - calculateNetAmount(order.getItems()); + if(order.getItems() != null) { + calculateNetAmount(order.getItems()); + } // get all items of the order CqnSelect selItems = Select.from(OrderItems_.class).where(i -> i.parent().ID().eq(order.getId())); diff --git a/bookstore/srv/src/test/java/com/sap/teched/cap/bookstore/handlers/orderServiceTest.java b/bookstore/srv/src/test/java/com/sap/teched/cap/bookstore/handlers/orderServiceTest.java index bebbc797..09bb35d2 100644 --- a/bookstore/srv/src/test/java/com/sap/teched/cap/bookstore/handlers/orderServiceTest.java +++ b/bookstore/srv/src/test/java/com/sap/teched/cap/bookstore/handlers/orderServiceTest.java @@ -26,7 +26,7 @@ import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MvcResult; -import sap.capire.bookstore.OrderItems; +import cds.gen.sap.capire.bookstore.OrderItems; @RunWith(SpringRunner.class) @SpringBootTest diff --git a/products-service/package.json b/products-service/package.json index ce04753a..1c03c5e7 100644 --- a/products-service/package.json +++ b/products-service/package.json @@ -10,10 +10,10 @@ "deploy": "cds deploy" }, "dependencies": { - "@sap/cds": "3.17.4" + "@sap/cds": "3.21.2" }, "devDependencies": { - "sqlite3": "^4.1.0" + "sqlite3": "^4.1.1" }, "cds": { "build": { diff --git a/products-service/pom.xml b/products-service/pom.xml index 92f9f9aa..bdab8043 100644 --- a/products-service/pom.xml +++ b/products-service/pom.xml @@ -16,9 +16,9 @@ 1.8 - 1.0.1 - 1.2.1 - 2.1.7.RELEASE + 1.2.0 + 1.6.0 + 2.2.3.RELEASE v10.4.1 https://nodejs.org/dist/ @@ -128,6 +128,7 @@ ${spring.boot.version} true + false diff --git a/products-service/srv/pom.xml b/products-service/srv/pom.xml index 5b89c08f..95f1aa31 100644 --- a/products-service/srv/pom.xml +++ b/products-service/srv/pom.xml @@ -84,6 +84,7 @@ ${cds4j.version} ${project.basedir}/src/gen + cds.gen