Schema changes

nhsconnect · Jun 24, 2024 · f720629 · f720629
1 parent 023f168
commit f720629
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 18 deletions.
diff --git a/database/functions/R__reporting.get_transient_data.sql b/database/functions/R__reporting.get_transient_data.sql
@@ -2,28 +2,39 @@ drop function if exists reporting.get_transient_data;
 
 create function reporting.get_transient_data
 (
-	_transient_report_id varchar(100)
+	_transient_report_id text
 )
 returns table
 (
-	transient_id varchar(100), 
 	transient_data json,
-	transient_report_id varchar(100),
-	transient_report_name varchar(100)
+	transient_report_id text,
+	transient_report_name text
 )
 as $$
 begin	
 	return query
-	select
-		t.transient_id,
-		t.transient_data,
-		t.transient_report_id,
-		t.transient_report_name
-	from 
-		reporting.transient t
-	where 
-		t.transient_report_id = _transient_report_id
-		and entry_date - now() = 0;
+	select 
+		replace(substring(a.transient_data from 2 for length(a.transient_data)-2),'], [',',')::json as transient_data,
+		a.transient_report_id,
+		a.transient_report_name
+	from (
+		select
+			json_agg(t.transient_data)::text as transient_data,
+			t.transient_report_id,
+			t.transient_report_name
+		from 
+			reporting.transient t
+		where 
+			UPPER(t.transient_report_id) = UPPER(_transient_report_id)
+			and t.entry_date :: date = now() :: date
+		group by
+			t.transient_report_id,
+			t.transient_report_name
+		) a 
+	group by 
+		a.transient_data, 
+		a.transient_report_id, 
+		a.transient_report_name;
 end;
 $$ language plpgsql;
 
diff --git a/modules/api/src/DAL/Mapping/TransientDataMap.cs b/modules/api/src/DAL/Mapping/TransientDataMap.cs
@@ -7,7 +7,6 @@ public class TransientDataMap : EntityMap<TransientData>
 {
     public TransientDataMap()
     {
-        Map(p => p.Id).ToColumn("transient_id");
         Map(p => p.Data).ToColumn("transient_data");
         Map(p => p.ReportId).ToColumn("transient_report_id");
         Map(p => p.ReportName).ToColumn("transient_report_name");

diff --git a/modules/api/src/DTO/Response/Reporting/TransientData.cs b/modules/api/src/DTO/Response/Reporting/TransientData.cs
@@ -2,7 +2,6 @@
 
 public class TransientData
 {
-    public string Id { get; set; }
     public string Data { get; set; }
     public string ReportId { get; set; }
     public string ReportName { get; set; }

diff --git a/modules/api/src/Service/ReportingService.cs b/modules/api/src/Service/ReportingService.cs
@@ -59,8 +59,9 @@ public async Task<Stream> CreateInteractionReport(ReportCreationRequest reportCr
         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);
-        return CreateReport(response?.Data?.ConvertJsonDataToDataTable(), reportCreationRequest.ReportName, reportCreationRequest.ReportFilter);
+        var response = await _dataService.ExecuteQueryFirstOrDefault<TransientData>(functionName, parameters);        
+        var dataTable = response?.Data?.ConvertJsonDataToDataTable();
+        return CreateReport(dataTable, reportCreationRequest.ReportName, reportCreationRequest.ReportFilter);
     }
 
     public async Task RouteReportRequest(RouteReportRequest routeReportRequest)