From a9e2d8b237f6e19f088e27a4a1855a751ffa2d20 Mon Sep 17 00:00:00 2001 From: Damien Ostler Date: Tue, 20 Feb 2024 00:06:10 -0500 Subject: [PATCH] fix: request endpont models --- .../Admin/AdminSellerRequestsController.cs | 2 +- .../Controllers/RequestsController.cs | 13 ++++++++++++- .../Models/Request/RequestModel.cs | 1 + 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/comissions.app.api/Controllers/Admin/AdminSellerRequestsController.cs b/src/comissions.app.api/Controllers/Admin/AdminSellerRequestsController.cs index 44f9d6a..125de2b 100644 --- a/src/comissions.app.api/Controllers/Admin/AdminSellerRequestsController.cs +++ b/src/comissions.app.api/Controllers/Admin/AdminSellerRequestsController.cs @@ -31,7 +31,7 @@ public class AdminArtistRequestsController : Controller [HttpGet] public async Task GetArtistRequests(int offset = 0, int pageSize = 10) { - var requests = _dbContext.ArtistRequests.Where(x=>x.Accepted==false).Skip(offset).Take(pageSize).ToList(); + var requests = _dbContext.ArtistRequests.Where(x=>x.Accepted==false) .Skip(offset).Take(pageSize).ToList(); var result = requests.Select(x=>x.ToModel()).ToList(); return Ok(result); } diff --git a/src/comissions.app.api/Controllers/RequestsController.cs b/src/comissions.app.api/Controllers/RequestsController.cs index 8e5dca3..f213396 100644 --- a/src/comissions.app.api/Controllers/RequestsController.cs +++ b/src/comissions.app.api/Controllers/RequestsController.cs @@ -62,11 +62,22 @@ public class RequestsController : Controller [Route("Requests")] public async Task CreateRequest([FromBody] RequestModel model) { + var openRequests = await _dbContext.Requests + .Where(x=>x.UserId==User.GetUserId()) + .CountAsync(); + + if(openRequests>3) + return BadRequest("You can only have 3 open requests at a time."); + var request = new Request() { Amount = model.Amount, Message = model.Message, - RequestDate = DateTime.Now + RequestDate = DateTime.Now, + Accepted = false, + AcceptedDate = null, + UserId = User.GetUserId(), + ArtistId = model.ArtistId }; _dbContext.Requests.Add(request); await _dbContext.SaveChangesAsync(); diff --git a/src/comissions.app.api/Models/Request/RequestModel.cs b/src/comissions.app.api/Models/Request/RequestModel.cs index f582df0..7554323 100644 --- a/src/comissions.app.api/Models/Request/RequestModel.cs +++ b/src/comissions.app.api/Models/Request/RequestModel.cs @@ -5,6 +5,7 @@ public class RequestModel public int Id { get; set; } public string Message { get; set; } public decimal Amount { get; set; } + public int ArtistId { get; set; } public string UserId { get; set; } public DateTime RequestDate { get; set; } public bool Accepted { get; set; } = false;