damien/comissions-app-core-api
1
0
Fork 0
mirror of https://github.com/D4M13N-D3V/comissions-app-core-api.git synced 2025-10-31 17:45:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: changed how requests are queried.

Browse Source
This commit is contained in:
Damien Ostler 2024-02-24 01:41:44 -05:00
parent f076349307
commit 91837e0e05
1 changed files with 10 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
src/comissions.app.api/Controllers/RequestsController.cs
View File

@ -669,24 +669,8 @@ public class RequestsController : Controller
{ {
var userId = User.GetUserId(); var userId = User.GetUserId();
var query = _dbContext.Requests var query = _dbContext.Requests
.Where(x => x.UserId == userId); .Where(x => x.UserId == userId)
.Where(x => x.Completed == completed || x.Declined == declined || x.Accepted == accepted || x.Paid == paid);
if (completed)
{
query = query.Where(x => x.Completed );
}
if (declined)
{
query = query.Where(x => x.Declined);
}
if (accepted)
{
query = query.Where(x => x.Accepted);
}
if (paid)
{
query = query.Where(x => x.Paid);
}
if (!string.IsNullOrWhiteSpace(search)) if (!string.IsNullOrWhiteSpace(search))
{ {
@ -710,25 +694,9 @@ public class RequestsController : Controller
{ {
var userId = User.GetUserId(); var userId = User.GetUserId();
var query = _dbContext.Requests var query = _dbContext.Requests
.Where(x => x.UserId == userId); .Where(x => x.UserId == userId)
.Where(x => x.Completed == completed || x.Declined == declined || x.Accepted == accepted || x.Paid == paid);
if (completed)
{
query = query.Where(x => x.Completed );
}
if (declined)
{
query = query.Where(x => x.Declined);
}
if (accepted)
{
query = query.Where(x => x.Accepted);
}
if (paid)
{
query = query.Where(x => x.Paid);
}
if (!string.IsNullOrWhiteSpace(search)) if (!string.IsNullOrWhiteSpace(search))
{ {
query = query.Where(x => x.Artist.Name.Contains(search) || x.Message.Contains(search)); query = query.Where(x => x.Artist.Name.Contains(search) || x.Message.Contains(search));
@ -763,24 +731,9 @@ public class RequestsController : Controller
{ {
var userId = User.GetUserId(); var userId = User.GetUserId();
var query = _dbContext.Requests.Include(x=>x.Artist) var query = _dbContext.Requests.Include(x=>x.Artist)
.Where(x => x.Artist.UserId == userId); .Where(x => x.Artist.UserId == userId)
.Where(x => x.Completed == completed || x.Declined == declined || x.Accepted == accepted || x.Paid == paid);
if (completed)
{
query = query.Where(x => x.Completed );
}
if (declined)
{
query = query.Where(x => x.Declined);
}
if (accepted)
{
query = query.Where(x => x.Accepted);
}
if (paid)
{
query = query.Where(x => x.Paid);
}
if (!string.IsNullOrWhiteSpace(search)) if (!string.IsNullOrWhiteSpace(search))
{ {
@ -805,25 +758,9 @@ public class RequestsController : Controller
{ {
var userId = User.GetUserId(); var userId = User.GetUserId();
var query = _dbContext.Requests.Include(x=>x.Artist) var query = _dbContext.Requests.Include(x=>x.Artist)
.Where(x => x.Artist.UserId == userId); .Where(x => x.Artist.UserId == userId)
.Where(x => x.Completed == completed || x.Declined == declined || x.Accepted == accepted || x.Paid == paid);
if (completed)
{
query = query.Where(x => x.Completed );
}
if (declined)
{
query = query.Where(x => x.Declined);
}
if (accepted)
{
query = query.Where(x => x.Accepted);
}
if (paid)
{
query = query.Where(x => x.Paid);
}
if (!string.IsNullOrWhiteSpace(search)) if (!string.IsNullOrWhiteSpace(search))
{ {
query = query.Where(x => x.Artist.Name.Contains(search) || x.Message.Contains(search)); query = query.Where(x => x.Artist.Name.Contains(search) || x.Message.Contains(search));