diff --git a/src/main/java/ru/serega6531/packmate/controller/PatternController.java b/src/main/java/ru/serega6531/packmate/controller/PatternController.java index 6b4075c..143ab1e 100644 --- a/src/main/java/ru/serega6531/packmate/controller/PatternController.java +++ b/src/main/java/ru/serega6531/packmate/controller/PatternController.java @@ -23,13 +23,14 @@ 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 public Pattern addPattern(@RequestBody Pattern pattern) { + pattern.setEnabled(true); return service.save(pattern); } 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 1d44fda..b80cb1c 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, COUNTERS_UPDATE + SAVE_SERVICE, SAVE_PATTERN, DELETE_SERVICE, ENABLE_PATTERN, DISABLE_PATTERN, NEW_STREAM, COUNTERS_UPDATE } diff --git a/src/main/java/ru/serega6531/packmate/service/PatternService.java b/src/main/java/ru/serega6531/packmate/service/PatternService.java index 46974b9..6063521 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) { - final Optional optional = repository.findById(id); - if (optional.isPresent()) { - final Pattern pattern = optional.get(); - log.info("Removed pattern {} with value {}", pattern.getName(), pattern.getValue()); + public void enable(int id, boolean enabled) { + final Pattern pattern = find(id); + if (pattern != null) { + pattern.setEnabled(enabled); + repository.save(pattern); - 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) {