同じ名前の食材がある場合でもエラーにならないように修正

backend/src/main/java/com/example/todoapp/service/RecipeService.java

@@ -64,17 +64,17 @@ public class RecipeService {
 
         List<RecipeStuffs> recipeStuffsList = new ArrayList<>();
         for (StuffRequestDTO stuffDTO : dto.getStuffAndAmountArray()) {
+            Optional<Stuffs> optStuff = stuffsRepository.findByStuffName(stuffDTO.getStuffName());
             Stuffs stuff;
-            if (stuffDTO.getStuffId() != null && !stuffDTO.getStuffId().isEmpty()) {
+
-                // stuffIdが存在する
+            if (optStuff.isEmpty()) {
-                stuff = stuffsRepository.findById(Long.valueOf(stuffDTO.getStuffId()))
-                        .orElseThrow(() -> new RuntimeException("材料がありません"));
-            } else {
                 // stuffIdが存在しない
                 stuff = new Stuffs();
                 stuff.setStuffName(stuffDTO.getStuffName());
                 stuff.setCategory(stuffDTO.getCategory());
                 stuff = stuffsRepository.save(stuff);
+            } else {
+                stuff = optStuff.get();
             }
 
             RecipeStuffs recipeStuffs = new RecipeStuffs();
@@ -158,11 +158,14 @@ public class RecipeService {
 
         // 提供された材料の詳細を繰り返し処理
         for (StuffDetailDTO stuffDTO : dto.getStuffAndAmountArray()) {
-            if (stuffDTO.getStuffId() == null) {
+
+            Optional<Stuffs> optStuff = stuffsRepository.findByStuffName(stuffDTO.getStuffName());
+
+            if (optStuff.isEmpty()) {
                 // 材料IDがnullの場合、新しい材料を作成
                 Stuffs newStuff = new Stuffs();
                 newStuff.setStuffName(stuffDTO.getStuffName());
-                newStuff.setCategory("その他");
+                newStuff.setCategory(stuffDTO.getCategory());
                 newStuff = stuffsRepository.save(newStuff);
 
                 // 新しいRecipeStuffsエントリを作成
@@ -174,9 +177,11 @@ public class RecipeService {
 
                 incomingStuffIds.add(newStuff.getStuffId());
             } else {
+                Long stuffId = optStuff.get().getStuffId();
+
                 // 材料IDが提供されている場合、既存のRecipeStuffsエントリを検索
                 Optional<RecipeStuffs> optionalRs = recipeStuffsRepository
-                    .findByRecipesRecipeIdAndStuffStuffId(dto.getRecipeId(), stuffDTO.getStuffId());
+                    .findByRecipesRecipeIdAndStuffStuffId(dto.getRecipeId(), stuffId);
 
                 if (optionalRs.isPresent()) {
                     // RecipeStuffsエントリが存在する場合、数量を更新

backend/src/main/java/com/example/todoapp/service/ToBuysService.java

@@ -77,8 +77,10 @@ public class ToBuysService {
         User user = userRepository.findByUsername(username)
                 .orElseThrow(() -> new RuntimeException("ユーザーが見つかりません: " + username));
 
+        Optional<Stuffs> optStuff = stuffsRepository.findByStuffName(toBuyDTO.getStuffName());
         Stuffs stuff;
-        if (toBuyDTO.getStuffId() == null) {
+
+        if (optStuff.isEmpty()) {
             // 新しい材料を作成
             stuff = new Stuffs();
             stuff.setStuffName(toBuyDTO.getStuffName());
@@ -86,11 +88,7 @@ public class ToBuysService {
             stuff = stuffsRepository.save(stuff);
         } else {
             // 材料情報を取得
-            Optional<Stuffs> optionalStuffs = stuffsRepository.findByStuffId(toBuyDTO.getStuffId());
+            stuff = optStuff.get();
-            if (!optionalStuffs.isPresent()) {
-                throw new RuntimeException("材料がありません");
-            }
-            stuff = optionalStuffs.get();
         }
 
         ToBuys toBuys = new ToBuys();
@@ -220,7 +218,7 @@ public class ToBuysService {
         User user = userRepository.findByUsername(username)
                 .orElseThrow(() -> new RuntimeException("ユーザーが見つかりません: " + username));
 
-        //　料理情報を取得
+        // 料理情報を取得
         List<RecipeStuffs> recipeStuffsList = RecipeStuffsRepository.findByRecipesRecipeId(recipeId);
 
         List<ToBuyResponseDTO> result = new ArrayList<>();
@@ -268,10 +266,8 @@ public class ToBuysService {
      */
     private User getUserByUsername(String username) {
         return userRepository.findByUsername(username)
-            .orElseThrow(() -> new UsernameNotFoundException(messageUtils.getMessage("error.auth.user.not.found.with.name", new Object[]{username})));
+                .orElseThrow(() -> new UsernameNotFoundException(
+                        messageUtils.getMessage("error.auth.user.not.found.with.name", new Object[] { username })));
     }
 
-
-    
-
 }