Refactor bot framework and controller registration

Restructure the TelegramBot application by removing the
`MapControllers` method from the `IBot` interface and
implementing the `AddBotControllers` extension method
in `ServiceCollectionExtensions`. This change allows
for direct registration of bot controllers into the
service collection, enhancing modularity and
maintainability. The `Run` method in `BotApp` has
been simplified, and the `BotControllerMethodsContainer`
is now instantiated within the new extension method.

Author: bvdcode

Sources/TelegramBot.ConsoleTest/Program.cs

@@ -15,6 +15,7 @@ public static void Main(string[] args)
                 .UseApiKey(x => x.FromConfiguration());
 
             builder.Services
+                .AddBotControllers()
                 .RegisterCommands(x =>
                 {
                     x.RegisterCommand("/start", "initiates the bot")
@@ -35,9 +36,8 @@ public static void Main(string[] args)
                 }, "ru")
                 .AddDbContext<AppDbContext>(x => x.UseSqlite("Data Source=app.db"))
                 .UseAuthorizationHandler<AuthorizationHandler>();
+
             var app = builder.Build();
-            app.MapControllers();
-            
             app.Run();
         }
     }

Sources/TelegramBot/BotApp.cs

@@ -1,11 +1,7 @@
 using System;
-using System.Linq;
 using System.Threading;
-using System.Reflection;
 using TelegramBot.Services;
 using System.Threading.Tasks;
-using TelegramBot.Containers;
-using TelegramBot.Controllers;
 using System.Collections.Generic;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
@@ -39,33 +35,6 @@ public BotApp(ServiceProvider serviceProvider)
             _logger = serviceProvider.GetRequiredService<ILogger<BotApp>>();
         }
 
-        /// <summary>
-        /// Maps controllers inherited from <see cref="BotControllerBase"/>.
-        /// </summary>
-        public IBot MapControllers()
-        {
-            CheckDisposed();
-            var types = Assembly.GetCallingAssembly().GetTypes();
-            List<Type> result = new List<Type>();
-            foreach (var type in types)
-            {
-                if (type.IsSubclassOf(typeof(BotControllerBase)))
-                {
-                    result.Add(type);
-                }
-            }
-            var controllerMethods = result
-                .SelectMany(t => t.GetMethods(BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly))
-                .ToList();
-            BotControllerMethodsContainer container = _serviceProvider.GetService<BotControllerMethodsContainer>()
-                ?? throw new InvalidOperationException("Bot controller methods container is not registered.");
-            foreach (var method in controllerMethods)
-            {
-                container.AddMethod(method);
-            }
-            return this;
-        }
-
         /// <summary>
         /// Runs the bot.
         /// </summary>

Sources/TelegramBot/Builders/BotBuilder.cs

@@ -190,7 +190,6 @@ public IBot Build()
             }
             Services.AddHostedService<TelegramBotHostedService>();
             Services.AddSingleton(_botConfiguration);
-            Services.AddSingleton<BotControllerMethodsContainer>();
             return new BotApp(Services.BuildServiceProvider());
         }
     }

Sources/TelegramBot/Extensions/ServiceCollectionExtensions.cs

@@ -1,7 +1,12 @@
 using System;
+using System.Linq;
+using System.Reflection;
 using TelegramBot.Builders;
 using TelegramBot.Attributes;
+using TelegramBot.Containers;
+using TelegramBot.Controllers;
 using TelegramBot.Abstractions;
+using System.Collections.Generic;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace TelegramBot.Extensions
@@ -11,9 +16,36 @@ namespace TelegramBot.Extensions
     /// </summary>
     public static class ServiceCollectionExtensions
     {
+        /// <summary>
+        /// Registers the bot controllers in the service collection. <br/>
+        /// </summary>
+        /// <param name="services">The service collection.</param>
+        /// <returns>The modified service collection with bot controllers registered.</returns>
+        public static IServiceCollection AddBotControllers(this IServiceCollection services)
+        {
+            var types = Assembly.GetCallingAssembly().GetTypes();
+            List<Type> result = new List<Type>();
+            foreach (var type in types)
+            {
+                if (type.IsSubclassOf(typeof(BotControllerBase)))
+                {
+                    result.Add(type);
+                }
+            }
+            var controllerMethods = result
+                .SelectMany(t => t.GetMethods(BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly))
+                .ToList();
+            BotControllerMethodsContainer container = new BotControllerMethodsContainer();
+            foreach (var method in controllerMethods)
+            {
+                container.AddMethod(method);
+            }
+            return services.AddSingleton(container);
+        }
+
         /// <summary>
         /// Register commands for the bot. This method only registers the commands in Telegram UI. <br/>
-        /// Controllers should be registered separately with <see cref="IBot.MapControllers"/> <br/>
+        /// Controllers should be registered separately with <see cref="AddBotControllers(IServiceCollection)"/> <br/>
         /// You can use commands even without this method.
         /// </summary>
         /// <param name="services">The service collection.</param>
@@ -24,8 +56,7 @@ public static IServiceCollection RegisterCommands(this IServiceCollection servic
         {
             CommandRegistrationBuilder builder = new CommandRegistrationBuilder(language);
             setup(builder);
-            services.AddSingleton(builder);
-            return services;
+            return services.AddSingleton(builder);
         }
 
         /// <summary>

Sources/TelegramBot/IBot.cs

@@ -1,5 +1,4 @@
 using System.Threading;
-using TelegramBot.Controllers;
 using Microsoft.Extensions.Hosting;
 
 namespace TelegramBot
@@ -9,11 +8,6 @@ namespace TelegramBot
     /// </summary>
     public interface IBot : IHost
     {
-        /// <summary>
-        /// Maps controllers inherited from <see cref="BotControllerBase"/>.
-        /// </summary>
-        IBot MapControllers();
-
         /// <summary>
         /// Runs the bot.
         /// </summary>

Sources/TelegramBot/Services/TelegramBotHostedService.cs

@@ -30,14 +30,15 @@ internal class TelegramBotHostedService : IHostedService
 
         public TelegramBotHostedService(BotConfiguration botConfiguration, ITelegramBotClient telegramBotClient,
             ILogger<TelegramBotHostedService> logger, IServiceProvider serviceProvider, 
-            BotControllerMethodsContainer botControllerMethodsContainer)
+            BotControllerMethodsContainer? botControllerMethodsContainer)
         {
             _logger = logger;
             _client = telegramBotClient;
             _serviceProvider = serviceProvider;
             _botConfiguration = botConfiguration;
-            _methods = botControllerMethodsContainer.Methods;
             _cancellationTokenSource = new CancellationTokenSource();
+            _methods = botControllerMethodsContainer?.Methods ?? new List<MethodInfo>();
+            _logger.LogInformation("Telegram bot hosted service initialized with {methodCount} methods.", _methods.Count);
         }
 
         public async Task StartAsync(CancellationToken cancellationToken)