Merge pull request #870 from sumesh-aot/group_cfs_lines

Adding some error handling in place to avoid unwanted errors

pay-api/src/pay_api/services/direct_pay_service.py

@@ -147,7 +147,7 @@ def get_receipt(self, payment_account: PaymentAccount, pay_response_url: str, in
         """Get the receipt details by calling PayBC web service."""
         # If pay_response_url is present do all the pre-check, else check the status by using the invoice id
         current_app.logger.debug(f'Getting receipt details {invoice_reference.invoice_id}. {pay_response_url}')
-        if pay_response_url is not None:
+        if pay_response_url:
             parsed_args = parse_url_params(pay_response_url)
 
             # validate if hashValue matches with rest of the values hashed
@@ -166,6 +166,10 @@ def get_receipt(self, payment_account: PaymentAccount, pay_response_url: str, in
             # Get the transaction number from invoice reference
             paybc_transaction_number = invoice_reference.invoice_number
 
+        # If transaction number cannot be found, return None
+        if not paybc_transaction_number:
+            return None
+
         # Call PAYBC web service, get access token and use it in get txn call
         access_token = self.__get_token().json().get('access_token')
 

pay-api/src/pay_api/services/payment_transaction.py

@@ -385,6 +385,9 @@ def update_transaction(transaction_id: uuid,  # pylint: disable=too-many-locals
             txn_reason_code = exc.status
             transaction_dao.pay_system_reason_code = txn_reason_code
             receipt_details = None
+        except Exception as exc:  # noqa pylint: disable=unused-variable, broad-except
+            receipt_details = None
+
         current_app.logger.info(f'Receipt details for {payment.invoice_number} : {receipt_details}')
         if receipt_details:
             PaymentTransaction._update_receipt_details(invoices, payment, receipt_details, transaction_dao)

pay-api/tests/unit/services/test_payment_transaction.py

@@ -387,11 +387,11 @@ def test_transaction_update_on_paybc_connection_error(session, stan_server):
     # Mock here that the invoice update fails here to test the rollback scenario
     with patch('pay_api.services.oauth_service.requests.post', side_effect=ConnectionError('mocked error')):
         transaction = PaymentTransactionService.update_transaction(transaction.id,
-                                                                   pay_response_url='receipt_number=123451')
+                                                                   pay_response_url=None)
         assert transaction.pay_system_reason_code == 'SERVICE_UNAVAILABLE'
     with patch('pay_api.services.oauth_service.requests.post', side_effect=ConnectTimeout('mocked error')):
         transaction = PaymentTransactionService.update_transaction(transaction.id,
-                                                                   pay_response_url='receipt_number=123451')
+                                                                   pay_response_url=None)
         assert transaction.pay_system_reason_code == 'SERVICE_UNAVAILABLE'
 
     assert transaction is not None