From 32dee3a0789ed199ac378ce4263a65ba878db7f8 Mon Sep 17 00:00:00 2001
From: Kwoth <master.kwoth@gmail.com>
Date: Fri, 18 Jun 2021 08:53:06 +0200
Subject: [PATCH] Removed remind repository

---
 .../Modules/Utility/RemindCommands.cs         |  9 ++++----
 .../Services/Database/IUnitOfWork.cs          |  1 -
 .../Repositories/IReminderRepository.cs       | 11 ----------
 .../Repositories/Impl/ReminderRepository.cs   | 22 +++++++------------
 src/NadekoBot/Services/Database/UnitOfWork.cs |  3 ---
 5 files changed, 13 insertions(+), 33 deletions(-)
 delete mode 100644 src/NadekoBot/Services/Database/Repositories/IReminderRepository.cs

diff --git a/src/NadekoBot/Modules/Utility/RemindCommands.cs b/src/NadekoBot/Modules/Utility/RemindCommands.cs
index dcade6527..a31bae185 100644
--- a/src/NadekoBot/Modules/Utility/RemindCommands.cs
+++ b/src/NadekoBot/Modules/Utility/RemindCommands.cs
@@ -9,6 +9,7 @@ using NadekoBot.Core.Services;
 using NadekoBot.Core.Services.Database.Models;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Administration.Services;
+using NadekoBot.Modules.Utility.Common;
 using NadekoBot.Modules.Utility.Services;
 
 namespace NadekoBot.Modules.Utility
@@ -92,7 +93,7 @@ namespace NadekoBot.Modules.Utility
                 List<Reminder> rems;
                 using (var uow = _db.GetDbContext())
                 {
-                    rems = uow.Reminders.RemindersFor(ctx.User.Id, page)
+                    rems = uow._context.Reminders.RemindersFor(ctx.User.Id, page)
                         .ToList();
                 }
 
@@ -130,13 +131,13 @@ namespace NadekoBot.Modules.Utility
                 Reminder rem = null;
                 using (var uow = _db.GetDbContext())
                 {
-                    var rems = uow.Reminders.RemindersFor(ctx.User.Id, index / 10)
+                    var rems = uow._context.Reminders.RemindersFor(ctx.User.Id, index / 10)
                         .ToList();
                     var pageIndex = index % 10;
                     if (rems.Count > pageIndex)
                     {
                         rem = rems[pageIndex];
-                        uow.Reminders.Remove(rem);
+                        uow._context.Reminders.Remove(rem);
                         uow.SaveChanges();
                     }
                 }
@@ -179,7 +180,7 @@ namespace NadekoBot.Modules.Utility
 
                 using (var uow = _db.GetDbContext())
                 {
-                    uow.Reminders.Add(rem);
+                    uow._context.Reminders.Add(rem);
                     await uow.SaveChangesAsync();
                 }
 
diff --git a/src/NadekoBot/Services/Database/IUnitOfWork.cs b/src/NadekoBot/Services/Database/IUnitOfWork.cs
index b9efd584b..59eda8bda 100644
--- a/src/NadekoBot/Services/Database/IUnitOfWork.cs
+++ b/src/NadekoBot/Services/Database/IUnitOfWork.cs
@@ -10,7 +10,6 @@ namespace NadekoBot.Core.Services.Database
 
         IQuoteRepository Quotes { get; }
         IGuildConfigRepository GuildConfigs { get; }
-        IReminderRepository Reminders { get; }
         ICustomReactionRepository CustomReactions { get; }
         IMusicPlaylistRepository MusicPlaylists { get; }
         IWaifuRepository Waifus { get; }
diff --git a/src/NadekoBot/Services/Database/Repositories/IReminderRepository.cs b/src/NadekoBot/Services/Database/Repositories/IReminderRepository.cs
deleted file mode 100644
index cf73f9f5d..000000000
--- a/src/NadekoBot/Services/Database/Repositories/IReminderRepository.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using NadekoBot.Core.Services.Database.Models;
-using System.Collections.Generic;
-
-namespace NadekoBot.Core.Services.Database.Repositories
-{
-    public interface IReminderRepository : IRepository<Reminder>
-    {
-        IEnumerable<Reminder> GetIncludedReminders(IEnumerable<ulong> guildIds);
-        IEnumerable<Reminder> RemindersFor(ulong userId, int page);
-    }
-}
diff --git a/src/NadekoBot/Services/Database/Repositories/Impl/ReminderRepository.cs b/src/NadekoBot/Services/Database/Repositories/Impl/ReminderRepository.cs
index 7fc48219d..2988d2346 100644
--- a/src/NadekoBot/Services/Database/Repositories/Impl/ReminderRepository.cs
+++ b/src/NadekoBot/Services/Database/Repositories/Impl/ReminderRepository.cs
@@ -3,26 +3,20 @@ using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace NadekoBot.Core.Services.Database.Repositories.Impl
+namespace NadekoBot.Modules.Utility.Common
 {
-    public class ReminderRepository : Repository<Reminder>, IReminderRepository
+    public static class ReminderExtensions
     {
-        public ReminderRepository(DbContext context) : base(context)
-        {
-        }
+        public static IEnumerable<Reminder> GetIncludedReminders(this DbSet<Reminder> reminders, IEnumerable<ulong> guildIds) 
+            => reminders.AsQueryable()
+                .Where(x => guildIds.Contains(x.ServerId) || x.ServerId == 0)
+                .ToList();
 
-        public IEnumerable<Reminder> GetIncludedReminders(IEnumerable<ulong> guildIds)
-        {
-            return _set.AsQueryable().Where(x => guildIds.Contains(x.ServerId) || x.ServerId == 0).ToList();
-        }
-
-        public IEnumerable<Reminder> RemindersFor(ulong userId, int page)
-        {
-            return _set.AsQueryable()
+        public static IEnumerable<Reminder> RemindersFor(this DbSet<Reminder> reminders, ulong userId, int page)
+            => reminders.AsQueryable()
                 .Where(x => x.UserId == userId)
                 .OrderBy(x => x.DateAdded)
                 .Skip(page * 10)
                 .Take(10);
-        }
     }
 }
diff --git a/src/NadekoBot/Services/Database/UnitOfWork.cs b/src/NadekoBot/Services/Database/UnitOfWork.cs
index d2847aa4b..7f62cc58c 100644
--- a/src/NadekoBot/Services/Database/UnitOfWork.cs
+++ b/src/NadekoBot/Services/Database/UnitOfWork.cs
@@ -15,9 +15,6 @@ namespace NadekoBot.Core.Services.Database
         private IGuildConfigRepository _guildConfigs;
         public IGuildConfigRepository GuildConfigs => _guildConfigs ?? (_guildConfigs = new GuildConfigRepository(_context));
 
-        private IReminderRepository _reminders;
-        public IReminderRepository Reminders => _reminders ?? (_reminders = new ReminderRepository(_context));
-
         private IMusicPlaylistRepository _musicPlaylists;
         public IMusicPlaylistRepository MusicPlaylists => _musicPlaylists ?? (_musicPlaylists = new MusicPlaylistRepository(_context));