kayashov73/my-bar
1
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

#4 - устранения бага дублей при текстовом поиске в базе коктейлей

Browse Source
This commit is contained in:
Kayashov.SM
2025-04-27 16:05:40 +04:00
parent e789b02521
commit f2b8d18e01
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@@ -17,7 +17,7 @@ deploy-back-job:
- docker rm my-bar - docker rm my-bar
- docker rmi my-bar - docker rmi my-bar
- echo "Сборка образа докер" - echo "Сборка образа докер"
- docker build -t my-bar . - docker build -t my-bar . --no-cache
- echo "Запуск докер контейнера" - 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 - 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 "Деплой завершен" - echo "Деплой завершен"

3
src/main/java/ru/kayashov/bar/service/CocktailService.java
View File

@@ -101,6 +101,7 @@ public class CocktailService {
Root<CocktailEntity> root = criteriaQuery.from(CocktailEntity.class); Root<CocktailEntity> root = criteriaQuery.from(CocktailEntity.class);
List<Predicate> predicates = new ArrayList<>(); List<Predicate> predicates = new ArrayList<>();
criteriaQuery.distinct(true);
if (!dto.getAll()) { if (!dto.getAll()) {
Long barId = visitor.getResidents().stream() Long barId = visitor.getResidents().stream()
.filter(BarResident::getActive) .filter(BarResident::getActive)
@@ -112,8 +113,6 @@ public class CocktailService {
Predicate pr = root.get("id").in(cocktailIds); Predicate pr = root.get("id").in(cocktailIds);
predicates.add(pr); predicates.add(pr);
criteriaQuery.distinct(true);
List<Long> stopListIds = getStopListIds(visitor); List<Long> stopListIds = getStopListIds(visitor);
predicates.add(cb.not(root.get("id").in(stopListIds))); predicates.add(cb.not(root.get("id").in(stopListIds)));
} }