fix: dedup by computed_name

Author: joseph-sentry

api/internal/tests/views/test_coverage_viewset.py

@@ -10,7 +10,8 @@
     OwnerFactory,
     RepositoryFactory,
 )
-from shared.reports.resources import Report, ReportFile, ReportLine
+from shared.reports.resources import Report, ReportFile
+from shared.reports.types import ReportLine
 from shared.utils.sessions import Session
 
 from services.components import Component

api/public/v2/tests/test_api_compare_viewset.py

@@ -12,7 +12,8 @@
     RepositoryFactory,
 )
 from shared.reports.api_report_service import SerializableReport
-from shared.reports.resources import Report, ReportFile, ReportLine
+from shared.reports.resources import Report, ReportFile
+from shared.reports.types import ReportLine
 from shared.reports.types import ReportTotals
 from shared.utils.merge import LineType
 from shared.utils.sessions import Session

api/public/v2/tests/test_api_component_viewset.py

@@ -7,7 +7,8 @@
     OwnerFactory,
     RepositoryFactory,
 )
-from shared.reports.resources import Report, ReportFile, ReportLine
+from shared.reports.resources import Report, ReportFile
+from shared.reports.types import ReportLine
 from shared.utils.sessions import Session
 
 from services.components import Component

api/public/v2/tests/test_file_report_viewset.py

@@ -9,7 +9,8 @@
     OwnerFactory,
     RepositoryFactory,
 )
-from shared.reports.resources import Report, ReportFile, ReportLine
+from shared.reports.resources import Report, ReportFile
+from shared.reports.types import ReportLine
 from shared.utils.sessions import Session
 
 from core.models import Branch

api/public/v2/tests/test_flag_viewset.py

@@ -7,7 +7,8 @@
     OwnerFactory,
     RepositoryFactory,
 )
-from shared.reports.resources import Report, ReportFile, ReportLine
+from shared.reports.resources import Report, ReportFile
+from shared.reports.types import ReportLine
 from shared.utils.sessions import Session
 
 from reports.tests.factories import RepositoryFlagFactory

api/public/v2/tests/test_report_tree.py

@@ -8,7 +8,8 @@
     OwnerFactory,
     RepositoryFactory,
 )
-from shared.reports.resources import Report, ReportFile, ReportLine
+from shared.reports.resources import Report, ReportFile
+from shared.reports.types import ReportLine
 from shared.utils.sessions import Session
 
 from utils.test_utils import APIClient

api/public/v2/tests/test_report_viewset.py

@@ -13,7 +13,8 @@
     CommitFactory,
     RepositoryFactory,
 )
-from shared.reports.resources import Report, ReportFile, ReportLine
+from shared.reports.resources import Report, ReportFile
+from shared.reports.types import ReportLine
 from shared.utils.sessions import Session
 
 from services.components import Component

api/public/v2/tests/test_totals_viewset.py

@@ -10,7 +10,8 @@
     OwnerFactory,
     RepositoryFactory,
 )
-from shared.reports.resources import Report, ReportFile, ReportLine
+from shared.reports.resources import Report, ReportFile
+from shared.reports.types import ReportLine
 from shared.utils.sessions import Session
 
 from services.components import Component

compare/commands/compare/interactors/tests/test_fetch_impacted_files.py

@@ -8,7 +8,8 @@
     PullFactory,
     RepositoryFactory,
 )
-from shared.reports.resources import Report, ReportFile, ReportLine
+from shared.reports.resources import Report, ReportFile
+from shared.reports.types import ReportLine
 from shared.utils.sessions import Session
 
 from compare.commands.compare.interactors.fetch_impacted_files import (

conftest.py

@@ -4,7 +4,8 @@
 import pytest
 import vcr
 from django.conf import settings
-from shared.reports.resources import Report, ReportFile, ReportLine
+from shared.reports.resources import Report, ReportFile
+from shared.reports.types import ReportLine
 from shared.utils.sessions import Session
 
 # we need to enable this in the test environment since we're often creating