-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #678 from bcgov/2.0.8
2.0.8
- Loading branch information
Showing
56 changed files
with
11,941 additions
and
15,353 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,146 @@ | ||
| using Microsoft.AspNetCore.Mvc; | ||
| using Hmcr.Api.Controllers.Base; | ||
| using Hmcr.Model.Dtos.SaltReport; | ||
| using System; | ||
| using System.Threading.Tasks; | ||
| using Hmcr.Domain.Services; | ||
| using Hmcr.Api.Authorization; | ||
| using Hmcr.Model; | ||
| using System.Linq; | ||
| using System.Text.Json; | ||
| using Microsoft.Extensions.Logging; | ||
| using System.Data.Common; | ||
| using System.Collections.Generic; | ||
|
|
||
| namespace Hmcr.Api.Controllers | ||
| { | ||
| [ApiVersion("1.0")] | ||
| [Route("api/saltreports")] | ||
| public class SaltReportController : HmcrControllerBase | ||
| { | ||
| private readonly ISaltReportService _saltReportService; | ||
| private HmcrCurrentUser _currentUser; | ||
|
|
||
| public SaltReportController(ISaltReportService saltReportService, ISubmissionObjectService submissionService, HmcrCurrentUser currentUser, IEmailService emailService) | ||
| { | ||
| _saltReportService = saltReportService ?? throw new ArgumentNullException(nameof(saltReportService)); | ||
| _currentUser = currentUser ?? throw new ArgumentNullException(nameof(currentUser)); | ||
| } | ||
|
|
||
| [HttpPost] | ||
| [RequiresPermission(Permissions.FileUploadWrite)] | ||
| public async Task<IActionResult> CreateSaltReportAsync([FromBody] SaltReportDto saltReport) | ||
| { | ||
| if (saltReport == null) | ||
| { | ||
| return BadRequest("Received salt report data is null"); | ||
| } | ||
|
|
||
| var problem = IsServiceAreaAuthorized(_currentUser, saltReport.ServiceArea); | ||
| if (problem != null) | ||
| { | ||
| return Unauthorized(problem); | ||
| } | ||
|
|
||
| try | ||
| { | ||
| var createdReport = await _saltReportService.CreateReportAsync(saltReport); | ||
| return CreatedAtRoute(nameof(GetSaltReportAsync), new { id = createdReport.SaltReportId }, saltReport); | ||
| } | ||
| catch (Exception ex) | ||
| { | ||
| // Get the inner exception message if it exists | ||
| var innerExceptionMessage = ex.InnerException?.Message ?? "Please contact an administrator to resolve this issue."; | ||
|
|
||
| Console.Error.WriteLine($"Exception: {ex.Message}"); | ||
| if (ex.InnerException != null) | ||
| { | ||
| Console.Error.WriteLine($"Inner Exception: {innerExceptionMessage}"); | ||
| } | ||
|
|
||
| return StatusCode(500, new | ||
| { | ||
| message = "An internal error occurred. Please try again later.", | ||
| error = $"500 Internal Server Error: {innerExceptionMessage}" | ||
| }); | ||
| } | ||
|
|
||
| } | ||
|
|
||
|
|
||
| [HttpGet("{id}", Name = "GetSaltReportAsync")] | ||
| public async Task<ActionResult<SaltReportDto>> GetSaltReportAsync(int id) | ||
| { | ||
| var saltReportDto = await _saltReportService.GetSaltReportByIdAsync(id); | ||
|
|
||
| if (saltReportDto == null) | ||
| { | ||
| return NotFound(); | ||
| } | ||
|
|
||
| return Ok(saltReportDto); | ||
| } | ||
|
|
||
| [HttpGet(Name = "GetSaltReportsAsync")] | ||
| public async Task<IActionResult> GetSaltReportsAsync([FromQuery] string serviceAreas, [FromQuery] string format, [FromQuery] DateTime fromDate, [FromQuery] DateTime toDate, int pageSize, int pageNumber) | ||
| { | ||
| try | ||
| { | ||
| if (string.IsNullOrWhiteSpace(serviceAreas)) | ||
| { | ||
| return BadRequest("Service areas cannot be null or empty."); | ||
| } | ||
| format = (format ?? "json").ToLower(); | ||
|
|
||
| // Decide the output format based on the 'format' parameter | ||
| switch (format) | ||
| { | ||
| case "csv": | ||
| var saltReportEntities = await _saltReportService.GetSaltReportEntitiesAsync(serviceAreas, fromDate, toDate).ConfigureAwait(false); | ||
|
|
||
| if (!saltReportEntities.Any()) | ||
| { | ||
| return NotFound("No reports found matching the specified criteria."); | ||
| } | ||
| var csvStream = _saltReportService.ConvertToCsvStream(saltReportEntities); | ||
| if (csvStream == null || csvStream.Length == 0) | ||
| { | ||
| return NotFound("CSV data not found or is empty."); | ||
| } | ||
| // Return the stream as a CSV file | ||
| return File(csvStream, "text/csv", "salt_reports.csv"); | ||
|
|
||
| case "json": | ||
| default: | ||
| try | ||
| { | ||
| var reports = await _saltReportService.GetSaltReportDtosAsync(serviceAreas, fromDate, toDate, pageSize, pageNumber); | ||
| return Ok(reports); | ||
| } | ||
| catch (ArgumentException ex) | ||
| { | ||
| return BadRequest(ex.Message); | ||
| } | ||
| catch (Exception ex) | ||
| { | ||
| // Log the exception details here to diagnose issues. | ||
| return StatusCode(500, "An internal server error occurred."); | ||
| } | ||
| } | ||
| } | ||
| catch (ArgumentException ex) | ||
| { | ||
| return BadRequest(ex.Message); // Return 400 Bad Request with error message | ||
| } | ||
| catch (DbException ex) | ||
| { | ||
| return StatusCode(500, "An error occurred while processing your request."); | ||
| } | ||
| catch (Exception ex) | ||
| { | ||
| return StatusCode(500, "An error occurred while processing your request."); | ||
| } | ||
| } | ||
|
|
||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.