From 172cc8ffe563865c48b35de0d1c4262959879396 Mon Sep 17 00:00:00 2001 From: Michael Olund Date: Mon, 26 Oct 2020 11:36:37 -0700 Subject: [PATCH] Hooked up after_submit calls for efiling --- edivorce/apps/core/efilinghub.py | 8 ++++--- edivorce/apps/core/urls.py | 2 ++ edivorce/apps/core/utils/cso_filing.py | 29 +++++++++++++++++++------- edivorce/apps/core/views/efiling.py | 28 ++++++++++++++++++++++++- 4 files changed, 56 insertions(+), 11 deletions(-) diff --git a/edivorce/apps/core/efilinghub.py b/edivorce/apps/core/efilinghub.py index 8f38ac0f..ffd9dc20 100644 --- a/edivorce/apps/core/efilinghub.py +++ b/edivorce/apps/core/efilinghub.py @@ -230,16 +230,18 @@ class EFilingHub: if parties: package['filingPackage']['parties'] = parties # update return urls - package['navigationUrls']['success'] = request.build_absolute_uri( - reverse('dashboard_nav', args=['check_with_registry'])) package['navigationUrls']['error'] = request.build_absolute_uri( reverse('dashboard_nav', args=['check_with_registry'])) if self.initial_filing: package['navigationUrls']['cancel'] = request.build_absolute_uri( reverse('dashboard_nav', args=['initial_filing'])) + package['navigationUrls']['success'] = request.build_absolute_uri( + reverse('after_submit_initial_files')) else: package['navigationUrls']['cancel'] = request.build_absolute_uri( reverse('dashboard_nav', args=['final_filing'])) + package['navigationUrls']['success'] = request.build_absolute_uri( + reverse('after_submit_final_files')) return package @@ -334,7 +336,7 @@ class EFilingHub: d["childSupportAct"] = json.loads(r.get('child_support_act', '[]')) d["spouseSupportAct"] = r.get('spouse_support_act', '') - orders_sought = json.load(r.get('want_which_orders', '[]')) + orders_sought = json.loads(r.get('want_which_orders', '[]')) if 'A legal end to the marriage' in orders_sought: d["ordersSought"].append('DIV') diff --git a/edivorce/apps/core/urls.py b/edivorce/apps/core/urls.py index fb749177..e566956c 100644 --- a/edivorce/apps/core/urls.py +++ b/edivorce/apps/core/urls.py @@ -23,6 +23,8 @@ urlpatterns = [ url(r'^dashboard/(?P.*)', main.dashboard_nav, name="dashboard_nav"), path('submit/initial', efiling.submit_initial_files, name="submit_initial_files"), path('submit/final', efiling.submit_final_files, name="submit_final_files"), + path('after-submit/initial', efiling.after_submit_initial_files, name="after_submit_initial_files"), + path('after-submit/final', efiling.after_submit_final_files, name="after_submit_final_files"), url(r'^health$', system.health), url(r'^legal$', main.legal, name="legal"), url(r'^acknowledgements$', main.acknowledgements, name="acknowledgements"), diff --git a/edivorce/apps/core/utils/cso_filing.py b/edivorce/apps/core/utils/cso_filing.py index 5e87620b..a9f165df 100644 --- a/edivorce/apps/core/utils/cso_filing.py +++ b/edivorce/apps/core/utils/cso_filing.py @@ -12,7 +12,8 @@ def file_documents(request, responses, initial=False): (uploaded, generated) = forms_to_file(responses, initial) missing_forms = [] for form in uploaded: - docs = Document.objects.filter(bceid_user=user, doc_type=form['doc_type'], party_code=form.get('party_code', 0)) + docs = Document.objects.filter( + bceid_user=user, doc_type=form['doc_type'], party_code=form.get('party_code', 0)) if docs.count() == 0: missing_forms.append(Document.form_types[form['doc_type']]) @@ -25,11 +26,20 @@ def file_documents(request, responses, initial=False): location = hub.get_location(responses) parties = hub.get_parties(responses) - redirect_url, msg = hub.upload(request, post_files, documents, parties, location) + redirect_url, msg = hub.upload(request, post_files, documents, parties, location) if redirect_url: return None, redirect_url + if msg: + return msg, None + + return None, None + + +def after_file_documents(request, responses, initial=False): + user = request.user + # Save dummy data for now. Eventually replace with data from CSO prefix = 'initial' if initial else 'final' _save_response(user, f'{prefix}_filing_submitted', True) @@ -71,14 +81,19 @@ def forms_to_file(responses_dict, initial=False): how_to_file = responses_dict.get('how_to_file') how_to_sign = responses_dict.get('how_to_sign') - signing_location_both = responses_dict.get('signing_location') if how_to_sign == 'Together' else None - signing_location_you = responses_dict.get('signing_location_you') if how_to_sign == 'Separately' else None - signing_location_spouse = responses_dict.get('signing_location_spouse') if how_to_sign == 'Separately' else None + signing_location_both = responses_dict.get( + 'signing_location') if how_to_sign == 'Together' else None + signing_location_you = responses_dict.get( + 'signing_location_you') if how_to_sign == 'Separately' else None + signing_location_spouse = responses_dict.get( + 'signing_location_spouse') if how_to_sign == 'Separately' else None derived = responses_dict.get('derived', get_derived_data(responses_dict)) - name_change_you = derived['wants_other_orders'] and responses_dict.get('name_change_you') == 'YES' - name_change_spouse = derived['wants_other_orders'] and responses_dict.get('name_change_spouse') == 'YES' + name_change_you = derived['wants_other_orders'] and responses_dict.get( + 'name_change_you') == 'YES' + name_change_spouse = derived['wants_other_orders'] and responses_dict.get( + 'name_change_spouse') == 'YES' has_children = derived['has_children_of_marriage'] provide_marriage_certificate = responses_dict.get('original_marriage_certificate') == 'YES' diff --git a/edivorce/apps/core/views/efiling.py b/edivorce/apps/core/views/efiling.py index 30b3231b..ee64488c 100644 --- a/edivorce/apps/core/views/efiling.py +++ b/edivorce/apps/core/views/efiling.py @@ -4,7 +4,7 @@ from django.urls import reverse from django.contrib.auth.decorators import login_required from ..decorators import prequal_completed -from ..utils.cso_filing import file_documents +from ..utils.cso_filing import file_documents, after_file_documents from ..utils.user_response import get_data_for_user @@ -41,3 +41,29 @@ def _submit_files(request, initial=False): responses_dict['active_page'] = next_page return redirect(reverse('dashboard_nav', kwargs={'nav_step': next_page}), context=responses_dict) + + +@login_required +@prequal_completed +def after_submit_initial_files(request): + return _after_submit_files(request, initial=True) + + +@login_required +@prequal_completed +def after_submit_final_files(request): + return _after_submit_files(request, initial=False) + + +def _after_submit_files(request, initial=False): + responses_dict = get_data_for_user(request.user) + if initial: + next_page = 'wait_for_number' + else: + next_page = 'next_steps' + + after_file_documents(request, responses_dict, initial=initial) + + responses_dict['active_page'] = next_page + + return redirect(reverse('dashboard_nav', kwargs={'nav_step': next_page}), context=responses_dict)