Merge pull request #366 from bcgov/CCFRI5928-CMS-Technical-Segregate-Payments-Table

Refactor the fetchXMLs (in Payment Web APIs)

Author: Prashanthi-Sivanarayana

OFM.Infrastructure.WebAPI/Services/Processes/Payments/P500SendPaymentRequestProvider.cs

@@ -136,6 +136,7 @@ public string RequestPaymentLineUri
                     <attribute name="ofm_revised_effective_date" />
                         <order attribute="ofm_name" descending="false" />
                          <filter type="and">
+                    	<condition attribute="owningbusinessunitname" operator="like" value="%OFM%" />
                         <condition attribute="statuscode" operator="eq" value="{(int)ofm_payment_StatusCode.ApprovedforPayment}" />
                         <condition attribute="ofm_supplierid" operator="not-null" />
                         <condition attribute="ofm_siteid" operator="not-null" />
@@ -167,7 +168,7 @@ public string RequestPaymentLineUri
             // ofm_payments?$select=ofm_paymentid,_ofm_organization_value,ofm_name,createdon,ofm_amount,ofm_description,ofm_effective_date,_ofm_fiscal_year_value,ofm_revised_invoice_received_date,ofm_revised_invoice_date,ofm_revised_effective_date,_ofm_funding_value,ofm_invoice_line_number,_owningbusinessunit_value,ofm_payment_type,ofm_remittance_message,statuscode,ofm_invoice_number,_ofm_application_value,ofm_siteid,ofm_payment_method,ofm_supplierid,ofm_invoice_received_date,ofm_invoice_date&$expand=ofm_fiscal_year($select=ofm_financial_year),ofm_application($select=ofm_application),ofm_facility($select=accountnumber,name),ofm_funding($select=_ofm_cohortid_value)&$filter=(statuscode eq {(int)ofm_payment_StatusCode.ApprovedforPayment} and ofm_supplierid ne null and ofm_siteid ne null and ofm_payment_method ne null and ofm_amount ne null and (ofm_invoice_date eq '{localDateOnlyPST}' or ofm_revised_invoice_date eq '{localDateOnlyPST}')) and (ofm_application/ofm_applicationid ne null)and (ofm_funding/ofm_fundingid ne null)&$orderby=ofm_name asc
             // """;
             var requestUri = $"""
-                         ofm_payments?$select=ofm_paymentid,_ofm_organization_value,ofm_name,createdon,ofm_amount,ofm_description,ofm_effective_date,_ofm_fiscal_year_value,ofm_revised_invoice_received_date,ofm_revised_invoice_date,ofm_revised_effective_date,_ofm_funding_value,ofm_invoice_line_number,_owningbusinessunit_value,ofm_payment_type,ofm_remittance_message,statuscode,ofm_invoice_number,_ofm_application_value,ofm_siteid,ofm_payment_method,ofm_supplierid,ofm_invoice_received_date,ofm_invoice_date&$expand=ofm_fiscal_year($select=ofm_financial_year),ofm_application($select=ofm_application),ofm_facility($select=accountnumber,name),ofm_funding($select=_ofm_cohortid_value)&$filter=(statuscode eq {(int)ofm_payment_StatusCode.ApprovedforPayment} and ofm_supplierid ne null and ofm_siteid ne null and ofm_payment_method ne null and ofm_amount ne null and (ofm_invoice_date eq '{localDateOnlyPST}' or ofm_revised_invoice_date eq '{localDateOnlyPST}')) and (ofm_application/ofm_applicationid ne null)and (ofm_funding/ofm_fundingid ne null)&$orderby=ofm_name asc
+                         ofm_payments?$select=ofm_paymentid,_ofm_organization_value,ofm_name,createdon,ofm_amount,ofm_description,ofm_effective_date,_ofm_fiscal_year_value,ofm_revised_invoice_received_date,ofm_revised_invoice_date,ofm_revised_effective_date,_ofm_funding_value,ofm_invoice_line_number,_owningbusinessunit_value,ofm_payment_type,ofm_remittance_message,statuscode,ofm_invoice_number,_ofm_application_value,ofm_siteid,ofm_payment_method,ofm_supplierid,ofm_invoice_received_date,ofm_invoice_date&$expand=ofm_fiscal_year($select=ofm_financial_year),ofm_application($select=ofm_application),ofm_facility($select=accountnumber,name),ofm_funding($select=_ofm_cohortid_value)&$filter=(contains(owningbusinessunitname, 'OFM') and statuscode eq {(int)ofm_payment_StatusCode.ApprovedforPayment} and ofm_supplierid ne null and ofm_siteid ne null and ofm_payment_method ne null and ofm_amount ne null and (ofm_invoice_date eq '{localDateOnlyPST}' or ofm_revised_invoice_date eq '{localDateOnlyPST}')) and (ofm_application/ofm_applicationid ne null)and (ofm_funding/ofm_fundingid ne null)&$orderby=ofm_name asc
                          """;
 
             return requestUri;

