From 41bb8d2b637f256d1ec89b74f9d9fff0f2223982 Mon Sep 17 00:00:00 2001
From: serega6531 <serega6531@yandex.ru>
Date: Mon, 16 Mar 2020 23:32:31 +0300
Subject: [PATCH] =?UTF-8?q?=D0=92=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=B8=20=D0=B2=D1=8B=D0=BA=D0=BB=D1=8E=D1=87?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B0=D1=82=D1=82=D0=B5=D1=80?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=B2=20=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=BE=20?=
 =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PatternController.java         |  6 ++---
 .../ru/serega6531/packmate/model/Pattern.java |  2 ++
 .../model/enums/SubscriptionMessageType.java  |  2 +-
 .../packmate/service/PatternService.java      | 24 +++++++------------
 4 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/main/java/ru/serega6531/packmate/controller/PatternController.java b/src/main/java/ru/serega6531/packmate/controller/PatternController.java
index 6b4075c..1b00237 100644
--- a/src/main/java/ru/serega6531/packmate/controller/PatternController.java
+++ b/src/main/java/ru/serega6531/packmate/controller/PatternController.java
@@ -23,9 +23,9 @@ public class PatternController {
         return service.findAll();
     }
 
-    @DeleteMapping("/{id}")
-    public void deletePattern(@PathVariable int id) {
-        service.deleteById(id);
+    @PostMapping("/{id}")
+    public void enable(@PathVariable int id, @RequestParam boolean enabled) {
+        service.enable(id, enabled);
     }
 
     @PostMapping
diff --git a/src/main/java/ru/serega6531/packmate/model/Pattern.java b/src/main/java/ru/serega6531/packmate/model/Pattern.java
index bf499fa..80f10f6 100644
--- a/src/main/java/ru/serega6531/packmate/model/Pattern.java
+++ b/src/main/java/ru/serega6531/packmate/model/Pattern.java
@@ -28,6 +28,8 @@ public class Pattern {
     @GeneratedValue(generator = "pattern_generator")
     private int id;
 
+    private boolean enabled;
+
     private String name;
 
     private String value;
diff --git a/src/main/java/ru/serega6531/packmate/model/enums/SubscriptionMessageType.java b/src/main/java/ru/serega6531/packmate/model/enums/SubscriptionMessageType.java
index af46d09..89ce895 100644
--- a/src/main/java/ru/serega6531/packmate/model/enums/SubscriptionMessageType.java
+++ b/src/main/java/ru/serega6531/packmate/model/enums/SubscriptionMessageType.java
@@ -1,5 +1,5 @@
 package ru.serega6531.packmate.model.enums;
 
 public enum SubscriptionMessageType {
-    SAVE_SERVICE, SAVE_PATTERN, DELETE_SERVICE, DELETE_PATTERN, NEW_STREAM
+    SAVE_SERVICE, SAVE_PATTERN, DELETE_SERVICE, ENABLE_PATTERN, DISABLE_PATTERN, NEW_STREAM
 }
diff --git a/src/main/java/ru/serega6531/packmate/service/PatternService.java b/src/main/java/ru/serega6531/packmate/service/PatternService.java
index 8983c50..8e8b9b8 100644
--- a/src/main/java/ru/serega6531/packmate/service/PatternService.java
+++ b/src/main/java/ru/serega6531/packmate/service/PatternService.java
@@ -3,10 +3,8 @@ package ru.serega6531.packmate.service;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import ru.serega6531.packmate.model.FoundPattern;
 import ru.serega6531.packmate.model.Pattern;
-import ru.serega6531.packmate.model.Stream;
 import ru.serega6531.packmate.model.enums.PatternDirectionType;
 import ru.serega6531.packmate.model.enums.PatternSearchType;
 import ru.serega6531.packmate.model.enums.SubscriptionMessageType;
@@ -52,28 +50,24 @@ public class PatternService {
         return new PatternMatcher(bytes, list).findMatches();
     }
 
-    @Transactional
-    public void deleteById(int id) {
+    public void enable(int id, boolean enabled) {
         final Optional<Pattern> optional = repository.findById(id);
         if (optional.isPresent()) {
             final Pattern pattern = optional.get();
-            log.info("Удален паттерн {} со значением {}", pattern.getName(), pattern.getValue());
+            pattern.setEnabled(enabled);
 
-            for (Stream stream : pattern.getMatchedStreams()) {
-                stream.getFoundPatterns().remove(pattern);
-                stream.getPackets().forEach(p ->
-                        p.getMatches().removeIf(m ->
-                                m.getPatternId() == pattern.getId()));
+            if(enabled) {
+                log.info("Включен паттерн {} со значением {}", pattern.getName(), pattern.getValue());
+                subscriptionService.broadcast(new SubscriptionMessage(SubscriptionMessageType.ENABLE_PATTERN, id));
+            } else {
+                log.info("Выключен паттерн {} со значением {}", pattern.getName(), pattern.getValue());
+                subscriptionService.broadcast(new SubscriptionMessage(SubscriptionMessageType.DISABLE_PATTERN, id));
             }
-
-            patterns.remove(id);
-            repository.delete(pattern);
-            subscriptionService.broadcast(new SubscriptionMessage(SubscriptionMessageType.DELETE_PATTERN, id));
         }
     }
 
     public Pattern save(Pattern pattern) {
-        if(pattern.getSearchType() == PatternSearchType.REGEX) {
+        if (pattern.getSearchType() == PatternSearchType.REGEX) {
             try {
                 PatternMatcher.compilePattern(pattern);
             } catch (PatternSyntaxException e) {