From d98686de12d300fe5aff971eb4ebc5780282d2d1 Mon Sep 17 00:00:00 2001
From: "Kayashov.SM" <kayshovcm@answer-42.ru>
Date: Thu, 21 Aug 2025 02:50:09 +0400
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D0=B0?=
 =?UTF-8?q?=20=D0=BA=D0=B0=D0=BB=D1=8C=D0=BA=D1=83=D0=BB=D1=8F=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/ru/kayashov/bar/service/CocktailService.java  | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/main/java/ru/kayashov/bar/service/CocktailService.java b/src/main/java/ru/kayashov/bar/service/CocktailService.java
index b000c39..8345161 100644
--- a/src/main/java/ru/kayashov/bar/service/CocktailService.java
+++ b/src/main/java/ru/kayashov/bar/service/CocktailService.java
@@ -29,13 +29,11 @@ import ru.kayashov.bar.repository.ReceiptRepository;
 import javax.persistence.EntityManager;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Expression;
 import javax.persistence.criteria.Join;
 import javax.persistence.criteria.JoinType;
 import javax.persistence.criteria.Order;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
-import javax.persistence.criteria.Subquery;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -80,7 +78,7 @@ public class CocktailService {
         dto.setOnlyFavourite(false);
         dto.setSort(SortingEnum.NAME_ASC);
 
-        return mapper.cocktailsToDtoList(criteria(dto),false, true);
+        return mapper.cocktailsToDtoList(criteria(dto), false, true);
     }
 
     private List<CocktailEntity> criteria(CocktailFilterRequestDto dto) {
@@ -239,12 +237,12 @@ public class CocktailService {
     //todo: так и не придумал я нормальный запрос
     private List<Long> findCocktailByCountNotHaveIngredient() {
         String sql = "SELECT cifc.cocktail_id" +
-        " FROM (SELECT r.cocktail_id," +
+                " FROM (SELECT r.cocktail_id," +
                 " COUNT(CASE WHEN i.is_have = false THEN 1 END) AS false_count" +
                 " FROM receipt r" +
                 " LEFT JOIN public.ingredient i ON i.id = r.ingredient_id" +
-        " GROUP BY r.cocktail_id) AS cifc" +
-        " WHERE false_count = 0";
+                " GROUP BY r.cocktail_id) AS cifc" +
+                " WHERE false_count = 0";
 
         javax.persistence.Query query = entityManager.createNativeQuery(sql);
         return query.getResultList();