Union/ProjectLighthouse
1
0
Fork 0
mirror of https://github.com/LBPUnion/ProjectLighthouse.git synced 2025-08-02 10:08:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

filter locked levels from lucky dip (#1055)

Browse source 
* filter locked levels from lucky dip

* yeah sure

* put the filter in a more reasonable place
This commit is contained in:
Kat 2024-08-28 18:16:08 -07:00 • committed by GitHub
commit fb2192d37d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ProjectLighthouse.Servers.GameServer/Controllers/Slots/SlotsController.cs
View file

@ -263,6 +263,7 @@ public class SlotsController : ControllerBase
PaginationData pageData = this.Request.GetPaginationData(); PaginationData pageData = this.Request.GetPaginationData();
SlotQueryBuilder queryBuilder = this.FilterFromRequest(token); SlotQueryBuilder queryBuilder = this.FilterFromRequest(token);
queryBuilder.AddFilter(new LockedSlotFilter());
pageData.TotalElements = await StatisticsHelper.SlotCount(this.database, queryBuilder); pageData.TotalElements = await StatisticsHelper.SlotCount(this.database, queryBuilder);

8
ProjectLighthouse.Servers.GameServer/Types/Categories/LuckyDipCategory.cs
View file

@ -2,6 +2,7 @@
using LBPUnion.ProjectLighthouse.Database; using LBPUnion.ProjectLighthouse.Database;
using LBPUnion.ProjectLighthouse.Extensions; using LBPUnion.ProjectLighthouse.Extensions;
using LBPUnion.ProjectLighthouse.Filter; using LBPUnion.ProjectLighthouse.Filter;
using LBPUnion.ProjectLighthouse.Filter.Filters;
using LBPUnion.ProjectLighthouse.Filter.Sorts; using LBPUnion.ProjectLighthouse.Filter.Sorts;
using LBPUnion.ProjectLighthouse.Types.Entities.Level; using LBPUnion.ProjectLighthouse.Types.Entities.Level;
using LBPUnion.ProjectLighthouse.Types.Entities.Token; using LBPUnion.ProjectLighthouse.Types.Entities.Token;
@ -16,7 +17,10 @@ public class LuckyDipCategory : SlotCategory
public override string Endpoint { get; set; } = "lucky_dip"; public override string Endpoint { get; set; } = "lucky_dip";
public override string Tag => "lucky_dip"; public override string Tag => "lucky_dip";
public override IQueryable<SlotEntity> GetItems(DatabaseContext database, GameTokenEntity token, SlotQueryBuilder queryBuilder) => public override IQueryable<SlotEntity> GetItems(DatabaseContext database, GameTokenEntity token, SlotQueryBuilder queryBuilder)
database.Slots.Where(queryBuilder.Build()) {
queryBuilder.AddFilter(new LockedSlotFilter());
return database.Slots.Where(queryBuilder.Build())
.ApplyOrdering(new SlotSortBuilder<SlotEntity>().AddSort(new RandomFirstUploadedSort())); .ApplyOrdering(new SlotSortBuilder<SlotEntity>().AddSort(new RandomFirstUploadedSort()));
}
} }

11
ProjectLighthouse/Filter/Filters/LockedSlotFilter.cs Normal file
View file

@ -0,0 +1,11 @@
using System;
using System.Linq.Expressions;
using LBPUnion.ProjectLighthouse.Types.Entities.Level;
using LBPUnion.ProjectLighthouse.Types.Filter;
namespace LBPUnion.ProjectLighthouse.Filter.Filters;
public class LockedSlotFilter : ISlotFilter
{
public Expression<Func<SlotEntity, bool>> GetPredicate() => s => !s.InitiallyLocked;
}