refactor: move filter_order_handler.py to common #265

ral-facilities · Jan 27, 2022 · ff637e7 · ff637e7
1 parent 2beb861
commit ff637e7
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 9 deletions.
diff --git a/...c/datagateway_api/filter_order_handler.py → ...ay_api/src/common/filter_order_handler.py b/...c/datagateway_api/filter_order_handler.py → ...ay_api/src/common/filter_order_handler.py
diff --git a/datagateway_api/src/datagateway_api/database/helpers.py b/datagateway_api/src/datagateway_api/database/helpers.py
@@ -11,6 +11,7 @@
     BadRequestError,
     MissingRecordError,
 )
+from datagateway_api.src.common.filter_order_handler import FilterOrderHandler
 from datagateway_api.src.common.helpers import map_distinct_attributes_to_results
 from datagateway_api.src.datagateway_api.database.filters import (
     DatabaseDistinctFieldFilter,
@@ -25,7 +26,6 @@
     INVESTIGATIONINSTRUMENT,
     SESSION,
 )
-from datagateway_api.src.datagateway_api.filter_order_handler import FilterOrderHandler
 
 
 log = logging.getLogger()

diff --git a/datagateway_api/src/datagateway_api/icat/helpers.py b/datagateway_api/src/datagateway_api/icat/helpers.py
@@ -21,7 +21,7 @@
     MissingRecordError,
     PythonICATError,
 )
-from datagateway_api.src.datagateway_api.filter_order_handler import FilterOrderHandler
+from datagateway_api.src.common.filter_order_handler import FilterOrderHandler
 from datagateway_api.src.datagateway_api.icat.filters import (
     PythonICATLimitFilter,
     PythonICATWhereFilter,

diff --git a/datagateway_api/src/search_api/helpers.py b/datagateway_api/src/search_api/helpers.py
@@ -1,6 +1,6 @@
 import logging
 
-from datagateway_api.src.datagateway_api.filter_order_handler import FilterOrderHandler
+from datagateway_api.src.common.filter_order_handler import FilterOrderHandler
 from datagateway_api.src.datagateway_api.icat.filters import PythonICATIncludeFilter
 from datagateway_api.src.search_api.filters import SearchAPIIncludeFilter
 from datagateway_api.src.search_api.panosc_mappings import mappings

diff --git a/test/datagateway_api/icat/filters/test_limit_filter.py b/test/datagateway_api/icat/filters/test_limit_filter.py
@@ -3,7 +3,7 @@
 import pytest
 
 from datagateway_api.src.common.exceptions import FilterError
-from datagateway_api.src.datagateway_api.filter_order_handler import FilterOrderHandler
+from datagateway_api.src.common.filter_order_handler import FilterOrderHandler
 from datagateway_api.src.datagateway_api.icat.filters import (
     icat_set_limit,
     PythonICATLimitFilter,

diff --git a/test/datagateway_api/icat/filters/test_order_filter.py b/test/datagateway_api/icat/filters/test_order_filter.py
@@ -2,7 +2,7 @@
 from typing_extensions import OrderedDict
 
 from datagateway_api.src.common.exceptions import FilterError
-from datagateway_api.src.datagateway_api.filter_order_handler import FilterOrderHandler
+from datagateway_api.src.common.filter_order_handler import FilterOrderHandler
 from datagateway_api.src.datagateway_api.icat.filters import PythonICATOrderFilter
 
 

diff --git a/test/datagateway_api/icat/filters/test_where_filter.py b/test/datagateway_api/icat/filters/test_where_filter.py
@@ -1,7 +1,7 @@
 import pytest
 
 from datagateway_api.src.common.exceptions import BadRequestError, FilterError
-from datagateway_api.src.datagateway_api.filter_order_handler import FilterOrderHandler
+from datagateway_api.src.common.filter_order_handler import FilterOrderHandler
 from datagateway_api.src.datagateway_api.icat.filters import PythonICATWhereFilter
 
 

diff --git a/test/datagateway_api/icat/test_filter_order_handler.py b/test/datagateway_api/icat/test_filter_order_handler.py
@@ -1,6 +1,6 @@
 import pytest
 
-from datagateway_api.src.datagateway_api.filter_order_handler import FilterOrderHandler
+from datagateway_api.src.common.filter_order_handler import FilterOrderHandler
 from datagateway_api.src.datagateway_api.icat.filters import (
     PythonICATLimitFilter,
     PythonICATWhereFilter,

diff --git a/test/search_api/filters/test_search_api_include_filter.py b/test/search_api/filters/test_search_api_include_filter.py
@@ -1,6 +1,6 @@
 import pytest
 
-from datagateway_api.src.datagateway_api.filter_order_handler import FilterOrderHandler
+from datagateway_api.src.common.filter_order_handler import FilterOrderHandler
 from datagateway_api.src.search_api.filters import SearchAPIIncludeFilter
 from datagateway_api.src.search_api.query import SearchAPIQuery
 

diff --git a/test/search_api/filters/test_search_api_where_filter.py b/test/search_api/filters/test_search_api_where_filter.py
@@ -1,6 +1,6 @@
 import pytest
 
-from datagateway_api.src.datagateway_api.filter_order_handler import FilterOrderHandler
+from datagateway_api.src.common.filter_order_handler import FilterOrderHandler
 from datagateway_api.src.search_api.filters import SearchAPIWhereFilter
 from datagateway_api.src.search_api.nested_where_filters import NestedWhereFilters
 from datagateway_api.src.search_api.query import SearchAPIQuery