Skip to content

Commit

Permalink
fix code smells
Browse files Browse the repository at this point in the history
  • Loading branch information
Shaed Parkar committed Oct 10, 2023
1 parent 440d6f7 commit 94cd5e8
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ export class SummaryComponent implements OnInit, OnDestroy {

private handleValidationProblem(validationErrors: ValidationProblemDetails) {
this.saveFailedMessages = [];
Object.keys(validationErrors.errors).map(key => {
Object.keys(validationErrors.errors).forEach(key => {
const messages = validationErrors.errors[key];
this.saveFailedMessages.push(...messages);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ export class SaveFailedPopupComponent implements OnInit {

@Input() errorMessages: string[];

constructor() {}
ngOnInit() {}

trySaveAgain(): void {
Expand Down
22 changes: 8 additions & 14 deletions AdminWebsite/AdminWebsite/Controllers/HearingsController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ public class HearingsController : ControllerBase
private readonly IFeatureToggles _featureToggles;
private readonly ILogger<HearingsController> _logger;
private readonly IUserIdentity _userIdentity;
private const int StartingSoonMinutesThreshold = 30;

/// <summary>
/// Instantiates the controller
Expand Down Expand Up @@ -207,7 +206,8 @@ public async Task<IActionResult> CloneHearing(Guid hearingId, MultiHearingReques

var groupedHearings = await _bookingsApiClient.GetHearingsByGroupIdAsync(hearingId);

var conferenceStatusToGet = groupedHearings.Where(x => x.Participants?.Any(x => x.HearingRoleName == RoleNames.Judge) ?? false);
var conferenceStatusToGet = groupedHearings.Where(x => x.Participants?
.Exists(x => x.HearingRoleName == RoleNames.Judge) ?? false);
var tasks = conferenceStatusToGet.Select(x => GetHearingConferenceStatus(x.Id)).ToList();
await Task.WhenAll(tasks);

Expand Down Expand Up @@ -399,7 +399,7 @@ private async Task UpdateParticipantsV2(Guid hearingId, EditHearingRequest reque

private static List<Guid> GetRemovedParticipantIds(EditHearingRequest request, HearingDetailsResponse originalHearing)
{
return originalHearing.Participants.Where(p => request.Participants.All(rp => rp.Id != p.Id))
return originalHearing.Participants.Where(p => request.Participants.TrueForAll(rp => rp.Id != p.Id))
.Select(x => x.Id).ToList();
}

Expand All @@ -420,11 +420,11 @@ private static List<LinkedParticipantRequest> ExtractLinkedParticipants(
for (int i = 0; i < participantsWithLinks.Count; i++)
{
var participantWithLinks = participantsWithLinks[i];
var linkedParticipantRequest = new LinkedParticipantRequest()
var linkedParticipantRequest = new LinkedParticipantRequest
{
LinkedParticipantContactEmail = participantWithLinks.LinkedParticipants[0].LinkedParticipantContactEmail,
ParticipantContactEmail = participantWithLinks.LinkedParticipants[0].ParticipantContactEmail ?? participantWithLinks.ContactEmail,
Type = (Contracts.Enums.LinkedParticipantType) participantWithLinks.LinkedParticipants[0].Type
Type = participantWithLinks.LinkedParticipants[0].Type
};

// If the participant link is not new and already existed, then the ParticipantContactEmail will be null. We find it here and populate it.
Expand Down Expand Up @@ -460,7 +460,7 @@ private static void ExtractExistingParticipants(
EditParticipantRequest participant,
List<UpdateParticipantRequest> existingParticipants)
{
var existingParticipant = originalHearing.Participants.FirstOrDefault(p => p.Id.Equals(participant.Id));
var existingParticipant = originalHearing.Participants.Find(p => p.Id.Equals(participant.Id));
if (existingParticipant == null || string.IsNullOrEmpty(existingParticipant.UserRoleName))
return;

Expand All @@ -473,20 +473,14 @@ private static void ExtractExistingParticipantsV2(
EditParticipantRequest participant,
List<UpdateParticipantRequestV2> existingParticipants)
{
var existingParticipant = originalHearing.Participants.FirstOrDefault(p => p.Id.Equals(participant.Id));
var existingParticipant = originalHearing.Participants.Find(p => p.Id.Equals(participant.Id));
if (existingParticipant == null || string.IsNullOrEmpty(existingParticipant.UserRoleName))
return;

var updateParticipantRequest = UpdateParticipantRequestMapper.MapToV2(participant);
existingParticipants.Add(updateParticipantRequest);
}

private static bool IsHearingStartingSoon(HearingDetailsResponse originalHearing)
{
var timeToCheckHearingAgainst = DateTime.UtcNow.AddMinutes(StartingSoonMinutesThreshold);
return originalHearing.ScheduledDateTime < timeToCheckHearingAgainst;
}

/// <summary>
/// Gets bookings hearing by Id.
/// </summary>
Expand Down Expand Up @@ -623,7 +617,7 @@ public async Task<IActionResult> UpdateBookingStatus(Guid hearingId, UpdateBooki
try
{
var hearing = await _bookingsApiClient.GetHearingDetailsByIdAsync(hearingId);
var judgeExists = hearing?.Participants?.Any(p => p.HearingRoleName == RoleNames.Judge) ?? false;
var judgeExists = hearing?.Participants?.Exists(p => p.HearingRoleName == RoleNames.Judge) ?? false;
if (!judgeExists && updateBookingStatusRequest.Status == BookingsApi.Contract.V1.Requests.Enums.UpdateBookingStatus.Created)
return BadRequest("This hearing has no judge");

Expand Down

0 comments on commit 94cd5e8

Please sign in to comment.