Fix data mapping

MarkBurt · Jul 4, 2022 · 67a775a · 67a775a
1 parent 4b01f78
commit 67a775a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/src/Zeus.Infrastructure/Configuration/Mappers/Profiles/MeterProfile.cs b/src/Zeus.Infrastructure/Configuration/Mappers/Profiles/MeterProfile.cs
@@ -10,6 +10,8 @@ internal sealed class MeterProfile : Profile
    {
       public MeterProfile()
       {
+         CreateProjection<Meter, MeterDto>();
+
          CreateProjection<Tuple<Meter, Device>, MeterDto>()
             .ForMember(dst => dst.DeviceId, opt => opt.MapFrom(src => src.Item1.DeviceId))
             .ForMember(dst => dst.Date, opt => opt.MapFrom(src => src.Item1.Date))

diff --git a/src/Zeus.Infrastructure/Configuration/Mappers/Profiles/RvdProfile.cs b/src/Zeus.Infrastructure/Configuration/Mappers/Profiles/RvdProfile.cs
@@ -10,6 +10,8 @@ internal sealed class RvdProfile : Profile
    {
       public RvdProfile()
       {
+         CreateProjection<Rvd145, Rvd145Dto>();
+
          CreateProjection<Tuple<Rvd145, Device>, Rvd145Dto>()
             .ForMember(dst => dst.DeviceId, opt => opt.MapFrom(src => src.Item1.DeviceId))
             .ForMember(dst => dst.Date, opt => opt.MapFrom(src => src.Item1.Date))

diff --git a/src/Zeus.Infrastructure/Plc/MeterPlcProcessor.cs b/src/Zeus.Infrastructure/Plc/MeterPlcProcessor.cs
@@ -58,12 +58,12 @@ public async Task FillDataAsync(UnitOfWork uow, ExcelWorksheet sheet, DateOnly d
                return;
             }
 
-            MeterReportDto beforePlc = await GetBeforeDataAsync(uow.Meter.AsQueryable(), date, device, reportProcessor, mapper, cancellationToken);
+            MeterDto beforePlc = await GetBeforeDataAsync(uow.Meter.AsQueryable(), date, device, reportProcessor, mapper, cancellationToken);
             startColumn += FillSheet(sheet, device, beforePlc, currentPlcData, startColumn, reportProcessor);
          }
       }
 
-      private static int FillSheet(ExcelWorksheet sheet, DeviceReportDto device, MeterReportDto beforeMeter, IReadOnlyCollection<MeterReportDto> currentData, int startColumn, IReportProcessor reportProcessor)
+      private static int FillSheet(ExcelWorksheet sheet, DeviceReportDto device, MeterDto beforeMeter, IReadOnlyCollection<MeterReportDto> currentData, int startColumn, IReportProcessor reportProcessor)
       {
          float beforeVolumeSummary = beforeMeter.VolumeSummary;
          float beforeEnergySummary = beforeMeter.EnergySummary;
@@ -123,20 +123,20 @@ private static int FillSheet(ExcelWorksheet sheet, DeviceReportDto device, Meter
          return summaryColIndex;
       }
 
-      private static async Task<MeterReportDto> GetBeforeDataAsync(IMongoQueryable<Meter> plc, DateOnly date, DeviceReportDto device, IReportProcessor reportProcessor, IMapper mapper, CancellationToken cancellationToken)
+      private static async Task<MeterDto> GetBeforeDataAsync(IMongoQueryable<Meter> plc, DateOnly date, DeviceReportDto device, IReportProcessor reportProcessor, IMapper mapper, CancellationToken cancellationToken)
       {
          DateRange range = reportProcessor.GetRange(date);
 
-         MeterReportDto? before = await plc
+         MeterDto? before = await plc
             .Where(x =>
                x.DeviceId == device.Id &&
                x.Date < range.Start
             )
             .OrderByDescending(x => x.Date)
-            .ProjectTo<MeterReportDto>(mapper)
+            .ProjectTo<MeterDto>(mapper)
             .FirstOrDefaultAsync(cancellationToken);
 
-         if (before != null)
+         if (before is not null)
          {
             return before;
          }
@@ -147,7 +147,7 @@ private static async Task<MeterReportDto> GetBeforeDataAsync(IMongoQueryable<Met
                x.Date < range.End
             )
             .OrderBy(x => x.Date)
-            .ProjectTo<MeterReportDto>(mapper)
+            .ProjectTo<MeterDto>(mapper)
             .FirstAsync(cancellationToken);
 
          return before;