Revert "14853 - Create Task When New Product Add by GOVM/GOVN (bcgov#3584)"

This reverts commit a47d5ce.

Author: Jxio

auth-api/src/auth_api/exceptions/errors.py

@@ -126,7 +126,6 @@ class Error(Enum):
     )
     BCEID_USERS_CANT_BE_OWNERS = "BCEID Users cant be owners", HTTPStatus.BAD_REQUEST
     PAYMENT_ACCOUNT_UPSERT_FAILED = "Account upsert failed in Pay", HTTPStatus.INTERNAL_SERVER_ERROR
-    ACCOUNT_FEES_FETCH_FAILED = "Failed to fetch account fees from Pay API", HTTPStatus.INTERNAL_SERVER_ERROR
     GOVM_ACCOUNT_DATA_MISSING = (
         "GOVM account creation needs payment info , gl code and mailing address",
         HTTPStatus.BAD_REQUEST,

auth-api/src/auth_api/models/dataclass.py

@@ -183,7 +183,6 @@ class TaskSearch:  # pylint: disable=too-many-instance-attributes
     submitted_sort_order: str = "asc"
     page: int = 1
     limit: int = 10
-    action: str = ""
 
 
 @dataclass
@@ -202,7 +201,6 @@ class ProductReviewTask:
 
     org_id: str
     org_name: str
-    org_access_type: str
     product_code: str
     product_description: str
     product_subscription_id: int

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

@@ -66,8 +66,6 @@ def fetch_tasks(cls, task_search: TaskSearch):
             query = query.filter(Task.type == task_search.type)
         if task_search.status:
             query = query.filter(Task.status.in_(task_search.status))
-        if task_search.action:
-            query = query.filter(Task.action.in_(task_search.action))
         start_date = None
         end_date = None
         if task_search.start_date:

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

@@ -46,7 +46,6 @@ def get_tasks():
             relationship_status=request.args.get("relationshipStatus", None),
             type=request.args.get("type", None),
             status=request.args.getlist("status", None),
-            action=request.args.getlist("action", None),
             modified_by=request.args.get("modifiedBy", None),
             submitted_sort_order=request.args.get("submittedSortOrder", None),
             page=int(request.args.get("page", 1)),

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

@@ -56,8 +56,7 @@
     get_product_notification_data,
     get_product_notification_type,
 )
-from auth_api.utils.pay import get_account_fees_dict
-from auth_api.utils.roles import CLIENT_ADMIN_ROLES, CLIENT_AUTH_ROLES, GOV_ORG_TYPES, STAFF
+from auth_api.utils.roles import CLIENT_ADMIN_ROLES, CLIENT_AUTH_ROLES, STAFF
 from auth_api.utils.user_context import UserContext, user_context
 
 from .activity_log_publisher import ActivityLogPublisher
