From c55cebc88d709dcbfa11bc3001382a7a7d5c45d7 Mon Sep 17 00:00:00 2001 From: Akiff Manji Date: Mon, 30 Oct 2023 23:21:04 +0000 Subject: [PATCH] chore: fix tests and linting Signed-off-by: Akiff Manji --- legal-api/src/legal_api/models/__init__.py | 9 +++++---- .../business/business_digital_credentials.py | 20 +++++++++---------- .../unit/services/test_digital_credentials.py | 4 ++-- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/legal-api/src/legal_api/models/__init__.py b/legal-api/src/legal_api/models/__init__.py index 7609c6e2bd..fc7fa5b6ec 100644 --- a/legal-api/src/legal_api/models/__init__.py +++ b/legal-api/src/legal_api/models/__init__.py @@ -23,8 +23,8 @@ from .corp_type import CorpType from .dc_connection import DCConnection from .dc_definition import DCDefinition -from .dc_issued_credential import DCIssuedCredential from .dc_issued_business_user_credential import DCIssuedBusinessUserCredential +from .dc_issued_credential import DCIssuedCredential from .document import Document, DocumentType from .filing import Filing from .naics_element import NaicsElement @@ -41,6 +41,7 @@ __all__ = ('db', 'Address', 'Alias', 'Business', 'ColinLastUpdate', 'Comment', 'ConsentContinuationOut', 'CorpType', - 'DCConnection', 'DCDefinition', 'DCIssuedCredential', 'DCIssuedBusinessUserCredential', 'Document', 'DocumentType', - 'Filing', 'Office', 'OfficeType', 'Party', 'RegistrationBootstrap', 'RequestTracker', 'Resolution', - 'PartyRole', 'ShareClass', 'ShareSeries', 'User', 'UserRoles', 'NaicsStructure', 'NaicsElement') + 'DCConnection', 'DCDefinition', 'DCIssuedCredential', 'DCIssuedBusinessUserCredential', 'Document', + 'DocumentType', 'Filing', 'Office', 'OfficeType', 'Party', 'RegistrationBootstrap', 'RequestTracker', + 'Resolution', 'PartyRole', 'ShareClass', 'ShareSeries', 'User', 'UserRoles', 'NaicsStructure', + 'NaicsElement') diff --git a/legal-api/src/legal_api/resources/v2/business/business_digital_credentials.py b/legal-api/src/legal_api/resources/v2/business/business_digital_credentials.py index d69ac6c3db..85fbbf4c2d 100644 --- a/legal-api/src/legal_api/resources/v2/business/business_digital_credentials.py +++ b/legal-api/src/legal_api/resources/v2/business/business_digital_credentials.py @@ -16,21 +16,18 @@ from datetime import datetime from http import HTTPStatus -from flask import Blueprint, current_app, jsonify, request, _request_ctx_stack +from flask import Blueprint, _request_ctx_stack, current_app, jsonify, request from flask_cors import cross_origin -from legal_api.core import Filing as FilingCore from legal_api.extensions import socketio from legal_api.models import ( Business, CorpType, - Filing, DCConnection, DCDefinition, - DCIssuedCredential, DCIssuedBusinessUserCredential, - PartyRole, - User + DCIssuedCredential, + User, ) from legal_api.services import digital_credentials from legal_api.utils.auth import jwt @@ -167,21 +164,21 @@ def send_credential(identifier, credential_type): business = Business.find_by_identifier(identifier) if not business: return jsonify({'message': f'{identifier} not found'}), HTTPStatus.NOT_FOUND - + user = User.find_by_jwt_token(_request_ctx_stack.top.current_user) if not user: return jsonify({'message': 'User not found'}, HTTPStatus.NOT_FOUND) connection = DCConnection.find_active_by(business_id=business.id) definition = DCDefinition.find_by(DCDefinition.CredentialType[credential_type], - digital_credentials.business_schema_id, + digital_credentials.business_schema_id, digital_credentials.business_cred_def_id) issued_credentials = DCIssuedCredential.find_by(dc_connection_id=connection.id, dc_definition_id=definition.id) if issued_credentials and issued_credentials[0].credential_exchange_id: return jsonify({'message': 'Already requested to issue credential.'}), HTTPStatus.INTERNAL_SERVER_ERROR - + credential_data = _get_data_for_credential(definition.credential_type, business, user) credential_id = next((item['value'] for item in credential_data if item['name'] == 'credential_id'), None) @@ -293,7 +290,8 @@ def _get_data_for_credential(credential_type: DCDefinition.CredentialType, busin if credential_type == DCDefinition.CredentialType.business: # Find the credential id from dc_issued_business_user_credentials and if there isn't one create one - issued_business_user_credential = DCIssuedBusinessUserCredential.find_by(business_id=business.id, user_id=user.id) + issued_business_user_credential = DCIssuedBusinessUserCredential.find_by( + business_id=business.id, user_id=user.id) if not issued_business_user_credential: issued_business_user_credential = DCIssuedBusinessUserCredential(business_id=business.id, user_id=user.id) issued_business_user_credential.save() @@ -308,7 +306,7 @@ def _get_data_for_credential(credential_type: DCDefinition.CredentialType, busin registered_on_dateint = '' if business.founding_date: - registered_on_dateint = business.founding_date.strftime(f'%Y%m%d') + registered_on_dateint = business.founding_date.strftime('%Y%m%d') company_status = Business.State(business.state).name diff --git a/legal-api/tests/unit/services/test_digital_credentials.py b/legal-api/tests/unit/services/test_digital_credentials.py index d4d77dfab4..157de205c6 100644 --- a/legal-api/tests/unit/services/test_digital_credentials.py +++ b/legal-api/tests/unit/services/test_digital_credentials.py @@ -31,7 +31,7 @@ def test_init_app(session, app): # pylint:disable=unused-argument digital_credentials.init_app(app) definition = DCDefinition.find_by_credential_type(DCDefinition.CredentialType.business) assert definition.schema_id == schema_id - assert definition.schema_name == digital_credentials.business_schema['schema_name'] - assert definition.schema_version == digital_credentials.business_schema['schema_version'] + assert definition.schema_name == digital_credentials.business_schema_name + assert definition.schema_version == digital_credentials.business_schema_version assert definition.credential_definition_id == cred_def_id assert not definition.is_deleted