Fix docker compose

AdminWebsite/AdminWebsite.UnitTests/Controllers/AudioPlatformControllerTests.cs

@@ -1,5 +1,4 @@
 using System.Threading.Tasks;
-using AdminWebsite.Configuration;
 using AdminWebsite.Controllers;
 using AdminWebsite.Models;
 using BookingsApi.Client;
@@ -20,16 +19,14 @@ public class AudioPlatformControllerTests
 
         private readonly Mock<IBookingsApiClient> _bookingsApiClientMock;
         private readonly Mock<ILogger<AudioPlatformController>> _loggerMock;
-        private readonly Mock<IFeatureToggles> _featureTogglesMock;
 
         public AudioPlatformControllerTests()
         {
             _videoApiClientMock = new Mock<IVideoApiClient>();
             _bookingsApiClientMock = new Mock<IBookingsApiClient>();
             _loggerMock = new Mock<ILogger<AudioPlatformController>>();
-            _featureTogglesMock = new Mock<IFeatureToggles>();
 
-            _controller = new AudioPlatformController(_videoApiClientMock.Object, _loggerMock.Object, _bookingsApiClientMock.Object, _featureTogglesMock.Object);
+            _controller = new AudioPlatformController(_videoApiClientMock.Object, _loggerMock.Object, _bookingsApiClientMock.Object);
         }
 
         [Test]
@@ -41,7 +38,6 @@ public async Task Should_return_ok()
             };
 
             _videoApiClientMock.Setup(x => x.GetAudioRecordingLinkAsync(It.IsAny<string>())).ReturnsAsync(audioResponse);
-            _featureTogglesMock.Setup(x => x.HrsEnabled()).Returns(false);
 
             var result = await _controller.GetAudioRecordingLinkAsync(It.IsAny<Guid>());
 
@@ -55,7 +51,7 @@ public async Task Should_return_ok()
         }
 
         [Test]
-        public async Task Should_return_hrs_file_format_with_hrs_toggle_on()
+        public async Task Should_return_hrs_file_format()
         {
             var audioResponse = new AudioRecordingResponse
             {
@@ -72,7 +68,6 @@ public async Task Should_return_hrs_file_format_with_hrs_toggle_on()
             };
 
             _videoApiClientMock.Setup(x => x.GetAudioRecordingLinkAsync(It.IsAny<string>())).ReturnsAsync(audioResponse);
-            _featureTogglesMock.Setup(x => x.HrsEnabled()).Returns(true);
             _bookingsApiClientMock.Setup(x => x.GetHearingDetailsByIdV2Async(It.IsAny<Guid>())).ReturnsAsync(hearing);
 
             var result = await _controller.GetAudioRecordingLinkAsync(It.IsAny<Guid>());

AdminWebsite/AdminWebsite.UnitTests/Controllers/HearingsController/CancelMultiDayHearingTests.cs

@@ -24,69 +24,10 @@ protected override void Setup()
             UserIdentity.Setup(x => x.GetUserIdentityName()).Returns(UpdatedBy);
         }
 