OFM.Infrastructure.WebAPI/Services/Processes/Payments/P505GeneratePaymentLinesProvider.cs

@@ -61,6 +61,7 @@ public string AllPaymentsByApplicationIdRequestUri
                         <attribute name="statecode" />
                         <order attribute="ofm_invoice_line_number" descending="true" />
                         <filter type="and">
+                          <condition attribute="owningbusinessunitname" operator="like" value="%OFM%" />
                           <condition attribute="ofm_application" operator="eq" value="00000000-0000-0000-0000-000000000000" />
                         </filter>
                         <link-entity name="ofm_funding" from="ofm_fundingid" to="ofm_funding" link-type="inner" alias="Funding">
@@ -80,7 +81,7 @@ public string AllPaymentsByApplicationIdRequestUri
                     """;
 
                 var requestUri = $"""
-                         ofm_payments?$select=ofm_paymentid,ofm_name,createdon,statuscode,_ofm_funding_value,ofm_payment_type,ofm_effective_date,ofm_amount,_ofm_application_value,ofm_invoice_line_number,ofm_invoice_received_date,ofm_payment_manual_review,_ofm_regardingid_value,ofm_remittance_message,ofm_revised_effective_date,ofm_revised_invoice_date,ofm_revised_invoice_received_date,_ofm_facility_value,_ofm_fiscal_year_value,ofm_invoice_date,ofm_invoice_number,statecode&$expand=ofm_funding($select=ofm_end_date,ofm_fundingid,ofm_monthly_province_base_funding_y1,ofm_start_date,ofm_version_number),ofm_application($select=ofm_application,ofm_applicationid,statuscode)&$filter=(_ofm_application_value eq '{_processParams!.Application!.applicationId}') and (ofm_funding/ofm_fundingid ne null) and (ofm_application/ofm_applicationid ne null)&$orderby=ofm_invoice_line_number desc
+                         ofm_payments?$select=ofm_paymentid,ofm_name,createdon,statuscode,_ofm_funding_value,ofm_payment_type,ofm_effective_date,ofm_amount,_ofm_application_value,ofm_invoice_line_number,ofm_invoice_received_date,ofm_payment_manual_review,_ofm_regardingid_value,ofm_remittance_message,ofm_revised_effective_date,ofm_revised_invoice_date,ofm_revised_invoice_received_date,_ofm_facility_value,_ofm_fiscal_year_value,ofm_invoice_date,ofm_invoice_number,statecode&$expand=ofm_funding($select=ofm_end_date,ofm_fundingid,ofm_monthly_province_base_funding_y1,ofm_start_date,ofm_version_number),ofm_application($select=ofm_application,ofm_applicationid,statuscode)&$filter=(contains(owningbusinessunitname, 'OFM') and _ofm_application_value eq '{_processParams!.Application!.applicationId}') and (ofm_funding/ofm_fundingid ne null) and (ofm_application/ofm_applicationid ne null)&$orderby=ofm_invoice_line_number desc
                          """;
 
                 return requestUri;

OFM.Infrastructure.WebAPI/Services/Processes/Payments/P510ReadPaymentResponseProvider.cs

@@ -96,8 +96,9 @@ public string PaymentInProcessUri
                         <attribute name="ofm_application" />
                         <order attribute="ofm_name" descending="false" />
                      <filter type="and">
-                    <condition attribute="statuscode" operator="eq" value="{(int)ofm_payment_StatusCode.ProcessingPayment}" />
-                      </filter>
+                       <condition attribute="owningbusinessunitname" operator="like" value="%OFM%" />
+                       <condition attribute="statuscode" operator="eq" value="{(int)ofm_payment_StatusCode.ProcessingPayment}" />
+                     </filter>
                      <link-entity name="ofm_fiscal_year" from="ofm_fiscal_yearid" to="ofm_fiscal_year" visible="false" link-type="outer" alias="ofm_fiscal_year">
                       <attribute name="ofm_financial_year" />                      
                     </link-entity>
@@ -112,7 +113,7 @@ public string PaymentInProcessUri
                     </fetch>
                     """;
             var requestUri = $"""
-                         ofm_payments?$select=ofm_paymentid,ofm_name,_ofm_fiscal_year_value,ofm_payment_type,statuscode,ofm_invoice_number,ofm_cas_response,_ofm_application_value&$expand=ofm_fiscal_year($select=ofm_financial_year),ofm_application($select=ofm_application,ofm_applicationid),ofm_facility($select=name)&$filter=(statuscode eq {(int)ofm_payment_StatusCode.ProcessingPayment}) and (ofm_application/ofm_applicationid ne null)&$orderby=ofm_name asc
+                         ofm_payments?$select=ofm_paymentid,ofm_name,_ofm_fiscal_year_value,ofm_payment_type,statuscode,ofm_invoice_number,ofm_cas_response,_ofm_application_value&$expand=ofm_fiscal_year($select=ofm_financial_year),ofm_application($select=ofm_application,ofm_applicationid),ofm_facility($select=name)&filter=(contains(owningbusinessunitname, 'OFM') and statuscode eq {(int)ofm_payment_StatusCode.ProcessingPayment}) and (ofm_application/ofm_applicationid ne null)&$orderby=ofm_name asc
                          """;
 
             return requestUri;

