CDD-3342 - Fixed merge conflict

Author: tushortz

metrics/api/serializers/charts/dual_category_charts.py

@@ -13,7 +13,6 @@
     DEFAULT_CHART_WIDTH,
     DEFAULT_X_AXIS,
     DEFAULT_Y_AXIS,
-    ChartAxisFields,
     ChartTypes,
     DataSourceFileType,
     DEFAULT_Y_AXIS_MINIMUM_VAlUE,

metrics/api/serializers/downloads/dual_category.py

@@ -16,7 +16,6 @@
 from metrics.domain.models.downloads.dual_category import (
     DualCategoryDownloadRequestParams,
 )
-from metrics.domain.tables.dual_category import build_dual_category_plot_params
 
 
 class DualCategoryDownloadSegmentSerializer(serializers.Serializer):

metrics/api/serializers/tables/dual_category.py

@@ -17,12 +17,7 @@
     ChartAxisFields,
     ChartTypes,
 )
-from metrics.domain.models.tables.dual_category import DualCategoryTableRequestParams
-
-from metrics.domain.tables.dual_category import (
-    DualCategoryTableRequestParams,
-    build_dual_category_plot_params,
-)
+from metrics.domain.tables.dual_category import DualCategoryTableRequestParams
 
 
 class DualCategoryTableRequestParamsSerializer(DualCategoryChartSerializer):

metrics/domain/models/tables/dual_category.py

@@ -6,7 +6,6 @@
     extract_metric_group_from_metric,
 )
 from metrics.domain.models import ChartRequestParams
-from metrics.domain.models.tables.dual_category import DualCategoryTableRequestParams
 from metrics.domain.tables.dual_category import DualCategoryTableRequestParams
 from metrics.domain.tables.generation import DualCategoryTabularData, TabularData
 from metrics.interfaces.plots.access import PlotsInterface

metrics/interfaces/tables/access.py

@@ -4,7 +4,6 @@
 import pytest
 
 from metrics.api.views.tables.dual_category_tables import DualCategoryTablesView
-from metrics.domain.models.tables.dual_category import DualCategoryTableRequestParams
 from metrics.domain.tables.dual_category import DualCategoryTableRequestParams
 from metrics.interfaces.plots.access import (
     DataNotFoundForAnyPlotError,

tests/unit/metrics/api/views/tables/test_dual_category_tables.py

@@ -3,7 +3,6 @@
 
 from metrics.domain.common.utils import ChartAxisFields
 from metrics.domain.models.plots import PlotGenerationData, PlotParameters
-from metrics.domain.models.tables.dual_category import DualCategoryTableRequestParams
 from metrics.domain.tables.dual_category import DualCategoryTableRequestParams
 from metrics.domain.tables.generation import (
     LOWER_CONFIDENCE,