added work context. made the services work with provided context.

Author: basarozogut

RedmineTelegramBot.Core/Commands.cs

@@ -10,6 +10,7 @@ namespace RedmineTelegramBot.Core
  public static class Commands
  {
  public const string Cancel = "cancel";
+ public const string Register = "register";
  public const string ProjectList = "projectlist";
  public const string AddIssue = "addissue";
 
@@ -22,6 +23,11 @@ public static List<BotCommand> GetBotCommands()
  Description = "Cancel current command."
  },
  new BotCommand()
+ {
+ Command = Register,
+ Description = "Register user & secret."
+ },
+ new BotCommand()
  {
  Command = ProjectList,
  Description = "Returns list of projects ids and project names."

RedmineTelegramBot.Core/ContextualServiceProvider.cs

@@ -0,0 +1,29 @@
+using RedmineTelegramBot.Core;
+using System;
+
+namespace RedmineTelegramBot.Core
+{
+ public class ContextualServiceProvider : IServiceProvider
+ {
+ private readonly IWorkContext _workContext;
+ private readonly IServiceProvider _wrappedServiceProvider;
+
+ public ContextualServiceProvider(IWorkContext workContext, IServiceProvider wrappedServiceProvider)
+ {
+ _workContext = workContext;
+ _wrappedServiceProvider = wrappedServiceProvider;
+ }
+
+ public object GetService(Type serviceType)
+ {
+ if (serviceType == typeof(IWorkContext))
+ {
+ return _workContext;
+ }
+ else
+ {
+ return _wrappedServiceProvider.GetService(serviceType);
+ }
+ }
+ }
+}

RedmineTelegramBot.Core/ConversationHandler.cs

@@ -1,4 +1,5 @@
-using RedmineTelegramBot.Core.Models;
+using RedmineTelegramBot.Core.Data;
+using RedmineTelegramBot.Core.Models;
 using System;
 using System.Linq;
 using System.Threading.Tasks;
@@ -9,23 +10,32 @@ namespace RedmineTelegramBot.Core
 {
  public class ConversationHandler : IConversationHandler
  {
+ private readonly IWorkContext _workContext;
  private readonly ITelegramBotClient _telegramBotClient;
  private readonly IRedmineApiClient _redmineApiClient;
+ private readonly IUserSettingsRepository _userSettingsRepository;
+ private readonly IConversationStateRepository _conversationStateRepository;
 
- private readonly ConversationStateModel _conversationState;
+ private ConversationStateModel _conversationState;
 
  public ConversationHandler(
+ IWorkContext workContext,
  ITelegramBotClient telegramBotClient,
  IRedmineApiClient redmineApiClient,
- ConversationStateModel conversationState)
+ IUserSettingsRepository userSettingsRepository,
+ IConversationStateRepository conversationStateRepository)
  {
+ _workContext = workContext;
  _telegramBotClient = telegramBotClient;
  _redmineApiClient = redmineApiClient;
- _conversationState = conversationState;
+ _userSettingsRepository = userSettingsRepository;
+ _conversationStateRepository = conversationStateRepository;
  }
 
  public async Task Handle(Message message)
  {
+ _conversationState = _conversationStateRepository.GetConversationState(_workContext.Username);
+
  if (message.Text == $"/{Commands.Cancel}")
  {
  await ChangeState(message, State.Command);
@@ -35,6 +45,18 @@ public async Task Handle(Message message)
 
  if (_conversationState.State == State.Command)
  {
+ if (message.Text == $"/{Commands.Register}")
+ {
+ await ChangeState(message, State.RegisterSecret);
+ return;
+ }
+
+ if (!CheckRegistration())
+ {
+ await ReplyMessage(message, "You must register your redmine secret before using any functionality.");
+ return;
+ }
+
  if (message.Text == $"/{Commands.ProjectList}")
  {
  await ChangeState(message, State.SearchProjects);
@@ -49,6 +71,23 @@ public async Task Handle(Message message)
  }
  }
 
+ if (_conversationState.State == State.RegisterSecret)
+ {
+ var settings = _userSettingsRepository.GetSettings(_conversationState.Username);
+ if (settings == null)
+ {
+ settings = new UserSettings()
+ {
+ Username = _conversationState.Username
+ };
+ }
+ settings.RedmineSecret = message.Text;
+ _userSettingsRepository.StoreSettings(settings);
+ await ReplyMessage(message, "User registered.");
+ await ChangeState(message, State.Command);
+ return;
+ }
+
  if (_conversationState.State == State.SearchProjects)
  {
  await ReplyWithProjectList(message, message.Text);
@@ -87,11 +126,26 @@ public async Task Handle(Message message)
  await ReplyMessage(message, "Unknown text or command:\n" + message.Text);
  }
 
+ private bool CheckRegistration()
+ {
+ var userSettings = _userSettingsRepository.GetSettings(_workContext.Username);
+ if (userSettings == null || string.IsNullOrEmpty(userSettings.RedmineSecret))
+ {
+ return false;
+ }
+
+ return true;
+ }
+
  private async Task ChangeState(Message message, State state)
  {
  _conversationState.State = state;
 
- if (state == State.AddIssueSetIssueProjectId)
+ if (state == State.RegisterSecret)
+ {
+ await ReplyMessage(message, "Redmine Secret:\n");
+ }
+ else if (state == State.AddIssueSetIssueProjectId)
  {
  await ReplyMessage(message, "Project Id:\n");
  }
@@ -172,5 +226,10 @@ private async Task AddIssue(Message message)
  await ReplyMessage(message, "Issue created.");
  }
  }
+
+ public void SaveState()
+ {
+ _conversationStateRepository.StoreConversationState(_conversationState);
+ }
  }
 }

RedmineTelegramBot.Core/ConversationHandlerFactory.cs

@@ -0,0 +1,18 @@
+using RedmineTelegramBot.Core.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RedmineTelegramBot.Core.Data
+{
+ public interface IConversationStateRepository
+ {
+ ConversationStateModel GetConversationState(string username);
+
+ void StoreConversationState(ConversationStateModel conversationState);
+
+ void DeleteConversationState(string username);
+ }
+}

RedmineTelegramBot.Core/Data/IConversationStateRepository.cs

@@ -8,7 +8,7 @@ namespace RedmineTelegramBot.Core.Data
 {
  public interface IUserSettingsRepository
  {
- void StoreSettings(string username, UserSettings userSettings);
+ void StoreSettings(UserSettings userSettings);
 
  UserSettings GetSettings(string username);
  }

RedmineTelegramBot.Core/Data/IUserSettingsRepository.cs

@@ -0,0 +1,40 @@
+using RedmineTelegramBot.Core.Models;
+using System.Collections.Generic;
+using System.Text.Json;
+
+namespace RedmineTelegramBot.Core.Data
+{
+ public class InMemoryConversationStateRepository : IConversationStateRepository
+ {
+ // store serialized versions of the state to avoid concurrency issues and make it behave like a db.
+ private readonly Dictionary<string, string> _store;
+
+ public InMemoryConversationStateRepository()
+ {
+ _store = new Dictionary<string, string>();
+ }
+
+ public void DeleteConversationState(string username)
+ {
+ if (!_store.ContainsKey(username))
+ throw new BotException("Conversation state for this username does not exists!");
+
+ _store.Remove(username);
+ }
+
+ public ConversationStateModel GetConversationState(string username)
+ {
+ if (_store.ContainsKey(username))
+ {
+ return JsonSerializer.Deserialize<ConversationStateModel>(_store[username]);
+ }
+
+ return null;
+ }
+
+ public void StoreConversationState(ConversationStateModel conversationState)
+ {
+ _store[conversationState.Username] = JsonSerializer.Serialize(conversationState);
+ }
+ }
+}

RedmineTelegramBot.Core/Data/InMemoryConversationStateRepository.cs

@@ -29,9 +29,12 @@ public UserSettings GetSettings(string username)
  return null;
  }
 
- public void StoreSettings(string username, UserSettings userSettings)
+ public void StoreSettings(UserSettings userSettings)
  {
- var path = MakePath(username);
+ if (string.IsNullOrEmpty(userSettings.Username))
+ throw new BotException("Username can't be null or empty!");
+
+ var path = MakePath(userSettings.Username);
  var json = JsonSerializer.Serialize(userSettings);
  File.WriteAllText(path, json);
  }

RedmineTelegramBot.Core/Data/UsersSettingsFileRepository.cs

@@ -11,5 +11,7 @@ namespace RedmineTelegramBot.Core
  public interface IConversationHandler
  {
  Task Handle(Message message);
+
+ void SaveState();
  }
 }