Merge pull request #1811 from bcgov/revert-1807-master

KyleKayfish · web-flow · commit 19586c102786 · 2023-08-30T12:26:34.000-07:00
Revert "Report performance improvements"
diff --git a/ess/src/API/EMBC.ESS/Managers/Reports/ReportsManager.cs b/ess/src/API/EMBC.ESS/Managers/Reports/ReportsManager.cs
@@ -76,7 +76,7 @@ public async Task Handle(EvacueeReportRequested evt)
             evacueeQuery.EvacuatedFrom = communities.SingleOrDefault(c => c.Code == evacueeQuery.EvacuatedFrom)?.Name;
             evacueeQuery.EvacuatedTo = communities.SingleOrDefault(c => c.Code == evacueeQuery.EvacuatedTo)?.Name;
 
-            var csv = evacuees.ToCSV(evacueeQuery, "\"");
+            var csv = evacuees.ToCSV(evacueeQuery);
 
             var content = Encoding.UTF8.GetBytes(csv);
             var contentType = "text/csv";
@@ -87,7 +87,7 @@ public async Task Handle(EvacueeReportRequested evt)
                 ContentType = contentType
             };
             var cacheKey = ReportRequestKey(evt.ReportRequestId);
-            await cache.Set(cacheKey, report, TimeSpan.FromMinutes(10));
+            await cache.Set(cacheKey, report, TimeSpan.FromHours(1));
         }
 
         public async Task<ReportQueryResult> Handle(EvacueeReportQuery query)
@@ -147,7 +147,7 @@ public async Task Handle(SupportReportRequested evt)
                 ContentType = contentType
             };
             var cacheKey = ReportRequestKey(evt.ReportRequestId);
-            await cache.Set(cacheKey, report, TimeSpan.FromMinutes(10));
+            await cache.Set(cacheKey, report, TimeSpan.FromHours(1));
         }
 
         public async Task<ReportQueryResult> Handle(SupportReportQuery query)
