From 6c1caafa2f3f9e19d974f94e92520bbc691097d1 Mon Sep 17 00:00:00 2001 From: Michael Olund Date: Wed, 18 Nov 2020 17:42:01 -0800 Subject: [PATCH] Renamed classes --- .../{court_locations.py => efiling_court_locations.py} | 6 +++--- .../{efiling_hub_api.py => efiling_hub_caller_base.py} | 2 +- edivorce/apps/core/utils/efiling_packaging.py | 4 ++-- edivorce/apps/core/utils/efiling_submission.py | 6 +++--- edivorce/apps/core/views/efiling.py | 2 +- edivorce/apps/core/views/main.py | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) rename edivorce/apps/core/utils/{court_locations.py => efiling_court_locations.py} (94%) rename edivorce/apps/core/utils/{efiling_hub_api.py => efiling_hub_caller_base.py} (99%) diff --git a/edivorce/apps/core/utils/court_locations.py b/edivorce/apps/core/utils/efiling_court_locations.py similarity index 94% rename from edivorce/apps/core/utils/court_locations.py rename to edivorce/apps/core/utils/efiling_court_locations.py index 204aeadd..063334d1 100644 --- a/edivorce/apps/core/utils/court_locations.py +++ b/edivorce/apps/core/utils/efiling_court_locations.py @@ -7,17 +7,17 @@ from django.conf import settings from django.core.cache import cache from django.core.exceptions import PermissionDenied -from .efiling_hub_api import EFilingHubApi +from .efiling_hub_caller_base import EFilingHubCallerBase logger = logging.getLogger(__name__) -class CourtLocations(EFilingHubApi): +class EFilingCourtLocations(EFilingHubCallerBase): def __init__(self): self.access_token = None self.refresh_token = None - EFilingHubApi.__init__(self) + EFilingHubCallerBase.__init__(self) def _get_api(self, request, url, bceid_guid, headers={}): # make sure we have an access token diff --git a/edivorce/apps/core/utils/efiling_hub_api.py b/edivorce/apps/core/utils/efiling_hub_caller_base.py similarity index 99% rename from edivorce/apps/core/utils/efiling_hub_api.py rename to edivorce/apps/core/utils/efiling_hub_caller_base.py index 83455575..bfb4d898 100644 --- a/edivorce/apps/core/utils/efiling_hub_api.py +++ b/edivorce/apps/core/utils/efiling_hub_caller_base.py @@ -9,7 +9,7 @@ from django.core.exceptions import PermissionDenied logger = logging.getLogger(__name__) -class EFilingHubApi: +class EFilingHubCallerBase: def __init__(self): self.client_id = settings.EFILING_HUB_KEYCLOAK_CLIENT_ID diff --git a/edivorce/apps/core/utils/efiling_packaging.py b/edivorce/apps/core/utils/efiling_packaging.py index 9b32c5c3..fca6ebaa 100644 --- a/edivorce/apps/core/utils/efiling_packaging.py +++ b/edivorce/apps/core/utils/efiling_packaging.py @@ -9,7 +9,7 @@ from django.urls import reverse from ..models import Document from ..views.pdf import images_to_pdf, pdf_form -from .court_locations import CourtLocations +from .efiling_court_locations import EFilingCourtLocations logger = logging.getLogger(__name__) @@ -316,7 +316,7 @@ class EFilingPackaging: def _get_location(self, request, responses): location_name = responses.get('court_registry_for_filing', '') if not self.court_locations: - self.court_locations = CourtLocations().courts(request) + self.court_locations = EFilingCourtLocations().courts(request) return self.court_locations.get(location_name, {'location_id': '0000'}).get('location_id') diff --git a/edivorce/apps/core/utils/efiling_submission.py b/edivorce/apps/core/utils/efiling_submission.py index 610ffc20..8c693391 100644 --- a/edivorce/apps/core/utils/efiling_submission.py +++ b/edivorce/apps/core/utils/efiling_submission.py @@ -6,12 +6,12 @@ import uuid from django.conf import settings from django.core.exceptions import PermissionDenied -from .efiling_hub_api import EFilingHubApi +from .efiling_hub_caller_base import EFilingHubCallerBase logger = logging.getLogger(__name__) -class EFilingSubmission(EFilingHubApi): +class EFilingSubmission(EFilingHubCallerBase): def __init__(self, initial_filing, packaging): self.initial_filing = initial_filing @@ -19,7 +19,7 @@ class EFilingSubmission(EFilingHubApi): self.submission_id = None self.access_token = None self.refresh_token = None - EFilingHubApi.__init__(self) + EFilingHubCallerBase.__init__(self) def _get_transaction(self, request): """ diff --git a/edivorce/apps/core/views/efiling.py b/edivorce/apps/core/views/efiling.py index 5e397012..39cdfe8c 100644 --- a/edivorce/apps/core/views/efiling.py +++ b/edivorce/apps/core/views/efiling.py @@ -10,10 +10,10 @@ from django.contrib.auth.decorators import login_required from ..decorators import prequal_completed from ..models import Document, UserResponse +from ..utils.efiling_court_locations import EFilingCourtLocations from ..utils.efiling_documents import forms_to_file from ..utils.efiling_packaging import EFilingPackaging from ..utils.efiling_submission import EFilingSubmission -from ..utils.court_locations import CourtLocations from ..utils.user_response import get_data_for_user MAX_MEGABYTES = 10 diff --git a/edivorce/apps/core/views/main.py b/edivorce/apps/core/views/main.py index b48094d5..12439a69 100644 --- a/edivorce/apps/core/views/main.py +++ b/edivorce/apps/core/views/main.py @@ -7,8 +7,8 @@ from django.contrib.auth.decorators import login_required from edivorce.apps.core.utils.derived import get_derived_data from ..decorators import intercept, prequal_completed +from ..utils.efiling_court_locations import EFilingCourtLocations from ..utils.efiling_documents import forms_to_file -from ..utils.court_locations import CourtLocations from ..utils.step_completeness import get_error_dict, get_missed_question_keys, get_step_completeness, is_complete, get_formatted_incomplete_list from ..utils.template_step_order import template_step_order from ..utils.user_response import ( @@ -232,7 +232,7 @@ def question(request, step, sub_step=None): responses_dict['active_page'] = step # If page is filing location page, add registries dictionary for list of court registries if step == "location": - courts = CourtLocations().courts(request) + courts = EFilingCourtLocations().courts(request) responses_dict['registries'] = sorted(courts.keys()) responses_dict['sub_step'] = sub_step