Fix the logic for selecting template (#212)

bcgov · Aug 6, 2024 · d64972a · d64972a
1 parent 9cf6853
commit d64972a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/...nfrastructure.WebAPI/Services/Processes/FundingReports/P615CreateMonthlyReportProvider.cs b/...nfrastructure.WebAPI/Services/Processes/FundingReports/P615CreateMonthlyReportProvider.cs
@@ -155,8 +155,9 @@ public async Task<JsonObject> RunProcessAsync(ID365AppUserService appUserService
 
         var currentUTC = DateTime.UtcNow;
         DateTime monthEndDate = new DateTime();
+        DateTime monthEndDateInPST = new DateTime();
+
 
-
         //batch create the monthly report
         if (batchFlag)
         {
@@ -174,6 +175,7 @@ public async Task<JsonObject> RunProcessAsync(ID365AppUserService appUserService
             // april report
             //Run at PST May 1 1AM -> Min 1 month -> April 1 1AM
             monthEndDate = currentUTC.ToLocalPST().AddMonths(-1);
+            monthEndDateInPST = new DateTime(monthEndDate.Year, monthEndDate.Month, DateTime.DaysInMonth(monthEndDate.Year, monthEndDate.Month), 23, 59, 00);
         }
         else
         {
@@ -189,9 +191,9 @@ public async Task<JsonObject> RunProcessAsync(ID365AppUserService appUserService
 
             //when funding is expired or terminated -> create the report for current month
             monthEndDate = currentUTC.ToLocalPST();
+            monthEndDateInPST = monthEndDate;
         }
 
-        var monthEndDateInPST = new DateTime(monthEndDate.Year, monthEndDate.Month, DateTime.DaysInMonth(monthEndDate.Year, monthEndDate.Month), 23, 59, 00);
         var monthEndDateInUTC = monthEndDateInPST.ToUTC();
 
         //Set the fiscal year and duedate

diff --git a/tools/config/update-configmap.sh b/tools/config/update-configmap.sh
@@ -278,7 +278,7 @@ D365_CONFIGURATION=$(jq << JSON
       "transactionCount": 250,
       "clientCode": "62",
       "cGIBatchNumber": "$D365_CGI_BATCH_NUMBER",
-      "oracleBatchNumber": "001",
+      "oracleBatchNumber": "0000000000001",
       "batchType": "AP",
       "delimiter": "\u001d",
       "transactionType": "BH",