diff --git a/apps/worker/database/enums.py b/apps/worker/database/enums.py index ef4e0fe2d..5ca2306b1 100644 --- a/apps/worker/database/enums.py +++ b/apps/worker/database/enums.py @@ -8,7 +8,7 @@ FlakeSymptomType, Notification, NotificationState, - ReportType, notification_type_status_or_checks, ) +from shared.django_apps.reports.models import ReportType # noqa: F401 from shared.plan.constants import TrialStatus # noqa: F401 diff --git a/apps/worker/database/models/core.py b/apps/worker/database/models/core.py index ab3b9b97c..c3f055a57 100644 --- a/apps/worker/database/models/core.py +++ b/apps/worker/database/models/core.py @@ -14,12 +14,8 @@ import database.models from database.base import CodecovBaseModel, MixinBaseClass, MixinBaseClassNoExternalID from database.utils import ArchiveField -from shared.django_apps.enums import ( - Decoration, - Notification, - NotificationState, - ReportType, -) +from shared.django_apps.enums import Decoration, Notification, NotificationState +from shared.django_apps.reports.models import ReportType from shared.django_apps.utils.config import should_write_data_to_storage_config_check from shared.helpers.github_apps import is_configured from shared.plan.constants import DEFAULT_FREE_PLAN, PlanName diff --git a/apps/worker/services/bundle_analysis/comparison.py b/apps/worker/services/bundle_analysis/comparison.py index 905be9cb9..f2b8385d5 100644 --- a/apps/worker/services/bundle_analysis/comparison.py +++ b/apps/worker/services/bundle_analysis/comparison.py @@ -13,7 +13,7 @@ BundleAnalysisComparison, BundleAnalysisReportLoader, ) -from shared.django_apps.enums import ReportType +from shared.django_apps.reports.models import ReportType class ComparisonLoader: diff --git a/apps/worker/services/bundle_analysis/notify/conftest.py b/apps/worker/services/bundle_analysis/notify/conftest.py index 230419462..3892a9f90 100644 --- a/apps/worker/services/bundle_analysis/notify/conftest.py +++ b/apps/worker/services/bundle_analysis/notify/conftest.py @@ -6,7 +6,7 @@ from services.repository import EnrichedPull from shared.api_archive.archive import ArchiveService from shared.bundle_analysis.storage import get_bucket_name -from shared.django_apps.enums import ReportType +from shared.django_apps.reports.models import ReportType SAMPLE_FOLDER_PATH = Path(__file__).resolve().parent / "tests" / "samples" diff --git a/apps/worker/services/bundle_analysis/notify/contexts/__init__.py b/apps/worker/services/bundle_analysis/notify/contexts/__init__.py index b6e3c6168..4739dd864 100644 --- a/apps/worker/services/bundle_analysis/notify/contexts/__init__.py +++ b/apps/worker/services/bundle_analysis/notify/contexts/__init__.py @@ -13,7 +13,7 @@ ) from services.repository import get_repo_provider_service from shared.bundle_analysis import BundleAnalysisReport, BundleAnalysisReportLoader -from shared.django_apps.enums import ReportType +from shared.django_apps.reports.models import ReportType from shared.torngit.base import TorngitBaseAdapter from shared.typings.torngit import AdditionalData, UploadType from shared.validation.types import BundleThreshold diff --git a/apps/worker/services/bundle_analysis/report.py b/apps/worker/services/bundle_analysis/report.py index 49e881123..59ea6424e 100644 --- a/apps/worker/services/bundle_analysis/report.py +++ b/apps/worker/services/bundle_analysis/report.py @@ -20,7 +20,7 @@ from shared.django_apps.bundle_analysis.service.bundle_analysis import ( BundleAnalysisCacheConfigService, ) -from shared.django_apps.enums import ReportType +from shared.django_apps.reports.models import ReportType from shared.metrics import Counter from shared.reports.enums import UploadState, UploadType from shared.storage.exceptions import FileNotInStorageError, PutRequestRateLimitError diff --git a/apps/worker/services/bundle_analysis/tests/test_bundle_analysis.py b/apps/worker/services/bundle_analysis/tests/test_bundle_analysis.py index 2feb5f888..0ee0fdfd6 100644 --- a/apps/worker/services/bundle_analysis/tests/test_bundle_analysis.py +++ b/apps/worker/services/bundle_analysis/tests/test_bundle_analysis.py @@ -27,7 +27,7 @@ from shared.bundle_analysis.models import AssetType from shared.bundle_analysis.storage import get_bucket_name from shared.config import PATCH_CENTRIC_DEFAULT_CONFIG -from shared.django_apps.enums import ReportType +from shared.django_apps.reports.models import ReportType from shared.yaml import UserYaml from tests.helpers import mock_all_plans_and_tiers diff --git a/apps/worker/services/lock_manager.py b/apps/worker/services/lock_manager.py index e49d1fecc..5fde98eae 100644 --- a/apps/worker/services/lock_manager.py +++ b/apps/worker/services/lock_manager.py @@ -13,7 +13,7 @@ DEFAULT_LOCK_TIMEOUT_SECONDS, ) from shared.config import get_config -from shared.django_apps.enums import ReportType +from shared.django_apps.reports.models import ReportType from shared.helpers.redis import get_redis_connection # type: ignore log = logging.getLogger(__name__) diff --git a/apps/worker/services/test_analytics/tests/test_ta_finish_upload.py b/apps/worker/services/test_analytics/tests/test_ta_finish_upload.py index c6e439b30..797ae1708 100644 --- a/apps/worker/services/test_analytics/tests/test_ta_finish_upload.py +++ b/apps/worker/services/test_analytics/tests/test_ta_finish_upload.py @@ -14,7 +14,7 @@ from services.yaml import UserYaml from shared.django_apps.core.models import Commit as DjangoCommit from shared.django_apps.core.models import Repository as DjangoRepo -from shared.django_apps.enums import ReportType +from shared.django_apps.reports.models import ReportType from shared.django_apps.reports.tests.factories import ( UploadErrorFactory as DjangoUploadErrorFactory, ) diff --git a/apps/worker/services/test_results.py b/apps/worker/services/test_results.py index e467d0027..4658b5d4e 100644 --- a/apps/worker/services/test_results.py +++ b/apps/worker/services/test_results.py @@ -23,7 +23,7 @@ from services.urls import get_members_url, get_test_analytics_url from services.yaml import read_yaml_field from shared.django_apps.codecov_auth.models import Plan -from shared.django_apps.enums import ReportType +from shared.django_apps.reports.models import ReportType from shared.plan.constants import TierName from shared.yaml import UserYaml diff --git a/apps/worker/services/tests/test_lock_manager.py b/apps/worker/services/tests/test_lock_manager.py index 8f98a8856..af4e930cf 100644 --- a/apps/worker/services/tests/test_lock_manager.py +++ b/apps/worker/services/tests/test_lock_manager.py @@ -7,7 +7,7 @@ from redis.exceptions import LockError from services.lock_manager import LockManager, LockRetry, LockType -from shared.django_apps.enums import ReportType +from shared.django_apps.reports.models import ReportType from tasks.base import BaseCodecovTask diff --git a/apps/worker/tasks/bundle_analysis_processor.py b/apps/worker/tasks/bundle_analysis_processor.py index 2d9c46950..36967a562 100644 --- a/apps/worker/tasks/bundle_analysis_processor.py +++ b/apps/worker/tasks/bundle_analysis_processor.py @@ -19,7 +19,7 @@ BUNDLE_ANALYSIS_PROCESSOR_MAX_RETRIES, bundle_analysis_processor_task_name, ) -from shared.django_apps.enums import ReportType +from shared.django_apps.reports.models import ReportType from shared.reports.enums import UploadState from shared.yaml import UserYaml from tasks.base import BaseCodecovTask diff --git a/apps/worker/tasks/manual_trigger.py b/apps/worker/tasks/manual_trigger.py index 65c0352a1..2684b226a 100644 --- a/apps/worker/tasks/manual_trigger.py +++ b/apps/worker/tasks/manual_trigger.py @@ -15,7 +15,7 @@ notify_task_name, pulls_task_name, ) -from shared.django_apps.enums import ReportType +from shared.django_apps.reports.models import ReportType from shared.reports.enums import UploadState from tasks.base import BaseCodecovTask diff --git a/apps/worker/tasks/notify.py b/apps/worker/tasks/notify.py index d07b85790..12c10c7f5 100644 --- a/apps/worker/tasks/notify.py +++ b/apps/worker/tasks/notify.py @@ -51,12 +51,8 @@ ) from shared.config import get_config from shared.django_apps.codecov_auth.models import Service -from shared.django_apps.enums import ( - CommitErrorTypes, - Decoration, - NotificationState, - ReportType, -) +from shared.django_apps.enums import CommitErrorTypes, Decoration, NotificationState +from shared.django_apps.reports.models import ReportType from shared.django_apps.upload_breadcrumbs.models import Errors, Milestones from shared.helpers.redis import Redis, get_redis_connection from shared.reports.readonly import ReadOnlyReport diff --git a/apps/worker/tasks/notify_error.py b/apps/worker/tasks/notify_error.py index c1e76d77d..83a60597d 100644 --- a/apps/worker/tasks/notify_error.py +++ b/apps/worker/tasks/notify_error.py @@ -8,7 +8,7 @@ from helpers.checkpoint_logger.flows import UploadFlow from helpers.notifier import BaseNotifier, NotifierResult from services.yaml import UserYaml -from shared.django_apps.enums import ReportType +from shared.django_apps.reports.models import ReportType from tasks.base import BaseCodecovTask, celery_app log = logging.getLogger(__name__) diff --git a/apps/worker/tasks/test_analytics_notifier.py b/apps/worker/tasks/test_analytics_notifier.py index f69957e44..3678ba883 100644 --- a/apps/worker/tasks/test_analytics_notifier.py +++ b/apps/worker/tasks/test_analytics_notifier.py @@ -36,7 +36,7 @@ ) from shared.celery_config import test_analytics_notifier_task_name from shared.django_apps.core.models import Repository -from shared.django_apps.enums import ReportType +from shared.django_apps.reports.models import ReportType from shared.helpers.redis import get_redis_connection from shared.reports.types import UploadType from shared.typings.torngit import AdditionalData diff --git a/apps/worker/tasks/test_results_finisher.py b/apps/worker/tasks/test_results_finisher.py index 839fcc506..3dc06bcf5 100644 --- a/apps/worker/tasks/test_results_finisher.py +++ b/apps/worker/tasks/test_results_finisher.py @@ -9,7 +9,7 @@ from services.lock_manager import LockManager, LockRetry, LockType from services.test_analytics.ta_finish_upload import ta_finish_upload from shared.celery_config import test_results_finisher_task_name -from shared.django_apps.enums import ReportType +from shared.django_apps.reports.models import ReportType from shared.yaml import UserYaml from tasks.base import BaseCodecovTask from tasks.notify import notify_task_name diff --git a/apps/worker/tasks/tests/unit/test_bundle_analysis_processor_task.py b/apps/worker/tasks/tests/unit/test_bundle_analysis_processor_task.py index ac91e63a6..b055d1aa1 100644 --- a/apps/worker/tasks/tests/unit/test_bundle_analysis_processor_task.py +++ b/apps/worker/tasks/tests/unit/test_bundle_analysis_processor_task.py @@ -10,7 +10,7 @@ from shared.bundle_analysis.storage import get_bucket_name from shared.celery_config import BUNDLE_ANALYSIS_PROCESSOR_MAX_RETRIES from shared.django_apps.bundle_analysis.models import CacheConfig -from shared.django_apps.enums import ReportType +from shared.django_apps.reports.models import ReportType from shared.storage.exceptions import PutRequestRateLimitError from tasks.bundle_analysis_processor import BundleAnalysisProcessorTask from tasks.bundle_analysis_save_measurements import ( diff --git a/apps/worker/tasks/tests/unit/test_upload_finisher_task.py b/apps/worker/tasks/tests/unit/test_upload_finisher_task.py index c01fe9d2f..ed5a8d10c 100644 --- a/apps/worker/tasks/tests/unit/test_upload_finisher_task.py +++ b/apps/worker/tasks/tests/unit/test_upload_finisher_task.py @@ -26,7 +26,7 @@ timeseries_save_commit_measurements_task_name, upload_breadcrumb_task_name, ) -from shared.django_apps.enums import ReportType +from shared.django_apps.reports.models import ReportType from shared.django_apps.upload_breadcrumbs.models import ( BreadcrumbData, Errors, diff --git a/apps/worker/tasks/tests/unit/test_upload_task.py b/apps/worker/tasks/tests/unit/test_upload_task.py index cc0821f8f..44845fa15 100644 --- a/apps/worker/tasks/tests/unit/test_upload_task.py +++ b/apps/worker/tasks/tests/unit/test_upload_task.py @@ -19,7 +19,7 @@ from services.lock_manager import LockRetry from services.report import NotReadyToBuildReportYetError, ReportService from shared.celery_config import upload_breadcrumb_task_name -from shared.django_apps.enums import ReportType +from shared.django_apps.reports.models import ReportType from shared.django_apps.upload_breadcrumbs.models import ( BreadcrumbData, Errors, diff --git a/apps/worker/tasks/upload.py b/apps/worker/tasks/upload.py index 841ef8975..38b75222a 100644 --- a/apps/worker/tasks/upload.py +++ b/apps/worker/tasks/upload.py @@ -38,7 +38,7 @@ from services.test_results import TestResultsReportService from shared.celery_config import DEFAULT_LOCK_TIMEOUT_SECONDS, upload_task_name from shared.config import get_config -from shared.django_apps.enums import ReportType +from shared.django_apps.reports.models import ReportType from shared.django_apps.upload_breadcrumbs.models import Errors, Milestones from shared.django_apps.user_measurements.models import UserMeasurement from shared.helpers.redis import get_redis_connection diff --git a/apps/worker/tasks/upload_finisher.py b/apps/worker/tasks/upload_finisher.py index b39a797a8..ec425bfa2 100644 --- a/apps/worker/tasks/upload_finisher.py +++ b/apps/worker/tasks/upload_finisher.py @@ -39,7 +39,8 @@ timeseries_save_commit_measurements_task_name, upload_finisher_task_name, ) -from shared.django_apps.enums import CommitErrorTypes, ReportType +from shared.django_apps.enums import CommitErrorTypes +from shared.django_apps.reports.models import ReportType from shared.django_apps.upload_breadcrumbs.models import Errors, Milestones from shared.helpers.cache import cache from shared.helpers.redis import get_redis_connection diff --git a/libs/shared/shared/django_apps/enums.py b/libs/shared/shared/django_apps/enums.py index 586d17685..753bf194f 100644 --- a/libs/shared/shared/django_apps/enums.py +++ b/libs/shared/shared/django_apps/enums.py @@ -61,12 +61,6 @@ class CommitErrorTypes(Enum): REPO_BOT_INVALID = "repo_bot_invalid" -class ReportType(Enum): - COVERAGE = "coverage" - TEST_RESULTS = "test_results" - BUNDLE_ANALYSIS = "bundle_analysis" - - class FlakeSymptomType(Enum): FAILED_IN_DEFAULT_BRANCH = "failed_in_default_branch" CONSECUTIVE_DIFF_OUTCOMES = "consecutive_diff_outcomes"