fix: #tno-2269 - fixed reporting service (#1465)

- code to include aggregations on section was missing - moved converter to shared library
bcgov · Jan 26, 2024 · 9fba7b1 · 9fba7b1
1 parent 181ed64
commit 9fba7b1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/api/net/Areas/Helpers/ReportHelper.cs b/api/net/Areas/Helpers/ReportHelper.cs
@@ -11,6 +11,7 @@
 using TNO.TemplateEngine.Models;
 using TNO.TemplateEngine.Models.Charts;
 using TNO.TemplateEngine.Models.Reports;
+using TNO.TemplateEngine.Converters;
 
 namespace TNO.API.Helpers;
 

diff --git a/.../Areas/Helpers/SearchAggregationHelper.cs → ...ate/Converters/SearchAggregationHelper.cs b/.../Areas/Helpers/SearchAggregationHelper.cs → ...ate/Converters/SearchAggregationHelper.cs
@@ -1,11 +1,11 @@
-namespace TNO.API.Helpers;
+namespace TNO.TemplateEngine.Converters;
 
 /// <summary>
 /// Extension methods to convert between Elastic models and Report models
 /// </summary>
 public static class SearchAggregationHelper
 {
-    /// <summary>
+    /// <summary> 
     /// Convert from one model to another
     /// </summary>
     /// <param name="model"></param>

diff --git a/libs/net/template/TNO.TemplateEngine.csproj b/libs/net/template/TNO.TemplateEngine.csproj
@@ -17,6 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\elastic\TNO.Elastic.csproj" />
     <ProjectReference Include="..\core\TNO.Core.csproj" />
     <ProjectReference Include="..\models\TNO.Models.csproj" />
     <ProjectReference Include="..\entities\TNO.Entities.csproj" />

diff --git a/services/net/reporting/ReportingManager.cs b/services/net/reporting/ReportingManager.cs
@@ -18,6 +18,7 @@
 using TNO.TemplateEngine;
 using TNO.TemplateEngine.Models;
 using TNO.TemplateEngine.Models.Reports;
+using TNO.TemplateEngine.Converters;
 
 namespace TNO.Services.Reporting;
 
@@ -360,6 +361,14 @@ private async Task GenerateReportAsync(ReportRequestModel request, API.Areas.Ser
             {
                 var sortOrder = 0;
                 section.Content = this.ReportEngine.OrderBySectionField(results.Hits.Hits.Select(h => new ContentModel(h.Source, sortOrder++)).OrderBy(c => c.SortOrder).ToArray(), section.Settings.SortBy);
+                if (results.Aggregations != null)
+                {
+                    section.Aggregations = new Dictionary<string, TNO.TemplateEngine.Models.Reports.AggregationRootModel>();
+                    foreach (var aggregation in results.Aggregations)
+                    {
+                        section.Aggregations.Add(aggregation.Key, aggregation.Value.Convert());
+                    }
+                }
             }
             return section;
         });