Добавлен атрибут картинки для ингредиентов и удален атрибут английского названия

src/main/java/ru/kayashov/bar/controller/dto/ingredient/IngredientResponseDto.java

@@ -32,7 +32,7 @@ public class IngredientResponseDto {
                 .type(i.getType() != null ? i.getType().getName() : null)
                 .abv(i.getAbv())
                 .isHave(i.getIsHave())
-                .image("https://thecocktaildb.com/images/ingredients/" + i.getEnName() + "-Medium.png")
+                .image(i.getImage())
                 .description(i.getDescription())
                 .build();
     }

src/main/java/ru/kayashov/bar/controller/dto/ingredient/IngredientSimpleResponseDto.java

@@ -16,7 +16,7 @@ public class IngredientSimpleResponseDto {
 
     public static IngredientSimpleResponseDto mapToDto(IngredientEntity ingredient) {
         return new IngredientSimpleResponseDto(ingredient.getId(), ingredient.getName(),
-                "https://thecocktaildb.com/images/ingredients/" + ingredient.getEnName() + "-Medium.png",
+                ingredient.getImage(),
                 ingredient.getIsHave());
     }
 }

src/main/java/ru/kayashov/bar/mapper/CocktailMapper.java

@@ -154,7 +154,7 @@ public class CocktailMapper {
     private IngredientSimpleResponseDto createIngredientResponseDto(IngredientEntity i) {
         return new IngredientSimpleResponseDto(i.getId(),
                 i.getName(),
-                "https://thecocktaildb.com/images/ingredients/" + i.getEnName() + "-Medium.png",
+                i.getImage(),
                 i.getIsHave());
     }
 

src/main/java/ru/kayashov/bar/mapper/IngredientMapper.java

@@ -27,7 +27,7 @@ public class IngredientMapper {
                 .type(i.getType() != null ? i.getType().getName() : null)
                 .abv(i.getAbv())
                 .isHave(i.getIsHave())
-                .image("https://thecocktaildb.com/images/ingredients/" + i.getEnName() + "-Medium.png")
+                .image(i.getImage())
                 .description(i.getDescription())
                 .build();
     }
@@ -40,7 +40,7 @@ public class IngredientMapper {
 
     private IngredientSimpleResponseDto mapIngredientToSimpleDto(IngredientEntity i) {
         return new IngredientSimpleResponseDto(i.getId(), i.getName(),
-                "https://thecocktaildb.com/images/ingredients/" + i.getEnName() + "-Medium.png",
+                i.getImage(),
                 i.getIsHave());
     }
 }

src/main/java/ru/kayashov/bar/model/entity/IngredientEntity.java

@@ -33,10 +33,10 @@ public class IngredientEntity {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
     private String name;
-    private String enName;
     private Boolean alcohol;
     private Integer abv;
     private Boolean isHave;
+    private String image;
 
     @Column(columnDefinition = "text")
     private String description;

src/main/java/ru/kayashov/bar/repository/IngredientRepository.java

@@ -6,6 +6,4 @@ import ru.kayashov.bar.model.entity.IngredientEntity;
 import java.util.Optional;
 
 public interface IngredientRepository extends JpaRepository<IngredientEntity, Long> {
-
-    Optional<IngredientEntity> findByEnNameIgnoreCase(String name);
 }

src/main/java/ru/kayashov/bar/service/IngredientService.java

@@ -93,6 +93,7 @@ public class IngredientService {
         IngredientEntity entity;
         if (dto.getId() == null) {
             entity = new IngredientEntity();
+            entity.setIsHave(false);
         } else {
             entity = repository.findById(dto.getId())
                     .orElse(null);