From 92f2523396a101c7d85dfb94a224b6047a142867 Mon Sep 17 00:00:00 2001
From: "Kayashov.SM" <kayshovcm@answer-42.ru>
Date: Sat, 23 Aug 2025 23:52:46 +0400
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D1=8C=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D0=B8=D0=BD=D0=B3=D1=80=D0=B5=D0=B4=D0=B8=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bar/model/entity/IngredientEntity.java    |  3 +++
 .../bar/service/IngredientService.java        | 22 ++++++++++---------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/main/java/ru/kayashov/bar/model/entity/IngredientEntity.java b/src/main/java/ru/kayashov/bar/model/entity/IngredientEntity.java
index e92a3fe..6b2f217 100644
--- a/src/main/java/ru/kayashov/bar/model/entity/IngredientEntity.java
+++ b/src/main/java/ru/kayashov/bar/model/entity/IngredientEntity.java
@@ -9,6 +9,8 @@ import lombok.Setter;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
@@ -28,6 +30,7 @@ import java.util.List;
 public class IngredientEntity {
 
     @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
     private String name;
     private String enName;
diff --git a/src/main/java/ru/kayashov/bar/service/IngredientService.java b/src/main/java/ru/kayashov/bar/service/IngredientService.java
index 00bb3e8..925a789 100644
--- a/src/main/java/ru/kayashov/bar/service/IngredientService.java
+++ b/src/main/java/ru/kayashov/bar/service/IngredientService.java
@@ -90,13 +90,15 @@ public class IngredientService {
     }
 
     public boolean saveChange(IngredientResponseDto dto) {
+        IngredientEntity entity;
         if (dto.getId() == null) {
-            return false;
-        }
-        IngredientEntity entity = repository.findById(dto.getId())
-                .orElse(null);
-        if (entity == null) {
-            return false;
+            entity = new IngredientEntity();
+        } else {
+            entity = repository.findById(dto.getId())
+                    .orElse(null);
+            if (entity == null) {
+                return false;
+            }
         }
 
         entity.setName(dto.getName());
@@ -105,12 +107,12 @@ public class IngredientService {
         entity.setAlcohol(dto.getAlcohol());
 
         TypeEntity type = findTypeByName(dto.getType());
-        if (type == null) {
-            return false;
-        }
+//        if (type == null) {
+//            return false;
+//        }
         entity.setType(type);
         repository.save(entity);
-        log.info("Ингредиент {} изменен", entity.getName());
+        log.info("Ингредиент {} {}", entity.getName(), dto.getId() == null ? "создан" : "изменен");
         return true;
     }