diff --git a/pom.xml b/pom.xml index 0e78b05..3688045 100644 --- a/pom.xml +++ b/pom.xml @@ -19,8 +19,8 @@ UTF-8 UTF-8 - 0.0.59 - 0.0.60 + 0.0.63 + 0.0.63 3.10.1 diff --git a/src/main/java/dev/struchkov/godfather/telegram/starter/config/TelegramBotAutoconfiguration.java b/src/main/java/dev/struchkov/godfather/telegram/starter/config/TelegramBotAutoconfiguration.java index 9c76e57..fe690a5 100644 --- a/src/main/java/dev/struchkov/godfather/telegram/starter/config/TelegramBotAutoconfiguration.java +++ b/src/main/java/dev/struchkov/godfather/telegram/starter/config/TelegramBotAutoconfiguration.java @@ -2,7 +2,6 @@ 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.simple.context.repository.StorylineRepository; import dev.struchkov.godfather.simple.context.repository.UnitPointerRepository; import dev.struchkov.godfather.simple.context.service.ErrorHandler; import dev.struchkov.godfather.simple.context.service.EventDispatching; @@ -88,29 +87,25 @@ public class TelegramBotAutoconfiguration { } @Bean("mailStorylineService") - @ConditionalOnBean(value = {UnitPointerService.class, StorylineRepository.class, PersonUnitConfiguration.class}) + @ConditionalOnBean(value = {UnitPointerService.class, PersonUnitConfiguration.class}) public StorylineService mailStorylineService( UnitPointerService unitPointerService, - StorylineRepository storylineRepository, List personUnitConfigurations ) { return new StorylineMailService<>( unitPointerService, - storylineRepository, new ArrayList<>(personUnitConfigurations) ); } @Bean("chatMailStorylineService") - @ConditionalOnBean(value = {UnitPointerService.class, StorylineRepository.class, ChatUnitConfiguration.class}) + @ConditionalOnBean(value = {UnitPointerService.class, ChatUnitConfiguration.class}) public StorylineService chatMailStorylineService( UnitPointerService unitPointerService, - StorylineRepository storylineRepository, List chatUnitConfigurations ) { return new StorylineMailService<>( unitPointerService, - storylineRepository, new ArrayList<>(chatUnitConfigurations) ); } diff --git a/src/main/java/dev/struchkov/godfather/telegram/starter/config/TelegramBotDataConfiguration.java b/src/main/java/dev/struchkov/godfather/telegram/starter/config/TelegramBotDataConfiguration.java index 66922c7..068be9b 100644 --- a/src/main/java/dev/struchkov/godfather/telegram/starter/config/TelegramBotDataConfiguration.java +++ b/src/main/java/dev/struchkov/godfather/telegram/starter/config/TelegramBotDataConfiguration.java @@ -1,12 +1,10 @@ package dev.struchkov.godfather.telegram.starter.config; -import dev.struchkov.godfather.simple.context.repository.PersonSettingRepository; import dev.struchkov.godfather.simple.context.repository.StorylineContext; -import dev.struchkov.godfather.simple.context.repository.StorylineRepository; +import dev.struchkov.godfather.simple.context.repository.StorylineHistoryRepository; import dev.struchkov.godfather.simple.context.repository.UnitPointerRepository; import dev.struchkov.godfather.simple.core.service.StorylineContextMapImpl; -import dev.struchkov.godfather.simple.data.repository.impl.PersonSettingLocalRepository; -import dev.struchkov.godfather.simple.data.repository.impl.StorylineMapRepository; +import dev.struchkov.godfather.simple.data.repository.impl.StorylineMapHistoryRepository; import dev.struchkov.godfather.simple.data.repository.impl.UnitPointLocalRepository; import dev.struchkov.godfather.telegram.simple.context.repository.SenderRepository; import dev.struchkov.godfather.telegram.simple.context.service.TelegramConnect; @@ -28,18 +26,12 @@ public class TelegramBotDataConfiguration { return new UnitPointLocalRepository(); } - @Bean - @ConditionalOnBean(TelegramConnect.class) - @ConditionalOnMissingBean(PersonSettingRepository.class) - public PersonSettingRepository personSettingRepository() { - return new PersonSettingLocalRepository(); - } @Bean @ConditionalOnBean(TelegramConnect.class) - @ConditionalOnMissingBean(StorylineRepository.class) - public StorylineRepository storylineRepository() { - return new StorylineMapRepository(); + @ConditionalOnMissingBean(StorylineHistoryRepository.class) + public StorylineHistoryRepository storylineHistoryRepository() { + return new StorylineMapHistoryRepository(); } @Bean