OFM.Infrastructure.WebAPI/Services/Processes/Payments/P515GenerateIrregularPaymentProvider.cs

@@ -176,14 +176,15 @@ public string AllPaymentsByApplicationIdRequestUri
                         <attribute name="ofm_revised_invoice_received_date" />
                         <order attribute="ofm_invoice_line_number" descending="true" />
                         <filter type="and">
+                          <condition attribute="owningbusinessunitname" operator="like" value="%OFM%" /> 
                           <condition attribute="ofm_application" operator="eq" value="00000000-0000-0000-0000-000000000000" />
                         </filter>
                       </entity>
                     </fetch>
                     """;
 
                 var requestUri = $"""
-                         ofm_payments?$select=ofm_paymentid,ofm_name,createdon,statuscode,_ofm_funding_value,ofm_payment_type,ofm_effective_date,ofm_amount,_ofm_application_value,ofm_invoice_line_number,ofm_cas_response,ofm_invoice_received_date,ofm_payment_manual_review,_ofm_regardingid_value,ofm_remittance_message,ofm_revised_effective_date,ofm_revised_invoice_date,ofm_revised_invoice_received_date&$filter=(_ofm_application_value eq '{_baseApplicationId}')&$orderby=ofm_invoice_line_number desc
+                         ofm_payments?$select=ofm_paymentid,ofm_name,createdon,statuscode,_ofm_funding_value,ofm_payment_type,ofm_effective_date,ofm_amount,_ofm_application_value,ofm_invoice_line_number,ofm_cas_response,ofm_invoice_received_date,ofm_payment_manual_review,_ofm_regardingid_value,ofm_remittance_message,ofm_revised_effective_date,ofm_revised_invoice_date,ofm_revised_invoice_received_date&$filter=(contains(owningbusinessunitname, 'OFM') and _ofm_application_value eq '{_baseApplicationId}')&$orderby=ofm_invoice_line_number desc
                          """;
 
                 return requestUri;

OFM.Infrastructure.WebAPI/Services/Processes/Payments/P520GenerateAllowancePaymentProvider.cs

@@ -52,14 +52,15 @@ public string AllPaymentsByApplicationIdRequestUri
                         <attribute name="ofm_regardingid" />
                         <order attribute="ofm_invoice_line_number" descending="true" />
                         <filter type="and">
+                          <condition attribute="owningbusinessunitname" operator="like" value="%OFM%" /> 
                           <condition attribute="ofm_application" operator="eq" value="00000000-0000-0000-0000-000000000000" />
                         </filter>
                       </entity>
                     </fetch>
                     """;
 
                 var requestUri = $"""
-                         ofm_payments?$select=ofm_paymentid,ofm_name,_ofm_regardingid_value,createdon,statuscode,_ofm_funding_value,ofm_payment_type,ofm_effective_date,ofm_amount,_ofm_application_value,ofm_invoice_line_number&$filter=(_ofm_application_value eq {_baseApplicationId})&$orderby=ofm_invoice_line_number desc
+                         ofm_payments?$select=ofm_paymentid,ofm_name,_ofm_regardingid_value,createdon,statuscode,_ofm_funding_value,ofm_payment_type,ofm_effective_date,ofm_amount,_ofm_application_value,ofm_invoice_line_number&$filter=(contains(owningbusinessunitname, 'OFM') and _ofm_application_value eq {_baseApplicationId})&$orderby=ofm_invoice_line_number desc
                          """;
 
                 return requestUri;

