Dev

.github/workflows/docker-build-dev.yml

@@ -10,8 +10,8 @@ on:
       - '.gitignore'
       - 'database/**'
       - 'documentation/**'
-      - 'openshift/**'
-      - 'tests/**'
+      - '**/docs/**'
+      - '**/README*'
       - 'CODE_OF_CONDUCT.md'
       - 'COMPLIANCE.yaml'
       - 'CONTRIBUTING.md'

.github/workflows/docker-build-main.yml

@@ -10,8 +10,8 @@ on:
       - '.gitignore'
       - 'database/**'
       - 'documentation/**'
-      - 'openshift/**'
-      - 'tests/**'
+      - '**/docs/**'
+      - '**/README*'
       - 'CODE_OF_CONDUCT.md'
       - 'COMPLIANCE.yaml'
       - 'CONTRIBUTING.md'

.github/workflows/docker-build-test.yml

@@ -10,8 +10,8 @@ on:
       - '.gitignore'
       - 'database/**'
       - 'documentation/**'
-      - 'openshift/**'
-      - 'tests/**'
+      - '**/docs/**'
+      - '**/README*'
       - 'CODE_OF_CONDUCT.md'
       - 'COMPLIANCE.yaml'
       - 'CONTRIBUTING.md'

.github/workflows/pr-check-dev-branch.yml

@@ -1,4 +1,4 @@
-name: Dev - CI & Unit Tests
+name: Dev - Branch Protection - CI & Unit Tests
 
 permissions:
   contents: read

.github/workflows/pr-check-main-branch.yml

@@ -1,4 +1,4 @@
-name: Main - Branch Protection
+name: Main - Branch Protection - CI & Unit Tests
 permissions:
   contents: read
   pull-requests: write

README.md

@@ -14,9 +14,8 @@ The project is in a reliable state and major changes are unlikely to happen.
         ├── Unity.NginxData/    - Nginx HTTP server and reference files
         ├── Unity.RabbitMQ/     - RabbitMQ message broker configuration
         └── Unity.RedisSentinel/- Redis Sentinel high-availability setup
-    database/                   - Database configuration and scripts
-    documentation/              - Solution documentation and assets
-    openshift/                  - OpenShift deployment files and configs
+    database/                   - Database configuration scripts
+    documentation/              - Solution documentation
     COMPLIANCE.yaml             - BCGov PIA/STRA compliance status
     CONTRIBUTING.md             - How to contribute
     LICENSE                     - License

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application.Contracts/PaymentRequests/PaymentRequestDto.cs

@@ -4,12 +4,13 @@
 using Unity.Payments.PaymentTags;
 using Unity.Payments.Suppliers;
 using Volo.Abp.Application.Dtos;
