From af607f6079def0bb91ea6626000957a9bfce2dc2 Mon Sep 17 00:00:00 2001 From: ivanszabo Date: Tue, 4 Mar 2025 13:26:22 +0100 Subject: [PATCH] CheckPoint -y CheckListTemplateRow --- src/WorkFlowCheck.BL/Mappings/MapperProfile.cs | 3 ++- src/WorkFlowCheck.BL/Services/SyncService.cs | 9 ++++++--- src/WorkFlowCheck.Common/DTO/CheckPointDTO.cs | 9 +++++---- src/WorkFlowCheck.DL/Entities/CheckPoint.cs | 3 +++ 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/WorkFlowCheck.BL/Mappings/MapperProfile.cs b/src/WorkFlowCheck.BL/Mappings/MapperProfile.cs index 3b242e1..1f00a2e 100644 --- a/src/WorkFlowCheck.BL/Mappings/MapperProfile.cs +++ b/src/WorkFlowCheck.BL/Mappings/MapperProfile.cs @@ -22,9 +22,10 @@ namespace WorkFlowCheck.BL.Mappings CreateMap() .ForMember(dest => dest.CheckListTemplateRowDTO, opt => opt.MapFrom(src => src.CheckListTemplateRows)); CreateMap(); - CreateMap(); + CreateMap().ForMember(dest => dest.CheckListTemplateRowDTO, opt => opt.MapFrom(src => src.CheckListTemplateRows)); CreateMap(); CreateMap(); + CreateMap() .ForMember(dest => dest.CheckListRowDTO, opt => opt.MapFrom(src => src.CheckListRows)); } diff --git a/src/WorkFlowCheck.BL/Services/SyncService.cs b/src/WorkFlowCheck.BL/Services/SyncService.cs index 722c9a1..112b928 100644 --- a/src/WorkFlowCheck.BL/Services/SyncService.cs +++ b/src/WorkFlowCheck.BL/Services/SyncService.cs @@ -27,7 +27,10 @@ namespace WorkFlowCheck.BL.Services try { - var res = await _dbContext.CheckPoints.ToListAsync(); + var res = await _dbContext.CheckPoints + .Include(i => i.CheckListTemplateRows) + .AsNoTracking() + .ToListAsync(); if (res != null) { retVal = _mapper.Map>(res); @@ -89,7 +92,7 @@ namespace WorkFlowCheck.BL.Services if (res != null) { retVal = _mapper.Map>(res); - + } } catch (Exception ex) @@ -99,6 +102,6 @@ namespace WorkFlowCheck.BL.Services return retVal; } - + } } diff --git a/src/WorkFlowCheck.Common/DTO/CheckPointDTO.cs b/src/WorkFlowCheck.Common/DTO/CheckPointDTO.cs index 701c23b..df65798 100644 --- a/src/WorkFlowCheck.Common/DTO/CheckPointDTO.cs +++ b/src/WorkFlowCheck.Common/DTO/CheckPointDTO.cs @@ -1,10 +1,11 @@  namespace WorkFlowCheck.Common.DTO { - public class CheckPointDTO + public class CheckPointDTO { - public int Id { get; set; } - public string ShortName { get; set; } - public string Code { get; set; } + public int Id { get; set; } + public string ShortName { get; set; } + public string Code { get; set; } + public List CheckListTemplateRowDTO { get; set; } = new List(); } } diff --git a/src/WorkFlowCheck.DL/Entities/CheckPoint.cs b/src/WorkFlowCheck.DL/Entities/CheckPoint.cs index 9e1d358..0f8d255 100644 --- a/src/WorkFlowCheck.DL/Entities/CheckPoint.cs +++ b/src/WorkFlowCheck.DL/Entities/CheckPoint.cs @@ -17,5 +17,8 @@ namespace WorkFlowCheck.DL.Entities public string LastModBy { get; set; } = null!; public DateTime CreatedAt { get; set; } public string CreatedBy { get; set; } = null!; + + public virtual ICollection CheckListTemplateRows { get; set; } = new List(); + } }