Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LNK-3034: RC Logging Change Replication #511

Merged
merged 1 commit into from
Oct 23, 2024
Merged

LNK-3034: RC Logging Change Replication #511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 7 additions & 12 deletions DotNet/DataAcquisition/Controllers/ConnectionValidationController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public async Task<ActionResult<FacilityConnectionResult>> ValidateFacilityConnec
[FromQuery] DateTime? end = default,
CancellationToken cancellationToken = default)
{
if(!ConnectionValidationRequestValidator.ValidateRequest(facilityId, patientId, patientIdentifier, measureId, start, end, out var errorMessage))
if (!ConnectionValidationRequestValidator.ValidateRequest(facilityId, patientId, patientIdentifier, measureId, start, end, out var errorMessage))
{
return Problem(errorMessage, statusCode: StatusCodes.Status400BadRequest);
}
Expand All @@ -74,16 +74,14 @@ public async Task<ActionResult<FacilityConnectionResult>> ValidateFacilityConnec
End = end.Value
}, cancellationToken);

if(!result.IsConnected)
if (!result.IsConnected)
{
_logger.LogError("Connection validation failed for facility {FacilityId}\nerror:\n{errorMessage}", facilityId, result.ErrorMessage);
return Problem(result.ErrorMessage, statusCode: StatusCodes.Status400BadRequest);
}

if(result.IsConnected && !result.IsPatientFound)
if (result.IsConnected && !result.IsPatientFound)
{
_logger.LogError("Patient not found for facility {FacilityId}\nerror:\n{errorMessage}", facilityId, result.ErrorMessage);
return Problem(result.ErrorMessage, statusCode: StatusCodes.Status400BadRequest);
return Problem("Patient not found for provided facilityId." + (string.IsNullOrEmpty(result.ErrorMessage) ? "" : " Error Message: " + result.ErrorMessage), statusCode: StatusCodes.Status404NotFound);
}

if (result.IsConnected && result.IsPatientFound)
Expand All @@ -93,29 +91,26 @@ public async Task<ActionResult<FacilityConnectionResult>> ValidateFacilityConnec
}
catch (MissingFacilityIdException ex)
{
_logger.LogError(ex, "Facility ID is required to validate connection.");
return Problem("Facility ID is required to validate connection.", statusCode: StatusCodes.Status400BadRequest);
}
catch (MissingFacilityConfigurationException ex)
{
_logger.LogError(ex, "No configuration found for Facility ID {facilityId}.", facilityId);
return Problem($"No configuration found for Facility ID {facilityId}.", statusCode: StatusCodes.Status400BadRequest);
}
catch (MissingPatientIdOrPatientIdentifierException ex)
{
_logger.LogError(ex, "No Patient ID or Patient Identifier was provided. One is required to validate.");
return Problem("No Patient ID or Patient Identifier was provided. One is required to validate.", statusCode: StatusCodes.Status400BadRequest);
}
catch(FhirConnectionFailedException ex)
catch (FhirConnectionFailedException ex)
{
_logger.LogError(ex, "Error connecting to FHIR server for facility {FacilityId}", facilityId);
return Problem($"An error occurred while connecting to the FHIR server. Please review your query connection configuration.\nerrorMessage: {ex.Message}\ninnerException:\n{ex.InnerException}", statusCode: StatusCodes.Status424FailedDependency);
}
catch (Exception ex)
{
_logger.LogError(new EventId(LoggingIds.GetItem, "ValidateFacilityConnection"), ex, "An exception occurred while attempting to validate a connection with a facility id of {id}", facilityId);
_logger.LogError(new EventId(LoggingIds.GetItem, "ValidateFacilityConnection"), ex, "An exception occurred in ValidateFacilityConnection");
return Problem($"An error occurred while validating the connection.\nerror:\n{ex.Message}\nInnerException:\n{ex.InnerException}", statusCode: StatusCodes.Status500InternalServerError);
}

return Problem("Something went wrong. Please contact an administrator.", statusCode: StatusCodes.Status500InternalServerError);
}
}
2 changes: 0 additions & 2 deletions DotNet/LinkAdmin.BFF/Presentation/Endpoints/AuthEndpoints.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@ public IResult Login(HttpContext context)
RedirectLink = referer + "/dashboard";
}

_logger.LogInformation("Based on referer {referer} a redirect URL was determined: {RedirectLink}", referer, RedirectLink);

return Results.Challenge(
properties: new AuthenticationProperties
{
Expand Down