18653, 18380 - Affiliation REQUEST - update email templates, wording …

…on labels, remove paging from api call. (#2645)

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

@@ -32,14 +32,6 @@ class Activity:
     actor_id: Optional[int] = None
 
 
-@dataclass
-class PaginationInfo:
-    """Used for providing pagination info."""
-
-    page: int
-    limit: int
-
-
 @dataclass
 class AffiliationInvitationSearch:  # pylint: disable=too-many-instance-attributes
     """Used for searching Affiliation Invitations."""

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

@@ -24,7 +24,7 @@
 from auth_api.exceptions import BusinessException
 from auth_api.exceptions.errors import Error
 from auth_api.models.affiliation import Affiliation
-from auth_api.models.dataclass import OrgSearch, PaginationInfo
+from auth_api.models.dataclass import OrgSearch
 from auth_api.utils.enums import AccessType, InvitationStatus, InvitationType
 from auth_api.utils.enums import OrgStatus as OrgStatusEnum
 from auth_api.utils.enums import OrgType as OrgTypeEnum
@@ -161,7 +161,6 @@ def search_org(cls, search: OrgSearch, environment: str):
     @classmethod
     def search_orgs_by_business_identifier(cls,
                                            business_identifier,
-                                           pagination_info: PaginationInfo,
                                            environment,
                                            excluded_org_types: List[str] = None
                                            ):
@@ -173,10 +172,10 @@ def search_orgs_by_business_identifier(cls,
         if excluded_org_types:
             query = query.filter(Org.type_code.notin_(excluded_org_types))
 
-        pagination = query.order_by(Org.name.desc()) \
-            .paginate(per_page=pagination_info.limit, page=pagination_info.page)
+        query = query.order_by(Org.name.desc())
 
-        return pagination.items, pagination.total
+        items = query.all()
+        return items, len(items)
 
     @classmethod
     def _search_by_business_identifier(cls, query, business_identifier, environment):

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

@@ -25,7 +25,6 @@
 from auth_api.models import Org as OrgModel
 from auth_api.models.dataclass import Affiliation as AffiliationData
 from auth_api.models.dataclass import DeleteAffiliationRequest
-from auth_api.models.dataclass import PaginationInfo  # noqa: I005; Not sure why isort doesn't like this
 from auth_api.models.org import OrgSearch  # noqa: I005; Not sure why isort doesn't like this
 from auth_api.schemas import InvitationSchema, MembershipSchema
 from auth_api.schemas import utils as schema_utils
@@ -392,14 +391,10 @@ def post_organization_affiliation(org_id):
 def get_org_details_by_affiliation(business_identifier):
     """Search non staff orgs by BusinessIdentifier and return org Name, branch Name and UUID."""
     environment = get_request_environment()
-    pagination_info = PaginationInfo(
-        limit=int(request.args.get('limit', 10)),
-        page=int(request.args.get('page', 1))
-    )
     excluded_org_types = [OrgType.STAFF.value, OrgType.SBC_STAFF.value]
     try:
         data = OrgService.search_orgs_by_affiliation(
-            business_identifier, pagination_info, environment, excluded_org_types
+            business_identifier, environment, excluded_org_types
         )
 
         org_details = \

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

@@ -22,7 +22,7 @@
 from sbc_common_components.tracing.service_tracing import ServiceTracing  # noqa: I001
 
 from auth_api import status as http_status
-from auth_api.models.dataclass import Activity, DeleteAffiliationRequest, PaginationInfo
+from auth_api.models.dataclass import Activity, DeleteAffiliationRequest
 from auth_api.exceptions import BusinessException
 from auth_api.exceptions.errors import Error
 from auth_api.models import AccountLoginOptions as AccountLoginOptionsModel
@@ -731,20 +731,17 @@ def search_orgs(search: OrgSearch, environment):  # pylint: disable=too-many-loc
 
     @staticmethod
     def search_orgs_by_affiliation(
-        business_identifier, pagination_info: PaginationInfo, environment, excluded_org_types
+        business_identifier, environment, excluded_org_types
     ):
         """Search for orgs based on input parameters."""
         orgs, total = OrgModel.search_orgs_by_business_identifier(
             business_identifier,
-            pagination_info,
             environment,
             excluded_org_types
         )
 
         return {
             'orgs': orgs,
-            'page': pagination_info.page,
-            'limit': pagination_info.limit,
             'total': total
         }
 

auth-web/src/components/auth/manage-business/manage-business-dialog/AccountAuthorizationRequest.vue

@@ -13,7 +13,7 @@
     </div>
 
     <div v-else-if="!isLoading && accounts && accounts.length > 0">
-      <span>Select the account you want to perform Registries activities for <strong>{{ businessName }}</strong></span>
+      <span>Select an account:</span>
       <v-select
         id="account-authorization-request-request-account-select"
         v-model="selectedAccount"

auth-web/src/components/auth/manage-business/manage-business-dialog/ManageBusinessDialog.vue

@@ -238,7 +238,9 @@
                   v-model="requestAuthBusinessOption"
                 >
                   <template #activator>
-                    <v-list-item-title>Request authorization from the business</v-list-item-title>
+                    <v-list-item-title>
+                      Request authorization from an account currently managing the business
+                    </v-list-item-title>
                   </template>
                   <div class="list-body">
                     <AccountAuthorizationRequest

queue_services/account-mailer/src/account_mailer/email_templates/affiliation_invitation_request.html

@@ -1,4 +1,4 @@
-Attention **{{ account }}**.
+**Attention {{ account }}**
 
 Your BC Registries and Online Services account is listed as the account managing **{{ business_name }}**.
 
@@ -14,7 +14,7 @@
 {% endif %}
 Go to {{ business_name }} to respond to this request:
 
-[Log in to your BC Registries Dashboard]({{ url }})
+**[Log in to your BC Registries Dashboard]({{ url }})**
 
 Only authorize this account if you recognize it.
 
@@ -33,5 +33,5 @@
 **Business Registry**
 BC Registries and Online Services
 Toll Free: [1-877-526-1526](1-877-526-1526)
-Victoria Office:
+Victoria Office: [250-387-7848](250-387-7848)
 Email: [BCRegistries@gov.bc.ca](BCRegistries@gov.bc.ca)

queue_services/account-mailer/src/account_mailer/email_templates/affiliation_invitation_request_authorization.html

@@ -1,17 +1,17 @@
-Attention {{ requesting_account }}
+**Attention {{ requesting_account }}**
 
 {% if is_authorized %}
 Your BC Registries and Online Services account is now authorized to manage {{ business_name }}.
 
-To manage this business now, [Log in to your BC Registries Dashboard]({{ url }})
+To manage this business now, **[Log in to your BC Registries Dashboard]({{ url }})**
 {% else %}
 Your request to manage {{ business_name }} has been declined.
 
-To change your request or make a new request to manage this business, [log in to your BC Registries Dashboard]({{ url }})
+To change your request or make a new request to manage this business, **[log in to your BC Registries Dashboard]({{ url }})**
 {% endif %}
 ___
 **Business Registry**
 BC Registries and Online Services
 Toll Free: [1-877-526-1526](1-877-526-1526)
-Victoria Office:
+Victoria Office: [250-387-7848](250-387-7848)
 Email: [BCRegistries@gov.bc.ca](BCRegistries@gov.bc.ca)