Merge pull request #751 from sumesh-aot/fix_nr_navigation

3947: Changes for affiliation and name for CONDITIONAL name requests

Author: sumesh-aot

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

@@ -27,6 +27,7 @@
 from auth_api.services.entity import Entity as EntityService
 from auth_api.services.org import Org as OrgService
 from auth_api.utils.enums import CorpType
+from auth_api.utils.enums import NRNameStatus, NRStatus
 from auth_api.utils.passcode import validate_passcode
 from auth_api.utils.roles import ALL_ALLOWED_ROLES, CLIENT_AUTH_ROLES, STAFF
 from .rest_service import RestService
@@ -182,7 +183,11 @@ def create_new_business_affiliation(org_id, business_identifier=None,  # pylint:
             nr_phone = nr_json.get('applicants').get('phoneNumber')
             nr_email = nr_json.get('applicants').get('emailAddress')
 
-            if status not in ('APPROVED', 'CONDITIONAL'):
+            if status not in (NRStatus.APPROVED.value, NRStatus.CONDITIONAL.value):
+                raise BusinessException(Error.NR_NOT_APPROVED, None)
+
+            # If consentFlag is not R, N or Null for a CONDITIONAL NR throw error
+            if status == NRStatus.CONDITIONAL.value and nr_json.get('consentFlag', None) not in (None, 'R', 'N'):
                 raise BusinessException(Error.NR_NOT_APPROVED, None)
 
             if (phone and phone != nr_phone) or (email and email != nr_email):
@@ -191,8 +196,12 @@ def create_new_business_affiliation(org_id, business_identifier=None,  # pylint:
             # Create an entity with the Name from NR if entity doesn't exist
             if not entity:
                 # Filter the names from NR response and get the name which has status APPROVED as the name.
-                name = next(
-                    (name.get('name') for name in nr_json.get('names') if name.get('state', None) == 'APPROVED'), None)
+                # Filter the names from NR response and get the name which has status CONDITION as the name.
+                nr_name_state = NRNameStatus.APPROVED.value if status == NRStatus.APPROVED.value \
+                    else NRNameStatus.CONDITION.value
+                name = next((name.get('name') for name in nr_json.get('names') if
+                             name.get('state', None) == nr_name_state), None)
+
                 entity = EntityService.save_entity({
                     'businessIdentifier': business_identifier,
                     'name': name,

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

@@ -80,3 +80,17 @@ class DocumentType(Enum):
 
     TERMS_OF_USE = 'termsofuse'
     TERMS_OF_USE_DIRECTOR_SEARCH = 'termsofuse_directorsearch'
+
+
+class NRStatus(Enum):
+    """NR statuses."""
+
+    APPROVED = 'APPROVED'
+    CONDITIONAL = 'CONDITIONAL'
+
+
+class NRNameStatus(Enum):
+    """NR name statuses."""
+
+    APPROVED = 'APPROVED'
+    CONDITION = 'CONDITION'