diff --git a/backend/src/main/java/com/example/todoapp/dto/ToBuysBuyDTO.java b/backend/src/main/java/com/example/todoapp/dto/ToBuysBuyDTO.java index 664a01c..89a0fc1 100644 --- a/backend/src/main/java/com/example/todoapp/dto/ToBuysBuyDTO.java +++ b/backend/src/main/java/com/example/todoapp/dto/ToBuysBuyDTO.java @@ -1,5 +1,7 @@ package com.example.todoapp.dto; +import java.time.LocalDate; + import lombok.Data; /** * カテゴリDTOクラス @@ -10,9 +12,9 @@ import lombok.Data; @Data public class ToBuysBuyDTO { - private Long stuff_id; - private int amount; - private String shop; - private String stuff_name; - private String category; + private int stuff_id; + private int price; + private LocalDate exp_date; + private LocalDate last_update; + private LocalDate buy_date; } \ No newline at end of file diff --git a/backend/src/main/java/com/example/todoapp/dto/ToBuysDTO.java b/backend/src/main/java/com/example/todoapp/dto/ToBuysDTO.java index 90830fd..fe6db25 100644 --- a/backend/src/main/java/com/example/todoapp/dto/ToBuysDTO.java +++ b/backend/src/main/java/com/example/todoapp/dto/ToBuysDTO.java @@ -1,6 +1,9 @@ package com.example.todoapp.dto; +import java.time.LocalDate; + import lombok.Data; + /** * カテゴリDTOクラス * このクラスはタスクのカテゴリ情報を表します。 @@ -8,14 +11,17 @@ import lombok.Data; * */ - @Data - public class ToBuysDTO { - private Long stuff_id; - private Long user_id; - - private int amount; - private String shop; - - private String stuff_name; - private String category; - } \ No newline at end of file +@Data +public class ToBuysDTO { + private int tobuy_id; + private Long stuff_id; + private Long user_id; + private int price; + private int amount; + private String shop; + private String stuff_name; + private String category; + private LocalDate exp_date; + private LocalDate last_update; + private LocalDate buy_date; +} \ No newline at end of file diff --git a/backend/src/main/java/com/example/todoapp/model/Stocks.java b/backend/src/main/java/com/example/todoapp/model/Stocks.java index d9f3f42..fb1b84b 100644 --- a/backend/src/main/java/com/example/todoapp/model/Stocks.java +++ b/backend/src/main/java/com/example/todoapp/model/Stocks.java @@ -52,7 +52,7 @@ public class Stocks { referencedColumnName = "stuff_id", nullable = false ) - private Stuffs stuffs; + private Long stuff_id; /** diff --git a/backend/src/main/java/com/example/todoapp/service/ToBuysService.java b/backend/src/main/java/com/example/todoapp/service/ToBuysService.java index fd4d50e..2484ecf 100644 --- a/backend/src/main/java/com/example/todoapp/service/ToBuysService.java +++ b/backend/src/main/java/com/example/todoapp/service/ToBuysService.java @@ -164,19 +164,19 @@ public class ToBuysService { return toBuysRepository.deleteByUserIdAndTobuyId(userId, tobuyId); } - public Stocks buyToBuys(String username, ToBuysBuyDTO dto) { + public Stocks buyToBuys(String username, ToBuysDTO dto) { // ユーザー情報を取得 User user = getUserByUsername(username); // 新しい在庫を作成 Stocks stock = new Stocks(); - stock.setStuffs(dto.getStuff_id()); + stock.setStuff_id(dto.getStuff_id()); stock.setUser_id(user); stock.setAmount(dto.getAmount()); stock.setPrice(dto.getPrice()); stock.setLast_update(dto.getLast_update()); stock.setBuy_date(dto.getBuy_date()); stock.setExp_date(dto.getExp_date()); - deleteToBuys(toBuyDTO); + deleteToBuyByIds(dto.getUser_id(), dto.getTobuy_id()); // データベースに保存 return stockRepository.save(stock); }