From 5983def43d8280303a65bb3cc552e67bf2c078b3 Mon Sep 17 00:00:00 2001 From: Michael Olund Date: Wed, 28 Oct 2020 12:53:42 -0700 Subject: [PATCH] Added final submission file number --- .../apps/core/tests/test_efiling_packaging.py | 2 +- edivorce/apps/core/utils/efiling_packaging.py | 16 ++++++++++++---- edivorce/apps/core/utils/efiling_submission.py | 7 +++---- edivorce/apps/core/views/efiling.py | 3 ++- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/edivorce/apps/core/tests/test_efiling_packaging.py b/edivorce/apps/core/tests/test_efiling_packaging.py index af66e963..2b972869 100644 --- a/edivorce/apps/core/tests/test_efiling_packaging.py +++ b/edivorce/apps/core/tests/test_efiling_packaging.py @@ -42,7 +42,7 @@ class EFilingPackagingTests(TransactionTestCase): parties.append(party) location = '6011' - package = self.packaging.format_package(self.request, files, documents, parties, location) + package = self.packaging.format_package(self.request, files, documents, parties, location, '') self.assertTrue(package) self.assertEqual(package['filingPackage']['documents'][0]['name'], 'form_0.pdf') diff --git a/edivorce/apps/core/utils/efiling_packaging.py b/edivorce/apps/core/utils/efiling_packaging.py index 7bd80911..e7ba83ae 100644 --- a/edivorce/apps/core/utils/efiling_packaging.py +++ b/edivorce/apps/core/utils/efiling_packaging.py @@ -39,7 +39,7 @@ PACKAGE_FORMAT = { "level": "S", "courtClass": "E", "division": "I", - "participatingClass": "string" + "fileNumber": None }, "parties": [] }, @@ -105,12 +105,14 @@ class EFilingPackaging: def __init__(self, initial_filing): self.initial_filing = initial_filing - def format_package(self, request, files, documents, parties, location): + def format_package(self, request, files, documents, parties, location, file_number): package = PACKAGE_FORMAT.copy() package['filingPackage']['court']['location'] = location package['filingPackage']['documents'] = documents if parties: package['filingPackage']['parties'] = parties + if file_number: + package['filingPackage']['court']['fileNumber'] = file_number # update return urls if self.initial_filing: package['navigationUrls']['error'] = self._get_absolute_url( @@ -266,7 +268,7 @@ class EFilingPackaging: if doc_type == 'NJF': document['data'] = self._get_json_data(responses) pdf_response = pdf_form(request, str(form['form_number'])) - document['md5'] = hashlib.md5(pdf_response.content).hexdigest() # nosec + document['md5'] = hashlib.md5(pdf_response.content).hexdigest() # nosec post_files.append(('files', (document['name'], pdf_response.content))) documents.append(document) @@ -276,7 +278,7 @@ class EFilingPackaging: pdf_response = images_to_pdf(request, doc_type, party_code) if pdf_response.status_code == 200: document = self._get_document(doc_type, party_code) - document['md5'] = hashlib.md5(pdf_response.content).hexdigest() # nosec + document['md5'] = hashlib.md5(pdf_response.content).hexdigest() # nosec post_files.append(('files', (document['name'], pdf_response.content))) documents.append(document) @@ -308,3 +310,9 @@ class EFilingPackaging: def get_location(self, responses): location_name = responses.get('court_registry_for_filing', '') return list_of_registries.get(location_name, '0000') + + def get_file_number(self, responses): + if not self.initial_filing: + return responses.get('court_file_number', '') + else: + return '' diff --git a/edivorce/apps/core/utils/efiling_submission.py b/edivorce/apps/core/utils/efiling_submission.py index a1d489c8..dc38d87c 100644 --- a/edivorce/apps/core/utils/efiling_submission.py +++ b/edivorce/apps/core/utils/efiling_submission.py @@ -132,7 +132,7 @@ class EFilingSubmission: return str(uuid.UUID(guid)) return guid - def upload(self, request, files, documents=None, parties=None, location=None): + def upload(self, request, files, documents=None, parties=None, location=None, file_number=None): """ Does an initial upload of documents and gets the generated eFiling Hub url. :param parties: @@ -150,8 +150,6 @@ class EFilingSubmission: if bce_id is None: raise PermissionDenied() - # package_data, files = self._get_data(request, responses, uploaded, generated) - url = f'{self.api_base_url}/submission/documents' print('DEBUG: ' + url) response = self._get_api(request, url, transaction_id, bce_id, headers={}, files=files) @@ -163,7 +161,8 @@ class EFilingSubmission: headers = { 'Content-Type': 'application/json' } - package_data = self.packaging.format_package(request, files, documents, parties, location) + package_data = self.packaging.format_package( + request, files, documents, parties, location, file_number) url = f"{self.api_base_url}/submission/{response['submissionId']}/generateUrl" print('DEBUG: ' + url) data = json.dumps(package_data) diff --git a/edivorce/apps/core/views/efiling.py b/edivorce/apps/core/views/efiling.py index fc4eb044..a21a0818 100644 --- a/edivorce/apps/core/views/efiling.py +++ b/edivorce/apps/core/views/efiling.py @@ -105,7 +105,8 @@ def _package_and_submit(request, uploaded, generated, responses, initial): post_files, documents, parties=packaging.get_parties(responses), - location=packaging.get_location(responses) + location=packaging.get_location(responses), + file_number=packaging.get_file_number(responses) ) return msg, redirect_url