Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

19374 & 19375 amalgamation validaton fixes #2397

Merged
merged 4 commits into from
Jan 19, 2024
Merged

19374 & 19375 amalgamation validaton fixes #2397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
737fa5c
19374 & 19375 amalgamation validaton fixes
vysakh-menon-aot Jan 19, 2024
0753bc1
no message
vysakh-menon-aot Jan 19, 2024
f7f63fd
no message
vysakh-menon-aot Jan 19, 2024
d0d49eb
no message
vysakh-menon-aot Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions legal-api/src/legal_api/resources/v2/business/business.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,11 @@ def get_businesses(identifier: str):
g.jwt_oidc_token_info,
account_response)
if orgs := account_response.get('orgs'):
if str(orgs[0].get('id')) == q_account:
business_json['accountId'] = orgs[0].get('id')
# A business can be affiliated in multiple accounts (in user account as well as in gov staff account's)
# AccountService.get_account_by_affiliated_identifier will fetch all of it
# check one of it has `q_account`
if any(str(org.get('id')) == q_account for org in orgs):
business_json['accountId'] = q_account
severinbeauvais marked this conversation as resolved.
Show resolved Hide resolved

return jsonify(business=business_json)

Expand Down
5 changes: 2 additions & 3 deletions legal-api/src/legal_api/services/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,15 @@
from legal_api.models import Business
from legal_api.utils.datetime import datetime

from .authz import (
from .authz import ( # noqa: I001;
ACCOUNT_IDENTITY,
BASIC_USER,
COLIN_SVC_ROLE,
STAFF_ROLE,
SYSTEM_ROLE,
authorized,
get_account_by_affiliated_identifier,
has_roles,
)
) # noqa: I001;
from .bootstrap import AccountService, RegistrationBootstrapService
from .business_details_version import VersionedBusinessDetailsService
from .digital_credentials import DigitalCredentialsService
Expand Down
18 changes: 0 additions & 18 deletions legal-api/src/legal_api/services/authz.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
from urllib.parse import urljoin

import jwt as pyjwt
import requests
from flask import current_app
from flask_jwt_oidc import JwtManager
from requests import Session, exceptions
Expand Down Expand Up @@ -753,23 +752,6 @@ def get_allowed(state: Business.State, legal_type: str, jwt: JwtManager):
return allowable_filing_types


def get_account_by_affiliated_identifier(token, identifier: str):
"""Return the account affiliated to the business."""
auth_url = current_app.config.get('AUTH_SVC_URL')
url = f'{auth_url}/orgs?affiliation={identifier}'

headers = {
'Authorization': f'Bearer {token}'
}

res = requests.get(url, headers=headers)
try:
return res.json()
except Exception: # noqa B902; pylint: disable=W0703;
current_app.logger.error('Failed to get response')
return None


def add_allowable_filing_type(is_allowable: bool = False,
allowable_filing_types: list = None,
allowable_filing_type: dict = None):
Expand Down
17 changes: 10 additions & 7 deletions legal-api/src/legal_api/services/filings/validations/amalgamation_application.py
View file
Open in desktop
severinbeauvais marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,9 @@ def validate_amalgamating_businesses( # pylint: disable=too-many-branches,too-m
'error': f'Cannot amalgamate with {identifier} which is in historical state.',
'path': amalgamating_businesses_path
})
elif _has_future_effective_filing(amalgamating_business):
elif _has_pending_filing(amalgamating_business):
msg.append({
'error': f'{identifier} has a future effective filing.',
'error': f'{identifier} has a draft, pending or future effective filing.',
'path': amalgamating_businesses_path
})