-        [TestCase(false)]
-        [TestCase(true)]
-        public async Task should_cancel_multi_day_hearing_for_v1(bool updateFutureDays)
-        {
-            // Arrange
-            var hearingId = Guid.NewGuid();
-            var groupId = Guid.NewGuid();
-            var hearingDates = new List<DateTime>
-            {
-                DateTime.Today.AddDays(1).AddHours(10),
-                DateTime.UtcNow.AddDays(2).AddHours(10),
-                DateTime.UtcNow.AddDays(3).AddHours(10),
-                DateTime.UtcNow.AddDays(4).AddHours(10),
-                DateTime.UtcNow.AddDays(5).AddHours(10),
-            };
-            var existingHearingsInMultiDayGroup = CreateListOfV1HearingsInMultiDayGroup(groupId, hearingId, scheduledDates: hearingDates);
-            existingHearingsInMultiDayGroup[3].Status = BookingStatus.Cancelled;
-            existingHearingsInMultiDayGroup[4].Status = BookingStatus.Failed;
-            BookingsApiClient.Setup(x => x.GetHearingsByGroupIdAsync(groupId)).ReturnsAsync(existingHearingsInMultiDayGroup);
-            var hearing = existingHearingsInMultiDayGroup.First(x => x.Id == hearingId);
-            BookingsApiClient.Setup(x => x.GetHearingDetailsByIdAsync(hearingId)).ReturnsAsync(hearing);
-
-            var request = CreateRequest();
-            request.UpdateFutureDays = updateFutureDays;
-
-            FeatureToggle.Setup(e => e.UseV2Api()).Returns(false);
-
-            // Act
-            var response = await Controller.CancelMultiDayHearing(hearing.Id, request);
-
-            // Assert
-            var result = (OkObjectResult)response;
-            result.StatusCode.Should().Be(StatusCodes.Status200OK);
-            result.Value.Should().NotBeNull().And.BeAssignableTo<UpdateBookingStatusResponse>().Subject.Success.Should().BeTrue();
-
-            var expectedUpdatedHearings = new List<HearingDetailsResponse>();
-            if (updateFutureDays)
-            {
-                expectedUpdatedHearings.AddRange(existingHearingsInMultiDayGroup);
-            }
-            else
-            {
-                expectedUpdatedHearings.Add(hearing);
-            }
-
-            expectedUpdatedHearings = expectedUpdatedHearings
-                .Where(h => 
-                    h.Status != BookingStatus.Cancelled && 
-                    h.Status != BookingStatus.Failed)
-                .ToList();
-
-            BookingsApiClient.Verify(x => x.CancelHearingsInGroupAsync(
-                groupId, 
-                It.Is<CancelHearingsInGroupRequest>(r =>
-                    r.UpdatedBy == UpdatedBy &&
-                    r.CancelReason == request.CancelReason &&
-                    r.HearingIds.SequenceEqual(expectedUpdatedHearings.Select(h => h.Id)))),
-                Times.Once);
-        }
 
         [TestCase(false)]
         [TestCase(true)]
-        public async Task should_cancel_multi_day_hearing_for_v2(bool updateFutureDays)
+        public async Task should_cancel_multi_day_hearing(bool updateFutureDays)
         {
             // Arrange
             var hearingId = Guid.NewGuid();
@@ -109,9 +50,7 @@ public async Task should_cancel_multi_day_hearing_for_v2(bool updateFutureDays)
 
             var request = CreateRequest();
             request.UpdateFutureDays = updateFutureDays;
-
-            FeatureToggle.Setup(e => e.UseV2Api()).Returns(true);
-
+
             // Act
             var response = await Controller.CancelMultiDayHearing(hearing.Id, request);
 
@@ -145,9 +84,8 @@ public async Task should_cancel_multi_day_hearing_for_v2(bool updateFutureDays)
                 Times.Once);
         }
 
-        [TestCase(false)]
-        [TestCase(true)]
-        public async Task Should_forward_not_found_from_bookings_api(bool useV2)
+        [Test]
+        public async Task Should_forward_not_found_from_bookings_api()
         {
             // Arrange
             var hearingId = Guid.NewGuid();
@@ -159,17 +97,8 @@ public async Task Should_forward_not_found_from_bookings_api(bool useV2)
                 null,
                 errorMessage,
                 null);
-            if (useV2)
-            {
-                BookingsApiClient.Setup(x => x.GetHearingDetailsByIdV2Async(hearingId))
+            BookingsApiClient.Setup(x => x.GetHearingDetailsByIdV2Async(hearingId))
                     .ThrowsAsync(apiException);
-            }
-            else
-            {
-                BookingsApiClient.Setup(x => x.GetHearingDetailsByIdAsync(hearingId))
-                    .ThrowsAsync(apiException);
-            }
-            FeatureToggle.Setup(e => e.UseV2Api()).Returns(useV2);
 
             // Act
             var result = await Controller.CancelMultiDayHearing(hearingId, request);
