lint

Author: Jxio

auth-api/src/auth_api/resources/v1/task.py

@@ -89,8 +89,7 @@ def put_task(task_id):
         task = TaskService(TaskModel.find_by_task_id(task_id))
         if task:
             # Update task and its relationships
-            origin = request.environ.get("HTTP_ORIGIN", "localhost")
-            task_dict = task.update_task(task_info=request_json, origin_url=origin).as_dict()
+            task_dict = task.update_task(task_info=request_json).as_dict()
             # ProductService uses TaskService already. So, we need to avoid circular import.
             if task_dict["relationship_type"] == TaskRelationshipType.PRODUCT.value:
                 ProductService.update_org_product_keycloak_groups(task_dict["account_id"])

auth-api/src/auth_api/services/org.py

@@ -206,9 +206,9 @@ def _create_staff_review_task(org: OrgModel, user: UserModel):
     def _send_account_created_notification(org: OrgModel, user: UserModel):
         """Send account created notification to the user."""
         current_app.logger.debug("<_send_account_created_notification")
-        app_url = current_app.config.get('WEB_APP_URL')
+        app_url = current_app.config.get("WEB_APP_URL")
         recipients = UserService.get_admin_emails_for_org(org.id)
-        login_source = user.login_source
+        login_source = user.login_source if user else None
         if not recipients:
             current_app.logger.warning(f"No recipient found for org {org.id}")
             return
@@ -980,7 +980,7 @@ def change_org_status(self, status_code, suspension_reason_code):
         return Org(org_model)
 
     @staticmethod
-    def approve_or_reject(org_id: int, is_approved: bool, origin_url: str = None, task_action: str = None):
+    def approve_or_reject(org_id: int, is_approved: bool, task_action: str = None):
         """Mark the affidavit as approved or rejected."""
         current_app.logger.debug("<find_affidavit_by_org_id ")
         # Get the org and check what's the current status
@@ -1061,7 +1061,7 @@ def send_approved_rejected_notification(receipt_admin_emails, org_name, org_id,
             notification_type = QueueMessageTypes.NON_BCSC_ORG_REJECTED_NOTIFICATION.value
         else:
             return  # Don't send mail for any other status change
-        app_url = current_app.config.get('WEB_APP_URL')
+        app_url = current_app.config.get("WEB_APP_URL")
         data = {
             "accountId": org_id,
             "emailAddresses": receipt_admin_emails,

auth-api/src/auth_api/services/task.py

@@ -90,7 +90,7 @@ def close_task(task_id, remarks: [] = None, do_commit: bool = True):
         if do_commit:
             db.session.commit()
 
-    def update_task(self, task_info: dict = None, origin_url: str = None):
+    def update_task(self, task_info: dict = None):
         """Update a task record."""
         current_app.logger.debug("<update_task ")
         task_model: TaskModel = self._model
@@ -104,12 +104,12 @@ def update_task(self, task_info: dict = None, origin_url: str = None):
         task_model.relationship_status = task_relationship_status
         task_model.flush()
 
-        self._update_relationship(origin_url=origin_url)
+        self._update_relationship()
         db.session.commit()
         current_app.logger.debug(">update_task ")
         return Task(task_model)
 
-    def _update_relationship(self, origin_url: str = None):
+    def _update_relationship(self):
         """Retrieve the relationship record and update the status."""
         task_model: TaskModel = self._model
         current_app.logger.debug("<update_task_relationship ")
@@ -121,7 +121,7 @@ def _update_relationship(self, origin_url: str = None):
             org_id = task_model.relationship_id
             if not is_hold:
                 self._update_org(
-                    is_approved=is_approved, org_id=org_id, origin_url=origin_url, task_action=task_model.action
+                    is_approved=is_approved, org_id=org_id, task_action=task_model.action, user=user
                 )
             else:
                 # Task with ACCOUNT_REVIEW action cannot be put on hold
@@ -211,7 +211,7 @@ def _notify_admin_about_hold(
             "applicationDate": f"{task_model.created.strftime('%m/%d/%Y')}",
             "accountId": account_id,
             "emailAddresses": admin_emails,
-            "contextUrl": f"{current_app.config.get('WEB_APP_URL')}"
+            "contextUrl": f"{current_app.config.get("WEB_APP_URL")}"
             f"/{current_app.config.get('BCEID_SIGNIN_ROUTE')}/"
             f"{create_account_signin_route}",
         }
@@ -223,14 +223,14 @@ def _notify_admin_about_hold(
             raise BusinessException(Error.FAILED_NOTIFICATION, None) from e
 
     @staticmethod
-    def _update_org(is_approved: bool, org_id: int, origin_url: str = None, task_action: str = None):
+    def _update_org(is_approved: bool, org_id: int, task_action: str = None):
         """Approve/Reject Affidavit and Org."""
         from auth_api.services import Org as OrgService  # pylint:disable=cyclic-import, import-outside-toplevel
 
         current_app.logger.debug("<update_task_org ")
 
         OrgService.approve_or_reject(
-            org_id=org_id, is_approved=is_approved, origin_url=origin_url, task_action=task_action
+            org_id=org_id, is_approved=is_approved, task_action=task_action
         )
 
         current_app.logger.debug(">update_task_org ")

auth-api/tests/unit/api/test_org.py

@@ -83,7 +83,6 @@
     patch_pay_account_delete_error,
     patch_pay_account_fees,
     patch_pay_account_post,
-    patch_pay_account_post,
     patch_pay_account_put,
 )