Use functions instead of Mix ins

Author: lvthanh03

upload/tests/views/test_combined_upload.py

@@ -106,7 +106,7 @@ def test_combined_upload_post(db, mocker):
         return_value="presigned put",
     )
     upload_task_mock = mocker.patch(
-        "upload.views.uploads.UploadLogicMixin.trigger_upload_task", return_value=True
+        "upload.views.uploads.trigger_upload_task", return_value=True
     )
 
     repository = RepositoryFactory(
@@ -204,7 +204,7 @@ def test_combined_upload_post_shelter(db, mocker):
         return_value="presigned put",
     )
     upload_task_mock = mocker.patch(
-        "upload.views.uploads.UploadLogicMixin.trigger_upload_task", return_value=True
+        "upload.views.uploads.trigger_upload_task", return_value=True
     )
 
     repository = RepositoryFactory(

upload/tests/views/test_uploads.py

@@ -23,7 +23,12 @@
 )
 from reports.tests.factories import CommitReportFactory, UploadFactory
 from services.archive import ArchiveService, MinioEndpoints
-from upload.views.uploads import CanDoCoverageUploadsPermission, UploadViews
+from upload.views.uploads import (
+    CanDoCoverageUploadsPermission,
+    UploadViews,
+    activate_repo,
+    trigger_upload_task,
+)
 
 
 def test_upload_permission_class_pass(db, mocker):