+using Volo.Abp.MultiTenancy;
 
 namespace Unity.Payments.PaymentRequests
 {
 #pragma warning disable CS8618
     [Serializable]
-    public class PaymentRequestDto : AuditedEntityDto<Guid>
+    public class PaymentRequestDto : AuditedEntityDto<Guid>, IMultiTenant
     {
         public string InvoiceNumber { get; set; }
         public decimal Amount { get; set; }
@@ -46,6 +47,8 @@ public class PaymentRequestDto : AuditedEntityDto<Guid>
         public DateTime? FsbNotificationSentDate { get; set; }
         public string? FsbApNotified { get; set; }
 
+        public Guid? TenantId { get; set; }
+
         public static explicit operator PaymentRequestDto(CreatePaymentRequestDto v)
         {
             throw new NotImplementedException();

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/Integrations/RabbitMQ/ReconciliationConsumer.cs

@@ -4,31 +4,36 @@
 using System;
 using Unity.Payments.PaymentRequests;
 using Unity.Payments.Integrations.Cas;
+using Volo.Abp.MultiTenancy;
 
 namespace Unity.Payments.Integrations.RabbitMQ;
 
 public class ReconciliationConsumer(
             CasPaymentRequestCoordinator casPaymentRequestCoordinator,
-            InvoiceService invoiceService
+            InvoiceService invoiceService,
+            ICurrentTenant currentTenant
         ) : IQueueConsumer<ReconcilePaymentMessages>
 {
     public async Task ConsumeAsync(ReconcilePaymentMessages reconcilePaymentMessage)
     {
         if (reconcilePaymentMessage != null && !reconcilePaymentMessage.InvoiceNumber.IsNullOrEmpty() && reconcilePaymentMessage.TenantId != Guid.Empty)
-        {
-            // string invoiceNumber, string supplierNumber, string siteNumber)
-            // Go to CAS retrieve the status of the payment
-            CasPaymentSearchResult result = await invoiceService.GetCasPaymentAsync(
-                reconcilePaymentMessage.TenantId,   
-                reconcilePaymentMessage.InvoiceNumber,
-                reconcilePaymentMessage.SupplierNumber,
-                reconcilePaymentMessage.SiteNumber);
+        {            
 
-            if (result != null && result.InvoiceStatus != null && result.InvoiceStatus != "")
+            using (currentTenant.Change(reconcilePaymentMessage.TenantId))
             {
-                await casPaymentRequestCoordinator.UpdatePaymentRequestStatus(reconcilePaymentMessage.TenantId, reconcilePaymentMessage.PaymentRequestId, result);
-            }
+                // string invoiceNumber, string supplierNumber, string siteNumber)
+                // Go to CAS retrieve the status of the payment
+                CasPaymentSearchResult result = await invoiceService.GetCasPaymentAsync(
+                    reconcilePaymentMessage.TenantId,   
+                    reconcilePaymentMessage.InvoiceNumber,
+                    reconcilePaymentMessage.SupplierNumber,
+                    reconcilePaymentMessage.SiteNumber);
 
+                if (result != null && result.InvoiceStatus != null && result.InvoiceStatus != "")
+                {
+                    await casPaymentRequestCoordinator.UpdatePaymentRequestStatus(reconcilePaymentMessage.TenantId, reconcilePaymentMessage.PaymentRequestId, result);
+                }
+            }
         }
     }
 

applications/Unity.GrantManager/modules/Unity.Payments/src/Unity.Payments.Application/PaymentRequests/CasPaymentRequestCoordinator.cs

@@ -92,7 +92,7 @@ public async Task ManuallyAddPaymentRequestsToReconciliationQueue(List<PaymentRe
                     InvoiceNumber = paymentRequest.InvoiceNumber,
                     SupplierNumber = paymentRequest.SupplierNumber,
                     SiteNumber = paymentRequest.Site?.Number ?? string.Empty,
-                    TenantId = _currentTenant.Id!.Value
+                    TenantId = paymentRequest.TenantId ?? _currentTenant.Id!.Value
                 };
 
                 await _paymentQueueService.SendPaymentToReconciliationQueueAsync(reconcilePaymentMessage);

applications/Unity.GrantManager/modules/Unity.Theme.UX2/src/Unity.Theme.UX2/wwwroot/themes/ux2/table-utils.js

@@ -216,6 +216,9 @@ function initializeDataTable(options) {
         externalSearchId = 'search',
         disableColumnSelect = false,
         listColumnDefs,
+        onStateSaveParams,//External hooks for save/load/loaded
+        onStateLoadParams,
+        onStateLoaded,
     } = options;
 
     // Process columns and visibility
@@ -314,15 +317,29 @@ function initializeDataTable(options) {
         processing: true,
         stateSave: true,
         stateDuration: 0,
+        externalSearchInputId: `#${externalSearchId}`,
+        onStateSaveParams,
+        onStateLoadParams,
+        onStateLoaded,
         stateSaveParams: function (settings, data) {
             let externalSearch = $(settings.oInit.externalSearchInputId);
             if (externalSearch.length) data.externalSearch = externalSearch.val();
+
+            // Call custom stateSave hook if provided
+            if (typeof settings.oInit.onStateSaveParams === 'function') {
+                settings.oInit.onStateSaveParams(settings, data);
+            }
         },
         stateLoadParams: function (settings, data) {
             if (data.externalSearch) {
                 let externalSearch = $(settings.oInit.externalSearchInputId);
                 if (externalSearch.length) externalSearch.val(data.externalSearch);
             }
+
+            // Call custom stateLoad hook if provided
+            if (typeof settings.oInit.onStateLoadParams === 'function') {
+                settings.oInit.onStateLoadParams(settings, data);
+            }
         },
         stateLoaded: function (settings, data) {
             let dtApi = new $.fn.dataTable.Api(settings);
@@ -360,6 +377,11 @@ function initializeDataTable(options) {
                     }
                 }
             }
+
+            // Call custom loaded hook if provided
+            if (typeof settings.oInit.onStateLoaded === 'function') {
+                settings.oInit.onStateLoaded(dtApi, data);
+            }
         },
     });