Refactored exceptions.py module from input package to entities pacakge

features/steps/steps.py

@@ -8,7 +8,7 @@
 
 import logging
 
-from pds_doi_service.core.input.exceptions import InputFormatException, CriticalDOIException
+from pds_doi_service.core.entities.exceptions import InputFormatException, CriticalDOIException
 from pds_doi_service.core.util.doi_xml_differ import DOIDiffer
 from pds_doi_service.core.actions.draft import DOICoreActionDraft
 from pds_doi_service.core.actions.reserve import DOICoreActionReserve

src/pds_doi_service/api/controllers/dois_controller.py

@@ -28,11 +28,11 @@
 from pds_doi_service.core.actions import DOICoreActionList
 from pds_doi_service.core.actions import DOICoreActionRelease
 from pds_doi_service.core.actions import DOICoreActionReserve
-from pds_doi_service.core.input.exceptions import InputFormatException
-from pds_doi_service.core.input.exceptions import NoTransactionHistoryForIdentifierException
-from pds_doi_service.core.input.exceptions import UnknownIdentifierException
-from pds_doi_service.core.input.exceptions import WarningDOIException
-from pds_doi_service.core.input.exceptions import WebRequestException
+from pds_doi_service.core.entities.exceptions import InputFormatException
+from pds_doi_service.core.entities.exceptions import NoTransactionHistoryForIdentifierException
+from pds_doi_service.core.entities.exceptions import UnknownIdentifierException
+from pds_doi_service.core.entities.exceptions import WarningDOIException
+from pds_doi_service.core.entities.exceptions import WebRequestException
 from pds_doi_service.core.input.input_util import DOIInputUtil
 from pds_doi_service.core.outputs.doi_record import CONTENT_TYPE_JSON
 from pds_doi_service.core.outputs.doi_record import CONTENT_TYPE_XML

src/pds_doi_service/core/actions/draft.py

@@ -18,15 +18,15 @@
 from pds_doi_service.core.actions import DOICoreAction
 from pds_doi_service.core.actions.list import DOICoreActionList
 from pds_doi_service.core.entities.doi import DoiStatus
-from pds_doi_service.core.input.exceptions import collect_exception_classes_and_messages
-from pds_doi_service.core.input.exceptions import CriticalDOIException
-from pds_doi_service.core.input.exceptions import DuplicatedTitleDOIException
-from pds_doi_service.core.input.exceptions import InputFormatException
-from pds_doi_service.core.input.exceptions import InvalidIdentifierException
-from pds_doi_service.core.input.exceptions import NoTransactionHistoryForIdentifierException
-from pds_doi_service.core.input.exceptions import raise_or_warn_exceptions
-from pds_doi_service.core.input.exceptions import TitleDoesNotMatchProductTypeException
-from pds_doi_service.core.input.exceptions import UnexpectedDOIActionException
+from pds_doi_service.core.entities.exceptions import collect_exception_classes_and_messages
+from pds_doi_service.core.entities.exceptions import CriticalDOIException
+from pds_doi_service.core.entities.exceptions import DuplicatedTitleDOIException
+from pds_doi_service.core.entities.exceptions import InputFormatException
+from pds_doi_service.core.entities.exceptions import InvalidIdentifierException
+from pds_doi_service.core.entities.exceptions import NoTransactionHistoryForIdentifierException
+from pds_doi_service.core.entities.exceptions import raise_or_warn_exceptions
+from pds_doi_service.core.entities.exceptions import TitleDoesNotMatchProductTypeException
+from pds_doi_service.core.entities.exceptions import UnexpectedDOIActionException
 from pds_doi_service.core.input.input_util import DOIInputUtil
 from pds_doi_service.core.input.node_util import NodeUtil
 from pds_doi_service.core.outputs.doi_record import CONTENT_TYPE_JSON

src/pds_doi_service/core/actions/list.py

@@ -17,7 +17,7 @@
 from pds_doi_service.core.actions.action import DOICoreAction
 from pds_doi_service.core.db.doi_database import DOIDataBase
 from pds_doi_service.core.entities.doi import DoiStatus
