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; }