dev-backend-tobuy
Amagasu 5 months ago
parent 5564f6e507
commit 99d34a0eed
  1. 8
      backend/src/main/java/com/example/todoapp/controller/ToBuysController.java
  2. 2
      backend/src/main/java/com/example/todoapp/dto/ToBuyResponse.java
  3. 2
      backend/src/main/java/com/example/todoapp/dto/ToBuysDTO.java
  4. 2
      backend/src/main/java/com/example/todoapp/model/Stocks.java
  5. 2
      backend/src/main/java/com/example/todoapp/model/Stuffs.java
  6. 2
      backend/src/main/java/com/example/todoapp/model/ToBuys.java
  7. 4
      backend/src/main/java/com/example/todoapp/repository/StuffsRepository.java
  8. 3
      backend/src/main/java/com/example/todoapp/service/ToBuysService.java

@ -13,6 +13,7 @@ import com.example.todoapp.dto.ToBuysDTO;
import com.example.todoapp.model.ToBuys; import com.example.todoapp.model.ToBuys;
import com.example.todoapp.model.User; import com.example.todoapp.model.User;
import com.example.todoapp.repository.UserRepository; import com.example.todoapp.repository.UserRepository;
import com.example.todoapp.repository.StuffsRepository;
import com.example.todoapp.service.ToBuysService; import com.example.todoapp.service.ToBuysService;
import jakarta.validation.Valid; import jakarta.validation.Valid;
@ -44,6 +45,9 @@ public class ToBuysController {
@Autowired @Autowired
private UserRepository userRepository; private UserRepository userRepository;
@Autowired
private StuffsRepository stuffsRepository;
/** /**
* 新しい購入アイテムを追加する * 新しい購入アイテムを追加する
* *
@ -92,8 +96,8 @@ public class ToBuysController {
.map(toBuy -> { .map(toBuy -> {
ToBuyResponse resp = new ToBuyResponse(); ToBuyResponse resp = new ToBuyResponse();
resp.setTobuy_id(toBuy.getTobuy_id()); resp.setTobuy_id(toBuy.getTobuy_id());
resp.setStuff_id(toBuy.getStuffs().getStuff_id()); resp.setStuff_id(toBuy.getStuff_id());
resp.setStuff_name(toBuy.getStuffs().getStuff_name()); resp.setStuff_name(stuffsRepository.findByStuff_id(toBuy.getStuff_id()).getStuff_name());
resp.setAmount(toBuy.getAmount()); resp.setAmount(toBuy.getAmount());
resp.setShop(toBuy.getStore()); resp.setShop(toBuy.getStore());
return resp; return resp;

@ -5,7 +5,7 @@ import lombok.Data;
@Data @Data
public class ToBuyResponse { public class ToBuyResponse {
private int tobuy_id; private int tobuy_id;
private Long stuff_id; private int stuff_id;
private String stuff_name; private String stuff_name;
private int amount; private int amount;
private String shop; private String shop;

@ -14,7 +14,7 @@ import lombok.Data;
@Data @Data
public class ToBuysDTO { public class ToBuysDTO {
private int tobuy_id; private int tobuy_id;
private Long stuff_id; private Integer stuff_id;
private Long user_id; private Long user_id;
private int price; private int price;
private int amount; private int amount;

@ -52,7 +52,7 @@ public class Stocks {
referencedColumnName = "stuff_id", referencedColumnName = "stuff_id",
nullable = false nullable = false
) )
private Long stuff_id; private int stuff_id;
/** /**

@ -35,7 +35,7 @@ import lombok.NoArgsConstructor;
*/ */
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
private Long stuff_id ; private int stuff_id ;
/** /**
* カテゴリ名 * カテゴリ名

@ -48,7 +48,7 @@ public class ToBuys {
referencedColumnName = "stuff_id", referencedColumnName = "stuff_id",
nullable = false nullable = false
) )
private Stuffs stuffs; private int stuff_id;
/** /**
* ユーザーテーブル参照用の外部キー * ユーザーテーブル参照用の外部キー

@ -9,6 +9,8 @@
package com.example.todoapp.repository; package com.example.todoapp.repository;
import com.example.todoapp.model.Stuffs; import com.example.todoapp.model.Stuffs;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
@ -22,4 +24,6 @@ import org.springframework.stereotype.Repository;
@Repository @Repository
public interface StuffsRepository extends JpaRepository<Stuffs, Long> { public interface StuffsRepository extends JpaRepository<Stuffs, Long> {
// 材料情報を主キーで取得するメソッド(必要に応じて追加) // 材料情報を主キーで取得するメソッド(必要に応じて追加)
Stuffs findByStuff_id(int stuff_id);
} }

@ -78,7 +78,8 @@ public class ToBuysService {
stuffs = stuffsRepository.save(stuffs); stuffs = stuffsRepository.save(stuffs);
} else { } else {
// 材料情報を取得 // 材料情報を取得
Optional<Stuffs> optionalStuffs = stuffsRepository.findById(toBuyDTO.getStuff_id()); int stuff_id = toBuyDTO.getStuff_id();
Optional<Stuffs> optionalStuffs = stuffsRepository.findById(stuff_id);
if (!optionalStuffs.isPresent()) { if (!optionalStuffs.isPresent()) {
throw new RuntimeException("材料がありません"); throw new RuntimeException("材料がありません");
} }

Loading…
Cancel
Save