0xb00b5/0xb00b5-packmate
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into enable-patterns

Browse Source 
# Conflicts:
#	src/main/java/ru/serega6531/packmate/model/enums/SubscriptionMessageType.java
#	src/main/java/ru/serega6531/packmate/service/PatternService.java
This commit is contained in:
serega6531
2020-04-07 00:41:00 +03:00
parent 388fd7ba52 459dbf0a02
commit a37055fb9b
27 changed files with 492 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/ru/serega6531/packmate/service/PatternService.java
View File

@@ -20,13 +20,13 @@ import java.util.stream.Collectors;
public class PatternService {
private final PatternRepository repository;
private final StreamSubscriptionService subscriptionService;
private final SubscriptionService subscriptionService;
private final Map<Integer, Pattern> patterns = new HashMap<>();
@Autowired
public PatternService(PatternRepository repository,
StreamSubscriptionService subscriptionService) {
SubscriptionService subscriptionService) {
this.repository = repository;
this.subscriptionService = subscriptionService;
@@ -56,7 +56,7 @@ public class PatternService {
pattern.setEnabled(enabled);
repository.save(pattern);
if(enabled) {
if (enabled) {
log.info("Включен паттерн {} со значением {}", pattern.getName(), pattern.getValue());
subscriptionService.broadcast(new SubscriptionMessage(SubscriptionMessageType.ENABLE_PATTERN, id));
} else {
@@ -77,7 +77,7 @@ public class PatternService {
final Pattern saved = repository.save(pattern);
patterns.put(saved.getId(), saved);
log.info("Добавлен новый паттерн {} со значением {}", pattern.getName(), pattern.getValue());
log.info("Added new pattern {} with value {}", pattern.getName(), pattern.getValue());
subscriptionService.broadcast(new SubscriptionMessage(SubscriptionMessageType.SAVE_PATTERN, saved));
return saved;
}