OFM.Infrastructure.WebAPI/Services/Processes/Payments/P525GenerateTopUpPaymentProvider.cs

@@ -94,6 +94,7 @@ public string AllPaymentsByApplicationIdRequestUri
                         <attribute name="statecode" />
                         <order attribute="ofm_invoice_line_number" descending="true" />
                         <filter type="and">
+                          <condition attribute="owningbusinessunitname" operator="like" value="%OFM%" /> 
                           <condition attribute="ofm_application" operator="eq" value="{_applicationId}" />
                         </filter>
                         <link-entity name="ofm_funding" from="ofm_fundingid" to="ofm_funding" link-type="inner" alias="Funding">
@@ -113,7 +114,7 @@ public string AllPaymentsByApplicationIdRequestUri
                     """;
 
                 var requestUri = $"""
-                         ofm_payments?$select=ofm_paymentid,ofm_name,createdon,statuscode,_ofm_funding_value,ofm_payment_type,ofm_effective_date,ofm_amount,_ofm_application_value,ofm_invoice_line_number,ofm_invoice_received_date,ofm_payment_manual_review,_ofm_regardingid_value,ofm_remittance_message,ofm_revised_effective_date,ofm_revised_invoice_date,ofm_revised_invoice_received_date,_ofm_facility_value,_ofm_fiscal_year_value,ofm_invoice_date,ofm_invoice_number,statecode&$expand=ofm_funding($select=ofm_end_date,ofm_fundingid,ofm_monthly_province_base_funding_y1,ofm_start_date,ofm_version_number),ofm_application($select=ofm_application,ofm_applicationid,statuscode)&$filter=(_ofm_application_value eq '{_applicationId}') and (ofm_funding/ofm_fundingid ne null) and (ofm_application/ofm_applicationid ne null)&$orderby=ofm_invoice_line_number desc
+                         ofm_payments?$select=ofm_paymentid,ofm_name,createdon,statuscode,_ofm_funding_value,ofm_payment_type,ofm_effective_date,ofm_amount,_ofm_application_value,ofm_invoice_line_number,ofm_invoice_received_date,ofm_payment_manual_review,_ofm_regardingid_value,ofm_remittance_message,ofm_revised_effective_date,ofm_revised_invoice_date,ofm_revised_invoice_received_date,_ofm_facility_value,_ofm_fiscal_year_value,ofm_invoice_date,ofm_invoice_number,statecode&$expand=ofm_funding($select=ofm_end_date,ofm_fundingid,ofm_monthly_province_base_funding_y1,ofm_start_date,ofm_version_number),ofm_application($select=ofm_application,ofm_applicationid,statuscode)&$filter=(contains(owningbusinessunitname, 'OFM') and _ofm_application_value eq '{_applicationId}') and (ofm_funding/ofm_fundingid ne null) and (ofm_application/ofm_applicationid ne null)&$orderby=ofm_invoice_line_number desc
                          """;
 
                 return requestUri;

OFM.Infrastructure.WebAPI/Services/Processes/Payments/P530ValidatePaymentRequest.cs

@@ -72,7 +72,8 @@ public string RequestPaymentLineUri
                        <attribute name="ofm_invoice_date"/>
                        <order attribute="ofm_name" descending="false"/>
                         <filter type="and">
-                        <condition attribute="statuscode" operator="eq" value="{(int)ofm_payment_StatusCode.ApprovedforPayment}" />
+                           <condition attribute="owningbusinessunitname" operator="like" value="%OFM%" /> 
+                           <condition attribute="statuscode" operator="eq" value="{(int)ofm_payment_StatusCode.ApprovedforPayment}" />
                         <filter type="or">
                           <condition attribute="ofm_invoice_date" operator="eq" value="{localDateOnlyPST}" />
                           <condition attribute="ofm_revised_invoice_date" operator="eq" value="{localDateOnlyPST}" />