create total_price (#22)

NORITHON · Jan 27, 2023 · 97458a8 · 97458a8
1 parent b792d7f
commit 97458a8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/src/main/java/com/noriton/team9/domain/Item.java b/src/main/java/com/noriton/team9/domain/Item.java
@@ -1,5 +1,6 @@
 package com.noriton.team9.domain;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
@@ -29,6 +30,7 @@ public class Item {
     private int count;
 
     @OneToMany(mappedBy = "item")
+    @JsonIgnore(value = false)
     private List<Orders> fundingList = new ArrayList<>();
     public void removeStockQuantity(int count) {
         int resStock = this.stockQuantity - count;

diff --git a/src/main/java/com/noriton/team9/domain/Orders.java b/src/main/java/com/noriton/team9/domain/Orders.java
@@ -1,5 +1,6 @@
 package com.noriton.team9.domain;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import jakarta.persistence.*;
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -29,6 +30,7 @@ public class Orders {
 
     @ManyToOne
     @JoinColumn(name = "item_id")
+    @JsonIgnore
     private Item item;
     private LocalDateTime orderDate;
 
@@ -38,6 +40,7 @@ public class Orders {
 
     @ManyToOne
     @JoinColumn(name = "member_id")
+    @JsonIgnore
     private Member member;
 
     private String fundStatus;

diff --git a/src/main/java/com/noriton/team9/request/ItemCreationRequest.java b/src/main/java/com/noriton/team9/request/ItemCreationRequest.java
@@ -5,8 +5,9 @@
 @Data
 public class ItemCreationRequest {
     private String name;
-    private int price;
-    private Long sampleId;
+    private int laborCost;
+    private int materialCost;
 
+    private Long sampleId;
     private int stockQuantity;
 }
diff --git a/src/main/java/com/noriton/team9/service/ItemService.java b/src/main/java/com/noriton/team9/service/ItemService.java
@@ -43,6 +43,8 @@ public Item createItem(ItemCreationRequest item) {
         }
         Item itemToCreate = new Item();
         BeanUtils.copyProperties(item, itemToCreate);
+        int totalCost = (item.getLaborCost() + item.getMaterialCost());
+        itemToCreate.setPrice(totalCost);
         itemToCreate.setCount(0);
         itemToCreate.setSample(sample.get());
         return itemRepository.save(itemToCreate);
@@ -65,10 +67,10 @@ public Item updateItem(Long itemId, ItemCreationRequest request){
         if(!getItem.isPresent()){
             throw new EntityNotFoundException("Item is not present in the database");
         }
-
         Item item = getItem.get();
         item.setName(request.getName());
-        item.setPrice(request.getPrice());
+        int totalPrice = (request.getLaborCost() + request.getMaterialCost());
+        item.setPrice(totalPrice);
         item.setStockQuantity(request.getStockQuantity());
         Optional<Sample> getSample = sampleRepository.findById(request.getSampleId());
         if(getSample.isPresent()){