From 388fd7ba52d748094d17df82bec18b2f28943488 Mon Sep 17 00:00:00 2001 From: serega6531 Date: Tue, 7 Apr 2020 00:37:44 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=B2=D1=8B=D0=BA?= =?UTF-8?q?=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=B0=D1=82?= =?UTF-8?q?=D1=82=D0=B5=D1=80=D0=BD=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serega6531/packmate/controller/PatternController.java | 1 + .../java/ru/serega6531/packmate/service/PatternService.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/ru/serega6531/packmate/controller/PatternController.java b/src/main/java/ru/serega6531/packmate/controller/PatternController.java index 1b00237..143ab1e 100644 --- a/src/main/java/ru/serega6531/packmate/controller/PatternController.java +++ b/src/main/java/ru/serega6531/packmate/controller/PatternController.java @@ -30,6 +30,7 @@ public class PatternController { @PostMapping public Pattern addPattern(@RequestBody Pattern pattern) { + pattern.setEnabled(true); return service.save(pattern); } diff --git a/src/main/java/ru/serega6531/packmate/service/PatternService.java b/src/main/java/ru/serega6531/packmate/service/PatternService.java index 8e8b9b8..aa2bec4 100644 --- a/src/main/java/ru/serega6531/packmate/service/PatternService.java +++ b/src/main/java/ru/serega6531/packmate/service/PatternService.java @@ -51,10 +51,10 @@ public class PatternService { } public void enable(int id, boolean enabled) { - final Optional optional = repository.findById(id); - if (optional.isPresent()) { - final Pattern pattern = optional.get(); + final Pattern pattern = find(id); + if (pattern != null) { pattern.setEnabled(enabled); + repository.save(pattern); if(enabled) { log.info("Включен паттерн {} со значением {}", pattern.getName(), pattern.getValue());