Добавлена возможность создания ингредиентов

This commit is contained in:
Kayashov.SM
2025-08-23 23:52:46 +04:00
parent 91770b99b7
commit 92f2523396
2 changed files with 15 additions and 10 deletions

View File

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

View File

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