Skip to content

TD-6108 Updating ServiceFilter Logic To Exclude Other Areas #3360

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

Merged
merged 1 commit into from
Aug 28, 2025
Merged

TD-6108 Updating ServiceFilter Logic To Exclude Other Areas #3360

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
69 changes: 36 additions & 33 deletions DigitalLearningSolutions.Web/ServiceFilter/RequireProcessAgreementFilter .cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,47 +24,50 @@ public void OnActionExecuted(ActionExecutedContext context) { }

public void OnActionExecuting(ActionExecutingContext context)
{
if (!(context.Controller is Controller controller))
if (context.HttpContext.Request.Path.ToString().Contains("/LearningPortal/SelfAssessment/"))
{
return;
}
if (!(context.Controller is Controller controller))
{
return;
}

if (!context.ActionArguments.ContainsKey("selfAssessmentId"))
{
return;
}
if (!context.ActionArguments.ContainsKey("selfAssessmentId"))
{
return;
}

var selfAssessmentId = int.Parse(context.ActionArguments["selfAssessmentId"].ToString()!);
var delegateUserId = controller.User.GetUserIdKnownNotNull();
var selfAssessmentId = int.Parse(context.ActionArguments["selfAssessmentId"].ToString()!);
var delegateUserId = controller.User.GetUserIdKnownNotNull();

var selfAssessment = selfAssessmentService.GetSelfAssessmentForCandidateById(delegateUserId, selfAssessmentId);
var selfAssessment = selfAssessmentService.GetSelfAssessmentForCandidateById(delegateUserId, selfAssessmentId);

if (selfAssessment == null)
{
logger.LogWarning(
$"Attempt to access self assessment {selfAssessmentId} by user {delegateUserId}, but no such assessment found"
);
context.Result = new RedirectToActionResult("StatusCode", "LearningSolutions", new { code = 403 });
return;
}
if (selfAssessment == null)
{
logger.LogWarning(
$"Attempt to access self assessment {selfAssessmentId} by user {delegateUserId}, but no such assessment found"
);
context.Result = new RedirectToActionResult("StatusCode", "LearningSolutions", new { code = 403 });
return;
}

var actionName = context.RouteData.Values["action"]?.ToString();
if (actionName == "AgreeSelfAssessmentProcess" || actionName == "ProcessAgreed")
{
return;
}
var actionName = context.RouteData.Values["action"]?.ToString();
if (actionName == "AgreeSelfAssessmentProcess" || actionName == "ProcessAgreed")
{
return;
}

if (!selfAssessment.SelfAssessmentProcessAgreed && selfAssessment.IsSupervised)
{
logger.LogInformation(
$"Redirecting user {delegateUserId} to agree process page for self assessment {selfAssessmentId}"
);
if (!selfAssessment.SelfAssessmentProcessAgreed && selfAssessment.IsSupervised)
{
logger.LogInformation(
$"Redirecting user {delegateUserId} to agree process page for self assessment {selfAssessmentId}"
);

context.Result = new RedirectToActionResult(
"AgreeSelfAssessmentProcess",
"LearningPortal",
new { selfAssessmentId }
);
context.Result = new RedirectToActionResult(
"AgreeSelfAssessmentProcess",
"LearningPortal",
new { selfAssessmentId }
);
}
}
}
}
Expand Down
Loading