From 6231f3523617b2135eebcc2d811968322c9a2ada Mon Sep 17 00:00:00 2001
From: Mikhail Kuznetsov <ivc_kuznetsovmv@dvgd.rzd>
Date: Wed, 24 Sep 2025 10:16:18 +1000
Subject: [PATCH] =?UTF-8?q?feat(api):=20=D0=B2=20JobUnitPreview=20=D0=B4?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BE=D0=B1?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D0=B0=20=D1=81=D0=B8=D1=82?=
 =?UTF-8?q?=D1=83=D0=B0=D1=86=D0=B8=D0=B8=20NoContent?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PARR.API/Controllers/V1/JobUnitPreviewController.cs | 5 +++++
 PARR.API/MappingProfiles/DomainToResponseProfile.cs | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/PARR.API/Controllers/V1/JobUnitPreviewController.cs b/PARR.API/Controllers/V1/JobUnitPreviewController.cs
index bd164fcf..d1ff51ef 100644
--- a/PARR.API/Controllers/V1/JobUnitPreviewController.cs
+++ b/PARR.API/Controllers/V1/JobUnitPreviewController.cs
@@ -12,6 +12,8 @@ using PARR.Constants;
 using PARR.DAL.DomainServices.Interfaces;
 using PARR.DAL.Models.Job;
 using PARR.DAL.Services.Interfaces.Unit;
+using static PARR.API.Contracts.V1.ApiRoutes;
+using Job = PARR.DAL.Models.Job.Job;
 
 namespace PARR.API.Controllers.V1
 {
@@ -68,6 +70,9 @@ namespace PARR.API.Controllers.V1
 
             var units = await query.ToListAsync();
 
+            if (!units.Any())
+                return NoContent();
+
             var unitResponse = mapper.Map<List<UnitBaseResponse>>(units);
 
             return Ok(new Response<List<UnitBaseResponse>>(unitResponse, true));
diff --git a/PARR.API/MappingProfiles/DomainToResponseProfile.cs b/PARR.API/MappingProfiles/DomainToResponseProfile.cs
index 45644069..a92b9fed 100644
--- a/PARR.API/MappingProfiles/DomainToResponseProfile.cs
+++ b/PARR.API/MappingProfiles/DomainToResponseProfile.cs
@@ -317,8 +317,8 @@ namespace PARR.API.MappingProfiles
 
             CreateMap<JobUnitFilter, UnitFilterResponse>()
                 .ForMember(d => d.UnitFilterMask, o => o.MapFrom(s => s.UnitFilter))
-                .ForMember(d => d.FieldFilters, o => o.MapFrom(s => s.FieldFilters.OrderBy(o => o.UnitField.AihitName)))
-                .ForMember(d => d.RelationshipFilters, o => o.MapFrom(s => s.RelationshipFilters.OrderBy(o => o.UnitField.AihitName)));
+                .ForMember(d => d.FieldFilters, o => o.MapFrom(s => s.FieldFilters.OrderBy(o => o.UnitField!.AihitName)))
+                .ForMember(d => d.RelationshipFilters, o => o.MapFrom(s => s.RelationshipFilters.OrderBy(o => o.UnitField!.AihitName)));
 
             CreateMap<JobFieldFilter, FieldResponse>();