Merge pull request #715 from sumesh-aot/fix_build

Fixing build error and changing the repo branch to main.

jobs/payment-jobs/tasks/stale_payment_task.py

@@ -52,8 +52,8 @@ def _update_stale_payments(cls):
                     'Stale Transaction Job Updated records.Payment Id: {}, Transaction Id : {}'.format(
                         transaction.payment_id, transaction.id))
             except BusinessException as err:  # just catch and continue .Don't stop
-                current_app.logger.error('Stale Transaction Error on update_transaction')
-                current_app.logger.error(err)
+                current_app.logger.info('Stale Transaction Error on update_transaction')
+                current_app.logger.info(err)
 
     @classmethod
     def _delete_marked_payments(cls):

jobs/payment-jobs/tests/docker/docker-compose.yml

@@ -52,32 +52,32 @@ services:
     image: stoplight/prism:3.3.0
     command: >
       mock -p 4010 --host 0.0.0.0
-      https://raw.githubusercontent.com/bcgov/sbc-pay/development/docs/docs/api_contract/bcol-api-1.0.0.yaml
+      https://raw.githubusercontent.com/bcgov/sbc-pay/main/docs/docs/api_contract/bcol-api-1.0.0.yaml
   pay:
     image: stoplight/prism:3.3.0
     command: >
       mock -p 4010 --host 0.0.0.0
-      https://raw.githubusercontent.com/bcgov/sbc-pay/development/docs/docs/api_contract/pay-api-1.0.0.yaml
+      https://raw.githubusercontent.com/bcgov/sbc-pay/main/docs/docs/api_contract/pay-api-1.0.0.yaml
   reports:
     image: stoplight/prism:3.3.0
     command: >
       mock -p 4010 --host 0.0.0.0
-      https://raw.githubusercontent.com/bcgov/sbc-pay/development/docs/docs/api_contract/report-api-1.0.0.yaml
+      https://raw.githubusercontent.com/bcgov/sbc-pay/main/docs/docs/api_contract/report-api-1.0.0.yaml
   paybc:
     image: stoplight/prism:3.3.0
     command: >
       mock -p 4010 --host 0.0.0.0
-      https://raw.githubusercontent.com/bcgov/sbc-pay/development/docs/docs/PayBC%20Mocking/paybc-1.0.0.yaml
+      https://raw.githubusercontent.com/bcgov/sbc-pay/main/docs/docs/PayBC%20Mocking/paybc-1.0.0.yaml
   auth:
     image: stoplight/prism:3.3.0
     command: >
       mock -p 4010 --host 0.0.0.0
-      https://raw.githubusercontent.com/bcgov/sbc-auth/development/docs/docs/api_contract/auth-api-1.0.0.yaml
+      https://raw.githubusercontent.com/bcgov/sbc-auth/main/docs/docs/api_contract/auth-api-1.0.0.yaml
   notify:
     image: stoplight/prism:3.3.0
     command: >
       mock -p 4010 --host 0.0.0.0
-      https://raw.githubusercontent.com/bcgov/sbc-auth/development/docs/docs/api_contract/notify-api-1.0.0.yaml
+      https://raw.githubusercontent.com/bcgov/sbc-auth/main/docs/docs/api_contract/notify-api-1.0.0.yaml
   sftp:
     image: atmoz/sftp
     volumes:

queue_services/payment-reconciliations/requirements.txt

@@ -26,5 +26,5 @@ tornado==6.1
 urllib3==1.26.5
 -e git+https://github.com/bcgov/lear.git#egg=entity_queue_common&subdirectory=queue_services/common
 -e git+https://github.com/bcgov/sbc-common-components.git#egg=sbc-common-components&subdirectory=python
--e git+https://github.com/bcgov/sbc-pay.git@master#egg=pay-api&subdirectory=pay-api
+-e git+https://github.com/bcgov/sbc-pay.git@main#egg=pay-api&subdirectory=pay-api
 # -e git+https://github.com/bcgov/sbc-pay.git@payment_settlement#egg=pay-api&subdirectory=pay-api

queue_services/payment-reconciliations/requirements/repo-libraries.txt

@@ -1,4 +1,4 @@
 -e git+https://github.com/bcgov/lear.git#egg=entity_queue_common&subdirectory=queue_services/common
 -e git+https://github.com/bcgov/sbc-common-components.git#egg=sbc-common-components&subdirectory=python
--e git+https://github.com/bcgov/sbc-pay.git@master#egg=pay-api&subdirectory=pay-api
+-e git+https://github.com/bcgov/sbc-pay.git@main#egg=pay-api&subdirectory=pay-api
 # -e git+https://github.com/bcgov/sbc-pay.git@payment_settlement#egg=pay-api&subdirectory=pay-api

queue_services/payment-reconciliations/tests/docker-compose.yml

@@ -34,4 +34,4 @@ services:
         image: stoplight/prism:3.3.0
         command: >
           mock -p 4010 --host 0.0.0.0
-          https://raw.githubusercontent.com/bcgov/sbc-pay/development/docs/docs/PayBC%20Mocking/paybc-1.0.0.yaml
+          https://raw.githubusercontent.com/bcgov/sbc-pay/main/docs/docs/PayBC%20Mocking/paybc-1.0.0.yaml