From f2b8d18e01c11d71e3366a2cedcc309b2f38316a Mon Sep 17 00:00:00 2001 From: "Kayashov.SM" Date: Sun, 27 Apr 2025 16:05:40 +0400 Subject: [PATCH] =?UTF-8?q?#4=20-=20=D1=83=D1=81=D1=82=D1=80=D0=B0=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B1=D0=B0=D0=B3=D0=B0=20=D0=B4?= =?UTF-8?q?=D1=83=D0=B1=D0=BB=D0=B5=D0=B9=20=D0=BF=D1=80=D0=B8=20=D1=82?= =?UTF-8?q?=D0=B5=D0=BA=D1=81=D1=82=D0=BE=D0=B2=D0=BE=D0=BC=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=B8=D1=81=D0=BA=D0=B5=20=D0=B2=20=D0=B1=D0=B0=D0=B7=D0=B5=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BA=D1=82=D0=B5=D0=B9=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 2 +- src/main/java/ru/kayashov/bar/service/CocktailService.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c6b12d2..f9538f7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ deploy-back-job: - docker rm my-bar - docker rmi my-bar - echo "Сборка образа докер" - - docker build -t my-bar . + - docker build -t my-bar . --no-cache - echo "Запуск докер контейнера" - docker run --name my-bar --restart=always -p 8091:8080 -d -e COCKTAIL_PHOTO_PATH=/front/assets/cocktails -v /mnt/sdb1/my-bar-front/build:/front my-bar - echo "Деплой завершен" diff --git a/src/main/java/ru/kayashov/bar/service/CocktailService.java b/src/main/java/ru/kayashov/bar/service/CocktailService.java index 84bffc8..7526218 100644 --- a/src/main/java/ru/kayashov/bar/service/CocktailService.java +++ b/src/main/java/ru/kayashov/bar/service/CocktailService.java @@ -101,6 +101,7 @@ public class CocktailService { Root root = criteriaQuery.from(CocktailEntity.class); List predicates = new ArrayList<>(); + criteriaQuery.distinct(true); if (!dto.getAll()) { Long barId = visitor.getResidents().stream() .filter(BarResident::getActive) @@ -112,8 +113,6 @@ public class CocktailService { Predicate pr = root.get("id").in(cocktailIds); predicates.add(pr); - criteriaQuery.distinct(true); - List stopListIds = getStopListIds(visitor); predicates.add(cb.not(root.get("id").in(stopListIds))); }