From b4d5999d98c00c1ce899f7d9de6cd4371b520674 Mon Sep 17 00:00:00 2001
From: Struchkov Mark <mark@struchkov.dev>
Date: Tue, 23 May 2023 16:32:35 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B1=D0=B0=D0=B3=D0=B0=20=D0=B2=20?=
 =?UTF-8?q?AnswerSaveAction?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quarkus/core/action/AnswerSaveAction.java    | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/action/AnswerSaveAction.java b/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/action/AnswerSaveAction.java
index 4b18a09..efcb154 100644
--- a/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/action/AnswerSaveAction.java
+++ b/bot-core/bot-core-quarkus/src/main/java/dev/struchkov/godfather/quarkus/core/action/AnswerSaveAction.java
@@ -24,28 +24,30 @@ public class AnswerSaveAction<D> implements ActionUnit<AnswerSave<Message, D>, M
         final AnswerSave<Message, D> answerSave = unitRequest.getUnit();
         final Message message = unitRequest.getMessage();
 
-        final AnswerSavePreservable<D> preservable = answerSave.getPreservable();
-        final String personId = message.getFromPersonId();
-
         final CheckSave<Message> checkSave = answerSave.getCheckSave();
         if (checkNotNull(checkSave)) {
             return Uni.createFrom().voidItem()
                     .onItem().transformToUni(
                             v -> checkSave.check(message)
-                                    .onItem().transform(
+                                    .onItem().ifNotNull().transformToUni(
                                             unit -> {
                                                 if (checkNotNull(unit)) {
-                                                    return UnitRequest.of(unit, message);
+                                                    return Uni.createFrom().item(UnitRequest.of(unit, message));
                                                 }
-                                                return UnitRequest.of(answerSave, message);
+                                                return getUnitRequestUni(answerSave, message);
                                             }
                                     )
                     );
         }
 
+        return getUnitRequestUni(answerSave, message);
+    }
+
+    private Uni<UnitRequest<MainUnit, Message>> getUnitRequestUni(AnswerSave<Message, D> answerSave, Message message) {
+        final String personId = message.getFromPersonId();
+        final AnswerSavePreservable<D> preservable = answerSave.getPreservable();
         final PreservableData<D, Message> preservableData = answerSave.getPreservableData();
         final Pusher<D> pusher = answerSave.getPusher();
-
         return Uni.createFrom().voidItem()
                 .onItem().transformToUni(
                         v -> {