Merge pull request #176 from ucdavis/quality/analyzer-bulk-cleanup

PR 3: chore(quality): mechanical analyzer-driven cleanup (453 files)

Author: rlorenzo

Viper.sln.DotSettings

@@ -0,0 +1,5 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=OptimizeUsings/@EntryIndexedValue">&lt;Profile name="OptimizeUsings"&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;/Profile&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=ShortenReferences/@EntryIndexedValue">&lt;Profile name="ShortenReferences"&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;/Profile&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=RemoveRedundancies/@EntryIndexedValue">&lt;Profile name="RemoveRedundancies"&gt;&lt;CSRemoveCodeRedundancies&gt;True&lt;/CSRemoveCodeRedundancies&gt;&lt;RemoveCodeRedundancies&gt;True&lt;/RemoveCodeRedundancies&gt;&lt;CSRemoveRedundantArgumentDefaultValues&gt;True&lt;/CSRemoveRedundantArgumentDefaultValues&gt;&lt;CSRemoveRedundantInitializers&gt;True&lt;/CSRemoveRedundantInitializers&gt;&lt;/Profile&gt;</s:String>
+</wpf:ResourceDictionary>

scripts/audit-resharper-regression.js

@@ -12,6 +12,7 @@
 //                                              [--sarif inspect-report/inspect.sarif]
 //                                              [--skip-scan]
 //                                              [--staged]
+//                                              [--exclude-rule <id> ...]
 //
 // --skip-scan reuses the SARIF from a prior `audit:resharper` run, useful in
 // CI where the full scan and the gate are split into separate steps so the
@@ -20,6 +21,11 @@
 // --staged filters findings to staged C# lines (`git diff --cached`) instead of
 // PR-diff lines. Pair with --skip-scan for fast iterative pre-commit checks
 // against an existing SARIF report.
+//
+// --exclude-rule adds a ReSharper rule id to skip (repeatable). The default
+// list covers rules known to misfire on ASP.NET Core / EF DTO patterns where
+// public surface looks unused to static analysis but is wired up at runtime
+// (JSON serialization, MVC model binding, Razor views, EF projections).
 
 const fs = require("node:fs")
 const path = require("node:path")
@@ -34,8 +40,30 @@ const MAX_BUFFER_BYTES = 268_435_456
 // Cap how many findings we print per rule before summarising the rest.
 const MAX_FINDINGS_PER_RULE = 5
 
