admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-09-21 15:15:04 +00:00
parent bfc5c9cb57
commit 0a76ffb58f
3 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/AyaNova/Controllers/ReminderController.cs
View File

@@ -135,7 +135,7 @@ namespace AyaNova.Api.Controllers
/// <param name="id"></param> /// <param name="id"></param>
/// <returns>Information to display in schedule when selected for more info</returns> /// <returns>Information to display in schedule when selected for more info</returns>
[HttpGet("sched-info/{id}")] [HttpGet("sched-info/{id}")]
public async Task<IActionResult> GetScheduledUserScheduleInfoView([FromRoute] long id) public async Task<IActionResult> GetScheduleInfoView([FromRoute] long id)
{ {
if (!serverState.IsOpen) if (!serverState.IsOpen)
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));

52
server/AyaNova/Controllers/ReviewController.cs
View File

@@ -59,29 +59,6 @@ namespace AyaNova.Api.Controllers
return CreatedAtAction(nameof(ReviewController.GetReview), new { id = o.Id, version = apiVersion.ToString() }, new ApiCreatedResponse(o)); return CreatedAtAction(nameof(ReviewController.GetReview), new { id = o.Id, version = apiVersion.ToString() }, new ApiCreatedResponse(o));
} }
// /// <summary>
// /// Duplicate Review
// /// (Wiki and Attachments are not duplicated)
// /// </summary>
// /// <param name="id">Source object id</param>
// /// <param name="apiVersion">From route path</param>
// /// <returns>Review</returns>
// [HttpPost("duplicate/{id}")]
// public async Task<IActionResult> DuplicateReview([FromRoute] long id, ApiVersion apiVersion)
// {
// if (!serverState.IsOpen)
// return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
// ReviewBiz biz = ReviewBiz.GetBiz(ct, HttpContext);
// if (!Authorized.HasCreateRole(HttpContext.Items, biz.BizType))
// return StatusCode(403, new ApiNotAuthorizedResponse());
// if (!ModelState.IsValid)
// return BadRequest(new ApiErrorResponse(ModelState));
// Review o = await biz.DuplicateAsync(id);
// if (o == null)
// return BadRequest(new ApiErrorResponse(biz.Errors));
// else
// return CreatedAtAction(nameof(ReviewController.GetReview), new { id = o.Id, version = apiVersion.ToString() }, new ApiCreatedResponse(o));
// }
/// <summary> /// <summary>
/// Get Review /// Get Review
@@ -118,7 +95,7 @@ namespace AyaNova.Api.Controllers
ReviewBiz biz = ReviewBiz.GetBiz(ct, HttpContext); ReviewBiz biz = ReviewBiz.GetBiz(ct, HttpContext);
if (!Authorized.HasModifyRole(HttpContext.Items, biz.BizType)) if (!Authorized.HasModifyRole(HttpContext.Items, biz.BizType))
return StatusCode(403, new ApiNotAuthorizedResponse()); return StatusCode(403, new ApiNotAuthorizedResponse());
var o = await biz.PutAsync(updatedObject); var o = await biz.PutAsync(updatedObject);
if (o == null) if (o == null)
{ {
if (biz.Errors.Exists(z => z.Code == ApiErrorCode.CONCURRENCY_CONFLICT)) if (biz.Errors.Exists(z => z.Code == ApiErrorCode.CONCURRENCY_CONFLICT))
@@ -150,7 +127,34 @@ namespace AyaNova.Api.Controllers
} }
/// <summary>
/// Get Review schedule "more" info
/// </summary>
/// <param name="id"></param>
/// <returns>Information to display in schedule when selected for more info</returns>
[HttpGet("sched-info/{id}")]
public async Task<IActionResult> GetScheduleInfoView([FromRoute] long id)
{
if (!serverState.IsOpen)
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
ReviewBiz biz = ReviewBiz.GetBiz(ct, HttpContext);
if (!Authorized.HasReadFullRole(HttpContext.Items, biz.BizType))
return StatusCode(403, new ApiNotAuthorizedResponse());
if (!ModelState.IsValid)
return BadRequest(new ApiErrorResponse(ModelState));
var o = await biz.GetAsync(id);
if (o == null)
return BadRequest(new ApiErrorResponse(biz.Errors));
return Ok(ApiOkResponse.Response(new
{
o.Name,
o.Notes,
o.ReviewDate,
o.CompletedDate,
o.CompletionNotes
}));
}
//------------ //------------

2
server/AyaNova/Controllers/ScheduleController.cs
View File

@@ -143,7 +143,7 @@ namespace AyaNova.Api.Controllers
} }
} }
break; break;
case AyaType.Review: case AyaType.Review:
{ {
ReviewBiz biz = ReviewBiz.GetBiz(ct, HttpContext); ReviewBiz biz = ReviewBiz.GetBiz(ct, HttpContext);
var o = await biz.PutNewScheduleTimeAsync(ad); var o = await biz.PutNewScheduleTimeAsync(ad);