From d12b8f816bce73317442ab8f7829be9a8384e9cb Mon Sep 17 00:00:00 2001 From: Struchkov Mark Date: Tue, 21 Feb 2023 12:13:56 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=B3=D0=B5=D0=BD=D0=B5=D1=80=D0=B0=D1=86=D0=B8=D1=8E=20=D1=82?= =?UTF-8?q?=D0=B8=D0=BF=D0=BE=D0=B2=20=D0=BD=D0=BE=D1=82=D0=B8=D1=84=D0=B8?= =?UTF-8?q?=D0=BA=D0=B0=D1=86=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../context/domain/notify/comment/NewCommentNotify.java | 2 ++ .../domain/notify/mergerequest/ConflictMrNotify.java | 6 +++++- .../notify/mergerequest/ConflictResolveMrNotify.java | 6 +++++- .../domain/notify/mergerequest/NewMrForAssignee.java | 6 +++++- .../domain/notify/mergerequest/NewMrForReview.java | 6 +++++- .../domain/notify/mergerequest/StatusMrNotify.java | 6 +++++- .../domain/notify/mergerequest/UpdateMrNotify.java | 6 +++++- .../context/domain/notify/pipeline/PipelineNotify.java | 7 +++++-- .../context/domain/notify/project/NewProjectNotify.java | 6 +++++- .../context/domain/notify/task/DiscussionNewNotify.java | 6 +++++- .../context/domain/notify/task/TaskCloseNotify.java | 6 +++++- .../bot/gitlab/telegram/service/StartNotify.java | 9 ++++++--- 12 files changed, 58 insertions(+), 14 deletions(-) diff --git a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/comment/NewCommentNotify.java b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/comment/NewCommentNotify.java index 0280129..151cda1 100644 --- a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/comment/NewCommentNotify.java +++ b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/comment/NewCommentNotify.java @@ -1,10 +1,12 @@ package dev.struchkov.bot.gitlab.context.domain.notify.comment; import dev.struchkov.bot.gitlab.context.domain.notify.Notify; +import dev.struchkov.haiti.utils.fieldconstants.annotation.FieldNames; import lombok.Builder; import lombok.Getter; @Getter +@FieldNames public final class NewCommentNotify implements Notify { public static final String TYPE = "NewCommentNotify"; diff --git a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/ConflictMrNotify.java b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/ConflictMrNotify.java index b8ea8e2..311da6e 100644 --- a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/ConflictMrNotify.java +++ b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/ConflictMrNotify.java @@ -1,12 +1,16 @@ package dev.struchkov.bot.gitlab.context.domain.notify.mergerequest; +import dev.struchkov.haiti.utils.fieldconstants.annotation.FieldNames; import lombok.Builder; import lombok.Getter; +import static dev.struchkov.bot.gitlab.context.domain.notify.mergerequest.ConflictMrNotifyFields.CLASS_NAME; + @Getter +@FieldNames public class ConflictMrNotify extends MrNotify { - public static final String TYPE = "ConflictPrNotify"; + public static final String TYPE = CLASS_NAME; private final String sourceBranch; diff --git a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/ConflictResolveMrNotify.java b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/ConflictResolveMrNotify.java index 548ae5c..7486f25 100644 --- a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/ConflictResolveMrNotify.java +++ b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/ConflictResolveMrNotify.java @@ -1,12 +1,16 @@ package dev.struchkov.bot.gitlab.context.domain.notify.mergerequest; +import dev.struchkov.haiti.utils.fieldconstants.annotation.FieldNames; import lombok.Builder; import lombok.Getter; +import static dev.struchkov.bot.gitlab.context.domain.notify.mergerequest.ConflictResolveMrNotifyFields.CLASS_NAME; + @Getter +@FieldNames public class ConflictResolveMrNotify extends MrNotify { - public static final String TYPE = "ConflictResolveMrNotify"; + public static final String TYPE = CLASS_NAME; private final String sourceBranch; diff --git a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/NewMrForAssignee.java b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/NewMrForAssignee.java index 1b04c80..5c5747f 100644 --- a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/NewMrForAssignee.java +++ b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/NewMrForAssignee.java @@ -1,5 +1,6 @@ package dev.struchkov.bot.gitlab.context.domain.notify.mergerequest; +import dev.struchkov.haiti.utils.fieldconstants.annotation.FieldNames; import lombok.Builder; import lombok.Getter; import lombok.Singular; @@ -7,10 +8,13 @@ import lombok.Singular; import java.util.List; import java.util.Set; +import static dev.struchkov.bot.gitlab.context.domain.notify.mergerequest.NewMrForAssigneeFields.CLASS_NAME; + @Getter +@FieldNames public class NewMrForAssignee extends NewMrNotify { - public static final String TYPE = "NewMrForAssignee"; + public static final String TYPE = CLASS_NAME; private final List reviewers; private final String oldAssigneeName; diff --git a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/NewMrForReview.java b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/NewMrForReview.java index 2e5d19e..74134d5 100644 --- a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/NewMrForReview.java +++ b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/NewMrForReview.java @@ -1,14 +1,18 @@ package dev.struchkov.bot.gitlab.context.domain.notify.mergerequest; +import dev.struchkov.haiti.utils.fieldconstants.annotation.FieldNames; import lombok.Builder; import lombok.Getter; import java.util.Set; +import static dev.struchkov.bot.gitlab.context.domain.notify.mergerequest.NewMrForReviewFields.CLASS_NAME; + @Getter +@FieldNames public class NewMrForReview extends NewMrNotify { - public static final String TYPE = "NewMrForReview"; + public static final String TYPE = CLASS_NAME; private final String assignee; diff --git a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/StatusMrNotify.java b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/StatusMrNotify.java index cf8d1e9..743473c 100644 --- a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/StatusMrNotify.java +++ b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/StatusMrNotify.java @@ -1,13 +1,17 @@ package dev.struchkov.bot.gitlab.context.domain.notify.mergerequest; import dev.struchkov.bot.gitlab.context.domain.MergeRequestState; +import dev.struchkov.haiti.utils.fieldconstants.annotation.FieldNames; import lombok.Builder; import lombok.Getter; +import static dev.struchkov.bot.gitlab.context.domain.notify.mergerequest.StatusMrNotifyFields.CLASS_NAME; + @Getter +@FieldNames public class StatusMrNotify extends MrNotify { - public static final String TYPE = "StatusPrNotify"; + public static final String TYPE = CLASS_NAME; private final MergeRequestState oldStatus; private final MergeRequestState newStatus; diff --git a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/UpdateMrNotify.java b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/UpdateMrNotify.java index 68845eb..8976af7 100644 --- a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/UpdateMrNotify.java +++ b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/mergerequest/UpdateMrNotify.java @@ -1,12 +1,16 @@ package dev.struchkov.bot.gitlab.context.domain.notify.mergerequest; +import dev.struchkov.haiti.utils.fieldconstants.annotation.FieldNames; import lombok.Builder; import lombok.Getter; +import static dev.struchkov.bot.gitlab.context.domain.notify.mergerequest.UpdateMrNotifyFields.CLASS_NAME; + @Getter +@FieldNames public class UpdateMrNotify extends MrNotify { - public static final String TYPE = "UpdatePrNotify"; + public static final String TYPE = CLASS_NAME; private final String author; private final Long allTasks; diff --git a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/pipeline/PipelineNotify.java b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/pipeline/PipelineNotify.java index ea20bb4..c619e76 100644 --- a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/pipeline/PipelineNotify.java +++ b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/pipeline/PipelineNotify.java @@ -2,18 +2,21 @@ package dev.struchkov.bot.gitlab.context.domain.notify.pipeline; import dev.struchkov.bot.gitlab.context.domain.PipelineStatus; import dev.struchkov.bot.gitlab.context.domain.notify.Notify; +import dev.struchkov.haiti.utils.fieldconstants.annotation.FieldNames; import lombok.Builder; import lombok.Getter; +import static dev.struchkov.bot.gitlab.context.domain.notify.pipeline.PipelineNotifyFields.CLASS_NAME; + /** * @author upagge 17.01.2021 */ //TODO [16.12.2022|uPagge]: Нужно реализовать заполнение projectName - @Getter +@FieldNames public final class PipelineNotify implements Notify { - public static final String TYPE = "PipelineNotify"; + public static final String TYPE = CLASS_NAME; private final Long projectId; private final Long pipelineId; diff --git a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/project/NewProjectNotify.java b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/project/NewProjectNotify.java index 17f5262..90091c3 100644 --- a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/project/NewProjectNotify.java +++ b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/project/NewProjectNotify.java @@ -1,16 +1,20 @@ package dev.struchkov.bot.gitlab.context.domain.notify.project; import dev.struchkov.bot.gitlab.context.domain.notify.Notify; +import dev.struchkov.haiti.utils.fieldconstants.annotation.FieldNames; import lombok.Builder; import lombok.Getter; +import static dev.struchkov.bot.gitlab.context.domain.notify.project.NewProjectNotifyFields.CLASS_NAME; + /** * @author upagge 15.01.2021 */ @Getter +@FieldNames public final class NewProjectNotify implements Notify { - public static final String TYPE = "NewProjectNotify"; + public static final String TYPE = CLASS_NAME; private final Long projectId; private final String projectName; diff --git a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/task/DiscussionNewNotify.java b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/task/DiscussionNewNotify.java index 78cc270..c953cab 100644 --- a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/task/DiscussionNewNotify.java +++ b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/task/DiscussionNewNotify.java @@ -1,19 +1,23 @@ package dev.struchkov.bot.gitlab.context.domain.notify.task; import dev.struchkov.haiti.utils.container.Pair; +import dev.struchkov.haiti.utils.fieldconstants.annotation.FieldNames; import lombok.Builder; import lombok.Getter; import lombok.Singular; import java.util.List; +import static dev.struchkov.bot.gitlab.context.domain.notify.task.DiscussionNewNotifyFields.CLASS_NAME; + /** * @author upagge 10.09.2020 */ @Getter +@FieldNames public class DiscussionNewNotify extends TaskNotify { - public static final String TYPE = "DiscussionNewNotify"; + public static final String TYPE = CLASS_NAME; private final String threadId; private final String mrName; diff --git a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/task/TaskCloseNotify.java b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/task/TaskCloseNotify.java index f32d7f9..bf43051 100644 --- a/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/task/TaskCloseNotify.java +++ b/bot-context/src/main/java/dev/struchkov/bot/gitlab/context/domain/notify/task/TaskCloseNotify.java @@ -1,15 +1,19 @@ package dev.struchkov.bot.gitlab.context.domain.notify.task; +import dev.struchkov.haiti.utils.fieldconstants.annotation.FieldNames; import lombok.Builder; import lombok.Getter; +import static dev.struchkov.bot.gitlab.context.domain.notify.task.TaskCloseNotifyFields.CLASS_NAME; + /** * @author upagge 10.09.2020 */ @Getter +@FieldNames public class TaskCloseNotify extends TaskNotify { - public static final String TYPE = "TaskCloseNotify"; + public static final String TYPE = CLASS_NAME; private final Long personTasks; private final Long personResolvedTasks; diff --git a/telegram-bot/src/main/java/dev/struchkov/bot/gitlab/telegram/service/StartNotify.java b/telegram-bot/src/main/java/dev/struchkov/bot/gitlab/telegram/service/StartNotify.java index d40c30b..2faea2a 100644 --- a/telegram-bot/src/main/java/dev/struchkov/bot/gitlab/telegram/service/StartNotify.java +++ b/telegram-bot/src/main/java/dev/struchkov/bot/gitlab/telegram/service/StartNotify.java @@ -1,17 +1,19 @@ package dev.struchkov.bot.gitlab.telegram.service; import dev.struchkov.bot.gitlab.context.service.AppSettingService; +import dev.struchkov.bot.gitlab.context.utils.Icons; import dev.struchkov.bot.gitlab.core.config.properties.AppProperty; import dev.struchkov.bot.gitlab.core.config.properties.PersonProperty; import dev.struchkov.godfather.simple.domain.BoxAnswer; -import dev.struchkov.godfather.telegram.main.context.BoxAnswerPayload; import dev.struchkov.godfather.telegram.simple.context.service.TelegramSending; import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; +import static dev.struchkov.bot.gitlab.telegram.utils.UnitName.DELETE_MESSAGE; import static dev.struchkov.godfather.main.domain.keyboard.button.SimpleButton.simpleButton; import static dev.struchkov.godfather.telegram.domain.keyboard.InlineKeyBoard.inlineKeyBoard; +import static dev.struchkov.godfather.telegram.main.context.BoxAnswerPayload.DISABLE_WEB_PAGE_PREVIEW; /** * @author upagge 19.01.2021 @@ -39,10 +41,11 @@ public class StartNotify { ) .keyBoard( inlineKeyBoard( - simpleButton("Open General Menu", "/start") + simpleButton(Icons.VIEW, DELETE_MESSAGE), + simpleButton("Open Menu", "/start") ) ) - .payload(BoxAnswerPayload.DISABLE_WEB_PAGE_PREVIEW, true) + .payload(DISABLE_WEB_PAGE_PREVIEW, true) .build(); sending.send(boxAnswer); }