Removed poll repository

src/NadekoBot/Modules/Games/Common/PollRunner.cs

@@ -3,6 +3,7 @@ using Discord;
 using NadekoBot.Core.Services.Database.Models;
 using NadekoBot.Core.Services;
 using System;
+using System.Linq;
 using System.Threading;
 
 namespace NadekoBot.Modules.Games.Common
@@ -57,7 +58,7 @@ namespace NadekoBot.Modules.Games.Common
             finally { _locker.Release(); }
             using (var uow = _db.GetDbContext())
             {
-                var trackedPoll = uow.Polls.GetById(Poll.Id);
+                var trackedPoll = uow._context.Poll.FirstOrDefault(x => x.Id == Poll.Id);
                 trackedPoll.Votes.Add(voteObj);
                 uow.SaveChanges();
             }

src/NadekoBot/Modules/Games/Services/PollService.cs

@@ -31,7 +31,7 @@ namespace NadekoBot.Modules.Games.Services
 
             using (var uow = db.GetDbContext())
             {
-                ActivePolls = uow.Polls.GetAllPolls()
+                ActivePolls = uow._context.Poll.GetAllPolls()
                     .ToDictionary(x => x.GuildId, x =>
                     {
                         var pr = new PollRunner(db, x);
@@ -70,7 +70,7 @@ namespace NadekoBot.Modules.Games.Services
             {
                 using (var uow = _db.GetDbContext())
                 {
-                    uow.Polls.Add(p);
+                    uow._context.Poll.Add(p);
                     uow.SaveChanges();
                 }
 
@@ -87,7 +87,7 @@ namespace NadekoBot.Modules.Games.Services
                 pr.OnVoted -= Pr_OnVoted;
                 
                 using var uow = _db.GetDbContext();
-                uow.Polls.RemovePoll(pr.Poll.Id);
+                uow._context.RemovePoll(pr.Poll.Id);
                 uow.SaveChanges();
                 
                 return pr.Poll;

src/NadekoBot/Services/Database/IUnitOfWork.cs

@@ -18,7 +18,6 @@ namespace NadekoBot.Core.Services.Database
         IDiscordUserRepository DiscordUsers { get; }
         IWarningsRepository Warnings { get; }
         IXpRepository Xp { get; }
-        IPollsRepository Polls { get; }
         IPlantedCurrencyRepository PlantedCurrency { get; }
 
         int SaveChanges();

src/NadekoBot/Services/Database/NadekoContext.cs

@@ -57,6 +57,7 @@ namespace NadekoBot.Core.Services.Database
         public DbSet<DiscordUser> DiscordUser { get; set; }
         public DbSet<MusicPlayerSettings> MusicPlayerSettings { get; set; }
         public DbSet<Repeater> Repeaters { get; set; }
+        public DbSet<Poll> Poll { get; set; }
 
         public NadekoContext(DbContextOptions<NadekoContext> options) : base(options)
         {

src/NadekoBot/Services/Database/Repositories/IPollsRepository.cs

@@ -1,11 +0,0 @@
-using NadekoBot.Core.Services.Database.Models;
-using System.Collections.Generic;
-
-namespace NadekoBot.Core.Services.Database.Repositories
-{
-    public interface IPollsRepository : IRepository<Poll>
-    {
-        IEnumerable<Poll> GetAllPolls();
-        void RemovePoll(int id);
-    }
-}

src/NadekoBot/Services/Database/Repositories/Impl/PollExtensions.cs

@@ -2,25 +2,23 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
+using NadekoBot.Core.Services.Database;
 
-namespace NadekoBot.Core.Services.Database.Repositories.Impl
+namespace NadekoBot.Modules.Games.Common
 {
-    public class PollsRepository : Repository<Poll>, IPollsRepository
+    public static class PollExtensions
     {
-        public PollsRepository(DbContext context) : base(context)
+        public static IEnumerable<Poll> GetAllPolls(this DbSet<Poll> polls)
         {
-        }
+            return polls.Include(x => x.Answers)
-
-        public IEnumerable<Poll> GetAllPolls()
-        {
-            return _set.Include(x => x.Answers)
                 .Include(x => x.Votes)
                 .ToArray();
         }
 
-        public void RemovePoll(int id)
+        public static void RemovePoll(this NadekoContext ctx, int id)
         {
-            var p = _set
+            var p = ctx
+                .Poll
                 .Include(x => x.Answers)
                 .Include(x => x.Votes)
                 .FirstOrDefault(x => x.Id == id);
@@ -30,17 +28,17 @@ namespace NadekoBot.Core.Services.Database.Repositories.Impl
             
             if (p.Votes != null)
             {
-                _context.Set<PollVote>().RemoveRange(p.Votes);
+                ctx.RemoveRange(p.Votes);
                 p.Votes.Clear();
             }
             
             if (p.Answers != null)
             {
-                _context.Set<PollAnswer>().RemoveRange(p.Answers);
+                ctx.RemoveRange(p.Answers);
                 p.Answers.Clear();
             }
             
-            _set.Remove(p);
+            ctx.Poll.Remove(p);
         }
     }
 }

src/NadekoBot/Services/Database/UnitOfWork.cs

@@ -39,9 +39,6 @@ namespace NadekoBot.Core.Services.Database
         private IXpRepository _xp;
         public IXpRepository Xp => _xp ?? (_xp = new XpRepository(_context));
 
-        private IPollsRepository _polls;
-        public IPollsRepository Polls => _polls ?? (_polls = new PollsRepository(_context));
-
         private IPlantedCurrencyRepository _planted;
         public IPlantedCurrencyRepository PlantedCurrency => _planted ?? (_planted = new PlantedCurrencyRepository(_context));