+// Rules excluded by default because they fire false positives on the kinds of
+// public surface ASP.NET Core / EF wires up at runtime (DTO/binding/EF
+// projection types) or where ReSharper's NRT contract analysis disagrees
+// with Roslyn's flow analysis (EF nav-property dereferences after `?.`).
+const DEFAULT_EXCLUDED_RULES = new Set([
+    "UnusedAutoPropertyAccessor.Global",
+    "UnusedAutoPropertyAccessor.Local",
+    "NotAccessedPositionalProperty.Local",
+    "S3260", // SonarLint sealed-record rule, low actionable value here
+    // ReSharper trusts the NRT annotation on EF nav properties (`Rotation` is
+    // declared non-null with `null!` default), but Roslyn rightly insists on
+    // `?.` because the runtime can produce null when Include() is missing.
+    // Keep the runtime-safe `?.Nav?.Member` style and silence the ReSharper rule.
+    "ConditionalAccessQualifierIsNonNullableAccordingToAPIContract",
+])
+
 function parseArgs(argv) {
-    const args = { base: "origin/main", sarif: DEFAULT_SARIF, skipScan: false, staged: false }
+    const args = {
+        base: "origin/main",
+        sarif: DEFAULT_SARIF,
+        skipScan: false,
+        staged: false,
+        excludedRules: new Set(DEFAULT_EXCLUDED_RULES),
+    }
     const remaining = [...argv]
     while (remaining.length > 0) {
         const flag = remaining.shift()
@@ -47,6 +75,8 @@ function parseArgs(argv) {
             args.skipScan = true
         } else if (flag === "--staged") {
             args.staged = true
+        } else if (flag === "--exclude-rule") {
+            args.excludedRules.add(remaining.shift())
         } else {
             console.error(`Unknown arg: ${flag}`)
             process.exit(2)
@@ -130,7 +160,7 @@ function normalizeUri(uri) {
     return s
 }
 
-function findRegressions(sarifPath, changedLines) {
+function findRegressions(sarifPath, changedLines, excludedRules) {
     const sarif = JSON.parse(fs.readFileSync(sarifPath, "utf8"))
     const results = sarif.runs?.[0]?.results ?? []
 
@@ -142,6 +172,9 @@ function findRegressions(sarifPath, changedLines) {
     const regressions = []
     for (const r of results) {
         const ruleId = r.ruleId ?? "?"
+        if (excludedRules.has(ruleId)) {
+            continue
+        }
         for (const loc of r.locations ?? []) {
             const uri = loc.physicalLocation?.artifactLocation?.uri
             const line = loc.physicalLocation?.region?.startLine
@@ -186,7 +219,11 @@ if (changed.size === 0) {
     process.exit(0)
 }
 
-const regressions = findRegressions(args.sarif, changed)
+if (args.excludedRules.size > 0) {
+    const sortedRules = [...args.excludedRules].toSorted()
+    console.log(`Excluding ${sortedRules.length} rule(s) from gate: ${sortedRules.join(", ")}`)
+}
+const regressions = findRegressions(args.sarif, changed, args.excludedRules)
 if (regressions.length === 0) {
     console.log(`✅ No new ReSharper warnings at ${touchedLabel} lines.`)
     process.exit(0)

test/AsyncQueryable.cs

@@ -1,5 +1,5 @@
-using Microsoft.EntityFrameworkCore.Query;
 using System.Linq.Expressions;
+using Microsoft.EntityFrameworkCore.Query;
 
 namespace Viper.test
 {

test/CTS/AssessmentControllerTest.cs

@@ -1,8 +1,8 @@
+using System.Net;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage;
 using NSubstitute;
-using System.Net;
 using Viper.Areas.CTS.Controllers;
 using Viper.Areas.CTS.Models;
 using Viper.Classes.SQLContext;
@@ -164,7 +164,7 @@ public async Task CreateStudentEpaCheck()
             context.Database.Returns(facadeSub);
 
             var actrlAsFac = GetAssessmentController(SetupUsers.UserType.Faculty);
-            var newEpa = new CreateUpdateStudentEpa()
+            var newEpa = new CreateUpdateStudentEpa
             {
                 EncounterDate = DateTime.Now,
                 Comment = "A comment",
@@ -204,7 +204,7 @@ public async Task UpdateStudentEpaCheck()
             var encId1 = SetupAssessments.Encounters.First(e => e.EnteredBy == SetupUsers.facultyUser.AaudUserId).EncounterId;
             var encId2 = SetupAssessments.Encounters.First(e => e.EnteredBy != SetupUsers.facultyUser.AaudUserId).EncounterId;
 
-            var epa1 = new CreateUpdateStudentEpa()
+            var epa1 = new CreateUpdateStudentEpa
             {
                 EncounterId = encId1,
                 EncounterDate = DateTime.Now,
@@ -214,7 +214,7 @@ public async Task UpdateStudentEpaCheck()
                 ServiceId = 0,
                 StudentId = SetupUsers.studentUser1.AaudUserId,
             };
-            var epa2 = new CreateUpdateStudentEpa()
+            var epa2 = new CreateUpdateStudentEpa
             {
                 EncounterId = encId2,
                 EncounterDate = DateTime.Now,
@@ -224,7 +224,7 @@ public async Task UpdateStudentEpaCheck()
                 ServiceId = 0,
                 StudentId = SetupUsers.studentUser1.AaudUserId,
             };
-            var epa3 = new CreateUpdateStudentEpa()
+            var epa3 = new CreateUpdateStudentEpa
             {
                 EncounterId = 99999,
                 EncounterDate = DateTime.Now,
@@ -258,7 +258,7 @@ private static bool IsForbidResult<T>(ActionResult<T> a)
                 var forbidResult = a.Result as ForbidResult;
                 if (result != null)
                 {
-                    Assert.Equal((int)HttpStatusCode.Forbidden, result?.StatusCode);
+                    Assert.Equal((int)HttpStatusCode.Forbidden, result.StatusCode);
                 }
                 Assert.True(result != null || forbidResult != null);
 

test/CTS/CompetencyBundleAssociationControllerTest.cs

@@ -112,7 +112,7 @@ public CompetencyBundleAssociationControllerTest()
         public async Task GetCompetencyBundleAssociations_NoFilters_ReturnsOnlyUnbundledCompetencies()
         {
             // Act
-            var result = await _controller.GetCompetencyBundleAssociations(null, null, null);
+            var result = await _controller.GetCompetencyBundleAssociations();
 
             // Assert
             var okResult = Assert.IsType<ActionResult<List<CompetencyBundleAssociationDto>>>(result);

test/CTS/SetupAssessments.cs

@@ -1,54 +1,54 @@
+using MockQueryable.NSubstitute;
 using NSubstitute;
-using System.Linq.Dynamic.Core;
 using Viper.Areas.CTS.Services;
 using Viper.Classes.SQLContext;
 using Viper.Models.CTS;
-using MockQueryable.NSubstitute;
+using Viper.Models.VIPER;
 
 namespace Viper.test.CTS
 {
     internal static class SetupAssessments
     {
-        public static readonly List<Encounter> Encounters = new List<Encounter>()
+        public static readonly List<Encounter> Encounters = new List<Encounter>
         {
-            new Encounter()
+            new Encounter
             {
                 EncounterId = 1,
                 EnteredBy = SetupUsers.facultyUser.AaudUserId,
                 EnteredOn = DateTime.Now,
                 StudentUserId = SetupUsers.studentUser1.AaudUserId,
                 EncounterType = (int)EncounterCreationService.EncounterType.Epa,
-                Student = new Models.VIPER.Person()
+                Student = new Person
                 {
                     FullName = SetupUsers.studentUser1.DisplayLastName + ", " + SetupUsers.studentUser1.DisplayFirstName,
                     MailId = "",
                 },
                 EnteredByPerson = SetupPeople.GetPeople().Where(p => p.PersonId == SetupUsers.facultyUser.AaudUserId).FirstOrDefault(),
                 ServiceId = 1,
             },
-            new Encounter()
+            new Encounter
             {
                 EncounterId = 2,
                 EnteredBy = SetupUsers.facultyUser.AaudUserId,
                 EnteredOn = DateTime.Now,
                 StudentUserId = SetupUsers.studentUser1.AaudUserId,
                 EncounterType = (int)EncounterCreationService.EncounterType.Epa,
-                Student = new Models.VIPER.Person()
+                Student = new Person
                 {
                     FullName = SetupUsers.studentUser1.DisplayLastName + ", " + SetupUsers.studentUser1.DisplayFirstName,
                     MailId = "",
                 },
                 EnteredByPerson = SetupPeople.GetPeople().Where(p => p.PersonId == SetupUsers.facultyUser.AaudUserId).FirstOrDefault(),
                 ServiceId = 2,
             },
-            new Encounter()
+            new Encounter
             {
                 EncounterId = 3,
                 EnteredBy = SetupUsers.otherFacultyUser.AaudUserId,
                 EnteredOn = DateTime.Now,
                 StudentUserId = SetupUsers.studentUser2.AaudUserId,
                 EncounterType = (int)EncounterCreationService.EncounterType.Epa,
-                Student = new Models.VIPER.Person()
+                Student = new Person
                 {
                     FullName = SetupUsers.studentUser2.DisplayLastName + ", " + SetupUsers.studentUser2.DisplayFirstName,
                     MailId = "",
@@ -73,7 +73,7 @@ public static void SetupEncountersTable(VIPERContext context)
                 .Do(callInfo =>
                  {
                      var e = callInfo.Arg<Encounter>();
-                     e.Student = new Models.VIPER.Person()
+                     e.Student = new Person
                      {
                          PersonId = e.StudentUserId,
                      };

test/CTS/SetupPeople.cs

@@ -1,7 +1,7 @@
+using MockQueryable.NSubstitute;
 using NSubstitute;
 using Viper.Classes.SQLContext;
 using Viper.Models.VIPER;
-using MockQueryable.NSubstitute;
 
 namespace Viper.test.CTS
 {

test/Classes/ApiResponseAttributeTests.cs

@@ -1,10 +1,10 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Routing;
-using System.Text.Json;
-using System.Text.Json.Serialization;
 using Viper.Classes;
 
 namespace Test.Classes

test/Classes/CustomAntiforgeryFilterTests.cs

@@ -1,11 +1,11 @@
+using System.Net;
 using Microsoft.AspNetCore.Antiforgery;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Routing;
 using NSubstitute;
-using System.Net;
 using Viper.Classes;
 
 namespace Test.Classes

test/ClinicalScheduler/ClinicalSchedulerContextTest.cs

@@ -1,5 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using Viper.Classes.SQLContext;
+using Viper.Models.ClinicalScheduler;
 
 namespace Viper.test.ClinicalScheduler
 {
@@ -81,7 +82,7 @@ public void ClinicalSchedulerContext_ServiceIgnoredPropertiesNotIncluded()
 
             // Act
             using var context = new ClinicalSchedulerContext(options);
-            var serviceEntityType = context.Model.FindEntityType(typeof(Viper.Models.ClinicalScheduler.Service));
+            var serviceEntityType = context.Model.FindEntityType(typeof(Service));
 
             // Assert - Verify that Encounters and Epas navigation properties are ignored
             Assert.NotNull(serviceEntityType);