@@ -197,7 +202,7 @@ def test_uploads_post(db, mocker, mock_redis):
         return_value="presigned put",
     )
     upload_task_mock = mocker.patch(
-        "upload.views.uploads.UploadViews.trigger_upload_task", return_value=True
+        "upload.views.uploads.trigger_upload_task", return_value=True
     )
 
     repository = RepositoryFactory(
@@ -293,7 +298,7 @@ def test_uploads_post_tokenless(db, mocker, mock_redis, private, branch, branch_
         return_value="presigned put",
     )
     upload_task_mock = mocker.patch(
-        "upload.views.uploads.UploadViews.trigger_upload_task", return_value=True
+        "upload.views.uploads.trigger_upload_task", return_value=True
     )
     analytics_service_mock = mocker.patch("upload.views.uploads.AnalyticsService")
 
@@ -433,7 +438,7 @@ def test_uploads_post_token_required_auth_check(
         return_value="presigned put",
     )
     upload_task_mock = mocker.patch(
-        "upload.views.uploads.UploadViews.trigger_upload_task", return_value=True
+        "upload.views.uploads.trigger_upload_task", return_value=True
     )
     analytics_service_mock = mocker.patch("upload.views.uploads.AnalyticsService")
 
@@ -577,7 +582,7 @@ def test_uploads_post_github_oidc_auth(
         return_value="presigned put",
     )
     upload_task_mock = mocker.patch(
-        "upload.views.uploads.UploadViews.trigger_upload_task", return_value=True
+        "upload.views.uploads.trigger_upload_task", return_value=True
     )
 
     repository = RepositoryFactory(
@@ -696,9 +701,7 @@ def test_uploads_post_shelter(db, mocker, mock_redis):
         "services.archive.StorageService.create_presigned_put",
         return_value="presigned put",
     )
-    mocker.patch(
-        "upload.views.uploads.UploadViews.trigger_upload_task", return_value=True
-    )
+    mocker.patch("upload.views.uploads.trigger_upload_task", return_value=True)
     mock_prometheus_metrics = mocker.patch("upload.metrics.API_UPLOAD_COUNTER.labels")
 
     repository = RepositoryFactory(
@@ -798,14 +801,13 @@ def test_deactivated_repo(db, mocker, mock_redis):
 
 
 def test_trigger_upload_task(db, mocker):
-    upload_views = UploadViews()
     repo = RepositoryFactory.create()
     upload = UploadFactory.create()
     report = CommitReportFactory.create()
     commitid = "commit id"
     mocked_redis = mocker.patch("upload.views.uploads.get_redis_connection")
     mocked_dispatched_task = mocker.patch("upload.views.uploads.dispatch_upload_task")
-    upload_views.trigger_upload_task(repo, commitid, upload, report)
+    trigger_upload_task(repo, commitid, upload, report)
     mocked_redis.assert_called()
     mocked_dispatched_task.assert_called()
 
@@ -814,8 +816,7 @@ def test_activate_repo(db):
     repo = RepositoryFactory(
         active=False, deleted=True, activated=False, coverage_enabled=False
     )
-    upload_views = UploadViews()
-    upload_views.activate_repo(repo)
+    activate_repo(repo)
     assert repo.active
     assert repo.activated
     assert not repo.deleted
@@ -826,8 +827,7 @@ def test_activate_already_activated_repo(db):
     repo = RepositoryFactory(
         active=True, activated=True, deleted=False, coverage_enabled=True
     )
-    upload_views = UploadViews()
-    upload_views.activate_repo(repo)
+    activate_repo(repo)
     assert repo.active
 
 
@@ -855,9 +855,7 @@ def test_uploads_post_github_enterprise_oidc_auth_jwks_url(
             "services.archive.StorageService.create_presigned_put",
             return_value="presigned put",
         )
-        self.mocker.patch(
-            "upload.views.uploads.UploadViews.trigger_upload_task", return_value=True
-        )
+        self.mocker.patch("upload.views.uploads.trigger_upload_task", return_value=True)
 
         repository = RepositoryFactory(
             name="the_repo",

upload/views/combined_upload.py

@@ -26,16 +26,18 @@
 )
 from upload.throttles import UploadsPerCommitThrottle, UploadsPerWindowThrottle
 from upload.views.base import GetterMixin
-from upload.views.commits import CommitLogicMixin
-from upload.views.reports import ReportLogicMixin
-from upload.views.uploads import CanDoCoverageUploadsPermission, UploadLogicMixin
+from upload.views.commits import create_commit
+from upload.views.reports import create_report
+from upload.views.uploads import (
+    CanDoCoverageUploadsPermission,
+    create_upload,
+    get_token_for_analytics,
+)
 
 log = logging.getLogger(__name__)
 
 
-class CombinedUploadView(
-    APIView, GetterMixin, CommitLogicMixin, ReportLogicMixin, UploadLogicMixin
-):
+class CombinedUploadView(APIView, GetterMixin):
     permission_classes = [CanDoCoverageUploadsPermission]
     authentication_classes = [
         UploadTokenRequiredAuthenticationCheck,
@@ -79,9 +81,16 @@ def post(self, request: HttpRequest, *args, **kwargs) -> Response:
             )
 
         repository = self.get_repo()
-        log.info(f"Creating commit for {commit_serializer.validated_data}")
         self.emit_metrics(position="create_commit")
-        commit = self.create_commit(commit_serializer, repository)
+        commit = create_commit(commit_serializer, repository)
+
+        log.info(
+            "Request to create new combined upload",
+            extra=dict(
+                repo=repository.name,
+                commit=commit.commitid,
+            ),
+        )
 
         # Create report
         commit_report_data = dict(
@@ -93,9 +102,8 @@ def post(self, request: HttpRequest, *args, **kwargs) -> Response:
                 commit_report_serializer.errors, status=status.HTTP_400_BAD_REQUEST
             )
 
-        log.info(f"Creating report for {commit_report_serializer.validated_data}")
         self.emit_metrics(position="create_report")
-        report = self.create_report(commit_report_serializer, repository, commit)
+        report = create_report(commit_report_serializer, repository, commit)
 
         # Do upload
         upload_data = dict(
@@ -117,9 +125,15 @@ def post(self, request: HttpRequest, *args, **kwargs) -> Response:
                 upload_serializer.errors, status=status.HTTP_400_BAD_REQUEST
             )
 
-        log.info(f"Creating upload for {upload_serializer.validated_data}")
         self.emit_metrics(position="create_upload")
-        upload = self.create_upload(upload_serializer, repository, commit, report)
+        upload = create_upload(
+            upload_serializer,
+            repository,
+            commit,
+            report,
+            self.is_shelter_request(),
+            get_token_for_analytics(commit, self.request),
+        )
 
         self.emit_metrics(position="end")
 

upload/views/commits.py

@@ -26,14 +26,13 @@
 log = logging.getLogger(__name__)
 
 
-class CommitLogicMixin:
-    def create_commit(self, serializer, repository):
-        validate_activated_repo(repository)
-        commit = serializer.save(repository=repository)
-        return commit
+def create_commit(serializer, repository):
+    validate_activated_repo(repository)
+    commit = serializer.save(repository=repository)
+    return commit
 
 
-class CommitViews(ListCreateAPIView, GetterMixin, CommitLogicMixin):
+class CommitViews(ListCreateAPIView, GetterMixin):
     serializer_class = CommitSerializer
     permission_classes = [CanDoCoverageUploadsPermission]
     authentication_classes = [
@@ -75,7 +74,7 @@ def perform_create(self, serializer):
             ),
         )
         repository = self.get_repo()
-        commit = self.create_commit(serializer, repository)
+        commit = create_commit(serializer, repository)
 
         log.info(
             "Request to create new commit",

upload/views/reports.py

@@ -28,23 +28,22 @@
 log = logging.getLogger(__name__)
 
 
-class ReportLogicMixin:
-    def create_report(self, serializer, repository, commit):
-        code = serializer.validated_data.get("code")
-        if code == "default":
-            serializer.validated_data["code"] = None
-        instance, was_created = serializer.save(
-            commit_id=commit.id,
-            report_type=CommitReport.ReportType.COVERAGE,
+def create_report(serializer, repository, commit):
+    code = serializer.validated_data.get("code")
+    if code == "default":
+        serializer.validated_data["code"] = None
+    instance, was_created = serializer.save(
+        commit_id=commit.id,
+        report_type=CommitReport.ReportType.COVERAGE,
+    )
+    if was_created:
+        TaskService().preprocess_upload(
+            repository.repoid, commit.commitid, instance.code
         )
-        if was_created:
-            TaskService().preprocess_upload(
-                repository.repoid, commit.commitid, instance.code
-            )
-        return instance
+    return instance
 
 
-class ReportViews(ListCreateAPIView, GetterMixin, ReportLogicMixin):
+class ReportViews(ListCreateAPIView, GetterMixin):
     serializer_class = CommitReportSerializer
     permission_classes = [CanDoCoverageUploadsPermission]
     authentication_classes = [
@@ -77,7 +76,7 @@ def perform_create(self, serializer):
             "Request to create new report",
             extra=dict(repo=repository.name, commit=commit.commitid),
         )
-        instance = self.create_report(serializer, repository, commit)
+        instance = create_report(serializer, repository, commit)
 
         inc_counter(
             API_UPLOAD_COUNTER,