Minor fixes

nhsconnect · Jun 24, 2024 · 94f370c · 94f370c
1 parent 998ac4c
commit 94f370c
Showing 1 changed file with 33 additions and 35 deletions.
diff --git a/modules/api/src/Service/ReportingService.cs b/modules/api/src/Service/ReportingService.cs
@@ -54,17 +54,13 @@ public async Task<Stream> ExportReport(ReportRequest reportRequest)
         return memoryStream;
     }
 
-    public async Task<Stream?> CreateInteractionReport(ReportCreationRequest reportCreationRequest)
+    public async Task<Stream> CreateInteractionReport(ReportCreationRequest reportCreationRequest)
     {
         var functionName = "reporting.get_transient_data";
         var parameters = new DynamicParameters();
         parameters.Add("_transient_report_id", reportCreationRequest.ReportId, DbType.String, ParameterDirection.Input);
         var response = await _dataService.ExecuteQueryFirstOrDefault<TransientData>(functionName, parameters);
-        if(response.Data != null)
-        {
-            return CreateReport(response.Data.ConvertJsonDataToDataTable(), reportCreationRequest.ReportName, reportCreationRequest.ReportFilter);
-        }
-        return null;
+        return CreateReport(response?.Data?.ConvertJsonDataToDataTable(), reportCreationRequest.ReportName, reportCreationRequest.ReportFilter);
     }
 
     public async Task RouteReportRequest(RouteReportRequest routeReportRequest)
@@ -124,8 +120,7 @@ public async Task<MemoryStream> ExportBySpineMessage(int spineMessageId, string
                 { "_spine_message_id", spineMessageId }
             };
         var result = await _dataService.ExecuteFunctionAndGetDataTable("application.get_spine_message_by_id", parameters);
-        var report = CreateReport(result);
-        return report;
+        return CreateReport(result);
     }
 
     public async Task<string> GetReport(string functionName)
@@ -149,47 +144,50 @@ public async Task<List<CapabilityReport>> GetCapabilityReports()
         return result;
     }
 
-    public MemoryStream CreateReport(DataTable result, string reportName = "", List<ReportFilterRequest>? reportFilterRequest = null)
+    public MemoryStream CreateReport(DataTable? result, string reportName = "", List<ReportFilterRequest>? reportFilterRequest = null)
     {
         try
         {
             var memoryStream = new MemoryStream();
-            reportFilterRequest = reportFilterRequest?.OrderBy(x => x.FilterValue).ToList();
+            if (result != null)
+            {                
+                reportFilterRequest = reportFilterRequest?.OrderBy(x => x.FilterValue).ToList();
 
-            using (var spreadsheetDocument = SpreadsheetDocument.Create(memoryStream, SpreadsheetDocumentType.Workbook))
-            {
-                var workbookPart = spreadsheetDocument.WorkbookPart ?? spreadsheetDocument.AddWorkbookPart();
-                workbookPart.Workbook = new Workbook();
+                using (var spreadsheetDocument = SpreadsheetDocument.Create(memoryStream, SpreadsheetDocumentType.Workbook))
+                {
+                    var workbookPart = spreadsheetDocument.WorkbookPart ?? spreadsheetDocument.AddWorkbookPart();
+                    workbookPart.Workbook = new Workbook();
 
-                var workbookStylesPart = workbookPart.AddNewPart<WorkbookStylesPart>();
-                workbookStylesPart.Stylesheet = StyleSheetBuilder.CreateStylesheet();
-                workbookStylesPart.Stylesheet.Save();
+                    var workbookStylesPart = workbookPart.AddNewPart<WorkbookStylesPart>();
+                    workbookStylesPart.Stylesheet = StyleSheetBuilder.CreateStylesheet();
+                    workbookStylesPart.Stylesheet.Save();
 
-                if (reportFilterRequest != null)
-                {
-                    for (var i = 0; i < reportFilterRequest.Count; i++)
+                    if (reportFilterRequest != null)
                     {
-                        var filteredList = result.AsEnumerable().Where(r => r.Field<string>(reportFilterRequest[i].FilterColumn) == reportFilterRequest[i].FilterValue);
-                        if (filteredList.Any())
+                        for (var i = 0; i < reportFilterRequest.Count; i++)
                         {
-                            CreateSheet(filteredList.CopyToDataTable(), reportName, spreadsheetDocument, i + 1, reportFilterRequest[i].FilterValue, reportFilterRequest[i].FilterTab);
-                            var toDelete = new List<DataRow>();
-                            toDelete.AddRange(filteredList.AsEnumerable());
-                            toDelete.ForEach(dr => result.Rows.Remove(dr));
+                            var filteredList = result.AsEnumerable().Where(r => r.Field<string>(reportFilterRequest[i].FilterColumn) == reportFilterRequest[i].FilterValue);
+                            if (filteredList.Any())
+                            {
+                                CreateSheet(filteredList.CopyToDataTable(), reportName, spreadsheetDocument, i + 1, reportFilterRequest[i].FilterValue, reportFilterRequest[i].FilterTab);
+                                var toDelete = new List<DataRow>();
+                                toDelete.AddRange(filteredList.AsEnumerable());
+                                toDelete.ForEach(dr => result.Rows.Remove(dr));
+                            }
                         }
+                        CreateSheet(result, reportName, spreadsheetDocument, reportFilterRequest.Count + 1);
                     }
-                    CreateSheet(result, reportName, spreadsheetDocument, reportFilterRequest.Count + 1);
-                }
-                else
-                {
-                    CreateSheet(result, reportName, spreadsheetDocument, 1);
+                    else
+                    {
+                        CreateSheet(result, reportName, spreadsheetDocument, 1);
+                    }
+
+                    spreadsheetDocument.WorkbookPart.Workbook.Save();
+                    spreadsheetDocument.Dispose();
                 }
 
-                spreadsheetDocument.WorkbookPart.Workbook.Save();
-                spreadsheetDocument.Dispose();
+                memoryStream.Seek(0, SeekOrigin.Begin);
             }
-
-            memoryStream.Seek(0, SeekOrigin.Begin);
             return memoryStream;
         }
         catch (Exception ex)