Merge pull request #41 from xforman2/40-create-message-handler-for-di…

…scord-bot feat: added discord message handler
xforman2 · Sep 5, 2024 · 3f1a479 · 3f1a479
2 parents 5729f39 + 63d9140
commit 3f1a479
Show file tree

Hide file tree

Showing 6 changed files with 97 additions and 12 deletions.
diff --git a/Backend/Seeding/DbSeeder.cs b/Backend/Seeding/DbSeeder.cs
@@ -12,24 +12,25 @@ public DbSeeder(HouseScoutContext context)
         _context = context;
     }
 
-    public void Seed()
+    public async Task Seed()
     {
         if (!_context.Estates.Any())
         {
             var estateFaker = new Faker<Estate>()
                 .RuleFor(e => e.ApiType, f => f.PickRandom<ApiType>())
                 .RuleFor(e => e.ApiId, f => f.Random.Guid().ToString())
                 .RuleFor(e => e.Address, f => f.Address.FullAddress())
-                .RuleFor(e => e.Price, f => f.Random.Decimal(100000, 1000000))
+                .RuleFor(e => e.Price, f => f.Random.Decimal(10000, 100000))
                 .RuleFor(e => e.Link, f => f.Internet.Url())
-                .RuleFor(e => e.Surface, f => f.Random.Double(50, 500))
+                .RuleFor(e => e.Surface, f => f.Random.Double(10, 100))
                 .RuleFor(e => e.EstateType, f => f.PickRandom<EstateType>())
-                .RuleFor(e => e.OfferType, f => f.PickRandom<OfferType>());
+                .RuleFor(e => e.OfferType, f => f.PickRandom<OfferType>())
+                .RuleFor(e => e.New, f => true);
 
-            var estates = estateFaker.Generate(500);
+            var estates = estateFaker.Generate(200);
 
-            _context.Estates.AddRange(estates);
-            _context.SaveChanges();
+            await _context.Estates.AddRangeAsync(estates);
+            await _context.SaveChangesAsync();
         }
     }
 }
diff --git a/DiscordBot/Filters/DataFilter.cs b/DiscordBot/Filters/DataFilter.cs
@@ -20,7 +20,8 @@ int surfaceMax
     {
         return _context
             .Estates.Where(e =>
-                e.Price >= priceMin
+                e.New
+                && e.Price >= priceMin
                 && e.Price <= priceMax
                 && e.Surface >= surfaceMin
                 && e.Surface <= surfaceMax

diff --git a/DiscordBot/Program.cs b/DiscordBot/Program.cs
@@ -4,6 +4,7 @@
 using Discord.Interactions;
 using Discord.WebSocket;
 using DiscordBot.Filters;
+using DiscordBot.Services;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -55,6 +56,7 @@ static async Task Main(string[] args)
 
         var rabbitMqService = host.Services.GetRequiredService<RabbitMQService>();
         rabbitMqService.StartListening();
+
         await Task.Delay(-1); // Keep the bot running
     }
 
@@ -87,7 +89,8 @@ private static IHostBuilder CreateHostBuilder() =>
                         )
                         .AddSingleton<CommandService>()
                         .AddScoped<DataFilter>()
-                        .AddSingleton<RabbitMQService>();
+                        .AddSingleton<RabbitMQService>()
+                        .AddSingleton<IMessageHandler, DiscordMessageHandler>();
                 }
             );
 

diff --git a/DiscordBot/Services/DiscordMessageHandler.cs b/DiscordBot/Services/DiscordMessageHandler.cs
@@ -0,0 +1,79 @@
+using System.Text;
+using Discord.WebSocket;
+using DiscordBot.Filters;
+using Microsoft.EntityFrameworkCore;
+using SharedDependencies.Model;
+using SharedDependencies.Services;
+
+namespace DiscordBot.Services
+{
+    public class DiscordMessageHandler : IMessageHandler
+    {
+        private readonly DiscordSocketClient _client;
+        private readonly HouseScoutContext _context;
+        private readonly DataFilter _dataFilter;
+
+        public DiscordMessageHandler(
+            DiscordSocketClient client,
+            HouseScoutContext context,
+            DataFilter dataFilter
+        )
+        {
+            _client = client;
+            _context = context;
+            _dataFilter = dataFilter;
+        }
+
+        public async Task HandleMessageAsync()
+        {
+            var users = await _context.Users.AsNoTracking().ToListAsync();
+            foreach (var dbUser in users)
+            {
+                var user = await _client.GetUserAsync((ulong)dbUser.UserId);
+                if (user != null)
+                {
+                    var dmChannel = await user.CreateDMChannelAsync();
+                    var estateData = _dataFilter.SurfacePriceFilter(
+                        dbUser.MinPrice,
+                        dbUser.MaxPrice,
+                        dbUser.MinSurface,
+                        dbUser.MaxSurface
+                    );
+
+                    var messages = PrepareMessages(estateData);
+
+                    foreach (var message in messages)
+                    {
+                        await dmChannel.SendMessageAsync(message);
+                    }
+                }
+            }
+        }
+
+        private List<string> PrepareMessages(List<Estate> estateData)
+        {
+            var messages = new List<string>();
+            var currentMessage = new StringBuilder();
+
+            foreach (var estate in estateData)
+            {
+                string estateInfo = $"{estate.Address} - {estate.Price:C} - {estate.Link}\n";
+
+                if (currentMessage.Length + estateInfo.Length > 2000)
+                {
+                    messages.Add(currentMessage.ToString());
+                    currentMessage.Clear();
+                }
+
+                currentMessage.Append(estateInfo);
+            }
+
+            if (currentMessage.Length > 0)
+            {
+                messages.Add(currentMessage.ToString());
+            }
+
+            return messages;
+        }
+    }
+}
diff --git a/SharedDependencies/Services/IMessageHandler.cs b/SharedDependencies/Services/IMessageHandler.cs
@@ -2,5 +2,5 @@ namespace SharedDependencies.Services;
 
 public interface IMessageHandler
 {
-    void HandleMessage();
+    Task HandleMessageAsync();
 }
diff --git a/SharedDependencies/Services/RabbitMQService.cs b/SharedDependencies/Services/RabbitMQService.cs
@@ -46,15 +46,16 @@ public void PublishMessage(string message)
     public void StartListening()
     {
         var consumer = new EventingBasicConsumer(_channel);
-        consumer.Received += (ch, ea) =>
+        consumer.Received += async (ch, ea) =>
         {
             if (_messageHandler != null)
             {
-                _messageHandler.HandleMessage();
+                await _messageHandler.HandleMessageAsync();
             }
 
             _channel.BasicAck(ea.DeliveryTag, false);
         };
+        _channel.BasicConsume(_queueName, false, consumer);
     }
 
     public void Dispose()