VIH-10166 remove suitability answers & questionnaire (#715)

BookingsApi/BookingsApi.AcceptanceTests/Models/CreateHearingRequestBuilder.cs

@@ -93,7 +93,6 @@ public CreateHearingRequestBuilder(string caseName)
                 .With(x => x.Endpoints = endpoints)
                 .With(x => x.Cases = cases)
                 .With(x => x.CreatedBy = createdBy)
-                .With(x => x.QuestionnaireNotRequired = false)
                 .With(x => x.AudioRecordingRequired = true)
                 .With(x => x.Endpoints = new List<EndpointRequest> {new EndpointRequest{ DisplayName = "New Endpoint"}})
                 .Build();

BookingsApi/BookingsApi.AcceptanceTests/Steps/ParticipantsSteps.cs

@@ -163,14 +163,5 @@ public void ThenIndividualDetailsShouldBeUpdated(string participant)
             model.TelephoneNumber.Should().Be(updateParticipantRequest.TelephoneNumber);
             model.LinkedParticipants.Count.Should().Be(participant == "Individual" ? 1 : 0);
         }
-
-        [Given(@"I have an update participant suitability answers with a valid user '(.*)'")]
-        public void GivenIHaveAnUpdateParticipantSuitabilityAnswersWithAValidUser(string role)
-        {
-            var participantId = _context.TestData.ParticipantsResponses.FirstOrDefault(x => x.UserRoleName.Equals(role)).Id;
-            var updateParticipantRequest = UpdateSuitabilityAnswersRequest.BuildRequest();
-            _context.TestData.Answers = updateParticipantRequest;
-            _context.Request = _context.Put(UpdateSuitabilityAnswers(_context.TestData.Hearing.Id, participantId), updateParticipantRequest);
-        }
     }
 }

BookingsApi/BookingsApi.AcceptanceTests/Steps/PersonsSteps.cs

@@ -92,34 +92,6 @@ public void ThenPersonsDetailsShouldBeRetrieved()
             actual.Username.Should().Be(expected.Username);
         }
 
