pulling updates from master

.github/workflows/build-and-test-api.yml

@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Building Web codebase
         uses: ./.github/workflows/actions/build-api

.github/workflows/build-and-test-lambdas.yml

@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Building Lambdas codebase
         uses: ./.github/workflows/actions/build-lambdas

.github/workflows/build-and-test-web.yml

@@ -21,7 +21,7 @@ jobs:
         node-version: [22]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Building Web codebase
         uses: ./.github/workflows/actions/build-web

.github/workflows/build-infra.yml

@@ -51,7 +51,7 @@ jobs:
           fi
 
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: tfsec
         uses: aquasecurity/tfsec-sarif-action@v0.1.4

.github/workflows/publish-api.yml

@@ -29,7 +29,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Build API codebase
         uses: ./.github/workflows/actions/build-api
@@ -87,7 +87,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Deploy to ${{ env.ENVIRONMENT }}
         uses: ./.github/workflows/actions/deploy-app
@@ -116,7 +116,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Deploy to ${{ env.ENVIRONMENT }}
         uses: ./.github/workflows/actions/deploy-app
@@ -145,7 +145,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Deploy to ${{ env.ENVIRONMENT }}
         uses: ./.github/workflows/actions/deploy-app

.github/workflows/publish-infra.yml

@@ -56,7 +56,7 @@ jobs:
           fi
 
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: tfsec
         uses: aquasecurity/tfsec-sarif-action@v0.1.4

.github/workflows/publish-lambdas.yml

@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Get Lambda directories
         id: lambdas
@@ -56,7 +56,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Build Lambdas codebase
         uses: ./.github/workflows/actions/build-lambdas
@@ -128,7 +128,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Deploy to ${{ env.ENVIRONMENT }}
         uses: ./.github/workflows/actions/deploy-lambda
@@ -160,7 +160,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Deploy to ${{ env.ENVIRONMENT }}
         uses: ./.github/workflows/actions/deploy-lambda
@@ -192,7 +192,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Deploy to ${{ env.ENVIRONMENT }}
         uses: ./.github/workflows/actions/deploy-lambda

.github/workflows/publish-openshift-images.yml

@@ -27,7 +27,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Log in to the GHCR
         uses: docker/login-action@v3

.github/workflows/publish-web.yml

@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Building Web codebase
         uses: ./.github/workflows/actions/build-web
@@ -93,7 +93,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Deploy to ${{ env.ENVIRONMENT }}
         uses: ./.github/workflows/actions/deploy-app
@@ -122,7 +122,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Deploy to ${{ env.ENVIRONMENT }}
         uses: ./.github/workflows/actions/deploy-app
@@ -151,7 +151,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Deploy to ${{ env.ENVIRONMENT }}
         uses: ./.github/workflows/actions/deploy-app

api/Controllers/DashboardController.cs

