diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1b087f4..f9538f7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,9 +17,9 @@ 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 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 "Деплой завершен" deploy-front-job: diff --git a/src/main/java/ru/kayashov/bar/controller/CocktailController.java b/src/main/java/ru/kayashov/bar/controller/CocktailController.java index 7fe35f3..3a63980 100644 --- a/src/main/java/ru/kayashov/bar/controller/CocktailController.java +++ b/src/main/java/ru/kayashov/bar/controller/CocktailController.java @@ -45,7 +45,7 @@ public class CocktailController { } @GetMapping("/instructions") - public String getInstructions(@RequestParam Long id) { + public String getInstructions(@RequestParam("id") Long id) { return cocktailService.findInstructions(id); } diff --git a/src/main/java/ru/kayashov/bar/controller/dto/cocktail/CocktailSimpleResponseDto.java b/src/main/java/ru/kayashov/bar/controller/dto/cocktail/CocktailSimpleResponseDto.java index 24d500f..42fea2d 100644 --- a/src/main/java/ru/kayashov/bar/controller/dto/cocktail/CocktailSimpleResponseDto.java +++ b/src/main/java/ru/kayashov/bar/controller/dto/cocktail/CocktailSimpleResponseDto.java @@ -9,12 +9,14 @@ import ru.kayashov.bar.model.entity.CocktailEntity; public class CocktailSimpleResponseDto { private Long id; private String name; + private String image; private Boolean hasError; public static CocktailSimpleResponseDto mapToDto(CocktailEntity e) { CocktailSimpleResponseDto d = new CocktailSimpleResponseDto(); d.setId(e.getId()); d.setName(e.getName()); + d.setImage(e.getImage()); boolean hasError = e.getReceipt().stream() .anyMatch(receiptEntity -> receiptEntity.getUnit() == null || receiptEntity.getCount() == null); d.setHasError(hasError); 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))); } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 5f08c7d..2eca8dd 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -8,7 +8,7 @@ spring.datasource.driver-class-name=org.postgresql.Driver spring.datasource.url=${DB_URL:jdbc:postgresql://192.168.1.100:5432/drinks} spring.datasource.username=${DB_NAME:nextcloud} spring.datasource.password=${DB_PASSWORD:kayash73} -spring.datasource.hikari.minimum-idle=10 +spring.datasource.hikari.minimum-idle=15 spring.datasource.hikari.maximum-pool-size=50 spring.datasource.hikari.idle-timeout=30000 spring.datasource.hikari.max-lifetime=600000