mikhail/parr_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(api): в UnitWithAttributesResponse добавлены родительские и дочерние ЭК

Browse Source
This commit is contained in:
Mikhail Trubnikov
2025-08-27 10:43:33 +10:00
parent b288888d7a
commit c9159f6546
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PARR.API/Contracts/V1/Responses/UnitBaseResponse.cs
View File

@@ -23,6 +23,10 @@
public DateTimeOffset? LastLogon { get; set; } public DateTimeOffset? LastLogon { get; set; }
public List<AttributeResponse>? Attributes { get; set; } public List<AttributeResponse>? Attributes { get; set; }
public List<UnitBaseResponse>? Parents { get; set; }
public List<UnitBaseResponse>? Childrens { get; set; }
} }
} }

6
PARR.API/Controllers/V1/UnitController.cs
View File

@@ -53,7 +53,9 @@ namespace PARR.API.Controllers.V1
.Include(t => t.UnitValues) .Include(t => t.UnitValues)
.ThenInclude(uv => uv.Value) .ThenInclude(uv => uv.Value)
.Include(tf => tf.UnitValues) .Include(tf => tf.UnitValues)
.ThenInclude(uv => uv.Field); .ThenInclude(uv => uv.Field)
.Include(p => p.ParentUnits).ThenInclude(t=>t.ParentUnit)
.Include(c => c.ChildUnits).ThenInclude(t=>t.ChildUnit);
var units = await unitService.GetPage(query, paginationFilter).ToListAsync(); var units = await unitService.GetPage(query, paginationFilter).ToListAsync();
@@ -80,6 +82,8 @@ namespace PARR.API.Controllers.V1
.ThenInclude(uv => uv.Value) .ThenInclude(uv => uv.Value)
.Include(tf => tf.UnitValues) .Include(tf => tf.UnitValues)
.ThenInclude(uv => uv.Field) .ThenInclude(uv => uv.Field)
.Include(p => p.ParentUnits).ThenInclude(t => t.ParentUnit)
.Include(c => c.ChildUnits).ThenInclude(t => t.ChildUnit)
.FirstOrDefaultAsync(t => t.Id == id); .FirstOrDefaultAsync(t => t.Id == id);
if (unit == null) if (unit == null)

4
PARR.API/MappingProfiles/DomainToResponseProfile.cs
View File

@@ -119,7 +119,9 @@ namespace PARR.API.MappingProfiles
.ForMember(d => d.Name, o => o.MapFrom(s => s.Name)); .ForMember(d => d.Name, o => o.MapFrom(s => s.Name));
CreateMap<Unit, UnitWithAttributesResponse>() CreateMap<Unit, UnitWithAttributesResponse>()
.ForMember(d => d.Attributes, o => o.MapFrom(s => s.UnitValues!.OrderBy(s => (string.IsNullOrEmpty(s.Field!.DisplayName)) ? s.Field!.AihitName : s.Field!.DisplayName))); .ForMember(d => d.Attributes, o => o.MapFrom(s => s.UnitValues!.OrderBy(s => (string.IsNullOrEmpty(s.Field!.DisplayName)) ? s.Field!.AihitName : s.Field!.DisplayName)))
.ForMember(d => d.Childrens, o => o.MapFrom(s => s.ChildUnits.Select(t => t.ChildUnit).OrderBy(t => t.Name)))
.ForMember(d => d.Parents, o => o.MapFrom(s => s.ParentUnits.Select(t => t.ParentUnit).OrderBy(t => t.Name)));
#endregion #endregion
#region WorkGroup #region WorkGroup