|
|
|
@ -37,7 +37,7 @@ public class StocksService { |
|
|
|
|
*/ |
|
|
|
|
public Stocks createStock(String username, Stocks stock) { |
|
|
|
|
User user = getUserByUsername(username); |
|
|
|
|
stock.setUser_id(user); |
|
|
|
|
stock.setUser(user); |
|
|
|
|
return stocksRepository.save(stock); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
@ -49,7 +49,7 @@ public class StocksService { |
|
|
|
|
*/ |
|
|
|
|
public List<Stocks> getALLStocksByUser(String username) { |
|
|
|
|
User user = getUserByUsername(username); |
|
|
|
|
return stocksRepository.findStocksByUser_id(user.getId()); |
|
|
|
|
return stocksRepository.findStocksByUserId(user.getId()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
@ -63,7 +63,7 @@ public class StocksService { |
|
|
|
|
public Stocks getStockById(String username, Long stockId) { |
|
|
|
|
User user = getUserByUsername(username); |
|
|
|
|
return stocksRepository.findById(stockId) |
|
|
|
|
.filter(stock -> stock.getUser_id().getId().equals(user.getId())) // ユーザーの在庫かどうかを確認
|
|
|
|
|
.filter(stock -> stock.getUser().equals(user)) // ユーザーの在庫かどうかを確認
|
|
|
|
|
.orElseThrow(() -> new RuntimeException(messageUtils.getMessage("error.stock.not.found"))); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -79,9 +79,9 @@ public class StocksService { |
|
|
|
|
Stocks stock = getStockById(username, stockId); |
|
|
|
|
stock.setAmount(stockDetails.getAmount()); |
|
|
|
|
stock.setPrice(stockDetails.getPrice()); |
|
|
|
|
stock.setLast_update(stockDetails.getLast_update()); |
|
|
|
|
stock.setBuy_date(stockDetails.getBuy_date()); |
|
|
|
|
stock.setExp_date(stockDetails.getExp_date()); |
|
|
|
|
stock.setLastUpdate(stockDetails.getLastUpdate()); |
|
|
|
|
stock.setBuyDate(stockDetails.getBuyDate()); |
|
|
|
|
stock.setExpDate(stockDetails.getExpDate()); |
|
|
|
|
return stocksRepository.save(stock); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|