Quotes repository removed

This commit is contained in:
Kwoth
2021-06-18 22:53:44 +02:00
parent 56f28568d1
commit c7ff982ec1
6 changed files with 21 additions and 43 deletions

View File

@@ -6,9 +6,7 @@ namespace NadekoBot.Core.Services.Database
{
public interface IUnitOfWork : IDisposable
{
NadekoContext _context { get; }
IQuoteRepository Quotes { get; }
NadekoContext _context { get; }
IGuildConfigRepository GuildConfigs { get; }
IWaifuRepository Waifus { get; }
IDiscordUserRepository DiscordUsers { get; }

View File

@@ -1,14 +0,0 @@
using NadekoBot.Core.Services.Database.Models;
using System.Collections.Generic;
using System.Threading.Tasks;
namespace NadekoBot.Core.Services.Database.Repositories
{
public interface IQuoteRepository : IRepository<Quote>
{
Task<Quote> GetRandomQuoteByKeywordAsync(ulong guildId, string keyword);
Task<Quote> SearchQuoteKeywordTextAsync(ulong guildId, string keyword, string text);
IEnumerable<Quote> GetGroup(ulong guildId, int page, OrderType order);
void RemoveAllByKeyword(ulong guildId, string keyword);
}
}

View File

@@ -7,15 +7,11 @@ using NadekoBot.Common;
namespace NadekoBot.Core.Services.Database.Repositories.Impl
{
public class QuoteRepository : Repository<Quote>, IQuoteRepository
public static class QuoteExtensions
{
public QuoteRepository(DbContext context) : base(context)
public static IEnumerable<Quote> GetGroup(this DbSet<Quote> quotes, ulong guildId, int page, OrderType order)
{
}
public IEnumerable<Quote> GetGroup(ulong guildId, int page, OrderType order)
{
var q = _set.AsQueryable().Where(x => x.GuildId == guildId);
var q = quotes.AsQueryable().Where(x => x.GuildId == guildId);
if (order == OrderType.Keyword)
q = q.OrderBy(x => x.Keyword);
else
@@ -24,20 +20,20 @@ namespace NadekoBot.Core.Services.Database.Repositories.Impl
return q.Skip(15 * page).Take(15).ToArray();
}
public async Task<Quote> GetRandomQuoteByKeywordAsync(ulong guildId, string keyword)
public static async Task<Quote> GetRandomQuoteByKeywordAsync(this DbSet<Quote> quotes, ulong guildId, string keyword)
{
var rng = new NadekoRandom();
return (await _set.AsQueryable()
return (await quotes.AsQueryable()
.Where(q => q.GuildId == guildId && q.Keyword == keyword)
.ToListAsync())
.OrderBy(q => rng.Next())
.FirstOrDefault();
}
public async Task<Quote> SearchQuoteKeywordTextAsync(ulong guildId, string keyword, string text)
public static async Task<Quote> SearchQuoteKeywordTextAsync(this DbSet<Quote> quotes, ulong guildId, string keyword, string text)
{
var rngk = new NadekoRandom();
return (await _set.AsQueryable()
return (await quotes.AsQueryable()
.Where(q => q.GuildId == guildId
&& q.Keyword == keyword
&& EF.Functions.Like(q.Text.ToUpper(), $"%{text.ToUpper()}%")
@@ -48,9 +44,9 @@ namespace NadekoBot.Core.Services.Database.Repositories.Impl
.FirstOrDefault();
}
public void RemoveAllByKeyword(ulong guildId, string keyword)
public static void RemoveAllByKeyword(this DbSet<Quote> quotes, ulong guildId, string keyword)
{
_set.RemoveRange(_set.AsQueryable().Where(x => x.GuildId == guildId && x.Keyword.ToUpper() == keyword));
quotes.RemoveRange(quotes.AsQueryable().Where(x => x.GuildId == guildId && x.Keyword.ToUpper() == keyword));
}
}

View File

@@ -9,9 +9,6 @@ namespace NadekoBot.Core.Services.Database
{
public NadekoContext _context { get; }
private IQuoteRepository _quotes;
public IQuoteRepository Quotes => _quotes ?? (_quotes = new QuoteRepository(_context));
private IGuildConfigRepository _guildConfigs;
public IGuildConfigRepository GuildConfigs => _guildConfigs ?? (_guildConfigs = new GuildConfigRepository(_context));