-from pds_doi_service.core.input.exceptions import UnknownIdentifierException
+from pds_doi_service.core.entities.exceptions import UnknownIdentifierException
 from pds_doi_service.core.input.node_util import NodeUtil
 from pds_doi_service.core.util.general_util import get_logger
 

src/pds_doi_service/core/actions/release.py

@@ -14,15 +14,15 @@
 from pds_doi_service.core.actions.action import DOICoreAction
 from pds_doi_service.core.entities.doi import DoiEvent
 from pds_doi_service.core.entities.doi import DoiStatus
-from pds_doi_service.core.input.exceptions import collect_exception_classes_and_messages
-from pds_doi_service.core.input.exceptions import CriticalDOIException
-from pds_doi_service.core.input.exceptions import DuplicatedTitleDOIException
-from pds_doi_service.core.input.exceptions import InputFormatException
-from pds_doi_service.core.input.exceptions import InvalidIdentifierException
-from pds_doi_service.core.input.exceptions import raise_or_warn_exceptions
-from pds_doi_service.core.input.exceptions import SiteURLNotExistException
-from pds_doi_service.core.input.exceptions import TitleDoesNotMatchProductTypeException
-from pds_doi_service.core.input.exceptions import UnexpectedDOIActionException
+from pds_doi_service.core.entities.exceptions import collect_exception_classes_and_messages
+from pds_doi_service.core.entities.exceptions import CriticalDOIException
+from pds_doi_service.core.entities.exceptions import DuplicatedTitleDOIException
+from pds_doi_service.core.entities.exceptions import InputFormatException
+from pds_doi_service.core.entities.exceptions import InvalidIdentifierException
+from pds_doi_service.core.entities.exceptions import raise_or_warn_exceptions
+from pds_doi_service.core.entities.exceptions import SiteURLNotExistException
+from pds_doi_service.core.entities.exceptions import TitleDoesNotMatchProductTypeException
+from pds_doi_service.core.entities.exceptions import UnexpectedDOIActionException
 from pds_doi_service.core.input.input_util import DOIInputUtil
 from pds_doi_service.core.input.node_util import NodeUtil
 from pds_doi_service.core.outputs.doi_record import CONTENT_TYPE_JSON

src/pds_doi_service/core/actions/reserve.py

@@ -14,15 +14,15 @@
 from pds_doi_service.core.actions.action import DOICoreAction
 from pds_doi_service.core.entities.doi import DoiEvent
 from pds_doi_service.core.entities.doi import DoiStatus
-from pds_doi_service.core.input.exceptions import collect_exception_classes_and_messages
-from pds_doi_service.core.input.exceptions import CriticalDOIException
-from pds_doi_service.core.input.exceptions import DuplicatedTitleDOIException
-from pds_doi_service.core.input.exceptions import InputFormatException
-from pds_doi_service.core.input.exceptions import InvalidIdentifierException
-from pds_doi_service.core.input.exceptions import raise_or_warn_exceptions
-from pds_doi_service.core.input.exceptions import SiteURLNotExistException
-from pds_doi_service.core.input.exceptions import TitleDoesNotMatchProductTypeException
-from pds_doi_service.core.input.exceptions import UnexpectedDOIActionException
+from pds_doi_service.core.entities.exceptions import collect_exception_classes_and_messages
+from pds_doi_service.core.entities.exceptions import CriticalDOIException
+from pds_doi_service.core.entities.exceptions import DuplicatedTitleDOIException
+from pds_doi_service.core.entities.exceptions import InputFormatException
+from pds_doi_service.core.entities.exceptions import InvalidIdentifierException
+from pds_doi_service.core.entities.exceptions import raise_or_warn_exceptions
+from pds_doi_service.core.entities.exceptions import SiteURLNotExistException
+from pds_doi_service.core.entities.exceptions import TitleDoesNotMatchProductTypeException
+from pds_doi_service.core.entities.exceptions import UnexpectedDOIActionException
 from pds_doi_service.core.input.input_util import DOIInputUtil
 from pds_doi_service.core.input.node_util import NodeUtil
 from pds_doi_service.core.outputs.doi_record import CONTENT_TYPE_JSON

