MMI-3212 Fix Scheduler Service Issue (bcgov#2426)

Fosol · web-flow · commit b40b72d8158f · 2025-03-22T09:32:17.000-07:00
diff --git a/api/net/Areas/Services/Controllers/EventScheduleController.cs b/api/net/Areas/Services/Controllers/EventScheduleController.cs
@@ -6,8 +6,11 @@
 using Swashbuckle.AspNetCore.Annotations;
 using TNO.API.Areas.Services.Models.EventSchedule;
 using TNO.API.Models;
+using TNO.API.Models.SignalR;
 using TNO.Core.Exceptions;
 using TNO.DAL.Services;
+using TNO.Kafka;
+using TNO.Kafka.SignalR;
 using TNO.Keycloak;
 
 namespace TNO.API.Areas.Services.Controllers;
@@ -28,19 +31,31 @@ namespace TNO.API.Areas.Services.Controllers;
 public class EventScheduleController : ControllerBase
 {
     #region Variables
-    private readonly IEventScheduleService _serviceEventSchedule;
+    private readonly IKafkaMessenger _kafkaMessenger;
+    private readonly KafkaHubConfig _kafkaHubOptions;
+    private readonly IUserService _userService;
+    private readonly IReportService _reportService;
+    private readonly IEventScheduleService _eventScheduleService;
     private readonly JsonSerializerOptions _serializerOptions;
     #endregion
 
     #region Constructors
     /// <summary>
     /// Creates a new instance of a EventScheduleController object, initializes with specified parameters.
     /// </summary>
-    /// <param name="serviceEventSchedule"></param>
+    /// <param name="kafkaMessenger"></param>
+    /// <param name="kafkaConfig"></param>
+    /// <param name="userService"></param>
+    /// <param name="reportService"></param>
+    /// <param name="eventScheduleService"></param>
     /// <param name="serializerOptions"></param>
-    public EventScheduleController(IEventScheduleService serviceEventSchedule, IOptions<JsonSerializerOptions> serializerOptions)
+    public EventScheduleController(IKafkaMessenger kafkaMessenger, IOptions<KafkaHubConfig> kafkaConfig, IUserService userService, IReportService reportService, IEventScheduleService eventScheduleService, IOptions<JsonSerializerOptions> serializerOptions)
     {
-        _serviceEventSchedule = serviceEventSchedule;
+        _kafkaMessenger = kafkaMessenger;
+        _kafkaHubOptions = kafkaConfig.Value;
+        _userService = userService;
+        _reportService = reportService;
+        _eventScheduleService = eventScheduleService;
         _serializerOptions = serializerOptions.Value;
     }
     #endregion
@@ -56,7 +71,7 @@ public EventScheduleController(IEventScheduleService serviceEventSchedule, IOpti
     [SwaggerOperation(Tags = new[] { "EventSchedule" })]
     public IActionResult GetEventSchedules()
     {
-        var result = _serviceEventSchedule.FindAll();
+        var result = _eventScheduleService.FindAll();
         return new JsonResult(result.Select(ds => new EventScheduleModel(ds, _serializerOptions)));
     }
 
@@ -72,7 +87,7 @@ public IActionResult GetEventSchedules()
     [SwaggerOperation(Tags = new[] { "EventSchedule" })]
     public IActionResult FindById(int id)
     {
-        var result = _serviceEventSchedule.FindById(id);
+        var result = _eventScheduleService.FindById(id);
         if (result == null) return NoContent();
         return new JsonResult(new EventScheduleModel(result, _serializerOptions));
     }
@@ -88,11 +103,32 @@ public IActionResult FindById(int id)
     [ProducesResponseType(typeof(ErrorResponseModel), (int)HttpStatusCode.BadRequest)]
     [ProducesResponseType((int)HttpStatusCode.NoContent)]
     [SwaggerOperation(Tags = new[] { "EventSchedule" })]
-    public IActionResult Update([FromBody] EventScheduleModel model)
+    public async Task<IActionResult> UpdateAsync([FromBody] EventScheduleModel model)
     {
-        _serviceEventSchedule.UpdateAndSave(model.ToEntity(_serializerOptions));
+        _eventScheduleService.UpdateAndSave(model.ToEntity(_serializerOptions));
 
-        var result = _serviceEventSchedule.FindById(model.Id) ?? throw new NoContentException();
+        var result = _eventScheduleService.FindById(model.Id) ?? throw new NoContentException();
+        if (result.ReportId.HasValue)
+        {
+            var report = _reportService.FindById(result.ReportId.Value);
+            if (report?.OwnerId.HasValue == true)
+            {
+                var instance = _reportService.GetCurrentReportInstance(report.Id, report.OwnerId);
+                var user = _userService.FindById(report.OwnerId.Value) ?? throw new NotAuthorizedException();
+                await _kafkaMessenger.SendMessageAsync(
+                    _kafkaHubOptions.HubTopic,
+                    new KafkaHubMessage(HubEvent.SendUser, user.Username, new KafkaInvocationMessage(MessageTarget.ReportStatus, new[] { new ReportMessageModel()
+                    {
+                        Id = instance?.Id ?? 0,
+                        ReportId = report.Id,
+                        Status = instance?.Status ?? Entities.ReportStatus.Pending,
+                        Subject = instance?.Subject ?? report.Name,
+                        OwnerId = user.Id,
+                        Message = "event",
+                    } }))
+                );
+            }
+        }
         return new JsonResult(new EventScheduleModel(result, _serializerOptions));
     }
     #endregion
diff --git a/app/subscriber/src/components/layout/DefaultLayout.tsx b/app/subscriber/src/components/layout/DefaultLayout.tsx
@@ -68,12 +68,14 @@ export const DefaultLayout: React.FC<ILayoutProps> = ({ children, ...rest }) =>
   hub.useHubEffect(MessageTargetKey.ReportStatus, async (message: IReportMessageModel) => {
     // Report has been updated, go fetch latest.
     try {
-      if (message.status === ReportStatusName.Accepted)
-        toast.info(`Report "${message.subject}" has been generated and email requested.`);
-      else if (message.status === ReportStatusName.Completed)
-        toast.info(`Report "${message.subject}" has been sent out by email.`);
-      else if (message.status === ReportStatusName.Failed)
-        toast.error(`Report "${message.subject}" failed to be sent out by email.`);
+      if (message.message === 'status') {
+        if (message.status === ReportStatusName.Accepted)
+          toast.info(`Report "${message.subject}" has been generated and email requested.`);
+        else if (message.status === ReportStatusName.Completed)
+          toast.info(`Report "${message.subject}" has been sent out by email.`);
+        else if (message.status === ReportStatusName.Failed)
+          toast.error(`Report "${message.subject}" failed to be sent out by email.`);
+      }
     } catch {}
   });
 
diff --git a/app/subscriber/src/features/my-reports/MyReports.tsx b/app/subscriber/src/features/my-reports/MyReports.tsx
@@ -22,7 +22,7 @@ import { ReportPreview } from './ReportPreview';
 import * as styled from './styled';
 
 export const MyReports: React.FC = () => {
-  const [{ myReports, reportsFilter }, { findMyReports, deleteReport }] = useReports();
+  const [{ myReports, reportsFilter }, { findMyReports, deleteReport, getReport }] = useReports();
   const [{ getReportInstance }] = useReportInstances();
   const { toggle, isShowing } = useModal();
   const navigate = useNavigate();
@@ -53,6 +53,14 @@ export const MyReports: React.FC = () => {
               i.id === message.id ? { ...i, status: message.status, version: message.version } : i,
             ),
           });
+        } else if (message.message === 'event') {
+          const updateReport = await getReport(report.id, false);
+          if (updateReport) {
+            setReport({
+              ...report,
+              events: updateReport.events,
+            });
+          }
         } else {
           const instance = await getReportInstance(message.id, false);
           if (instance) {
diff --git a/app/subscriber/src/features/my-reports/edit/ReportEditPage.tsx b/app/subscriber/src/features/my-reports/edit/ReportEditPage.tsx
@@ -168,6 +168,14 @@ export const ReportEditPage = () => {
               i.id === message.id ? { ...i, status: message.status, version: message.version } : i,
             ),
           });
+        } else if (message.message === 'event') {
+          const updateReport = await getReport(report.id, false);
+          if (updateReport) {
+            setReport({
+              ...report,
+              events: updateReport.events,
+            });
+          }
         } else {
           const instance = await getReportInstance(message.id, true);
           if (instance) {
diff --git a/app/subscriber/src/store/hooks/subscriber/useReportSync.ts b/app/subscriber/src/store/hooks/subscriber/useReportSync.ts
@@ -3,12 +3,14 @@ import { useProfileStore } from 'store/slices';
 import { IReportMessageModel, MessageTargetKey, useApiSubscriberReportInstances } from 'tno-core';
 
 import { useApiHub } from '../signalr';
+import { useReports } from './useReports';
 
 /**
  * Hook provides a singleton way to ensure my reports are synced across tabs.
  */
 export const useReportSync = () => {
   const { getReportInstance } = useApiSubscriberReportInstances();
+  const [, { getReport }] = useReports();
   const hub = useApiHub();
   const [{ myReports }, { storeMyReports }] = useProfileStore();
 
@@ -38,6 +40,21 @@ export const useReportSync = () => {
               );
               return results;
             });
+          } else if (message.message === 'event') {
+            const updateReport = await getReport(report.id, false);
+            if (updateReport) {
+              storeMyReports((reports) => {
+                const results = reports.map((r) =>
+                  r.id === report.id
+                    ? {
+                        ...report,
+                        events: updateReport.events,
+                      }
+                    : r,
+                );
+                return results;
+              });
+            }
           } else {
             const response = await getReportInstance(message.id, true);
             if (response.status === 200 && response.data) {
@@ -67,7 +84,7 @@ export const useReportSync = () => {
         }
       } catch {}
     },
