From 4ea84ac0fdcfae323e77cf4a8fe1ed13a8e5d49e Mon Sep 17 00:00:00 2001 From: Tim <47184194+imgde@users.noreply.github.com> Date: Sun, 15 Jun 2025 20:44:37 +0200 Subject: [PATCH] OrderModel add total --- .../main/java/de/htwsaar/webshop/model/OrderModel.java | 2 ++ .../de/htwsaar/webshop/repository/entities/Order.java | 9 ++++++++- .../htwsaar/webshop/repository/entities/OrderItem.java | 4 ++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/00-backend/src/main/java/de/htwsaar/webshop/model/OrderModel.java b/00-backend/src/main/java/de/htwsaar/webshop/model/OrderModel.java index 148e115..ccd38d1 100644 --- a/00-backend/src/main/java/de/htwsaar/webshop/model/OrderModel.java +++ b/00-backend/src/main/java/de/htwsaar/webshop/model/OrderModel.java @@ -29,4 +29,6 @@ public class OrderModel { @NotNull private List orderItems; + + private Integer total; } diff --git a/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/Order.java b/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/Order.java index 54e1f50..c9c2740 100644 --- a/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/Order.java +++ b/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/Order.java @@ -35,6 +35,13 @@ public class Order { private List orderItems; public OrderModel toModel() { - return new OrderModel(id, customer.getId(), time, status, orderItems.stream().map(OrderItem::toModel).toList()); + return new OrderModel( + id, + customer.getId(), + time, + status, + orderItems.stream().map(OrderItem::toModel).toList(), + orderItems.stream().mapToInt(OrderItem::getPrice).sum() + ); } } diff --git a/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/OrderItem.java b/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/OrderItem.java index a0de5c1..ab2ac31 100644 --- a/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/OrderItem.java +++ b/00-backend/src/main/java/de/htwsaar/webshop/repository/entities/OrderItem.java @@ -36,4 +36,8 @@ public class OrderItem { public OrderItemModel toModel() { return new OrderItemModel(id, amount, article.getUuid()); } + + public Integer getPrice() { + return amount * article.getPrice100(); + } }