separated conversation handling and state into different classes.

Author: basarozogut

RedmineTelegramBot.Core/BotException.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RedmineTelegramBot.Core
+{
+
+ [Serializable]
+ public class BotException : Exception
+ {
+ public BotException() { }
+ public BotException(string message) : base(message) { }
+ public BotException(string message, Exception inner) : base(message, inner) { }
+ protected BotException(
+ System.Runtime.Serialization.SerializationInfo info,
+ System.Runtime.Serialization.StreamingContext context) : base(info, context) { }
+ }
+}

RedmineTelegramBot.Core/Config/BotOptions.cs

@@ -12,8 +12,6 @@ public class BotOptions
 
  public string RedmineUrl { get; set; }
 
- public string RedmineSecret { get; set; }
-
  public string DataDirectory { get; set; }
  }
 }

RedmineTelegramBot.Core/ConversationFactory.cs

@@ -1,46 +1,30 @@
 using RedmineTelegramBot.Core.Models;
-using RestSharp;
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using Telegram.Bot;
 using Telegram.Bot.Types;
 
 namespace RedmineTelegramBot.Core
 {
- public class Conversation : IConversation
+ public class ConversationHandler : IConversationHandler
  {
- private enum State
- {
- Command,
- // search projects
- SearchProjects,
- // add issue
- AddIssueSetIssueProjectId,
- AddIssueSetIssueSubject,
- AddIssueSetIssueDescription,
- AddIssueSetTrackerId,
- }
-
  private readonly ITelegramBotClient _telegramBotClient;
  private readonly IRedmineApiClient _redmineApiClient;
 
- private State _state = State.Command;
-
- // issue
- private AddIssueModel _createIssueModel;
+ private readonly ConversationStateModel _conversationState;
 
- public Conversation(
+ public ConversationHandler(
  ITelegramBotClient telegramBotClient,
- IRedmineApiClient redmineApiClient)
+ IRedmineApiClient redmineApiClient,
+ ConversationStateModel conversationState)
  {
  _telegramBotClient = telegramBotClient;
  _redmineApiClient = redmineApiClient;
+ _conversationState = conversationState;
  }
 
- public async Task Process(Message message)
+ public async Task Handle(Message message)
  {
  if (message.Text == $"/{Commands.Cancel}")
  {
@@ -49,7 +33,7 @@ public async Task Process(Message message)
  return;
  }
 
- if (_state == State.Command)
+ if (_conversationState.State == State.Command)
  {
  if (message.Text == $"/{Commands.ProjectList}")
  {
@@ -59,42 +43,42 @@ public async Task Process(Message message)
 
  if (message.Text == $"/{Commands.AddIssue}")
  {
- _createIssueModel = new AddIssueModel();
+ _conversationState.CreateIssueModel = new AddIssueModel();
  await ChangeState(message, State.AddIssueSetIssueProjectId);
  return;
  }
  }
 
- if (_state == State.SearchProjects)
+ if (_conversationState.State == State.SearchProjects)
  {
  await ReplyWithProjectList(message, message.Text);
  return;
  }
 
- if (_state == State.AddIssueSetIssueProjectId)
+ if (_conversationState.State == State.AddIssueSetIssueProjectId)
  {
- _createIssueModel.issue.project_id = int.Parse(message.Text);
+ _conversationState.CreateIssueModel.issue.project_id = int.Parse(message.Text);
  await ChangeState(message, State.AddIssueSetIssueSubject);
  return;
  }
 
- if (_state == State.AddIssueSetIssueSubject)
+ if (_conversationState.State == State.AddIssueSetIssueSubject)
  {
- _createIssueModel.issue.subject = message.Text;
+ _conversationState.CreateIssueModel.issue.subject = message.Text;
  await ChangeState(message, State.AddIssueSetIssueDescription);
  return;
  }
 
- if (_state == State.AddIssueSetIssueDescription)
+ if (_conversationState.State == State.AddIssueSetIssueDescription)
  {
- _createIssueModel.issue.description = message.Text;
+ _conversationState.CreateIssueModel.issue.description = message.Text;
  await ChangeState(message, State.AddIssueSetTrackerId);
  return;
  }
 
- if (_state == State.AddIssueSetTrackerId)
+ if (_conversationState.State == State.AddIssueSetTrackerId)
  {
- _createIssueModel.issue.tracker_id = int.Parse(message.Text);
+ _conversationState.CreateIssueModel.issue.tracker_id = int.Parse(message.Text);
  await AddIssue(message);
  await ChangeState(message, State.Command);
  return;
@@ -105,7 +89,7 @@ public async Task Process(Message message)
 
  private async Task ChangeState(Message message, State state)
  {
- _state = state;
+ _conversationState.State = state;
 
  if (state == State.AddIssueSetIssueProjectId)
  {
@@ -178,7 +162,7 @@ private async Task ReplyWithTrackerList(Message message)
 
  private async Task AddIssue(Message message)
  {
- var response = await _redmineApiClient.AddIssue(_createIssueModel);
+ var response = await _redmineApiClient.AddIssue(_conversationState.CreateIssueModel);
  if (response.Errors != null && response.Errors.Count > 0)
  {
  await ReplyMessage(message, string.Join("\n", response.Errors));

RedmineTelegramBot.Core/Conversation.cs renamed to RedmineTelegramBot.Core/ConversationHandler.cs

@@ -0,0 +1,34 @@
+using RedmineTelegramBot.Core.Config;
+using RedmineTelegramBot.Core.Data;
+using RedmineTelegramBot.Core.Models;
+using Telegram.Bot;
+
+namespace RedmineTelegramBot.Core
+{
+ public class ConversationHandlerFactory : IConversationHandlerFactory
+ {
+ private readonly ITelegramBotClient _telegramBotClient;
+ private readonly BotOptions _botOptions;
+ private readonly IUserSettingsRepository _userSettingsRepository;
+
+ public ConversationHandlerFactory(ITelegramBotClient telegramBotClient, BotOptions botOptions, IUserSettingsRepository userSettingsRepository)
+ {
+ _telegramBotClient = telegramBotClient;
+ _botOptions = botOptions;
+ _userSettingsRepository = userSettingsRepository;
+ }
+
+ public IConversationHandler CreateConversationHandler(ConversationStateModel state)
+ {
+ var userSettings = _userSettingsRepository.GetSettings(state.Username);
+ if (userSettings == null)
+ {
+ throw new BotException("User settings not found!");
+ }
+
+ var restClientFactory = new RestClientFactory(_botOptions, userSettings);
+
+ return new ConversationHandler(_telegramBotClient, new RedmineApiClient(restClientFactory), state);
+ }
+ }
+}

RedmineTelegramBot.Core/ConversationHandlerFactory.cs

@@ -8,8 +8,8 @@
 
 namespace RedmineTelegramBot.Core
 {
- public interface IConversation
+ public interface IConversationHandler
  {
- Task Process(Message message);
+ Task Handle(Message message);
  }
 }

RedmineTelegramBot.Core/IConversationFactory.cs

@@ -0,0 +1,15 @@
+using RedmineTelegramBot.Core.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Telegram.Bot.Types;
+
+namespace RedmineTelegramBot.Core
+{
+ public interface IConversationHandlerFactory
+ {
+ IConversationHandler CreateConversationHandler(ConversationStateModel state);
+ }
+}

RedmineTelegramBot.Core/IConversation.cs renamed to RedmineTelegramBot.Core/IConversationHandler.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RedmineTelegramBot.Core.Models
+{
+ public class ConversationStateModel
+ {
+ public long ChatId { get; set; }
+
+ public string Username { get; set; }
+
+ public State State { get; set; } = State.Command;
+
+ public AddIssueModel CreateIssueModel { get; set; }
+ }
+
+ public enum State
+ {
+ Command,
+ // search projects
+ SearchProjects,
+ // add issue
+ AddIssueSetIssueProjectId,
+ AddIssueSetIssueSubject,
+ AddIssueSetIssueDescription,
+ AddIssueSetTrackerId,
+ }
+}

RedmineTelegramBot.Core/IConversationHandlerFactory.cs

@@ -16,14 +16,16 @@ public RedmineBotModule(BotOptions configuration)
 
  public void Load(IServiceCollection services)
  {
+ // config
+ services.AddSingleton(_options);
+
  // repositories
  services.AddTransient<IUserSettingsRepository>(c => new UsersSettingsFileRepository(_options.DataDirectory));
 
  // app services
  services.AddTransient<IRedmineBot, RedmineBot>();
  services.AddSingleton<ITelegramBotClient>(c => new TelegramBotClient(_options.Token));
- services.AddTransient<IConversationFactory, ConversationFactory>();
- services.AddTransient<IRestClientFactory>(c => new RestClientFactory(_options));
+ services.AddTransient<IConversationHandlerFactory, ConversationHandlerFactory>();
  services.AddTransient<IRedmineApiClient,RedmineApiClient>();
  }
  }