VIH-10812 do not auto transfer staff members into a hearing

hmcts · Jul 8, 2024 · bc1aee6 · bc1aee6
1 parent 41e52b3
commit bc1aee6
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 19 deletions.
diff --git a/VideoApi/VideoApi.Contract/Requests/StartHearingRequest.cs b/VideoApi/VideoApi.Contract/Requests/StartHearingRequest.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
 namespace VideoApi.Contract.Requests
 {
     public enum HearingLayout
@@ -15,7 +13,6 @@ public StartHearingRequest()
             Layout = HearingLayout.Dynamic;
         }
         public HearingLayout? Layout { get; set; }
-        public IEnumerable<string> ParticipantsToForceTransfer { get; set; }
         public bool? MuteGuests { get; set; }
         public string TriggeredByHostId { get; set; }
     }

diff --git a/VideoApi/VideoApi.Domain/ParticipantBase.cs b/VideoApi/VideoApi.Domain/ParticipantBase.cs
@@ -88,7 +88,8 @@ public void UpdateCurrentConsultationRoom(ConsultationRoom consultationRoom)
 
         public bool CanAutoTransferToHearingRoom()
         {
-            return UserRole != UserRole.QuickLinkParticipant && UserRole != UserRole.QuickLinkObserver && HearingRole != "Witness";
+            return UserRole != UserRole.QuickLinkParticipant && UserRole != UserRole.QuickLinkObserver &&
+                   HearingRole != "Witness" && UserRole != UserRole.StaffMember;
         }
 
     }

diff --git a/VideoApi/VideoApi.UnitTests/Controllers/ConferenceManagement/StartVideoHearingTests.cs b/VideoApi/VideoApi.UnitTests/Controllers/ConferenceManagement/StartVideoHearingTests.cs
@@ -26,7 +26,6 @@ public async Task should_return_accepted_when_start_hearing_has_been_requested()
             {
                 Layout = layout,
                 TriggeredByHostId = TestConference.Participants.Single(x => x.UserRole == VideoApi.Domain.Enums.UserRole.Judge).Id.ToString(),
-                ParticipantsToForceTransfer = participantIds,
                 MuteGuests = true
             };
             Mocker.Mock<IQueryHandler>()
@@ -51,12 +50,11 @@ public async Task should_return_accepted_when_start_hearing_with_muted_guests_ha
             var conferenceId = TestConference.Id;
             var layout = HearingLayout.OnePlus7;
             var participantIds = TestConference.Participants.Select(x => x.Id.ToString());
-            var muteGuests = true;
             var request = new Contract.Requests.StartHearingRequest
             {
                 Layout = layout,
                 TriggeredByHostId = TestConference.Participants.Single(x => x.UserRole == VideoApi.Domain.Enums.UserRole.Judge).Id.ToString(),
-                ParticipantsToForceTransfer = participantIds,
+                MuteGuests = true
             };
             Mocker.Mock<IQueryHandler>()
                 .Setup(x => x.Handle<GetConferenceByIdQuery, VideoApi.Domain.Conference>(
@@ -128,12 +126,10 @@ public async Task should_contain_correct_participants_when_start_hearing_has_bee
 
             var layout = HearingLayout.OnePlus7;
             var participantIds = TestConference.Participants.Where(x => x.UserRole != VideoApi.Domain.Enums.UserRole.QuickLinkParticipant && x.HearingRole != "Witness").Select(x => x.Id.ToString());
-            var muteGuests = true;
             var request = new Contract.Requests.StartHearingRequest
             {
                 Layout = layout,
                 TriggeredByHostId = TestConference.Participants.Single(x => x.UserRole == VideoApi.Domain.Enums.UserRole.Judge).Id.ToString(),
-                ParticipantsToForceTransfer = participantIds,
                 MuteGuests = true
             };
 
@@ -147,7 +143,7 @@ public async Task should_contain_correct_participants_when_start_hearing_has_bee
             var typedResult = (AcceptedResult)result;
             typedResult.Should().NotBeNull();
             typedResult.StatusCode.Should().Be((int)HttpStatusCode.Accepted);
-            VideoPlatformServiceMock.Verify(x => x.StartHearingAsync(conferenceId, request.TriggeredByHostId, participantIds, Layout.ONE_PLUS_SEVEN, muteGuests), Times.Once);
+            VideoPlatformServiceMock.Verify(x => x.StartHearingAsync(conferenceId, request.TriggeredByHostId, participantIds, Layout.ONE_PLUS_SEVEN, true), Times.Once);
         }
     }
 }
