Makumbacz 3 éve
szülő
commit
18885c4ff0

+ 3 - 3
src/main/java/com/example/plantsforyou/dto/ItemCartDto.java

@@ -15,8 +15,8 @@ public class ItemCartDto {
     private Integer quantity;
 
     public ItemCartDto(Cart cart){
-        this.id = getId();
-        this.plant = getPlant();
-        this.quantity = getQuantity();
+        this.id = cart.getId();
+        this.plant = cart.getPlant();
+        this.quantity = cart.getQuantity();
     }
 }

+ 2 - 2
src/main/java/com/example/plantsforyou/items_order/ItemOrder.java

@@ -24,10 +24,10 @@ public class ItemOrder {
     @NotNull
     private double price;
     @OneToOne
-    @JoinColumn/*(name = "plant_id", referencedColumnName = "id")*/
+    @JoinColumn(name = "plant_id", referencedColumnName = "id")
     private Plant plant;
     @ManyToOne
-    @JoinColumn/*(name = "order_id", referencedColumnName = "id")*/
+    @JoinColumn(name = "order_id", referencedColumnName = "id")
     private Order order;
     @NotNull
     private Integer quantity;

+ 16 - 5
src/main/java/com/example/plantsforyou/order/Order.java

@@ -2,6 +2,7 @@ package com.example.plantsforyou.order;
 
 import com.example.plantsforyou.appuser.AppUser;
 import com.example.plantsforyou.items_order.ItemOrder;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -14,8 +15,8 @@ import java.util.List;
 @Getter
 @Setter
 @NoArgsConstructor
-@ToString
 @Entity
+@Table(name = "orders")
 public class Order {
     //todo: validation
     @Id
@@ -35,14 +36,24 @@ public class Order {
     private double totalPrice;
 
     @OneToOne
-    @JoinColumn
+    @JsonIgnore
+    @JoinColumn(name = "appuser_id", referencedColumnName = "id")
     private AppUser appUser;
 
-    @OneToMany
-    @ToString.Exclude
+    @OneToMany(mappedBy = "order")
     private List<ItemOrder> itemsOrders;
 
     private String status;
 
-
+    public Order(String postalCode, String street, String city, String phoneNumber, double totalPrice, AppUser appUser, List<ItemOrder> itemsOrders, String status) {
+        this.postalCode = postalCode;
+        this.street = street;
+        this.city = city;
+        this.phoneNumber = phoneNumber;
+        this.createdDate = new Date();
+        this.totalPrice = totalPrice;
+        this.appUser = appUser;
+        this.itemsOrders = itemsOrders;
+        this.status = status;
+    }
 }

+ 1 - 0
src/main/java/com/example/plantsforyou/order/OrderService.java

@@ -37,6 +37,7 @@ public class OrderService {
         order.setTotalPrice(cartDto.getTotalCost());
         order.setStreet(placeOrderDto.getStreet());
         order.setStatus("Waiting for payment");
+        orderRepository.save(order);
 
         for (ItemCartDto itemCartDto:
              itemCartDtos) {