Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit d08843b

Browse files
vysakh-menon-aotvysakh-menon-aot
authored
34494 correction court order doc fix (#4782)
1 parent 9f64b8e commit d08843b

4 files changed

Lines changed: 13 additions & 23 deletions

File tree

‎legal-api/pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "legal-api"
3-
version = "3.1.30"
3+
version = "3.1.31"
44
description = ""
55
authors = [
66
{name = "thor",email = "[email protected]"}

‎legal-api/src/legal_api/core/filing.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -604,7 +604,7 @@ def _populate_completed_filing_documents( # noqa: PLR0913
604604
)
605605
if (
606606
not static_invisible and
607-
(static_docs := FilingMeta.get_static_documents(business, filing.storage, f"{base_url}{doc_url}/static"))
607+
(static_docs := FilingMeta.get_static_documents(filing.storage, f"{base_url}{doc_url}/static"))
608608
):
609609
documents["documents"]["staticDocuments"] = static_docs
610610

‎legal-api/src/legal_api/core/meta/filing.py‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
from enum import Enum, auto
1919
from typing import Final
2020

21-
from flask import current_app, url_for
22-
2321
from business_model.models import Business, DocumentType
2422
from business_model.models import Filing as FilingStorage
2523
from legal_api.services import VersionedBusinessDetailsService as VersionService
@@ -1072,7 +1070,7 @@ def alter_outputs_special_resolution(filing, outputs):
10721070
return outputs
10731071

10741072
@staticmethod
1075-
def get_static_documents(business, filing, url_prefix):
1073+
def get_static_documents(filing, url_prefix):
10761074
"""Get static documents."""
10771075
outputs = []
10781076
if filing.filing_type == "continuationIn":
@@ -1083,7 +1081,7 @@ def get_static_documents(business, filing, url_prefix):
10831081
court_order = filing.meta_data.get("courtOrder", {})
10841082
FilingMeta._get_court_order_static_documents(court_order, url_prefix, outputs)
10851083
elif filing.filing_type == "correction":
1086-
FilingMeta._get_correction_static_documents(business, filing, outputs)
1084+
FilingMeta._get_correction_static_documents(filing, url_prefix, outputs)
10871085
return outputs
10881086

10891087
@staticmethod
@@ -1129,15 +1127,9 @@ def _get_court_order_static_documents(court_order, url_prefix, outputs):
11291127
})
11301128

11311129
@staticmethod
1132-
def _get_correction_static_documents(business, filing, outputs):
1133-
base_url = current_app.config.get("BUSINESS_API_GW_URL")
1130+
def _get_correction_static_documents(filing, url_prefix, outputs):
11341131
court_orders = filing.meta_data.get("courtOrders", [])
11351132
for court_order in court_orders:
1136-
doc_url = url_for("API2.get_documents",
1137-
identifier=business.identifier,
1138-
filing_id=court_order.get("filingId"),
1139-
legal_filing_name=None)
1140-
url_prefix = f"{base_url}{doc_url}/static"
11411133
FilingMeta._get_court_order_static_documents(court_order, url_prefix, outputs)
11421134

11431135
@staticmethod

‎legal-api/src/legal_api/resources/v2/business/business_filings/business_documents.py‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
from business_account import AccountService
3030
from business_common.utils.legislation_datetime import LegislationDatetime
31-
from business_model.models import Business, Document, UserRoles
31+
from business_model.models import Business, UserRoles
3232
from business_model.models import Filing as FilingModel
3333
from legal_api.core import Filing
3434
from legal_api.exceptions import ErrorCode, get_error_message
@@ -122,15 +122,13 @@ def get_documents(identifier: str, # noqa: PLR0911, PLR0912
122122
return _get_receipt(business, filing)
123123

124124
return get_pdf(filing.storage, legal_filing_name)
125-
elif file_key and (document := Document.find_by_file_key(file_key)):
126-
if document.filing_id == filing.id and (match := re.match(r"^([A-Z]+)-(DS\d+)$", document.file_key)): # make sure the file belongs to this filing
127-
drs_response = client_doc_service.get_document(match.group(2), match.group(1), doc_binary=True)
128-
return current_app.response_class(
129-
response=drs_response.content,
130-
status=drs_response.status_code,
131-
mimetype=APP_PDF
132-
)
133-
125+
elif file_key and (match := re.match(r"^([A-Z]+)-(DS\d+)$", file_key)):
126+
drs_response = client_doc_service.get_document(match.group(2), match.group(1), doc_binary=True)
127+
return current_app.response_class(
128+
response=drs_response.content,
129+
status=drs_response.status_code,
130+
mimetype=APP_PDF
131+
)
134132

135133
return {}, HTTPStatus.NOT_FOUND
136134

0 commit comments

Comments
 (0)