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

fix(dal): UnitInValueService добавлены include для получение данных с Value, чтобы проверять не только по id но и непосредственно по значению

Browse Source
This commit is contained in:
Mikhail Kuznetsov
2025-12-09 17:53:54 +10:00
parent d19aa77ec4
commit 2f07ccd67c
3 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PARR.DAL/DomainServices/Implementations/ShortcodesService.cs
View File

@@ -78,7 +78,7 @@ namespace PARR.DAL.DomainServices.Implementations
// 3. %СВЯЗИ% — отдельная обработка
if (shortcodesInMask.Any(m => string.Equals(m.Value, "%СВЯЗИ%", StringComparison.OrdinalIgnoreCase)))
{
var relatedUnitNames = await unitFilterService.GetRelatedUnitNamesAsync(jobId, unitId);//GetRelatedUnitNamesAsync(job, unit);
var relatedUnitNames = await unitFilterService.GetRelatedUnitNamesAsync(jobId, unitId);
var linksText = string.Join("\n", relatedUnitNames);
resultName = Regex.Replace(resultName, "%СВЯЗИ%", linksText, RegexOptions.IgnoreCase);
}

9
PARR.DAL/DomainServices/Implementations/UnitFilterService.cs
View File

@@ -1,6 +1,5 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using PARR.DAL.Context;
using PARR.DAL.Contracts;
using PARR.DAL.DomainServices.Interfaces;
using PARR.DAL.Models.Job;
@@ -154,19 +153,11 @@ namespace PARR.DAL.DomainServices.Implementations
continue;
}
// --- НОВАЯ ЛОГИКА: Используем новые сервисы ---
List<UnitInUnit> relevantLinks;
if (rf.IsParent)
{
// u - родитель, его ребёнок - unitId
relevantLinks = await unitInUnitService.GetByChildIdAsync(unitId);
}
else
{
// u - ребёнок, его родитель - unitId
relevantLinks = await unitInUnitService.GetByParentIdAsync(unitId);
}
logger.LogDebug("Найдено {Count} связей через UnitInUnitService.", relevantLinks.Count);

6
PARR.DAL/Services/Implementations/Unit/UnitInValueService.cs
View File

@@ -22,14 +22,16 @@ namespace PARR.DAL.Services.Implementations.Unit
public async Task<List<UnitInValue>> GetByUnitIdAsync(Guid unitId)
{
return await dataContext.UnitInValues
return await dataContext.UnitInValues.AsNoTracking()
.Include(t => t.Value)
.Where(uv => uv.UnitId == unitId)
.ToListAsync();
}
public async Task<List<UnitInValue>> GetByUnitIdsAsync(IEnumerable<Guid> unitIds)
{
return await dataContext.UnitInValues
return await dataContext.UnitInValues.AsNoTracking()
.Include(t=>t.Value)
.Where(uv => unitIds.Contains(uv.UnitId))
.ToListAsync();
}