notazof/yavsc
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 3 Packages Wiki Activity Actions

require a command type in estimation

Browse source
This commit is contained in:
Paul Schneider 2017-03-03 01:17:00 +01:00
commit ea5ab19f8f
6 changed files with 2024 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Yavsc/ApiControllers/EstimateApiController.cs
View file

@ -65,13 +65,13 @@ namespace Yavsc.Controllers
}
// PUT: api/Estimate/5
[HttpPut("{id}")]
[HttpPut("{id}"),Produces("application/json")]
public IActionResult PutEstimate(long id, [FromBody] Estimate estimate)
{
if (!ModelState.IsValid)
{
return HttpBadRequest(ModelState);
return new BadRequestObjectResult(ModelState);
}
if (id != estimate.Id)
@ -109,13 +109,9 @@ namespace Yavsc.Controllers
}
// POST: api/Estimate
[HttpPost]
[HttpPost,Produces("application/json")]
public IActionResult PostEstimate([FromBody] Estimate estimate)
{
if (!ModelState.IsValid)
{
return HttpBadRequest(ModelState);
}
var uid = User.GetUserId();
if (!User.IsInRole(Constants.AdminGroupName))
{
@ -128,9 +124,13 @@ namespace Yavsc.Controllers
if (estimate.CommandId!=null) {
var query = _context.RdvQueries.FirstOrDefault(q => q.Id == estimate.CommandId);
if (query == null || query.PerformerId!= uid)
throw new InvalidOperationException();
return HttpBadRequest(ModelState);
query.ValidationDate = DateTime.Now;
}
if (!ModelState.IsValid)
{
return new BadRequestObjectResult(ModelState);
}
_context.Estimates.Add(estimate);