CodeQL 13: chore: additional style fixes (ternary, complex-block, implicit-conversion)

VueApp/src/Effort/__tests__/course-import-dialog.test.ts

@@ -69,7 +69,8 @@ describe("CourseImportDialog - Error Handling", () => {
 
             // Simulate handling a non-Error value (e.g., from external code)
             const nonErrorValue: unknown = "string error"
-            importError.value = nonErrorValue instanceof Error ? nonErrorValue.message : "Failed to import course"
+            const isError = typeof nonErrorValue === "object" && nonErrorValue instanceof Error
+            importError.value = isError ? (nonErrorValue as Error).message : "Failed to import course"
 
             expect(importError.value).toBe("Failed to import course")
         })
@@ -93,7 +94,8 @@ describe("CourseImportDialog - Error Handling", () => {
 
             // Simulate handling a non-Error value (e.g., from external code)
             const nonErrorValue: unknown = "unknown error"
-            searchError.value = nonErrorValue instanceof Error ? nonErrorValue.message : "Error searching for courses"
+            const isError = typeof nonErrorValue === "object" && nonErrorValue instanceof Error
+            searchError.value = isError ? (nonErrorValue as Error).message : "Error searching for courses"
 
             expect(searchError.value).toBe("Error searching for courses")
         })

web/Areas/ClinicalScheduler/Controllers/RotationsController.cs

@@ -58,16 +58,9 @@ public async Task<ActionResult<IEnumerable<RotationDto>>> GetRotations(int? serv
                 _logger.LogInformation("Getting rotations. ServiceId: {ServiceId}", serviceId);
 
                 // Get rotations through service layer
-                List<RotationDto> rotations;
-
-                if (serviceId.HasValue)
-                {
-                    rotations = await _rotationService.GetRotationsByServiceAsync(serviceId.Value, HttpContext.RequestAborted);
-                }
-                else
-                {
-                    rotations = await _rotationService.GetRotationsAsync(HttpContext.RequestAborted);
-                }
+                List<RotationDto> rotations = serviceId.HasValue
+                    ? await _rotationService.GetRotationsByServiceAsync(serviceId.Value, HttpContext.RequestAborted)
+                    : await _rotationService.GetRotationsAsync(HttpContext.RequestAborted);
 
                 // Filter rotations based on user permissions
                 var allowedServiceIds = await GetAllowedServiceIdsAsync(HttpContext.RequestAborted);

web/Areas/Effort/Services/EffortAuditService.cs

@@ -600,26 +600,19 @@
 
         var auditRecordIds = auditQuery.Select(a => a.RecordId);
 
-        IQueryable<int> courseIds;
-
-        if (termCode.HasValue)
-        {
-            // When filtering by term, start from Records (very selective on TermCode)
-            // and use a semi-join for audit existence instead of a full Audits→Records join
-            courseIds = _context.Records
+        // When filtering by term, start from Records (very selective on TermCode)
+        // and use a semi-join for audit existence instead of a full Audits→Records join
+        IQueryable<int> courseIds = termCode.HasValue
+            ? _context.Records
                 .AsNoTracking()
                 .Where(r => r.TermCode == termCode.Value)
                 .Where(r => auditRecordIds.Contains(r.Id))
                 .Select(r => r.CourseId)
-                .Distinct();
-        }
-        else
-        {
-            courseIds = auditQuery
+                .Distinct()
+            : auditQuery
                 .Join(_context.Records, a => a.RecordId, r => r.Id, (a, r) => r)
                 .Select(r => r.CourseId)
                 .Distinct();
-        }
 
         return _context.Courses
             .AsNoTracking()
@@ -669,7 +662,7 @@
             (a.TableName == EffortAuditTables.Percentages && percentageIdsInDepts.Contains(a.RecordId)));
     }
 
     private IQueryable<Audit> BuildFilteredQuery(EffortAuditFilter filter)
     {
         var query = _context.Audits.AsNoTracking().AsQueryable();
 

web/Areas/Effort/Services/MeritMultiYearService.cs

@@ -865,16 +865,14 @@ private static List<string> FilterTermsInRange(List<string> terms, int startTerm
     /// </summary>
     private static decimal? CalculateMedian(int n1, int n2, int n3, int n4, int n5)
     {
-        var total = n1 + n2 + n3 + n4 + n5;
-        if (total == 0) return null;
-
-        // Build sorted response list
-        var responses = new List<decimal>();
-        for (var i = 0; i < n1; i++) responses.Add(1);
-        for (var i = 0; i < n2; i++) responses.Add(2);
-        for (var i = 0; i < n3; i++) responses.Add(3);
-        for (var i = 0; i < n4; i++) responses.Add(4);
-        for (var i = 0; i < n5; i++) responses.Add(5);
+        if (n1 + n2 + n3 + n4 + n5 == 0) return null;
+
+        var responses = Enumerable.Repeat(1m, n1)
+            .Concat(Enumerable.Repeat(2m, n2))
+            .Concat(Enumerable.Repeat(3m, n3))
+            .Concat(Enumerable.Repeat(4m, n4))
+            .Concat(Enumerable.Repeat(5m, n5))
+            .ToList();
 
         return CalculateListMedian(responses);
     }

web/Areas/RAPS/Services/UinformService.cs

@@ -241,26 +241,18 @@ public async Task<AdUser> GetUser(string? guid = null, string? userPrincipalName
                 request.Content = content;
             }
 
-            UinformResponse<T>? uInformResponse;
             using HttpResponseMessage response = await _httpClient.SendAsync(request);
             string responseBody = await response.Content.ReadAsStringAsync();
-            if (response.IsSuccessStatusCode)
-            {
-                uInformResponse = JsonSerializer.Deserialize<UinformResponse<T>>(responseBody, _jsonOptions);
-            }
-            else
-            {
-                uInformResponse = new UinformResponse<T>()
+            return response.IsSuccessStatusCode
+                ? JsonSerializer.Deserialize<UinformResponse<T>>(responseBody, _jsonOptions)
+                : new UinformResponse<T>()
                 {
                     Success = false,
                     Error = new()
                     {
                         Message = response.StatusCode.ToString()
                     }
                 };
-            }
-
-            return uInformResponse;
         }
 
         private static string GetAuthSignature(HttpMethod method, string publicKey, int epochTime)

web/Areas/Students/Services/GradYearClassLevel.cs

@@ -54,20 +54,15 @@ static public Tuple<int, string> GetTermCodeAndClassLevelForGradYear(int gradYea
             switch (termPart)
             {
                 case 2:
-                    termAndClassLevel = Tuple.Create(currentTerm, "V" + (4 - (gradYear - termYear)).ToString());
+                    termAndClassLevel = Tuple.Create(currentTerm, "V" + (4 - (gradYear - termYear)));
                     break;
                 case 9:
-                    termAndClassLevel = Tuple.Create(currentTerm, "V" + (5 - (gradYear - termYear)).ToString());
+                    termAndClassLevel = Tuple.Create(currentTerm, "V" + (5 - (gradYear - termYear)));
                     break;
                 case 4:
-                    if (gradYear - termYear == 1)
-                    {
-                        termAndClassLevel = Tuple.Create(currentTerm, "V4");
-                    }
-                    else
-                    {
-                        termAndClassLevel = Tuple.Create((termYear * 100) + 9, "V" + (5 - (gradYear - termYear)).ToString());
-                    }
+                    termAndClassLevel = gradYear - termYear == 1
+                        ? Tuple.Create(currentTerm, "V4")
+                        : Tuple.Create((termYear * 100) + 9, "V" + (5 - (gradYear - termYear)));
                     break;
             }