Добавление конфигурации групповых чатов
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
parent
1208c5b2fe
commit
6d676a12c6
|
@ -1,5 +1,5 @@
|
||||||
package dev.struchkov.godfather.telegram.starter;
|
package dev.struchkov.godfather.telegram.starter;
|
||||||
|
|
||||||
public interface UnitConfiguration {
|
public interface ChatUnitConfiguration {
|
||||||
|
|
||||||
}
|
}
|
|
@ -0,0 +1,5 @@
|
||||||
|
package dev.struchkov.godfather.telegram.starter;
|
||||||
|
|
||||||
|
public interface PersonUnitConfiguration {
|
||||||
|
|
||||||
|
}
|
|
@ -1,5 +1,6 @@
|
||||||
package dev.struchkov.godfather.telegram.starter.config;
|
package dev.struchkov.godfather.telegram.starter.config;
|
||||||
|
|
||||||
|
import dev.struchkov.godfather.main.domain.content.ChatMail;
|
||||||
import dev.struchkov.godfather.main.domain.content.Mail;
|
import dev.struchkov.godfather.main.domain.content.Mail;
|
||||||
import dev.struchkov.godfather.simple.context.repository.PersonSettingRepository;
|
import dev.struchkov.godfather.simple.context.repository.PersonSettingRepository;
|
||||||
import dev.struchkov.godfather.simple.context.repository.StorylineRepository;
|
import dev.struchkov.godfather.simple.context.repository.StorylineRepository;
|
||||||
|
@ -8,8 +9,12 @@ import dev.struchkov.godfather.simple.context.service.ErrorHandler;
|
||||||
import dev.struchkov.godfather.simple.context.service.EventHandler;
|
import dev.struchkov.godfather.simple.context.service.EventHandler;
|
||||||
import dev.struchkov.godfather.simple.context.service.PersonSettingService;
|
import dev.struchkov.godfather.simple.context.service.PersonSettingService;
|
||||||
import dev.struchkov.godfather.simple.context.service.UnitPointerService;
|
import dev.struchkov.godfather.simple.context.service.UnitPointerService;
|
||||||
import dev.struchkov.godfather.simple.core.action.AnswerTextAction;
|
import dev.struchkov.godfather.simple.core.action.AnswerCheckAction;
|
||||||
import dev.struchkov.godfather.simple.core.provider.StoryLineHandler;
|
import dev.struchkov.godfather.simple.core.action.AnswerSaveAction;
|
||||||
|
import dev.struchkov.godfather.simple.core.action.AnswerTextChatMailAction;
|
||||||
|
import dev.struchkov.godfather.simple.core.action.AnswerTextMailAction;
|
||||||
|
import dev.struchkov.godfather.simple.core.provider.ChatStoryLineHandler;
|
||||||
|
import dev.struchkov.godfather.simple.core.provider.PersonStoryLineHandler;
|
||||||
import dev.struchkov.godfather.simple.core.service.PersonSettingServiceImpl;
|
import dev.struchkov.godfather.simple.core.service.PersonSettingServiceImpl;
|
||||||
import dev.struchkov.godfather.simple.core.service.StorylineMailService;
|
import dev.struchkov.godfather.simple.core.service.StorylineMailService;
|
||||||
import dev.struchkov.godfather.simple.core.service.StorylineService;
|
import dev.struchkov.godfather.simple.core.service.StorylineService;
|
||||||
|
@ -20,11 +25,13 @@ import dev.struchkov.godfather.telegram.simple.context.repository.SenderReposito
|
||||||
import dev.struchkov.godfather.telegram.simple.context.service.EventDistributor;
|
import dev.struchkov.godfather.telegram.simple.context.service.EventDistributor;
|
||||||
import dev.struchkov.godfather.telegram.simple.context.service.TelegramSending;
|
import dev.struchkov.godfather.telegram.simple.context.service.TelegramSending;
|
||||||
import dev.struchkov.godfather.telegram.simple.context.service.TelegramService;
|
import dev.struchkov.godfather.telegram.simple.context.service.TelegramService;
|
||||||
|
import dev.struchkov.godfather.telegram.simple.core.ChatMailAutoresponderTelegram;
|
||||||
import dev.struchkov.godfather.telegram.simple.core.MailAutoresponderTelegram;
|
import dev.struchkov.godfather.telegram.simple.core.MailAutoresponderTelegram;
|
||||||
import dev.struchkov.godfather.telegram.simple.core.TelegramConnectBot;
|
import dev.struchkov.godfather.telegram.simple.core.TelegramConnectBot;
|
||||||
import dev.struchkov.godfather.telegram.simple.core.service.TelegramServiceImpl;
|
import dev.struchkov.godfather.telegram.simple.core.service.TelegramServiceImpl;
|
||||||
import dev.struchkov.godfather.telegram.simple.sender.TelegramSender;
|
import dev.struchkov.godfather.telegram.simple.sender.TelegramSender;
|
||||||
import dev.struchkov.godfather.telegram.starter.UnitConfiguration;
|
import dev.struchkov.godfather.telegram.starter.ChatUnitConfiguration;
|
||||||
|
import dev.struchkov.godfather.telegram.starter.PersonUnitConfiguration;
|
||||||
import dev.struchkov.godfather.telegram.starter.property.TelegramBotAutoresponderProperty;
|
import dev.struchkov.godfather.telegram.starter.property.TelegramBotAutoresponderProperty;
|
||||||
import org.springframework.beans.factory.ObjectProvider;
|
import org.springframework.beans.factory.ObjectProvider;
|
||||||
import org.springframework.beans.factory.annotation.Qualifier;
|
import org.springframework.beans.factory.annotation.Qualifier;
|
||||||
|
@ -71,38 +78,6 @@ public class TelegramBotAutoconfiguration {
|
||||||
return new PersonSettingServiceImpl(personSettingRepository);
|
return new PersonSettingServiceImpl(personSettingRepository);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Bean
|
|
||||||
@ConditionalOnBean(TelegramConnectBot.class)
|
|
||||||
public MailAutoresponderTelegram messageAutoresponderTelegram(
|
|
||||||
@Qualifier(AUTORESPONDER_EXECUTORS_SERVICE) ObjectProvider<ExecutorService> executorServiceProvider,
|
|
||||||
TelegramSending sending,
|
|
||||||
PersonSettingService personSettingService,
|
|
||||||
ObjectProvider<ErrorHandler> errorHandlerProvider,
|
|
||||||
ObjectProvider<AnswerTextAction> answerTextActionProvider,
|
|
||||||
|
|
||||||
StorylineService<Mail> storylineService
|
|
||||||
) {
|
|
||||||
final MailAutoresponderTelegram autoresponder = new MailAutoresponderTelegram(
|
|
||||||
sending, personSettingService, storylineService
|
|
||||||
);
|
|
||||||
|
|
||||||
final ExecutorService executorService = executorServiceProvider.getIfAvailable();
|
|
||||||
if (checkNotNull(executorService)) {
|
|
||||||
autoresponder.setExecutorService(executorService);
|
|
||||||
}
|
|
||||||
|
|
||||||
final ErrorHandler errorHandler = errorHandlerProvider.getIfAvailable();
|
|
||||||
if (checkNotNull(errorHandler)) {
|
|
||||||
autoresponder.setErrorHandler(errorHandler);
|
|
||||||
}
|
|
||||||
|
|
||||||
final AnswerTextAction answerTextAction = answerTextActionProvider.getIfAvailable();
|
|
||||||
if (checkNotNull(answerTextAction)) {
|
|
||||||
autoresponder.initTextAnswerActionUnit(answerTextAction);
|
|
||||||
}
|
|
||||||
return autoresponder;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
@ConditionalOnBean(TelegramConnect.class)
|
@ConditionalOnBean(TelegramConnect.class)
|
||||||
public TelegramSending sending(
|
public TelegramSending sending(
|
||||||
|
@ -119,32 +94,122 @@ public class TelegramBotAutoconfiguration {
|
||||||
return telegramSender;
|
return telegramSender;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Bean("mailStorylineService")
|
||||||
|
@ConditionalOnBean(value = {UnitPointerService.class, StorylineRepository.class, PersonUnitConfiguration.class})
|
||||||
|
public StorylineService<Mail> mailStorylineService(
|
||||||
|
UnitPointerService unitPointerService,
|
||||||
|
StorylineRepository storylineRepository,
|
||||||
|
List<PersonUnitConfiguration> personUnitConfigurations
|
||||||
|
) {
|
||||||
|
return new StorylineMailService<>(
|
||||||
|
unitPointerService,
|
||||||
|
storylineRepository,
|
||||||
|
new ArrayList<>(personUnitConfigurations)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Bean("chatMailStorylineService")
|
||||||
|
@ConditionalOnBean(value = {UnitPointerService.class, StorylineRepository.class, ChatUnitConfiguration.class})
|
||||||
|
public StorylineService<ChatMail> chatMailStorylineService(
|
||||||
|
UnitPointerService unitPointerService,
|
||||||
|
StorylineRepository storylineRepository,
|
||||||
|
List<ChatUnitConfiguration> chatUnitConfigurations
|
||||||
|
) {
|
||||||
|
return new StorylineMailService<>(
|
||||||
|
unitPointerService,
|
||||||
|
storylineRepository,
|
||||||
|
new ArrayList<>(chatUnitConfigurations)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
@ConditionalOnBean(name = "chatMailStorylineService")
|
||||||
|
public ChatMailAutoresponderTelegram chatMailAutoresponderTelegram(
|
||||||
|
@Qualifier(AUTORESPONDER_EXECUTORS_SERVICE) ObjectProvider<ExecutorService> executorServiceProvider,
|
||||||
|
PersonSettingService personSettingService,
|
||||||
|
ObjectProvider<ErrorHandler> errorHandlerProvider,
|
||||||
|
ObjectProvider<AnswerTextChatMailAction> answerTextActionProvider,
|
||||||
|
|
||||||
|
TelegramSending telegramSending,
|
||||||
|
StorylineService<ChatMail> storylineService
|
||||||
|
) {
|
||||||
|
final ChatMailAutoresponderTelegram autoresponder = new ChatMailAutoresponderTelegram(personSettingService, storylineService);
|
||||||
|
autoresponder.registrationActionUnit(new AnswerCheckAction(telegramSending));
|
||||||
|
autoresponder.registrationActionUnit(new AnswerSaveAction<>());
|
||||||
|
|
||||||
|
final AnswerTextChatMailAction answerTextAction = answerTextActionProvider.getIfAvailable();
|
||||||
|
if (checkNotNull(answerTextAction)) {
|
||||||
|
autoresponder.registrationActionUnit(answerTextAction);
|
||||||
|
} else {
|
||||||
|
autoresponder.registrationActionUnit(new AnswerTextChatMailAction(telegramSending));
|
||||||
|
}
|
||||||
|
|
||||||
|
final ExecutorService executorService = executorServiceProvider.getIfAvailable();
|
||||||
|
if (checkNotNull(executorService)) {
|
||||||
|
autoresponder.setExecutorService(executorService);
|
||||||
|
}
|
||||||
|
|
||||||
|
final ErrorHandler errorHandler = errorHandlerProvider.getIfAvailable();
|
||||||
|
if (checkNotNull(errorHandler)) {
|
||||||
|
autoresponder.setErrorHandler(errorHandler);
|
||||||
|
}
|
||||||
|
|
||||||
|
return autoresponder;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
@ConditionalOnBean(name = "mailStorylineService")
|
||||||
|
public MailAutoresponderTelegram messageAutoresponderTelegram(
|
||||||
|
@Qualifier(AUTORESPONDER_EXECUTORS_SERVICE) ObjectProvider<ExecutorService> executorServiceProvider,
|
||||||
|
TelegramSending sending,
|
||||||
|
PersonSettingService personSettingService,
|
||||||
|
ObjectProvider<ErrorHandler> errorHandlerProvider,
|
||||||
|
ObjectProvider<AnswerTextMailAction> answerTextActionProvider,
|
||||||
|
|
||||||
|
StorylineService<Mail> storylineService
|
||||||
|
) {
|
||||||
|
final MailAutoresponderTelegram autoresponder = new MailAutoresponderTelegram(personSettingService, storylineService);
|
||||||
|
autoresponder.registrationActionUnit(new AnswerCheckAction(sending));
|
||||||
|
autoresponder.registrationActionUnit(new AnswerSaveAction<>());
|
||||||
|
|
||||||
|
final AnswerTextMailAction answerTextAction = answerTextActionProvider.getIfAvailable();
|
||||||
|
if (checkNotNull(answerTextAction)) {
|
||||||
|
autoresponder.registrationActionUnit(answerTextAction);
|
||||||
|
} else {
|
||||||
|
autoresponder.registrationActionUnit(new AnswerTextMailAction(sending));
|
||||||
|
}
|
||||||
|
|
||||||
|
final ExecutorService executorService = executorServiceProvider.getIfAvailable();
|
||||||
|
if (checkNotNull(executorService)) {
|
||||||
|
autoresponder.setExecutorService(executorService);
|
||||||
|
}
|
||||||
|
|
||||||
|
final ErrorHandler errorHandler = errorHandlerProvider.getIfAvailable();
|
||||||
|
if (checkNotNull(errorHandler)) {
|
||||||
|
autoresponder.setErrorHandler(errorHandler);
|
||||||
|
}
|
||||||
|
|
||||||
|
return autoresponder;
|
||||||
|
}
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
@ConditionalOnBean(MailAutoresponderTelegram.class)
|
@ConditionalOnBean(MailAutoresponderTelegram.class)
|
||||||
public StoryLineHandler storyLineHandler(MailAutoresponderTelegram mailAutoresponderTelegram) {
|
public EventHandler<Mail> personStoryLineHandler(MailAutoresponderTelegram mailAutoresponderTelegram) {
|
||||||
return new StoryLineHandler(mailAutoresponderTelegram);
|
return new PersonStoryLineHandler(mailAutoresponderTelegram);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
@ConditionalOnBean(ChatMailAutoresponderTelegram.class)
|
||||||
|
public EventHandler<ChatMail> chatStoryLineHandler(ChatMailAutoresponderTelegram mailAutoresponderTelegram) {
|
||||||
|
return new ChatStoryLineHandler(mailAutoresponderTelegram);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
@ConditionalOnBean(TelegramConnectBot.class)
|
@ConditionalOnBean(TelegramConnectBot.class)
|
||||||
public EventDistributor eventDistributor(
|
public EventDistributor eventDistributor(
|
||||||
TelegramConnectBot telegramConnect, List<EventHandler> eventProviders
|
TelegramConnectBot telegramConnect, List<? extends EventHandler> eventProviders
|
||||||
) {
|
) {
|
||||||
return new EventDistributorService(telegramConnect, eventProviders);
|
return new EventDistributorService(telegramConnect, (List<EventHandler>) eventProviders);
|
||||||
}
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
@ConditionalOnBean(value = {UnitPointerService.class, StorylineRepository.class})
|
|
||||||
public StorylineService<Mail> storylineService(
|
|
||||||
UnitPointerService unitPointerService,
|
|
||||||
StorylineRepository storylineRepository,
|
|
||||||
List<UnitConfiguration> unitConfigurations
|
|
||||||
) {
|
|
||||||
return new StorylineMailService(
|
|
||||||
unitPointerService,
|
|
||||||
storylineRepository,
|
|
||||||
new ArrayList<>(unitConfigurations)
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue