Browse Source

Renamed classes

pull/172/head
Michael Olund 5 years ago
parent
commit
6c1caafa2f
6 changed files with 12 additions and 12 deletions
  1. +3
    -3
      edivorce/apps/core/utils/efiling_court_locations.py
  2. +1
    -1
      edivorce/apps/core/utils/efiling_hub_caller_base.py
  3. +2
    -2
      edivorce/apps/core/utils/efiling_packaging.py
  4. +3
    -3
      edivorce/apps/core/utils/efiling_submission.py
  5. +1
    -1
      edivorce/apps/core/views/efiling.py
  6. +2
    -2
      edivorce/apps/core/views/main.py

edivorce/apps/core/utils/court_locations.py → edivorce/apps/core/utils/efiling_court_locations.py View File

@ -7,17 +7,17 @@ from django.conf import settings
from django.core.cache import cache from django.core.cache import cache
from django.core.exceptions import PermissionDenied from django.core.exceptions import PermissionDenied
from .efiling_hub_api import EFilingHubApi
from .efiling_hub_caller_base import EFilingHubCallerBase
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
class CourtLocations(EFilingHubApi):
class EFilingCourtLocations(EFilingHubCallerBase):
def __init__(self): def __init__(self):
self.access_token = None self.access_token = None
self.refresh_token = None self.refresh_token = None
EFilingHubApi.__init__(self)
EFilingHubCallerBase.__init__(self)
def _get_api(self, request, url, bceid_guid, headers={}): def _get_api(self, request, url, bceid_guid, headers={}):
# make sure we have an access token # make sure we have an access token

edivorce/apps/core/utils/efiling_hub_api.py → edivorce/apps/core/utils/efiling_hub_caller_base.py View File

@ -9,7 +9,7 @@ from django.core.exceptions import PermissionDenied
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
class EFilingHubApi:
class EFilingHubCallerBase:
def __init__(self): def __init__(self):
self.client_id = settings.EFILING_HUB_KEYCLOAK_CLIENT_ID self.client_id = settings.EFILING_HUB_KEYCLOAK_CLIENT_ID

+ 2
- 2
edivorce/apps/core/utils/efiling_packaging.py View File

@ -9,7 +9,7 @@ from django.urls import reverse
from ..models import Document from ..models import Document
from ..views.pdf import images_to_pdf, pdf_form from ..views.pdf import images_to_pdf, pdf_form
from .court_locations import CourtLocations
from .efiling_court_locations import EFilingCourtLocations
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -316,7 +316,7 @@ class EFilingPackaging:
def _get_location(self, request, responses): def _get_location(self, request, responses):
location_name = responses.get('court_registry_for_filing', '') location_name = responses.get('court_registry_for_filing', '')
if not self.court_locations: if not self.court_locations:
self.court_locations = CourtLocations().courts(request)
self.court_locations = EFilingCourtLocations().courts(request)
return self.court_locations.get(location_name, return self.court_locations.get(location_name,
{'location_id': '0000'}).get('location_id') {'location_id': '0000'}).get('location_id')


+ 3
- 3
edivorce/apps/core/utils/efiling_submission.py View File

@ -6,12 +6,12 @@ import uuid
from django.conf import settings from django.conf import settings
from django.core.exceptions import PermissionDenied from django.core.exceptions import PermissionDenied
from .efiling_hub_api import EFilingHubApi
from .efiling_hub_caller_base import EFilingHubCallerBase
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
class EFilingSubmission(EFilingHubApi):
class EFilingSubmission(EFilingHubCallerBase):
def __init__(self, initial_filing, packaging): def __init__(self, initial_filing, packaging):
self.initial_filing = initial_filing self.initial_filing = initial_filing
@ -19,7 +19,7 @@ class EFilingSubmission(EFilingHubApi):
self.submission_id = None self.submission_id = None
self.access_token = None self.access_token = None
self.refresh_token = None self.refresh_token = None
EFilingHubApi.__init__(self)
EFilingHubCallerBase.__init__(self)
def _get_transaction(self, request): def _get_transaction(self, request):
""" """


+ 1
- 1
edivorce/apps/core/views/efiling.py View File

@ -10,10 +10,10 @@ from django.contrib.auth.decorators import login_required
from ..decorators import prequal_completed from ..decorators import prequal_completed
from ..models import Document, UserResponse from ..models import Document, UserResponse
from ..utils.efiling_court_locations import EFilingCourtLocations
from ..utils.efiling_documents import forms_to_file from ..utils.efiling_documents import forms_to_file
from ..utils.efiling_packaging import EFilingPackaging from ..utils.efiling_packaging import EFilingPackaging
from ..utils.efiling_submission import EFilingSubmission from ..utils.efiling_submission import EFilingSubmission
from ..utils.court_locations import CourtLocations
from ..utils.user_response import get_data_for_user from ..utils.user_response import get_data_for_user
MAX_MEGABYTES = 10 MAX_MEGABYTES = 10


+ 2
- 2
edivorce/apps/core/views/main.py View File

@ -7,8 +7,8 @@ from django.contrib.auth.decorators import login_required
from edivorce.apps.core.utils.derived import get_derived_data from edivorce.apps.core.utils.derived import get_derived_data
from ..decorators import intercept, prequal_completed from ..decorators import intercept, prequal_completed
from ..utils.efiling_court_locations import EFilingCourtLocations
from ..utils.efiling_documents import forms_to_file 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.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.template_step_order import template_step_order
from ..utils.user_response import ( from ..utils.user_response import (
@ -232,7 +232,7 @@ def question(request, step, sub_step=None):
responses_dict['active_page'] = step responses_dict['active_page'] = step
# If page is filing location page, add registries dictionary for list of court registries # If page is filing location page, add registries dictionary for list of court registries
if step == "location": if step == "location":
courts = CourtLocations().courts(request)
courts = EFilingCourtLocations().courts(request)
responses_dict['registries'] = sorted(courts.keys()) responses_dict['registries'] = sorted(courts.keys())
responses_dict['sub_step'] = sub_step responses_dict['sub_step'] = sub_step


Loading…
Cancel
Save