nit

AsbCloudInfrastructure/Services/DailyReport/DailyReportService.cs

@@ -37,37 +37,29 @@ namespace AsbCloudInfrastructure.Services.DailyReport
                 return null;
             var query = db.DailyReports.Where(r => r.IdWell == idWell);
 
+            DateTimeOffset ExtractDate(DateTime dateTime)
+            {
+                var dateTimeOffset = dateTime.ToUtcDateTimeOffset(well!.Timezone.Hours);
+                var date = new DateTimeOffset(dateTimeOffset.Year, dateTimeOffset.Month, dateTimeOffset.Day, 0,0,0,TimeSpan.Zero);
+                return date;
+            }
+
             if (begin is not null)
             {
-                DateTimeOffset beginUTC = begin.Value
+                var beginUTC = ExtractDate(begin.Value);
-                    .AddHours(5)
-                    .ToUtcDateTimeOffset(well.Timezone.Hours);
                 query = query.Where(d => d.StartDate >= beginUTC);
             }
 
             if (end is not null)
             {
-                DateTimeOffset endUTC = end.Value
+                var endUTC = ExtractDate(end.Value);
-                    .AddHours(5)
-                    .ToUtcDateTimeOffset(well.Timezone.Hours);
                 query = query.Where(d => d.StartDate <= endUTC);
             }
 
             var entities = await query
+                .OrderBy(e => e.StartDate)
                 .ToListAsync(token);
             return entities.Select(r => Convert(r));
-            //var query = db.DailyReports.Where(r => r.IdWell == idWell);
-
-            //if (begin is not null)
-            //    query = query.Where(d => d.StartDate >= begin.Value.Date);
-
-            //if (end is not null)
-            //    query = query.Where(d => d.StartDate <= end.Value.Date);
-
-            //var entities = await query
-            //    .ToListAsync(token);
-
-            //return entities.Select(r => Convert(r));
         }
 
         public async Task<DailyReportDto> GetOrGenerateAsync(int idWell, DateTime date, CancellationToken token)