add new request types (#1395)

bcgov · Jul 6, 2023 · a852cbd · a852cbd
1 parent c92d648
commit a852cbd
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 5 deletions.
diff --git a/api/namex/VERSION.py b/api/namex/VERSION.py
@@ -1 +1 @@
-__version__ = '1.1.25'
+__version__ = '1.1.26'
diff --git a/api/namex/constants/__init__.py b/api/namex/constants/__init__.py
@@ -435,8 +435,12 @@ class LegacyEntityTypes:
  ('BERE', EntityTypes.BENEFIT_COMPANY.value, RequestAction.RESUBMIT.value),
  ('BECV', EntityTypes.BENEFIT_COMPANY.value, RequestAction.CNV.value, True),
  ('BECV', EntityTypes.BENEFIT_COMPANY.value, RequestAction.RESUBMIT.value),
+ ('ULBE', EntityTypes.BENEFIT_COMPANY.value, RequestAction.CNV.value, True),
+ ('ULBE', EntityTypes.BENEFIT_COMPANY.value, RequestAction.RESUBMIT.value),
  ('BECR', EntityTypes.CORPORATION.value, RequestAction.CNV.value, True),
- ('BECR', EntityTypes.CORPORATION.value, RequestAction.RESUBMIT.value)
+ ('BECR', EntityTypes.CORPORATION.value, RequestAction.RESUBMIT.value),
+ ('ULCB', EntityTypes.CORPORATION.value, RequestAction.CNV.value, True),
+ ('ULCB', EntityTypes.CORPORATION.value, RequestAction.RESUBMIT.value)
 ]
 
 reverse_request_type_mapping = [m for m in request_type_mapping if len(m) == 4 and m[3] is True]

diff --git a/api/namex/services/lookup/name_request_filing_actions.py b/api/namex/services/lookup/name_request_filing_actions.py
@@ -114,6 +114,8 @@ def teardown(self, exception):
  ('BERE', 'BEN', 'BC Benefit Company Incorporation', 'Restoration', 'lear', None, None, None),
  ('BECV', 'BEN', 'BC Benefit Company Incorporation', 'Alteration', 'lear', 'alteration', None, "{'filing': {'header': {'name': {entitiesFilingName} }, '{entitiesFilingName}': {'nameRequest': {'nrNumber': '{nrNumber}', 'legalName': '{legalName}', 'legalType': '{legalType}'}}}}"),
  ('BECR', 'BEN', 'BC Benefit Company Incorporation', 'Convert to BC', 'lear', 'alteration', None, "{'filing': {'header': {'name': {entitiesFilingName} }, '{entitiesFilingName}': {'nameRequest': {'nrNumber': '{nrNumber}', 'legalName': '{legalName}', 'legalType': '{legalType}'}}}}"),
+ ('ULBE', 'BEN', 'BC Benefit Company', 'Alteration', 'lear', 'alteration', None, "{'filing': {'header': {'name': {entitiesFilingName} }, '{entitiesFilingName}': {'nameRequest': {'nrNumber': '{nrNumber}', 'legalName': '{legalName}', 'legalType': '{legalType}'}}}}"),
+ ('ULCR', 'BC', 'B.C. limited Company', 'Alteration', 'lear', 'alteration', None, "{'filing': {'header': {'name': {entitiesFilingName} }, '{entitiesFilingName}': {'nameRequest': {'nrNumber': '{nrNumber}', 'legalName': '{legalName}', 'legalType': '{legalType}'}}}}"),
  ]
 
  @cached_property

diff --git a/api/namex/services/name_request/abstract_name_request.py b/api/namex/services/name_request/abstract_name_request.py
@@ -64,6 +64,12 @@ def request_entity(self):
  if entity_type_cd:
  return entity_type_cd
 
+ @property
+ def conversion_type(self):
+ conversion_type_cd = self.request_data.get('conversion_type_cd', None)
+ if conversion_type_cd:
+ return conversion_type_cd
+
  @property
  def request_type(self):
  request_type_cd = self.request_data.get('requestTypeCd', None)

diff --git a/api/namex/services/name_request/mappers/request_attrs.py b/api/namex/services/name_request/mappers/request_attrs.py
@@ -31,6 +31,8 @@ def map_request_attrs(name_request, **kwargs):
  request_action = kwargs.get('request_action', name_request.request_action_cd)
  request_type = kwargs.get('request_type', name_request.requestTypeCd)
 
+ conversion_type = kwargs.get('conversion_type', None)
+
  # Set action and entity
  if request_entity:
  name_request.entity_type_cd = request_entity
@@ -44,8 +46,13 @@ def map_request_attrs(name_request, **kwargs):
  # but a request_entity (entity_type_cd) and a request_action (request_action_cd)
  # are supplied, use get_mapped_request_type to map the requestTypeCd in the model
  # using the action and entity type
- request_type = get_mapped_request_type(request_entity, request_action)
- name_request.requestTypeCd = request_type[0]
+
+ # if conversion_type exists, using conversion_type as request_type
+ if conversion_type:
+ name_request.requestTypeCd = conversion_type
+ else:
+ request_type = get_mapped_request_type(request_entity, request_action)
+ name_request.requestTypeCd = request_type[0]
  elif request_type is not None:
  # If request_type is NOT None, (eg. 'requestTypeCd' was provided in the payload)
  # then use the provided value

diff --git a/api/namex/services/name_request/name_request.py b/api/namex/services/name_request/name_request.py
@@ -190,7 +190,8 @@ def map_request_data(self, name_request, map_attrs=False):
  nr_num=self.nr_num,
  request_entity=self.request_entity,
  request_action=self.request_action,
- request_type=self.request_type
+ request_type=self.request_type,
+ conversion_type=self.conversion_type
  )
 
  # If this is a DRAFT, set draft attributes