@@ -58,14 +58,15 @@ public async Task<IActionResult> GetMySchedule(string startDate, string endDate,
         /// <param name="startDate">The start date of the schedule.</param>
         /// <param name="endDate">The end date of the schedule.</param>
         /// <param name="locationIds">List location ids.</param>
+        /// <param name="judgeId">The override judgeId.</param>
         /// <returns>Court calendar</returns>
         [HttpGet]
         [Route("court-calendar")]
-        public async Task<IActionResult> GetCourtCalendar(string startDate, string endDate, string locationIds = "")
+        public async Task<IActionResult> GetCourtCalendar(string startDate, string endDate, string locationIds = "", int? judgeId = null)
         {
             var ids = string.IsNullOrWhiteSpace(locationIds) ? this.User.JudgeHomeLocationId().ToString() : locationIds;
 
-            var result = await _dashboardService.GetCourtCalendarScheduleAsync(ids, startDate, endDate);
+            var result = await _dashboardService.GetCourtCalendarScheduleAsync(this.User.JudgeId(judgeId), ids, startDate, endDate);
 
             if (!result.Succeeded)
             {

api/Controllers/FilesController.cs

@@ -21,9 +21,11 @@
 using Scv.Api.Models.Civil.Detail;
 using Scv.Api.Models.Criminal.Detail;
 using Scv.Api.Models.Search;
+using Scv.Api.Models.Document;
 using Scv.Api.Services.Files;
 using CivilAppearanceDetail = Scv.Api.Models.Civil.AppearanceDetail.CivilAppearanceDetail;
 using CriminalAppearanceDetail = Scv.Api.Models.Criminal.AppearanceDetail.CriminalAppearanceDetail;
+using Scv.Api.Documents;
 
 namespace Scv.Api.Controllers
 {
@@ -34,6 +36,7 @@ namespace Scv.Api.Controllers
     public class FilesController(
         IConfiguration configuration,
         ILogger<FilesController> logger,
+        IDocumentMerger documentMerger,
         FilesService filesService,
         VcCivilFileAccessHandler vcCivilFileAccessHandler,
         IHttpContextAccessor httpContextAccessor) : ControllerBase
@@ -42,6 +45,7 @@ public class FilesController(
 
         private readonly IConfiguration _configuration = configuration;
         private readonly ILogger<FilesController> _logger = logger;
+        private readonly IDocumentMerger _documentMerger = documentMerger;
         private readonly FilesService _filesService = filesService;
         private readonly CivilFilesService _civilFilesService = filesService.Civil;
         private readonly CriminalFilesService _criminalFilesService = filesService.Criminal;
@@ -343,6 +347,29 @@ public async Task<IActionResult> GetDocument(string documentId, string fileNameA
             return File(documentResponse.Stream, "application/pdf");
         }
 
+        /// <summary>
+        /// Generates a singular PDF document based off the relevant request data.
+        /// </summary>
+        /// <param name="documentRequests">An array of <see cref="PdfDocumentRequest"/> objects representing the documents to display in a single PDF.</param>
+        /// <returns>
+        /// An <see cref="IActionResult"/> containing the result of the merge operation.
+        /// </returns>
+        /// <remarks>
+        /// This endpoint accepts a POST request to "document/generate-pdf" and returns the a singular PDF document.
+        /// </remarks>
+        [HttpPost]
+        [Route("document/generate-pdf")]
+        public async Task<IActionResult> GeneratePdf(PdfDocumentRequest[] documentRequests)
+        {
+            if (documentRequests.Length == 0)
+            {
+                return BadRequest("No documents were provided for generation.");
+            }
+            var result = await _documentMerger.MergeDocuments(documentRequests);
+            return Ok(result);
+        }
+
+
         [HttpPost]
         [Route("archive")]
         public async Task<IActionResult> GetArchive(ArchiveRequest archiveRequest)

api/Documents/Strategies/FileStrategy.cs

@@ -17,7 +17,7 @@ public async Task<MemoryStream> Invoke(PdfDocumentRequestDetails documentRequest
     {
         var documentResponseStreamCopy = new MemoryStream();
         var documentId = Encoding.UTF8.GetString(WebEncoders.Base64UrlDecode(documentRequest.DocumentId));
-        var documentResponse = await _filesService.DocumentAsync(documentId, true, documentRequest.FileId, documentRequest.CorrelationId);
+        var documentResponse = await _filesService.DocumentAsync(documentId, documentRequest.IsCriminal, documentRequest.FileId, documentRequest.CorrelationId);
         await documentResponse.Stream.CopyToAsync(documentResponseStreamCopy);
 
         return documentResponseStreamCopy;

api/Helpers/ClaimsTypes.cs

@@ -19,6 +19,7 @@ public class CustomClaimTypes
         public const string UserId = nameof(CustomClaimTypes) + nameof(UserId);
         public const string JudgeId = nameof(CustomClaimTypes) + nameof(JudgeId);
         public const string JudgeHomeLocationId = nameof(CustomClaimTypes) + nameof(JudgeHomeLocationId);
+        public const string UserGuid = "idir_user_guid";
 
         public static readonly List<string> UsedKeycloakClaimTypes =
         [
@@ -27,7 +28,8 @@ public class CustomClaimTypes
             "name",
             "preferred_username",
             "groups",
-            ClaimTypes.Email
+            ClaimTypes.Email,
+            UserGuid
         ];
     }
 }

api/Helpers/Extensions/ClaimsPrincipalExtensions.cs

@@ -123,5 +123,8 @@ public static int JudgeHomeLocationId(this ClaimsPrincipal claimsPrincipal)
 
         public static bool CanViewOthersSchedule(this ClaimsPrincipal claimsPrincipal)
             => claimsPrincipal.HasClaim(c => c.Type == CustomClaimTypes.Groups && c.Value == "jasper-view-others-schedule");
+
+        public static string UserGuid(this ClaimsPrincipal claimsPrincipal) =>
+            claimsPrincipal.FindFirstValue(CustomClaimTypes.UserGuid);
     }
 }

api/Infrastructure/Authentication/AuthenticationServiceCollectionExtension.cs

@@ -111,7 +111,6 @@ await cookieCtx.HttpContext.SignOutAsync(CookieAuthenticationDefaults
                 options.SaveTokens = true;
                 options.CallbackPath = "/api/auth/signin-oidc";
                 options.Scope.Add("groups");
-                options.Scope.Add("vc_authn");
                 options.Events = new OpenIdConnectEvents
                 {
                     OnTicketReceived = context =>
@@ -190,6 +189,7 @@ await cookieCtx.HttpContext.SignOutAsync(CookieAuthenticationDefaults
                             var userDto = await userService.GetWithPermissionsAsync(context.Principal.Email());
                             if (userDto != null)
                             {
+                                // UserId's value refers to the id in the User collection from MongoDb.
                                 claims.Add(new Claim(CustomClaimTypes.UserId, userDto.Id));
 
                                 var permissionsClaims = userDto.Permissions.Select(p => new Claim(CustomClaimTypes.Permission, p));

api/Infrastructure/Authorization/ProviderAuthorizationHandler.cs

@@ -27,7 +27,8 @@ protected override Task HandleRequirementAsync(AuthorizationHandlerContext conte
                 return Task.CompletedTask;
             }
 
-            if (user.IsIdirUser() && (user.Groups().Contains("court-viewer-supreme") || user.Groups().Contains("court-viewer-provincial")))
+            // Authenticated user must belong to specific groups
+            if (user.Groups().Contains("court-viewer-supreme") || user.Groups().Contains("court-viewer-provincial"))
             {
                 context.Succeed(requirement);
                 return Task.CompletedTask;
@@ -57,7 +58,7 @@ protected override Task HandleRequirementAsync(AuthorizationHandlerContext conte
                     return Task.CompletedTask;
                 }
                 if (isAuthController && actionDescriptor.ActionName == nameof(AuthController.UserInfo))
-                { 
+                {
                     context.Succeed(requirement);
                     return Task.CompletedTask;
                 }

api/Models/Calendar/CalendarDayActivity.cs

@@ -25,5 +25,8 @@ public class CalendarDayActivity
     public int FilesCount { get; set; }
     public int ContinuationsCount { get; set; }
     public int JudgeId { get; set; }
+    public string JudgeInitials { get; set; }
+    public bool IsJudgeAway { get; set; }
+    public bool IsJudgeBorrowed { get; set; }
     public List<AdjudicatorRestriction> Restrictions { get; set; } = [];
 }

api/Models/Document/PdfDocumentDetailsRequest.cs

@@ -8,15 +8,11 @@ public class PdfDocumentRequestDetails
     public string ProfSeqNo { get; set; }
     public string CourtLevelCd { get; set; }
     public string CourtClassCd { get; set; }
-    public string RequestAgencyIdentifierId { get; set; }
-    public string RequestPartId { get; set; }
-    public string ApplicationCd { get; set; }
     public string AppearanceId { get; set; }
-    public string ReportName { get; set; }
     public string DocumentId { get; set; }
     public string CourtDivisionCd { get; set; }
     public string FileId { get; set; }
-    public bool Flatten { get; set; }
+    public bool IsCriminal { get; set; }
     public string CorrelationId { get; set; }
     public DateTime? Date { get; set; }
     public int? LocationId { get; set; }