From ed0d50777f5cd8eb8b9991446e40c7d79435d3d7 Mon Sep 17 00:00:00 2001
From: Struchkov Mark <mark@struchkov.dev>
Date: Sun, 23 Apr 2023 03:19:08 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20personSe?=
 =?UTF-8?q?ttingService=20=D0=BD=D0=B5=D0=BE=D0=B1=D1=8F=D0=B7=D0=B0=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quarkus/core/GeneralAutoResponder.java    | 71 +++++++++++--------
 1 file changed, 42 insertions(+), 29 deletions(-)

diff --git a/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/GeneralAutoResponder.java b/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/GeneralAutoResponder.java
index 8899aec..e598176 100644
--- a/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/GeneralAutoResponder.java
+++ b/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/GeneralAutoResponder.java
@@ -30,20 +30,20 @@ import static java.util.Collections.emptySet;
 
 public class GeneralAutoResponder<M extends Message> {
 
-    protected final PersonSettingService personSettingService;
+    protected PersonSettingService personSettingService;
     protected final StorylineService<M> storyLineService;
     protected Map<String, List<ActionUnit>> actionUnitMap = new HashMap<>();
     protected List<Modifiable<M>> modifiable;
     protected ErrorHandler errorHandler;
 
-    protected GeneralAutoResponder(
-            PersonSettingService personSettingService,
-            StorylineService<M> storyLineService
-    ) {
-        this.personSettingService = personSettingService;
+    protected GeneralAutoResponder(StorylineService<M> storyLineService) {
         this.storyLineService = storyLineService;
     }
 
+    public void setPersonSettingService(PersonSettingService personSettingService) {
+        this.personSettingService = personSettingService;
+    }
+
     public void registrationActionUnit(ActionUnit actionUnit) {
         actionUnitMap.computeIfAbsent(actionUnit.getUnitType(), k -> new ArrayList<>());
         actionUnitMap.get(actionUnit.getUnitType()).add(actionUnit);
@@ -67,17 +67,24 @@ public class GeneralAutoResponder<M extends Message> {
     public Uni<Void> processingNewMessage(M newMessage) {
         return Uni.createFrom().item(newMessage)
                 .onItem().ifNotNull().transformToUni(
-                        message -> personSettingService.getStateProcessingByPersonId(newMessage.getFromPersonId())
-                                .replaceIfNullWith(TRUE)
-                                .chain(
-                                        state -> {
-                                            if (TRUE.equals(state)) {
-                                                return processing(newMessage);
-                                            }
-                                            return Uni.createFrom().voidItem();
-                                        }
-                                )
-                ).replaceWithVoid();
+                        message -> {
+                            if (checkNotNull(personSettingService)) {
+                                return personSettingService.getStateProcessingByPersonId(newMessage.getFromPersonId())
+                                        .replaceIfNullWith(TRUE)
+                                        .flatMap(
+                                                state -> {
+                                                    if (TRUE.equals(state)) {
+                                                        return processing(newMessage);
+                                                    }
+                                                    return Uni.createFrom().voidItem();
+                                                }
+                                        );
+                            } else {
+                                return processing(newMessage);
+                            }
+                        }
+                )
+                .replaceWithVoid();
     }
 
     public Uni<Void> processingNewMessages(List<M> newMessages) {
@@ -89,18 +96,24 @@ public class GeneralAutoResponder<M extends Message> {
                             final Set<String> personIds = newMessages.stream()
                                     .map(Message::getFromPersonId)
                                     .collect(Collectors.toSet());
-                            return personSettingService.getAllPersonIdDisableMessages(personIds)
-                                    .replaceIfNullWith(emptySet())
-                                    .onItem().transformToMulti(
-                                            disableIds -> {
-                                                final List<M> allowedMessages = newMessages.stream()
-                                                        .filter(message -> !disableIds.contains(message.getFromPersonId()))
-                                                        .toList();
-                                                return Multi.createFrom().iterable(allowedMessages);
-                                            }
-                                    )
-                                    .onItem().transform(this::processing)
-                                    .toUni().replaceWithVoid();
+                            if (checkNotNull(personSettingService)) {
+                                return personSettingService.getAllPersonIdDisableMessages(personIds)
+                                        .replaceIfNullWith(emptySet())
+                                        .onItem().transformToMulti(
+                                                disableIds -> {
+                                                    final List<M> allowedMessages = newMessages.stream()
+                                                            .filter(message -> !disableIds.contains(message.getFromPersonId()))
+                                                            .toList();
+                                                    return Multi.createFrom().iterable(allowedMessages);
+                                                }
+                                        )
+                                        .onItem().transform(this::processing)
+                                        .collect().asList().replaceWithVoid();
+                            } else {
+                                return Multi.createFrom().iterable(newMessages)
+                                        .onItem().transform(this::processing)
+                                        .collect().asList().replaceWithVoid();
+                            }
                         }
                 );
     }