From 44dceee7b857a4f08cd0aec8375150895b0294b6 Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Mon, 9 Jun 2025 16:22:03 +0300 Subject: [PATCH] fix null reference exception when no departure or arrival addresses are found --- .../Queries/SearchAll/SearchAllQueryHandler.cs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/Application/VehicleEnrollmentSearch/Queries/SearchAll/SearchAllQueryHandler.cs b/src/Application/VehicleEnrollmentSearch/Queries/SearchAll/SearchAllQueryHandler.cs index 02d83a3..7db5cfb 100644 --- a/src/Application/VehicleEnrollmentSearch/Queries/SearchAll/SearchAllQueryHandler.cs +++ b/src/Application/VehicleEnrollmentSearch/Queries/SearchAll/SearchAllQueryHandler.cs @@ -141,11 +141,18 @@ public class SearchAllQueryHandler : // Find paths var departureAddress = routeAddressDetails - .First(e => e.RouteAddress.Address.Guid == request.DepartureAddressGuid) - .RouteAddress.Address; + .FirstOrDefault( + e => e.RouteAddress.Address.Guid == request.DepartureAddressGuid) + ?.RouteAddress.Address; var arrivalAddress = routeAddressDetails - .First(e => e.RouteAddress.Address.Guid == request.ArrivalAddressGuid) - .RouteAddress.Address; + .FirstOrDefault( + e => e.RouteAddress.Address.Guid == request.ArrivalAddressGuid) + ?.RouteAddress.Address; + + if (departureAddress == null || arrivalAddress == null) + { + throw new NotFoundException(); + } var paths = new List>>();