@@ -179,26 +108,18 @@ public async Task Should_forward_not_found_from_bookings_api(bool useV2)
             notFoundResult.Value.Should().Be(errorMessage);
         }
 
-        [TestCase(false)]
-        [TestCase(true)]
-        public async Task Should_return_bad_request_when_hearing_is_not_multi_day(bool useV2)
+        [Test]
+        public async Task Should_return_bad_request_when_hearing_is_not_multi_day()
         {
             // Arrange
             var hearingId = Guid.NewGuid();
             var groupId = Guid.NewGuid();
             var existingHearingsInMultiDayGroup = CreateListOfV1HearingsInMultiDayGroup(groupId, hearingId);
             var hearing = existingHearingsInMultiDayGroup.First(x => x.Id == hearingId);
             hearing.GroupId = null;
-            if (useV2)
-            {
-                var mappedHearing = MapHearingDetailsForV2(hearing);
-                BookingsApiClient.Setup(x => x.GetHearingDetailsByIdV2Async(hearingId)).ReturnsAsync(mappedHearing);
-            }
-            else
-            {
-                BookingsApiClient.Setup(x => x.GetHearingDetailsByIdAsync(hearingId)).ReturnsAsync(hearing);
-            }
-            FeatureToggle.Setup(e => e.UseV2Api()).Returns(useV2);
+
+            var mappedHearing = MapHearingDetailsForV2(hearing);
+            BookingsApiClient.Setup(x => x.GetHearingDetailsByIdV2Async(hearingId)).ReturnsAsync(mappedHearing);
 
             var request = CreateRequest();
 
@@ -218,55 +139,6 @@ public async Task Should_return_bad_request_when_hearing_is_not_multi_day(bool u
             errors.Should().BeEquivalentTo(validationProblemDetails.Errors);
         }
 
-        [Test]
-        public async Task Should_forward_bad_request_from_bookings_api()
-        {
-            // Arrange
-            var hearingId = Guid.NewGuid();
-            var request = new CancelMultiDayHearingRequest();
-            var validationProblemDetails = new ValidationProblemDetails(new Dictionary<string, string[]>
-            {
-                {"id", ["Please provide a valid id"] }
-            });
-            var apiException = new BookingsApiException<ValidationProblemDetails>("BadRequest", 
-                (int)HttpStatusCode.BadRequest,
-                "Please provide a valid id",
-                null,
-                validationProblemDetails,
-                null);
-            BookingsApiClient.Setup(x => x.GetHearingDetailsByIdAsync(hearingId))
-                .ThrowsAsync(apiException);
-
-            // Act
-            var result = await Controller.CancelMultiDayHearing(hearingId, request);
-
-            var objectResult = (ObjectResult)result;
-            var validationProblems = (ValidationProblemDetails)objectResult.Value;
-
-            var errors = validationProblems.Errors;
-            errors.Should().BeEquivalentTo(validationProblemDetails.Errors);
-        }
-
-        [Test]
-        public void Should_forward_unhandled_error_from_bookings_api()
-        {
-            // Arrange
-            var hearingId = Guid.NewGuid();
-            var request = new CancelMultiDayHearingRequest();
-            var errorMessage = "Unexpected error for unit test";
-            var apiException = new BookingsApiException<string>("Server Error",
-                (int) HttpStatusCode.InternalServerError,
-                "Server Error", null, errorMessage, null);
-            BookingsApiClient.Setup(x => x.GetHearingDetailsByIdAsync(hearingId))
-                .ThrowsAsync(apiException);
-
-            // Act & Assert
-            var response = Controller.CancelMultiDayHearing(hearingId, request);
-
-            ((ObjectResult) response.Result).StatusCode.Should().Be(500);
-
-        }
-
         private static CancelMultiDayHearingRequest CreateRequest() =>
             new()
             {