@@ -197,8 +196,6 @@ def create_product_subscription(
         if not skip_auth:
             check_auth(one_of_roles=(*CLIENT_ADMIN_ROLES, STAFF), org_id=org_id)
 
-        account_fees_dict = get_account_fees_dict(org)
-
         subscriptions_list = subscription_data.get("subscriptions")
         for subscription in subscriptions_list:
             product_code = subscription.get("productCode")
@@ -213,9 +210,7 @@ def create_product_subscription(
                 if previously_approved:
                     auto_approve = True
 
-                subscription_status = Product.find_subscription_status(
-                    org, product_model, account_fees_dict, auto_approve
-                )
+                subscription_status = Product.find_subscription_status(org, product_model, auto_approve)
                 product_subscription = Product._subscribe_and_publish_activity(
                     SubscriptionRequest(
                         org_id=org_id,
@@ -250,7 +245,6 @@ def create_product_subscription(
                         ProductReviewTask(
                             org_id=org.id,
                             org_name=org.name,
-                            org_access_type=org.access_type,
                             product_code=product_subscription.product_code,
                             product_description=product_model.description,
                             product_subscription_id=product_subscription.id,
@@ -377,14 +371,11 @@ def _reset_subscription_and_review_task(
     @staticmethod
     def _create_review_task(review_task: ProductReviewTask):
         task_type = review_task.product_description
-
-        required_review_types = {AccessType.GOVM.value, AccessType.GOVN.value}
-        if review_task.product_code in QUALIFIED_SUPPLIER_PRODUCT_CODES:
-            action_type = TaskAction.QUALIFIED_SUPPLIER_REVIEW.value
-        elif review_task.org_access_type in required_review_types:
-            action_type = TaskAction.NEW_PRODUCT_FEE_REVIEW.value
-        else:
-            action_type = TaskAction.PRODUCT_REVIEW.value
+        action_type = (
+            TaskAction.QUALIFIED_SUPPLIER_REVIEW.value
+            if review_task.product_code in QUALIFIED_SUPPLIER_PRODUCT_CODES
+            else TaskAction.PRODUCT_REVIEW.value
+        )
 
         task_info = {
             "name": review_task.org_name,
@@ -402,17 +393,16 @@ def _create_review_task(review_task: ProductReviewTask):
         TaskService.create_task(task_info, False)
 
     @staticmethod
-    def find_subscription_status(org, product_model, account_fees_dict, auto_approve=False):
+    def find_subscription_status(org, product_model, auto_approve=False):
         """Return the subscriptions status based on org type."""
-        required_review_types = GOV_ORG_TYPES
-
-        needs_review = (
-            org.access_type in required_review_types and account_fees_dict.get(product_model.code, False)
-        ) or (product_model.need_review and not auto_approve)
-
-        if needs_review:
-            return ProductSubscriptionStatus.PENDING_STAFF_REVIEW.value
-
+        # GOVM accounts has default active subscriptions
+        skip_review_types = [AccessType.GOVM.value]
+        if product_model.need_review and auto_approve is False:
+            return (
+                ProductSubscriptionStatus.ACTIVE.value
+                if (org.access_type in skip_review_types)
+                else ProductSubscriptionStatus.PENDING_STAFF_REVIEW.value
+            )
         return ProductSubscriptionStatus.ACTIVE.value
 
     @staticmethod
@@ -489,7 +479,7 @@ def update_product_subscription(product_sub_info: ProductSubscriptionInfo, is_ne
         is_approved = product_sub_info.is_approved
         is_hold = product_sub_info.is_hold
         org_id = product_sub_info.org_id
-        org_name = product_sub_info.org_name
+
         # Approve/Reject Product subscription
         product_subscription: ProductSubscriptionModel = ProductSubscriptionModel.find_by_id(product_subscription_id)
 
@@ -518,8 +508,6 @@ def update_product_subscription(product_sub_info: ProductSubscriptionInfo, is_ne
                     product_sub_model=product_subscription,
                     is_reapproved=is_reapproved,
                     remarks=product_sub_info.task_remarks,
-                    org_id=org_id,
-                    org_name=org_name,
                 )
             )
 

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

@@ -137,15 +137,13 @@ def _update_relationship(self, origin_url: str = None):
             # Update Product relationship
             product_subscription_id = task_model.relationship_id
             account_id = task_model.account_id
-            org: OrgModel = OrgModel.find_by_org_id(account_id)
             self._update_product_subscription(
                 ProductSubscriptionInfo(
                     is_approved=is_approved,
                     is_resubmitted=task_model.is_resubmitted,
                     is_hold=is_hold,
                     product_subscription_id=product_subscription_id,
                     org_id=account_id,
-                    org_name=org.name,
                     task_remarks=Task.get_task_remark(task_model),
                 )
             )

auth-api/src/auth_api/utils/enums.py

@@ -328,7 +328,6 @@ class TaskAction(Enum):
     ACCOUNT_REVIEW = "ACCOUNT_REVIEW"
     PRODUCT_REVIEW = "PRODUCT_REVIEW"
     QUALIFIED_SUPPLIER_REVIEW = "QUALIFIED_SUPPLIER_REVIEW"
-    NEW_PRODUCT_FEE_REVIEW = "NEW_PRODUCT_FEE_REVIEW"
 
 
 class ActivityAction(Enum):

auth-api/src/auth_api/utils/notifications.py

@@ -32,7 +32,6 @@ class ProductSubscriptionInfo:
     is_approved: bool
     product_subscription_id: int
     org_id: int
-    org_name: str | None = None
     task_remarks: str | None = None
     is_hold: bool | None = False
     is_resubmitted: bool | None = False
@@ -48,8 +47,6 @@ class ProductNotificationInfo:
     remarks: str | None = None
     is_reapproved: bool | None = False
     is_confirmation: bool | None = False
-    org_id: int | None = None
-    org_name: str | None = None
 
 
 # e.g [BC Registries and Online Services] Your {{MHR_QUALIFIED_SUPPLIER}} Access Has Been Approved
@@ -117,8 +114,7 @@ def get_product_notification_data(product_notification_info: ProductNotification
     remarks = product_notification_info.remarks
     org_id = product_notification_info.org_id
     if product_model.code not in DETAILED_MHR_NOTIFICATIONS:
-        org_name = product_notification_info.org_name
-        return get_default_product_notification_data(product_model, recipient_emails, org_id, org_name)
+        return get_default_product_notification_data(product_model, recipient_emails)
 
     if is_confirmation:
         return get_mhr_qs_confirmation_data(product_model, recipient_emails, org_id)
@@ -132,14 +128,9 @@ def get_product_notification_data(product_notification_info: ProductNotification
     return None
 
 
-def get_default_product_notification_data(product_model: ProductCodeModel, recipient_emails: str, org_id: int = None, org_name: str = None):
+def get_default_product_notification_data(product_model: ProductCodeModel, recipient_emails: str):
     """Get the default product notification data."""
-    data = {
-        "productName": product_model.description,
-        "emailAddresses": recipient_emails,
-        "accountId": org_id,
-        "accountName": org_name,
-    }
+    data = {"productName": product_model.description, "emailAddresses": recipient_emails}
     return data
 
 

auth-api/src/auth_api/utils/pay.py

@@ -15,7 +15,7 @@
 
 from enum import Enum
 
-from .enums import AccessType, OrgStatus, OrgType, ProductSubscriptionStatus, Status
+from .enums import OrgStatus, OrgType, ProductSubscriptionStatus, Status
 
 
 class Role(Enum):
@@ -88,5 +88,3 @@ class Role(Enum):
 EXCLUDED_FIELDS = ("status_code", "type_code")
 
 PREMIUM_ORG_TYPES = (OrgType.PREMIUM.value, OrgType.SBC_STAFF.value, OrgType.STAFF.value)
-
-GOV_ORG_TYPES = (AccessType.GOVM.value, AccessType.GOVN.value)