Expand Down Expand Up @@ -181,15 +181,18 @@ def validate_amalgamating_businesses( # pylint: disable=too-many-branches,too-m


def _is_business_affliated(identifier, account_id):
if (account_response := AccountService.get_account_by_affiliated_identifier(identifier)) and \
(orgs := account_response.get('orgs')) and str(orgs[0].get('id')) == account_id:
if ((account_response := AccountService.get_account_by_affiliated_identifier(identifier)) and
(orgs := account_response.get('orgs')) and
any(str(org.get('id')) == account_id for org in orgs)):
return True
return False


def _has_future_effective_filing(amalgamating_business: Business):
if Filing.get_filings_by_status(amalgamating_business.id,
[Filing.Status.PAID.value, Filing.Status.PENDING.value]):
def _has_pending_filing(amalgamating_business: Business):
if Filing.get_filings_by_status(amalgamating_business.id, [
Filing.Status.DRAFT.value,
Filing.Status.PENDING.value,
Filing.Status.PAID.value]):
return True
return False

Expand Down
24 changes: 12 additions & 12 deletions legal-api/tests/unit/services/filings/validations/test_amalgamation_application.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,7 @@ def mock_find_by_identifier(identifier):

mocker.patch('legal_api.services.filings.validations.amalgamation_application.validate_name_request',
return_value=[])
mocker.patch('legal_api.services.filings.validations.amalgamation_application._has_future_effective_filing',
mocker.patch('legal_api.services.filings.validations.amalgamation_application._has_pending_filing',
return_value=False)
mocker.patch('legal_api.models.business.Business.find_by_identifier', side_effect=mock_find_by_identifier)
mocker.patch('legal_api.services.bootstrap.AccountService.get_account_by_affiliated_identifier',
Expand All @@ -684,12 +684,12 @@ def mock_find_by_identifier(identifier):
@pytest.mark.parametrize(
'test_status, expected_code, expected_msg',
[
('FAIL', HTTPStatus.BAD_REQUEST, 'BC1234567 has a future effective filing.'),
('FAIL', HTTPStatus.BAD_REQUEST, 'BC1234567 has a draft, pending or future effective filing.'),
('SUCCESS', None, None)
]
)
def test_has_future_effective_filing(mocker, app, session, jwt, test_status, expected_code, expected_msg):
"""Assert valid amalgamating businesses has future effective filing."""
def test_has_pending_filing(mocker, app, session, jwt, test_status, expected_code, expected_msg):
"""Assert valid amalgamating businesses has draft, pending or future effective filing."""
filing = {'filing': {}}
filing['filing']['header'] = {'name': 'amalgamationApplication', 'date': '2019-04-08',
'certifiedBy': 'full name', 'email': 'no_one@never.get', 'filingId': 1}
Expand Down Expand Up @@ -746,7 +746,7 @@ def mock_find_by_identifier(identifier):

mocker.patch('legal_api.services.filings.validations.amalgamation_application.validate_name_request',
return_value=[])
mocker.patch('legal_api.services.filings.validations.amalgamation_application._has_future_effective_filing',
mocker.patch('legal_api.services.filings.validations.amalgamation_application._has_pending_filing',
return_value=False)
mocker.patch('legal_api.models.business.Business.find_by_identifier', side_effect=mock_find_by_identifier)
mocker.patch('legal_api.services.bootstrap.AccountService.get_account_by_affiliated_identifier',
Expand Down Expand Up @@ -800,7 +800,7 @@ def mock_find_by_identifier(identifier):

mocker.patch('legal_api.services.filings.validations.amalgamation_application.validate_name_request',
return_value=[])
mocker.patch('legal_api.services.filings.validations.amalgamation_application._has_future_effective_filing',
mocker.patch('legal_api.services.filings.validations.amalgamation_application._has_pending_filing',
return_value=False)
mocker.patch('legal_api.services.filings.validations.amalgamation_application._is_business_affliated',
return_value=True)
Expand Down Expand Up @@ -853,7 +853,7 @@ def mock_find_by_identifier(identifier):

mocker.patch('legal_api.services.filings.validations.amalgamation_application.validate_name_request',
return_value=[])
mocker.patch('legal_api.services.filings.validations.amalgamation_application._has_future_effective_filing',
mocker.patch('legal_api.services.filings.validations.amalgamation_application._has_pending_filing',
return_value=False)
mocker.patch('legal_api.services.filings.validations.amalgamation_application._is_business_affliated',
return_value=True)
Expand Down Expand Up @@ -893,7 +893,7 @@ def mock_find_by_identifier(identifier):

mocker.patch('legal_api.services.filings.validations.amalgamation_application.validate_name_request',
return_value=[])
mocker.patch('legal_api.services.filings.validations.amalgamation_application._has_future_effective_filing',
mocker.patch('legal_api.services.filings.validations.amalgamation_application._has_pending_filing',
return_value=False)
mocker.patch('legal_api.services.filings.validations.amalgamation_application._is_business_affliated',
return_value=True)
Expand Down Expand Up @@ -940,7 +940,7 @@ def mock_find_by_identifier(identifier):

mocker.patch('legal_api.services.filings.validations.amalgamation_application.validate_name_request',
return_value=[])
mocker.patch('legal_api.services.filings.validations.amalgamation_application._has_future_effective_filing',
mocker.patch('legal_api.services.filings.validations.amalgamation_application._has_pending_filing',
return_value=False)
mocker.patch('legal_api.services.filings.validations.amalgamation_application._is_business_affliated',
return_value=True)
Expand Down Expand Up @@ -986,7 +986,7 @@ def mock_find_by_identifier(identifier):

mocker.patch('legal_api.services.filings.validations.amalgamation_application.validate_name_request',
return_value=[])
mocker.patch('legal_api.services.filings.validations.amalgamation_application._has_future_effective_filing',
mocker.patch('legal_api.services.filings.validations.amalgamation_application._has_pending_filing',
return_value=False)
mocker.patch('legal_api.services.filings.validations.amalgamation_application._is_business_affliated',
return_value=True)
Expand Down Expand Up @@ -1033,7 +1033,7 @@ def mock_find_by_identifier(identifier):

mocker.patch('legal_api.services.filings.validations.amalgamation_application.validate_name_request',
return_value=[])
mocker.patch('legal_api.services.filings.validations.amalgamation_application._has_future_effective_filing',
mocker.patch('legal_api.services.filings.validations.amalgamation_application._has_pending_filing',
return_value=False)
mocker.patch('legal_api.services.filings.validations.amalgamation_application._is_business_affliated',
return_value=True)
Expand Down Expand Up @@ -1090,7 +1090,7 @@ def mock_find_by_identifier(identifier):

mocker.patch('legal_api.services.filings.validations.amalgamation_application.validate_name_request',
return_value=[])
mocker.patch('legal_api.services.filings.validations.amalgamation_application._has_future_effective_filing',
mocker.patch('legal_api.services.filings.validations.amalgamation_application._has_pending_filing',
return_value=False)
mocker.patch('legal_api.services.filings.validations.amalgamation_application._is_business_affliated',
return_value=True)
Expand Down
Loading