src/pds_doi_service/core/actions/test/draft_test.py

@@ -10,8 +10,8 @@
 from pds_doi_service.core.actions.release import DOICoreActionRelease
 from pds_doi_service.core.entities.doi import DoiStatus
 from pds_doi_service.core.entities.doi import ProductType
-from pds_doi_service.core.input.exceptions import InputFormatException
-from pds_doi_service.core.input.exceptions import WarningDOIException
+from pds_doi_service.core.entities.exceptions import InputFormatException
+from pds_doi_service.core.entities.exceptions import WarningDOIException
 from pds_doi_service.core.outputs.service import DOIServiceFactory
 from pkg_resources import resource_filename
 

src/pds_doi_service/core/input/exceptions.py → src/pds_doi_service/core/entities/exceptions.py

@@ -13,7 +13,7 @@
 """
 from pds_doi_service.core.util.general_util import get_logger
 
-logger = get_logger("pds_doi_service.core.input.exceptions")
+logger = get_logger(__name__)
 
 
 class InputFormatException(Exception):

src/pds_doi_service/core/input/input_util.py

@@ -23,7 +23,7 @@
 from pds_doi_service.core.entities.doi import Doi
 from pds_doi_service.core.entities.doi import DoiStatus
 from pds_doi_service.core.entities.doi import ProductType
-from pds_doi_service.core.input.exceptions import InputFormatException
+from pds_doi_service.core.entities.exceptions import InputFormatException
 from pds_doi_service.core.input.pds4_util import DOIPDS4LabelUtil
 from pds_doi_service.core.outputs.doi_record import CONTENT_TYPE_JSON
 from pds_doi_service.core.outputs.osti.osti_validator import DOIOstiValidator

src/pds_doi_service/core/input/node_util.py

@@ -4,7 +4,7 @@
 #  use must be negotiated with the Office of Technology Transfer at the
 #  California Institute of Technology.
 #
-from pds_doi_service.core.input.exceptions import UnknownNodeException
+from pds_doi_service.core.entities.exceptions import UnknownNodeException
 from pds_doi_service.core.util.general_util import get_logger
 
 # Get the common logger and set the level for this file.

src/pds_doi_service/core/input/pds4_util.py

@@ -17,7 +17,7 @@
 from pds_doi_service.core.entities.doi import Doi
 from pds_doi_service.core.entities.doi import DoiStatus
 from pds_doi_service.core.entities.doi import ProductType
-from pds_doi_service.core.input.exceptions import InputFormatException
+from pds_doi_service.core.entities.exceptions import InputFormatException
 from pds_doi_service.core.util.general_util import create_landing_page_url
 from pds_doi_service.core.util.general_util import get_logger
 from pds_doi_service.core.util.keyword_tokenizer import KeywordTokenizer

src/pds_doi_service/core/input/test/input_util_test.py

@@ -8,7 +8,7 @@
 from pds_doi_service.core.entities.doi import Doi
 from pds_doi_service.core.entities.doi import DoiStatus
 from pds_doi_service.core.entities.doi import ProductType
-from pds_doi_service.core.input.exceptions import InputFormatException
+from pds_doi_service.core.entities.exceptions import InputFormatException
 from pds_doi_service.core.input.input_util import DOIInputUtil
 from pds_doi_service.core.outputs.service import DOIServiceFactory
 from pds_doi_service.core.outputs.service import SERVICE_TYPE_OSTI

src/pds_doi_service/core/outputs/datacite/datacite_validator.py

@@ -16,7 +16,7 @@
 from os.path import exists
 
 import jsonschema
-from pds_doi_service.core.input.exceptions import InputFormatException
+from pds_doi_service.core.entities.exceptions import InputFormatException
 from pds_doi_service.core.outputs.service_validator import DOIServiceValidator
 from pds_doi_service.core.util.general_util import get_logger
 from pkg_resources import resource_filename

src/pds_doi_service/core/outputs/datacite/datacite_web_client.py

@@ -15,7 +15,7 @@
 import pprint
 
 import requests
-from pds_doi_service.core.input.exceptions import WebRequestException
+from pds_doi_service.core.entities.exceptions import WebRequestException
 from pds_doi_service.core.outputs.datacite.datacite_web_parser import DOIDataCiteWebParser
 from pds_doi_service.core.outputs.doi_record import CONTENT_TYPE_JSON
 from pds_doi_service.core.outputs.web_client import DOIWebClient

src/pds_doi_service/core/outputs/datacite/datacite_web_parser.py

@@ -19,8 +19,8 @@
 from pds_doi_service.core.entities.doi import Doi
 from pds_doi_service.core.entities.doi import DoiStatus
 from pds_doi_service.core.entities.doi import ProductType
-from pds_doi_service.core.input.exceptions import InputFormatException
-from pds_doi_service.core.input.exceptions import UnknownIdentifierException
+from pds_doi_service.core.entities.exceptions import InputFormatException
+from pds_doi_service.core.entities.exceptions import UnknownIdentifierException
 from pds_doi_service.core.outputs.doi_record import CONTENT_TYPE_JSON
 from pds_doi_service.core.outputs.web_parser import DOIWebParser
 from pds_doi_service.core.util.general_util import get_logger

src/pds_doi_service/core/outputs/doi_validator.py

@@ -19,13 +19,13 @@
 from pds_doi_service.core.db.doi_database import DOIDataBase
 from pds_doi_service.core.entities.doi import Doi
 from pds_doi_service.core.entities.doi import DoiStatus
-from pds_doi_service.core.input.exceptions import DuplicatedTitleDOIException
-from pds_doi_service.core.input.exceptions import IllegalDOIActionException
-from pds_doi_service.core.input.exceptions import InvalidIdentifierException
-from pds_doi_service.core.input.exceptions import InvalidRecordException
-from pds_doi_service.core.input.exceptions import SiteURLNotExistException
-from pds_doi_service.core.input.exceptions import TitleDoesNotMatchProductTypeException
-from pds_doi_service.core.input.exceptions import UnexpectedDOIActionException
+from pds_doi_service.core.entities.exceptions import DuplicatedTitleDOIException
+from pds_doi_service.core.entities.exceptions import IllegalDOIActionException
+from pds_doi_service.core.entities.exceptions import InvalidIdentifierException
+from pds_doi_service.core.entities.exceptions import InvalidRecordException
+from pds_doi_service.core.entities.exceptions import SiteURLNotExistException
+from pds_doi_service.core.entities.exceptions import TitleDoesNotMatchProductTypeException
+from pds_doi_service.core.entities.exceptions import UnexpectedDOIActionException
 from pds_doi_service.core.util.config_parser import DOIConfigUtil
 from pds_doi_service.core.util.general_util import get_logger
 

src/pds_doi_service/core/outputs/osti/osti_validator.py

@@ -19,7 +19,7 @@
 from lxml import etree
 from lxml import isoschematron  # type: ignore
 from pds_doi_service.core.entities.doi import DoiStatus
-from pds_doi_service.core.input.exceptions import InputFormatException
+from pds_doi_service.core.entities.exceptions import InputFormatException
 from pds_doi_service.core.outputs.service_validator import DOIServiceValidator
 from pds_doi_service.core.util.general_util import get_logger
 from pkg_resources import resource_filename

src/pds_doi_service/core/outputs/osti/osti_web_client.py

@@ -15,7 +15,7 @@
 import pprint
 
 import requests
-from pds_doi_service.core.input.exceptions import WebRequestException
+from pds_doi_service.core.entities.exceptions import WebRequestException
 from pds_doi_service.core.outputs.doi_record import CONTENT_TYPE_JSON
 from pds_doi_service.core.outputs.doi_record import CONTENT_TYPE_XML
 from pds_doi_service.core.outputs.osti.osti_web_parser import DOIOstiWebParser

src/pds_doi_service/core/outputs/osti/osti_web_parser.py

@@ -20,8 +20,8 @@
 from pds_doi_service.core.entities.doi import Doi
 from pds_doi_service.core.entities.doi import DoiStatus
 from pds_doi_service.core.entities.doi import ProductType
-from pds_doi_service.core.input.exceptions import InputFormatException
-from pds_doi_service.core.input.exceptions import UnknownIdentifierException
+from pds_doi_service.core.entities.exceptions import InputFormatException
+from pds_doi_service.core.entities.exceptions import UnknownIdentifierException
 from pds_doi_service.core.outputs.doi_record import CONTENT_TYPE_JSON
 from pds_doi_service.core.outputs.doi_record import CONTENT_TYPE_XML
 from pds_doi_service.core.outputs.web_parser import DOIWebParser

src/pds_doi_service/core/outputs/test/datacite_test.py

@@ -11,7 +11,7 @@
 from pds_doi_service.core.entities.doi import Doi
 from pds_doi_service.core.entities.doi import DoiStatus
 from pds_doi_service.core.entities.doi import ProductType
-from pds_doi_service.core.input.exceptions import InputFormatException
+from pds_doi_service.core.entities.exceptions import InputFormatException
 from pds_doi_service.core.outputs.datacite import DOIDataCiteRecord
 from pds_doi_service.core.outputs.datacite import DOIDataCiteValidator
 from pds_doi_service.core.outputs.datacite import DOIDataCiteWebClient

src/pds_doi_service/core/outputs/test/doi_validator_test.py

@@ -13,12 +13,12 @@
 from pds_doi_service.core.entities.doi import Doi
 from pds_doi_service.core.entities.doi import DoiStatus
 from pds_doi_service.core.entities.doi import ProductType
-from pds_doi_service.core.input.exceptions import DuplicatedTitleDOIException
-from pds_doi_service.core.input.exceptions import IllegalDOIActionException
-from pds_doi_service.core.input.exceptions import InvalidIdentifierException
-from pds_doi_service.core.input.exceptions import InvalidRecordException
-from pds_doi_service.core.input.exceptions import TitleDoesNotMatchProductTypeException
-from pds_doi_service.core.input.exceptions import UnexpectedDOIActionException
+from pds_doi_service.core.entities.exceptions import DuplicatedTitleDOIException
+from pds_doi_service.core.entities.exceptions import IllegalDOIActionException
+from pds_doi_service.core.entities.exceptions import InvalidIdentifierException
+from pds_doi_service.core.entities.exceptions import InvalidRecordException
+from pds_doi_service.core.entities.exceptions import TitleDoesNotMatchProductTypeException
+from pds_doi_service.core.entities.exceptions import UnexpectedDOIActionException
 from pds_doi_service.core.outputs.doi_validator import DOIValidator
 
 

src/pds_doi_service/core/outputs/web_client.py

@@ -16,7 +16,7 @@
 from typing import Optional
 
 import requests
-from pds_doi_service.core.input.exceptions import WebRequestException
+from pds_doi_service.core.entities.exceptions import WebRequestException
 from pds_doi_service.core.outputs.doi_record import CONTENT_TYPE_XML
 from pds_doi_service.core.outputs.web_parser import DOIWebParser
 from pds_doi_service.core.util.config_parser import DOIConfigUtil

src/pds_doi_service/core/util/doi_xml_differ.py

@@ -9,7 +9,7 @@
 import datetime
 
 from lxml import etree
-from pds_doi_service.core.input.exceptions import InputFormatException
+from pds_doi_service.core.entities.exceptions import InputFormatException
 from pds_doi_service.core.input.node_util import NodeUtil
 from pds_doi_service.core.util.general_util import get_logger
 

src/pds_doi_service/core/util/initialize_production_deployment.py

@@ -63,8 +63,8 @@
 import os
 from datetime import datetime
 
-from pds_doi_service.core.input.exceptions import CriticalDOIException
-from pds_doi_service.core.input.exceptions import InputFormatException
+from pds_doi_service.core.entities.exceptions import CriticalDOIException
+from pds_doi_service.core.entities.exceptions import InputFormatException
 from pds_doi_service.core.outputs.doi_record import CONTENT_TYPE_JSON
 from pds_doi_service.core.outputs.osti.osti_web_parser import DOIOstiXmlWebParser
 from pds_doi_service.core.outputs.service import DOIServiceFactory