diff --git a/F4SDM42WebApi/F4SDM42WebApiController.cs b/F4SDM42WebApi/F4SDM42WebApiController.cs index 41c0e11..adfb53e 100644 --- a/F4SDM42WebApi/F4SDM42WebApiController.cs +++ b/F4SDM42WebApi/F4SDM42WebApiController.cs @@ -247,25 +247,21 @@ namespace C4IT.F4SD } [Route("v2/getTicketOverviewCounts"), HttpPost] - public async Task getTicketOverviewCountsV2( + public async Task getTicketOverviewCountsV2( [FromBody] cTicketOverviewFilterRequest request) { - if (request?.UserId != Guid.Empty) - return await _f4stHelperService.getTicketOverviewCounts( - request.UserId, - request.Scope, - request.Keys, - 0, - new List(), - request.Filters) ?? new F4SDHelperService.TicketOverviewCountsResult(); + if (request == null || request.UserId == Guid.Empty) + return BadRequest("A Matrix42 user ID is required."); - return await _f4stHelperService.getTicketOverviewCounts( - request?.Sid ?? string.Empty, - request?.Scope ?? "personal", - request?.Keys ?? new List(), + var result = await _f4stHelperService.getTicketOverviewCounts( + request.UserId, + request.Scope, + request.Keys, 0, new List(), - request?.Filters) ?? new F4SDHelperService.TicketOverviewCountsResult(); + request.Filters) ?? new F4SDHelperService.TicketOverviewCountsResult(); + + return Ok(result); } [Obsolete("Use getTicketOverviewCountsByRolesForUser with a Matrix42 user ID.")] @@ -365,27 +361,22 @@ namespace C4IT.F4SD } [Route("v2/getTicketOverviewRelations"), HttpPost] - public async Task> getTicketOverviewRelationsV2( + public async Task getTicketOverviewRelationsV2( [FromBody] cTicketOverviewFilterRequest request) { - if (request?.UserId != Guid.Empty) - return await _f4stHelperService.getTicketOverviewRelations( - request.UserId, - request.Scope, - request.Key, - request.Count, - 0, - new List(), - request.Filters) ?? new List(); + if (request == null || request.UserId == Guid.Empty) + return BadRequest("A Matrix42 user ID is required."); - return await _f4stHelperService.getTicketOverviewRelations( - request?.Sid ?? string.Empty, - request?.Scope ?? "personal", - request?.Key ?? string.Empty, - request?.Count ?? 0, + var result = await _f4stHelperService.getTicketOverviewRelations( + request.UserId, + request.Scope, + request.Key, + request.Count, 0, new List(), - request?.Filters) ?? new List(); + request.Filters) ?? new List(); + + return Ok(result); } [Route("v2/getTicketFilterCapabilities"), HttpGet] diff --git a/Legacy/F4SDM42WebApi/F4SDM42WebApiController.cs b/Legacy/F4SDM42WebApi/F4SDM42WebApiController.cs index 908bb3c..1ba8ce3 100644 --- a/Legacy/F4SDM42WebApi/F4SDM42WebApiController.cs +++ b/Legacy/F4SDM42WebApi/F4SDM42WebApiController.cs @@ -214,25 +214,22 @@ namespace C4IT.F4SD } [Route("v2/getTicketOverviewCounts"), HttpPost] - public async Task getTicketOverviewCountsV2( + public async Task getTicketOverviewCountsV2( [FromBody] cTicketOverviewFilterRequest request) { + if (request == null || request.UserId == Guid.Empty) + return BadRequest("A Matrix42 user ID is required."); + using (_f4stHelperService.BeginTicketFilterScope(request?.Filters)) { - if (request?.UserId != Guid.Empty) - return await _f4stHelperService.getTicketOverviewCounts( - request.UserId, - request.Scope, - request.Keys, - 0, - new List()) ?? new F4SDHelperService.TicketOverviewCountsResult(); - - return await _f4stHelperService.getTicketOverviewCounts( - request?.Sid ?? string.Empty, - request?.Scope ?? "personal", - request?.Keys ?? new List(), + var result = await _f4stHelperService.getTicketOverviewCounts( + request.UserId, + request.Scope, + request.Keys, 0, new List()) ?? new F4SDHelperService.TicketOverviewCountsResult(); + + return Ok(result); } } @@ -313,27 +310,23 @@ namespace C4IT.F4SD } [Route("v2/getTicketOverviewRelations"), HttpPost] - public async Task> getTicketOverviewRelationsV2( + public async Task getTicketOverviewRelationsV2( [FromBody] cTicketOverviewFilterRequest request) { + if (request == null || request.UserId == Guid.Empty) + return BadRequest("A Matrix42 user ID is required."); + using (_f4stHelperService.BeginTicketFilterScope(request?.Filters)) { - if (request?.UserId != Guid.Empty) - return await _f4stHelperService.getTicketOverviewRelations( - request.UserId, - request.Scope, - request.Key, - request.Count, - 0, - new List()) ?? new List(); - - return await _f4stHelperService.getTicketOverviewRelations( - request?.Sid ?? string.Empty, - request?.Scope ?? "personal", - request?.Key ?? string.Empty, - request?.Count ?? 0, + var result = await _f4stHelperService.getTicketOverviewRelations( + request.UserId, + request.Scope, + request.Key, + request.Count, 0, new List()) ?? new List(); + + return Ok(result); } }