-    [getReportInstance, myReports, storeMyReports],
+    [getReportInstance, myReports, storeMyReports, getReport],
   );
 
   hub.useHubEffect(MessageTargetKey.ReportStatus, handleUpdateReportInstance);
diff --git a/libs/net/dal/Services/ContentService.cs b/libs/net/dal/Services/ContentService.cs
@@ -297,7 +297,7 @@ public override Content AddAndSave(Content entity)
     private Dictionary<string, object> GetChangedProperties(Microsoft.EntityFrameworkCore.ChangeTracking.PropertyValues currentValues,
     Microsoft.EntityFrameworkCore.ChangeTracking.PropertyValues? databaseValues)
     {
-        // Fields to ignore: system fields 
+        // Fields to ignore: system fields
         var ignoreFields = new HashSet<string> {
             nameof(Content.Versions),
             nameof(Content.UpdatedBy),
@@ -402,8 +402,8 @@ public override Content UpdateAndSave(Content entity)
                 var contentConflictEx = new ContentConflictException($"FIELDS:{changedFields}");
                 throw new DbUpdateConcurrencyException(contentConflictEx.Message, contentConflictEx);
             }
-            
-            throw ex;
+
+            throw;
         }
     }
 
diff --git a/libs/net/reports/TNO.Reports.csproj b/libs/net/reports/TNO.Reports.csproj
@@ -15,6 +15,7 @@
 
   <ItemGroup>
     <PackageReference Include="NPOI" Version="2.7.2" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.7" />
   </ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ public override Content AddAndSave(Content entity)`
`297`	`297`	`private Dictionary<string, object> GetChangedProperties(Microsoft.EntityFrameworkCore.ChangeTracking.PropertyValues currentValues,`
`298`	`298`	`Microsoft.EntityFrameworkCore.ChangeTracking.PropertyValues? databaseValues)`
`299`	`299`	`{`
`300`		`- // Fields to ignore: system fields`
	`300`	`+ // Fields to ignore: system fields`
`301`	`301`	`var ignoreFields = new HashSet<string> {`
`302`	`302`	`nameof(Content.Versions),`
`303`	`303`	`nameof(Content.UpdatedBy),`
`@@ -402,8 +402,8 @@ public override Content UpdateAndSave(Content entity)`
`402`	`402`	`var contentConflictEx = new ContentConflictException($"FIELDS:{changedFields}");`
`403`	`403`	`throw new DbUpdateConcurrencyException(contentConflictEx.Message, contentConflictEx);`
`404`	`404`	`}`
`405`		`-`
`406`		`- throw ex;`
	`405`	`+`
	`406`	`+ throw;`
`407`	`407`	`}`
`408`	`408`	`}`
`409`	`409`