diff --git a/VideoApi/VideoApi.UnitTests/Domain/Participants/CanAutoTransferToHearingRoomTests.cs b/VideoApi/VideoApi.UnitTests/Domain/Participants/CanAutoTransferToHearingRoomTests.cs
@@ -20,6 +20,14 @@ public void Should_return_false_when_user_role_is_QuickLinkObserver()
         var result = participant.CanAutoTransferToHearingRoom();
         result.Should().BeFalse();
     }
+
+    [Test]
+    public void Should_return_false_when_user_role_is_StaffMember()
+    {
+        var participant = new ParticipantBuilder().WithUserRole(UserRole.StaffMember).Build();
+        var result = participant.CanAutoTransferToHearingRoom();
+        result.Should().BeFalse();
+    }
 
     [Test]
     public void Should_return_false_when_user_role_is_Witness()

diff --git a/VideoApi/VideoApi/Controllers/ConferenceManagementController.cs b/VideoApi/VideoApi/Controllers/ConferenceManagementController.cs
@@ -57,14 +57,11 @@ public async Task<IActionResult> StartVideoHearingAsync(Guid conferenceId, Start
                 var hearingLayout =
                     HearingLayoutMapper.MapLayoutToVideoHearingLayout(
                         request.Layout.GetValueOrDefault(HearingLayout.Dynamic));
-
-                // ***Remove this line when video web sends the triggered by host id attribute ****ALSO, do not expose ParticipantsToForceTransfer sa this is populated here
-                var triggeredByHostId = request.TriggeredByHostId ?? request.ParticipantsToForceTransfer?.Single();
 
                 var conference = await _queryHandler.Handle<GetConferenceByIdQuery, Conference>(new GetConferenceByIdQuery(conferenceId));
                 var participants = conference.Participants.Where(x => x.State is ParticipantState.Available or ParticipantState.InConsultation 
                                                                       && x.CanAutoTransferToHearingRoom()).Select(x => x.Id.ToString()).ToList();
-                
+
                 var endpoints = conference.Endpoints
                     .Where(x => x.State is EndpointState.Connected or EndpointState.InConsultation)
                     .Select(x => x.Id.ToString()).ToList();
@@ -73,25 +70,24 @@ public async Task<IActionResult> StartVideoHearingAsync(Guid conferenceId, Start
 
                 if (_featureToggles.VodafoneIntegrationEnabled())
                 {
-                    await _videoPlatformService.StartHearingAsync(conferenceId, triggeredByHostId, allIdsToTransfer, hearingLayout, request.MuteGuests ?? true);    
+                    await _videoPlatformService.StartHearingAsync(conferenceId, request.TriggeredByHostId, allIdsToTransfer, hearingLayout, request.MuteGuests ?? true);    
                 }
                 else
                 {
-                    await _videoPlatformService.StartHearingAsync(conferenceId, triggeredByHostId, allIdsToTransfer, hearingLayout, request.MuteGuests ?? false);
+                    await _videoPlatformService.StartHearingAsync(conferenceId, request.TriggeredByHostId, allIdsToTransfer, hearingLayout, request.MuteGuests ?? false);
                 }
 
 
                 return Accepted();
             }
             catch (SupplierApiException ex)
             {
+                _logger.LogError(ex, "Error from supplier API. Unable to start video hearing");
                 if (ex.StatusCode == (int)HttpStatusCode.BadRequest)
                 {
                     return BadRequest(
-                        $"Invalid list of participants provided for {nameof(request.ParticipantsToForceTransfer)}. {request.ParticipantsToForceTransfer}");
+                        $"Invalid list of participants provided for participantsToForceTransfer");
                 }
-
-                _logger.LogError(ex, "Error from supplier API. Unable to start video hearing");
                 return StatusCode(ex.StatusCode, ex.Response);
             }
         }