VIH-11093 Sonar fixes

AdminWebsite/AdminWebsite.UnitTests/Controllers/BookingListControllerTest.cs

@@ -452,7 +452,7 @@ public async Task Should_return_booking_list_when_admin_search_by_multiple_crite
             okResult.StatusCode.Should().Be(200);
         }
 
-        private List<CaseTypeResponse> GetCaseTypesList()
+        private static List<CaseTypeResponse> GetCaseTypesList()
         {
             return new List<CaseTypeResponse>
             {

AdminWebsite/AdminWebsite.UnitTests/Controllers/HearingsController/PostHearingTests.cs

@@ -1,21 +1,16 @@
 using AdminWebsite.Models;
-using AdminWebsite.Security;
 using AdminWebsite.Services;
 using AdminWebsite.UnitTests.Helper;
-using FizzWare.NBuilder;
 using Microsoft.AspNetCore.Mvc;
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
-using AdminWebsite.Configuration;
-using AdminWebsite.Contracts.Enums;
 using AdminWebsite.Contracts.Requests;
 using BookingsApi.Client;
 using Autofac.Extras.Moq;
 using BookingsApi.Contract.V1.Requests;
+using BookingsApi.Contract.V2.Requests;
 using VideoApi.Contract.Responses;
-using EndpointRequest = AdminWebsite.Contracts.Requests.EndpointRequest;
-using LinkedParticipantRequest = AdminWebsite.Contracts.Requests.LinkedParticipantRequest;
 using ParticipantRequest = AdminWebsite.Contracts.Requests.ParticipantRequest;
 using V1 = BookingsApi.Contract.V1;
 
@@ -69,7 +64,7 @@ public void Should_throw_BookingsApiException()
                 BookingDetails = hearing
             };
 
-            _mocker.Mock<IBookingsApiClient>().Setup(x => x.BookNewHearingAsync(It.IsAny<BookNewHearingRequest>()))
+            _mocker.Mock<IBookingsApiClient>().Setup(x => x.BookNewHearingWithCodeAsync(It.IsAny<BookNewHearingRequestV2>()))
                 .Throws(ClientException.ForBookingsAPI(HttpStatusCode.InternalServerError));
 
             var response = _controller.Post(bookingRequest);
@@ -90,7 +85,7 @@ public void Should_throw_Exception()
                 BookingDetails = hearing
             };
 
-            _mocker.Mock<IBookingsApiClient>().Setup(x => x.BookNewHearingAsync(It.IsAny<BookNewHearingRequest>()))
+            _mocker.Mock<IBookingsApiClient>().Setup(x => x.BookNewHearingWithCodeAsync(It.IsAny<BookNewHearingRequestV2>()))
                 .Throws(new Exception("Some internal error"));
 
             var response = _controller.Post(bookingRequest);

AdminWebsite/AdminWebsite.UnitTests/Services/HearingServiceTests.cs

@@ -116,7 +116,7 @@ public async Task Should_process_participants()
                         && x.LinkedParticipants == linkedParticipants)), Times.Once);
         }
 
-        private HearingDetailsResponse InitHearing()
+        private static HearingDetailsResponse InitHearing()
         {
             var cases = new List<CaseResponse> { new CaseResponse { Name = "Test", Number = "123456" } };
             var rep = Builder<ParticipantResponse>.CreateNew()

AdminWebsite/AdminWebsite/AdminWebsite.csproj

@@ -87,6 +87,7 @@
     <EmbeddedResource Remove="ClientApp\jasmine-tests\**" />
     <Content Remove="ClientApp\jasmine-tests\**" />
     <None Remove="ClientApp\jasmine-tests\**" />
+    <None Remove="Properties\ServiceDependencies\vh-admin-web-demo - Web Deploy\profile.arm.json" />
   </ItemGroup>
 
   <ItemGroup>

AdminWebsite/AdminWebsite/Attributes/HearingInputSanitizerAttribute.cs

@@ -7,13 +7,13 @@
 namespace AdminWebsite.Attributes
 {
     [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)]
-    public class HearingInputSanitizerAttribute : ActionFilterAttribute
+    public partial class HearingInputSanitizerAttribute : ActionFilterAttribute
     {
         public override void OnActionExecuting(ActionExecutingContext context)
         {
-            if (context.ActionArguments != null && context.ActionArguments.ContainsKey("request"))
+            if (context.ActionArguments.TryGetValue("request", out var argument))
             {
-                switch (context.ActionArguments["request"])
+                switch (argument)
                 {
                     case BookNewHearingRequest newHearingRequest:
                         newHearingRequest.HearingRoomName = Sanitize(newHearingRequest.HearingRoomName);
@@ -74,9 +74,12 @@ private static string Sanitize(string input)
                 return input;
             }
 
-            var regex = new Regex(@"<(.*?)>", RegexOptions.Compiled);
+            var regex = InputRegex();
 
             return regex.Replace(input, string.Empty);
         }
+
+        [GeneratedRegex(@"<(.*?)>", RegexOptions.Compiled)]
+        private static partial Regex InputRegex();
     }
 }

AdminWebsite/AdminWebsite/ClientApp/acessability_lint.js

@@ -32,26 +32,28 @@ async function runPa11y(filename) {
 }
 
 const run = () => {
-    return new Promise(async (resolve, reject) => {
-        try {
-            const result = [];
-            const files = await getHtmlFiles();
-            output(`detected ${files.length} html files to parse`);
-            for (let index = 0; index < files.length; index += 1) {
-                const lintErrors = await runPa11y(files[index]);
-                if (lintErrors.issues.length > 0) {
-                    result.push({
-                        file: lintErrors.pageUrl,
-                        issues: lintErrors.issues
-                    });
+    return new Promise((resolve, reject) => {
+        (async () => {
+            try {
+                const result = [];
+                const files = await getHtmlFiles();
+                output(`detected ${files.length} html files to parse`);
+                for (let index = 0; index < files.length; index += 1) {
+                    const lintErrors = await runPa11y(files[index]);
+                    if (lintErrors.issues.length > 0) {
+                        result.push({
+                            file: lintErrors.pageUrl,
+                            issues: lintErrors.issues
+                        });
+                    }
+                    const doneDegree = Math.round((index / files.length) * 100);
+                    output(`${doneDegree}% done, completed ${files[index]}`);
                 }
-                const doneDegree = Math.round((index / files.length) * 100);
-                output(`${doneDegree}% done, completed ${files[index]}`);
+                resolve(result);
+            } catch (err) {
+                reject(err);
             }
-            resolve(result);
-        } catch (err) {
-            reject(err);
-        }
+        })();
     });
 };