diff --git a/ess/src/API/EMBC.ESS/Resources/Reports/ReportRepository.cs b/ess/src/API/EMBC.ESS/Resources/Reports/ReportRepository.cs
@@ -38,7 +38,7 @@ public async Task<EvacueeQueryResult> QueryEvacuee(ReportQuery query)
         public async Task<SupportQueryResult> QuerySupport(ReportQuery query)
         {
             var ct = new CancellationTokenSource().Token;
-            var files = (await QueryEvacuationFiles(readCtx, query, ct)).Concat(await QueryTasks(readCtx, query, ct)).ToList();
+            var files = (await QueryEvacuationFiles(readCtx, query, ct)).Concat(await QueryTasks(readCtx, query, ct));
 
             var results = await ParallelLoadSupportsAsync(readCtx, files, ct);
 
@@ -65,9 +65,9 @@ private static async Task<IEnumerable<era_evacuationfile>> QueryEvacuationFiles(
             if (query.StartDate.HasValue) filesQuery = filesQuery.Where(f => f.createdon >= query.StartDate.Value);
             if (query.EndDate.HasValue) filesQuery = filesQuery.Where(f => f.createdon <= query.EndDate.Value);
 
-            IEnumerable<era_evacuationfile> files = (await ((DataServiceQuery<era_evacuationfile>)filesQuery).GetAllPagesAsync(ct)).ToList();
-            if (!string.IsNullOrEmpty(query.TaskNumber)) files = files.Where(f => f.era_TaskId != null && f.era_TaskId.era_name.Equals(query.TaskNumber, StringComparison.OrdinalIgnoreCase));
-            if (!string.IsNullOrEmpty(query.EvacuatedTo)) files = files.Where(f => f.era_TaskId != null && f.era_TaskId._era_jurisdictionid_value == Guid.Parse(query.EvacuatedTo));
+            var files = (await ((DataServiceQuery<era_evacuationfile>)filesQuery).GetAllPagesAsync(ct)).ToArray();
+            if (!string.IsNullOrEmpty(query.TaskNumber)) files = files.Where(f => f.era_TaskId != null && f.era_TaskId.era_name.Equals(query.TaskNumber, StringComparison.OrdinalIgnoreCase)).ToArray();
+            if (!string.IsNullOrEmpty(query.EvacuatedTo)) files = files.Where(f => f.era_TaskId != null && f.era_TaskId._era_jurisdictionid_value == Guid.Parse(query.EvacuatedTo)).ToArray();
 
             return files;
         }
@@ -85,7 +85,7 @@ private static async Task<IEnumerable<era_evacuationfile>> QueryTasks(EssContext
             if (!string.IsNullOrEmpty(query.TaskNumber)) taskQuery = taskQuery.Where(f => f.era_name == query.TaskNumber);
             if (!string.IsNullOrEmpty(query.EvacuatedTo)) taskQuery = taskQuery.Where(f => f._era_jurisdictionid_value == Guid.Parse(query.EvacuatedTo));
 
-            var tasks = (await ((DataServiceQuery<era_task>)taskQuery).GetAllPagesAsync(ct)).ToList();
+            var tasks = (await ((DataServiceQuery<era_task>)taskQuery).GetAllPagesAsync(ct)).ToArray();
 
             await Parallel.ForEachAsync(tasks, ct, async (t, ct) =>
             {
@@ -123,7 +123,7 @@ private static async Task ParallelLoadEvacueeAsync(EssContext ctx, era_evacuatio
                 .Expand(m => m.era_Registrant)
                 .Where(m => m._era_evacuationfileid_value == file.era_evacuationfileid))
                 .GetAllPagesAsync(ct))
-                .ToList();
+                .ToArray();
 
             householdMembers.AsParallel().ForAll(m => m.era_EvacuationFileid = file);
             file.era_era_evacuationfile_era_householdmember_EvacuationFileid = new Collection<era_householdmember>(householdMembers);
@@ -151,15 +151,15 @@ private static async Task ParallelLoadSupportAsync(EssContext ctx, era_evacuatio
                 .Expand(s => s.era_GroupLodgingCityID)
                 .Where(s => s._era_evacuationfileid_value == file.era_evacuationfileid))
                 .GetAllPagesAsync(ct))
-                .ToList();
+                .ToArray();
 
             supports.AsParallel().ForAll(s => ctx.AttachTo(nameof(EssContext.era_evacueesupports), s));
 
             loadTasks.AddRange(supports.Select(s => ctx.LoadPropertyAsync(s, nameof(era_evacueesupport.era_era_householdmember_era_evacueesupport), ct)));
 
             await Task.WhenAll(loadTasks);
 
-            file.era_era_evacuationfile_era_evacueesupport_ESSFileId = new Collection<era_evacueesupport>(supports);
+            file.era_era_evacuationfile_era_evacueesupport_ESSFileId = new Collection<era_evacueesupport>(supports.ToArray());
             if (file.era_TaskId != null) file.era_TaskId.era_JurisdictionID = ctx.LookupJurisdictionByCode(file.era_TaskId._era_jurisdictionid_value?.ToString());
             supports.AsParallel().ForAll(s =>
             {
diff --git a/responders/src/UI/embc-responder/src/app/feature-components/reporting/reporting.component.ts b/responders/src/UI/embc-responder/src/app/feature-components/reporting/reporting.component.ts
@@ -38,7 +38,7 @@ export class ReportingComponent implements OnInit, OnDestroy {
     private alertService: AlertService,
     private locationService: LocationsService,
     private customValidation: CustomValidationService
-  ) { }
+  ) {}
 
   ngOnInit(): void {
     this.createReportingForm();
@@ -80,8 +80,8 @@ export class ReportingComponent implements OnInit, OnDestroy {
           switchMap((reportId) =>
             this.reportService
               .reportsGetEvacueeReport({ reportRequestId: reportId })
-              // try to get the report for 10 minutes
-              .pipe(retry({ delay: 10000, count: 60 }))
+              // try to get the report for 5 minutes
+              .pipe(retry({ delay: 6000, count: 50 }))
           )
         )
         .subscribe({
diff --git a/shared/src/EMBC.Utilities.Messaging/Grpc/Configuration.cs b/shared/src/EMBC.Utilities.Messaging/Grpc/Configuration.cs
@@ -27,15 +27,11 @@ namespace EMBC.Utilities.Messaging.Grpc
 {
     public static class Configuration
     {
-        private static readonly int maximumMessageSize = 15 * 1024 * 1024; // 15MB
-
         public static void Configure(ConfigurationServices configurationServices, MessagingOptions options)
         {
             configurationServices.Services.AddGrpc(opts =>
             {
                 opts.EnableDetailedErrors = configurationServices.Environment.IsDevelopment();
-                opts.MaxReceiveMessageSize = maximumMessageSize;
-                opts.MaxSendMessageSize = maximumMessageSize;
             });
             if (options.Mode == MessagingMode.Server || options.Mode == MessagingMode.Both)
             {
@@ -144,9 +140,6 @@ public static void Configure(ConfigurationServices configurationServices, Messag
                     return handler;
                 }).ConfigureChannel(opts =>
                 {
-                    opts.MaxReceiveMessageSize = maximumMessageSize;
-                    opts.MaxSendMessageSize = maximumMessageSize;
-
                     if (options.Url.Scheme == "dns")
                     {
                         opts.Credentials = ChannelCredentials.SecureSsl;
diff --git a/shared/src/EMBC.Utilities/Csv/CsvConverter.cs b/shared/src/EMBC.Utilities/Csv/CsvConverter.cs
@@ -35,16 +35,11 @@ private static void CreateRows<T>(IEnumerable<T> list, TextWriter sw, string quo
             }
         }
 
-        private static string Quote(object value, string quoteIdentifier) =>
-            $"{quoteIdentifier}{Escape(value ?? string.Empty, quoteIdentifier)}{quoteIdentifier}";
-
-        private static string Escape(object value, string quoteIdentifier) =>
-            (quoteIdentifier switch
-            {
-                "\"" => value.ToString().Replace("\"", "\"\""),
-                "'" => value.ToString().Replace("'", "''"),
-                _ => value.ToString()
-            }).Replace("\r", string.Empty).Replace("\n", string.Empty);
+        private static string Quote(object value, string quoteIdentifier)
+        {
+            if (value == null) return string.Empty;
+            return quoteIdentifier + value + quoteIdentifier;
+        }
 
         public static void CreateCSV<T>(this IEnumerable<T> list, string filePath)
         {

Original file line number	Diff line number	Diff line change
`@@ -27,15 +27,11 @@ namespace EMBC.Utilities.Messaging.Grpc`
`27`	`27`	`{`
`28`	`28`	`public static class Configuration`
`29`	`29`	`{`
`30`		`- private static readonly int maximumMessageSize = 15 * 1024 * 1024; // 15MB`
`31`		`-`
`32`	`30`	`public static void Configure(ConfigurationServices configurationServices, MessagingOptions options)`
`33`	`31`	`{`
`34`	`32`	`configurationServices.Services.AddGrpc(opts =>`
`35`	`33`	`{`
`36`	`34`	`opts.EnableDetailedErrors = configurationServices.Environment.IsDevelopment();`
`37`		`- opts.MaxReceiveMessageSize = maximumMessageSize;`
`38`		`- opts.MaxSendMessageSize = maximumMessageSize;`
`39`	`35`	`});`
`40`	`36`	`if (options.Mode == MessagingMode.Server \|\| options.Mode == MessagingMode.Both)`
`41`	`37`	`{`
`@@ -144,9 +140,6 @@ public static void Configure(ConfigurationServices configurationServices, Messag`
`144`	`140`	`return handler;`
`145`	`141`	`}).ConfigureChannel(opts =>`
`146`	`142`	`{`
`147`		`- opts.MaxReceiveMessageSize = maximumMessageSize;`
`148`		`- opts.MaxSendMessageSize = maximumMessageSize;`
`149`		`-`
`150`	`143`	`if (options.Url.Scheme == "dns")`
`151`	`144`	`{`
`152`	`145`	`opts.Credentials = ChannelCredentials.SecureSsl;`