minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-09-10 09:18:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Removed plantedcurrency repository

Browse Source
This commit is contained in:
Kwoth
2021-06-18 09:00:55 +02:00
parent 32dee3a078
commit a3fa8224c4
6 changed files with 14 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/NadekoBot/Modules/Gambling/Services/GamblingService.cs
View File

@@ -6,6 +6,7 @@ using NadekoBot.Modules.Gambling.Common.WheelOfFortune;
using Newtonsoft.Json;
using System;
using System.Collections.Concurrent;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore;
@@ -136,7 +137,7 @@ WHERE CurrencyAmount > {config.Decay.MinThreshold} AND UserId!={_client.CurrentU
{
cash = uow.DiscordUsers.GetTotalCurrency();
onePercent = uow.DiscordUsers.GetTopOnePercentCurrency(_client.CurrentUser.Id);
planted = uow.PlantedCurrency.GetTotalPlanted();
planted = uow._context.PlantedCurrency.AsQueryable().Sum(x => x.Amount);
waifus = uow.Waifus.GetTotalValue();
bot = uow.DiscordUsers.GetUserCurrency(_client.CurrentUser.Id);
}

14
src/NadekoBot/Modules/Gambling/Services/PlantPickService.cs
View File

@@ -269,7 +269,17 @@ namespace NadekoBot.Modules.Gambling.Services
// this method will sum all plants with that password,
// remove them, and get messageids of the removed plants
(amount, ids) = uow.PlantedCurrency.RemoveSumAndGetMessageIdsFor(ch.Id, pass);
pass = pass?.Trim().TrimTo(10, hideDots: true).ToUpperInvariant();
// gets all plants in this channel with the same password
var entries = uow._context.PlantedCurrency
.AsQueryable()
.Where(x => x.ChannelId == ch.Id && pass == x.Password)
.ToList();
// sum how much currency that is, and get all of the message ids (so that i can delete them)
amount = entries.Sum(x => x.Amount);
ids = entries.Select(x => x.MessageId).ToArray();
// remove them from the database
uow._context.RemoveRange(entries);
if (amount > 0)
@@ -360,7 +370,7 @@ namespace NadekoBot.Modules.Gambling.Services
{
using (var uow = _db.GetDbContext())
{
uow.PlantedCurrency.Add(new PlantedCurrency
uow._context.PlantedCurrency.Add(new PlantedCurrency
{
Amount = amount,
GuildId = gid,

1
src/NadekoBot/Services/Database/IUnitOfWork.cs
View File

@@ -16,7 +16,6 @@ namespace NadekoBot.Core.Services.Database
IDiscordUserRepository DiscordUsers { get; }
IWarningsRepository Warnings { get; }
IXpRepository Xp { get; }
IPlantedCurrencyRepository PlantedCurrency { get; }
int SaveChanges();
Task<int> SaveChangesAsync();

10
src/NadekoBot/Services/Database/Repositories/IPlantedCurrencyRepository.cs
View File

@@ -1,10 +0,0 @@
using NadekoBot.Core.Services.Database.Models;
namespace NadekoBot.Core.Services.Database.Repositories
{
public interface IPlantedCurrencyRepository : IRepository<PlantedCurrency>
{
(long Sum, ulong[] MessageIds) RemoveSumAndGetMessageIdsFor(ulong cid, string pass);
decimal GetTotalPlanted();
}
}

32
src/NadekoBot/Services/Database/Repositories/Impl/PlantedCurrencyRepository.cs
View File

@@ -1,32 +0,0 @@
using Microsoft.EntityFrameworkCore;
using NadekoBot.Core.Services.Database.Models;
using NadekoBot.Extensions;
using System.Linq;
namespace NadekoBot.Core.Services.Database.Repositories.Impl
{
public class PlantedCurrencyRepository : Repository<PlantedCurrency>, IPlantedCurrencyRepository
{
public PlantedCurrencyRepository(DbContext context) : base(context)
{
}
public decimal GetTotalPlanted()
{
return _set.Sum(x => x.Amount);
}
public (long Sum, ulong[] MessageIds) RemoveSumAndGetMessageIdsFor(ulong cid, string pass = null)
{
pass = pass?.Trim().TrimTo(10, hideDots: true).ToUpperInvariant();
// gets all plants in this channel with the same password
var entries = _set.AsQueryable().Where(x => x.ChannelId == cid && pass == x.Password).ToArray();
// sum how much currency that is, and get all of the message ids (so that i can delete them)
var toReturn = (entries.Sum(x => x.Amount), entries.Select(x => x.MessageId).ToArray());
// remove them from the database
_set.RemoveRange(entries);
return toReturn;
}
}
}

3
src/NadekoBot/Services/Database/UnitOfWork.cs
View File

@@ -33,9 +33,6 @@ namespace NadekoBot.Core.Services.Database
private IXpRepository _xp;
public IXpRepository Xp => _xp ?? (_xp = new XpRepository(_context));
private IPlantedCurrencyRepository _planted;
public IPlantedCurrencyRepository PlantedCurrency => _planted ?? (_planted = new PlantedCurrencyRepository(_context));
public UnitOfWork(NadekoContext context)
{
_context = context;