-        [Then(@"suitability answers for '(.*)' should be updated")]
-        public void ThenSuitabilityAnswersForShouldBeUpdated(string participant)
-        {
-            var username = _context.TestData.ParticipantsResponses
-                .FirstOrDefault(x => x.UserRoleName.Equals(participant)).Username;
-            var participantId = _context.TestData.ParticipantsResponses
-                .FirstOrDefault(x => x.UserRoleName.Equals(participant)).Id;
-            _context.Request = _context.Get(GetPersonSuitabilityAnswers(username));
-            _context.Response = _context.Client().Execute(_context.Request);
-            _context.Response.StatusCode.Should().Be(HttpStatusCode.OK);
-            var model =
-                RequestHelper.Deserialise<List<PersonSuitabilityAnswerResponse>>(
-                    _context.Response.Content);
-            var expectedResult = _context.TestData.Answers;
-
-            expectedResult[0].Key.Should().Be(model[0].Answers[0].Key);
-            expectedResult[0].Answer.Should().Be(model[0].Answers[0].Answer);
-            expectedResult[0].ExtendedAnswer.Should().Be(model[0].Answers[0].ExtendedAnswer);
-            expectedResult[1].Key.Should().Be(model[0].Answers[1].Key);
-            expectedResult[1].Answer.Should().Be(model[0].Answers[1].Answer);
-            expectedResult[1].ExtendedAnswer.Should().Be(model[0].Answers[1].ExtendedAnswer);
-
-            model[0].HearingId.Should().Be(_context.TestData.Hearing.Id);
-            model[0].ParticipantId.Should().Be(participantId);
-            model[0].UpdatedAt.Should().BeAfter(DateTime.UtcNow.AddMinutes(-2));
-            model[0].QuestionnaireNotRequired.Should().BeFalse();
-        }
-
         [Then(@"a list of hearings for deletion is (.*)")]
         public void ThenAListOfHearingsForDeletionIs(int expectedNumOfHearings)
         {

BookingsApi/BookingsApi.Contract/V1/Requests/BookNewHearingRequest.cs

@@ -67,7 +67,8 @@ public BookNewHearingRequest()
         /// <summary>
         /// QuestionnaireNotRequired
         /// </summary>
-        public bool QuestionnaireNotRequired { get; set; }
+        [Obsolete("This property is no longer used.")]
+        public bool QuestionnaireNotRequired { get; set; } = false;
 
         /// <summary>
         /// Gets or sets the audio recording required flag, value true  is indicated that recording is required, otherwise false

BookingsApi/BookingsApi.Contract/V1/Requests/UpdateHearingRequest.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 
 namespace BookingsApi.Contract.V1.Requests
 {
@@ -43,6 +44,8 @@ public class UpdateHearingRequest
         /// <summary>
         /// QuestionnaireNotRequired
         /// </summary>
+        [Obsolete("This property is no longer used.")]
+        [DefaultValue(false)]
         public bool? QuestionnaireNotRequired { get; set; }
 
         /// <summary>

BookingsApi/BookingsApi.Contract/V1/Responses/BookingsHearingResponse.cs

@@ -103,6 +103,7 @@ public DateTime HearingDate
         /// <summary>
         /// QuestionnaireNotRequired
         /// </summary>
+        [Obsolete("This property is no longer used.")]
         public bool QuestionnaireNotRequired { get; set; }
 
         /// <summary>

BookingsApi/BookingsApi.Contract/V1/Responses/HearingDetailsResponse.cs

@@ -101,6 +101,7 @@ public class HearingDetailsResponse
         /// <summary>
         /// QuestionnaireNotRequired
         /// </summary>
+        [Obsolete("This property is no longer used.")]
         public bool QuestionnaireNotRequired { get; set; }
 
         /// <summary>

BookingsApi/BookingsApi.DAL/Commands/CreateVideoHearingCommand.cs

@@ -6,23 +6,30 @@ namespace BookingsApi.DAL.Commands
 {
     public class CreateVideoHearingCommand : ICommand
     {
-        public CreateVideoHearingCommand(CaseType caseType, HearingType hearingType, DateTime scheduledDateTime,
-            int scheduledDuration, HearingVenue venue, List<NewParticipant> participants, List<Case> cases,
-            bool questionnaireNotRequired, bool audioRecordingRequired, List<NewEndpoint> endpoints,
-            List<LinkedParticipantDto> linkedParticipants, bool isMultiDayFirstHearing)
+        public CreateVideoHearingCommand(CreateVideoHearingRequiredDto requiredDto,
+            CreateVideoHearingOptionalDto optionalDto)
         {
-            CaseType = caseType;
-            HearingType = hearingType;
-            ScheduledDateTime = scheduledDateTime;
-            ScheduledDuration = scheduledDuration;
-            Venue = venue;
-            Participants = participants;
-            Cases = cases;
-            QuestionnaireNotRequired = questionnaireNotRequired;
-            AudioRecordingRequired = audioRecordingRequired;
-            Endpoints = endpoints;
-            LinkedParticipants = linkedParticipants;
-            IsMultiDayFirstHearing = isMultiDayFirstHearing;
+            CaseType = requiredDto.CaseType;
+            HearingType = requiredDto.HearingType;
+            ScheduledDateTime = requiredDto.ScheduledDateTime;
+            ScheduledDuration = requiredDto.ScheduledDuration;
+            Venue = requiredDto.Venue;
+            Cases = requiredDto.Cases;
+
+            Participants = optionalDto.Participants ?? new List<NewParticipant>();
+            HearingRoomName = optionalDto.HearingRoomName;
+            OtherInformation = optionalDto.OtherInformation;
+            CreatedBy = optionalDto.CreatedBy;
+
+            AudioRecordingRequired = optionalDto.AudioRecordingRequired;
+            Endpoints = optionalDto.Endpoints;
+            CancelReason = optionalDto.CancelReason;
+
+            LinkedParticipants = optionalDto.LinkedParticipants ?? new List<LinkedParticipantDto>();
+            JudiciaryParticipants = optionalDto.JudiciaryParticipants ?? new List<NewJudiciaryParticipant>();
+            IsMultiDayFirstHearing = optionalDto.IsMultiDayFirstHearing;
+
+            SourceId = optionalDto.SourceId;
         }
 
         public Guid NewHearingId { get; set; }
@@ -33,16 +40,15 @@ public CreateVideoHearingCommand(CaseType caseType, HearingType hearingType, Dat
         public HearingVenue Venue { get; }
         public List<NewParticipant> Participants { get; }
         public List<Case> Cases { get; }
-        public string HearingRoomName { get; set; }
-        public string OtherInformation { get; set; }
-        public string CreatedBy { get; set; }
-        public bool QuestionnaireNotRequired { get; set; }
-        public bool AudioRecordingRequired { get; set; }
+        public string HearingRoomName { get; }
+        public string OtherInformation { get; }
+        public string CreatedBy { get; }
+        public bool AudioRecordingRequired { get; }
         public List<NewEndpoint> Endpoints { get; }
-        public string CancelReason { get; set; }
-        public Guid? SourceId { get; set; }
+        public string CancelReason { get; }
+        public Guid? SourceId { get; }
         public List<LinkedParticipantDto> LinkedParticipants { get; }
-        public List<NewJudiciaryParticipant> JudiciaryParticipants { get; set; } = new();
+        public List<NewJudiciaryParticipant> JudiciaryParticipants { get; }
         public bool IsMultiDayFirstHearing { get; }
     }
 
@@ -61,8 +67,7 @@ public async Task Handle(CreateVideoHearingCommand command)
         {
             var videoHearing = new VideoHearing(command.CaseType, command.HearingType, command.ScheduledDateTime,
                 command.ScheduledDuration, command.Venue, command.HearingRoomName,
-                command.OtherInformation, command.CreatedBy, command.QuestionnaireNotRequired,
-                command.AudioRecordingRequired, command.CancelReason);
+                command.OtherInformation, command.CreatedBy, command.AudioRecordingRequired, command.CancelReason);
 
             // Ideally, the domain object would implement the clone method and so this change is a work around.
             videoHearing.IsFirstDayOfMultiDayHearing = command.IsMultiDayFirstHearing;

BookingsApi/BookingsApi.DAL/Commands/RemoveHearingCommand.cs

@@ -24,8 +24,7 @@ public async Task Handle(RemoveHearingCommand command)
             var hearingsIncCloned = await _context.VideoHearings
                 .Include(x => x.HearingCases).ThenInclude(x => x.Case)
                 .Include(x => x.Participants).ThenInclude(x => x.Person).ThenInclude(x => x.Organisation)
-                .Include(x => x.Participants).ThenInclude(x => x.LinkedParticipants)//.ThenInclude(x => x.Participant)
-                .Include(x => x.Participants).ThenInclude(x => x.Questionnaire).ThenInclude(x => x.SuitabilityAnswers)
+                .Include(x => x.Participants).ThenInclude(x => x.LinkedParticipants)
                 .Include(x => x.Endpoints).ThenInclude(x => x.DefenceAdvocate)
                 .Include(x=> x.JudiciaryParticipants).ThenInclude(x=> x.JudiciaryPerson)
                 .Where(x => x.Id == command.HearingId || x.SourceId == command.HearingId).ToListAsync();