From 445bc3401397e8aa87e61cce193a9d9925674104 Mon Sep 17 00:00:00 2001
From: Maxim Zhiltsov <zhiltsov.max35@gmail.com>
Date: Fri, 4 Nov 2022 21:21:19 +0300
Subject: [PATCH] Revert "Fix linter warnings (#5188)" (#5241)

This reverts commit 85f9fbdb3a6568a338223efa7803b73454ab0f84.
---
 cvat/apps/engine/mixins.py       |  1 -
 cvat/apps/engine/views.py        | 39 ++++++++++++++++----------------
 cvat/apps/organizations/views.py | 12 ++++++----
 3 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/cvat/apps/engine/mixins.py b/cvat/apps/engine/mixins.py
index 4c59f981..8dd38a62 100644
--- a/cvat/apps/engine/mixins.py
+++ b/cvat/apps/engine/mixins.py
@@ -329,7 +329,6 @@ class SerializeMixin:
 class CreateModelMixin(mixins.CreateModelMixin):
     def perform_create(self, serializer, **kwargs):
         serializer.save(**kwargs)
-
         signal_create.send(self, instance=serializer.instance)
 
 class PartialUpdateModelMixin:
diff --git a/cvat/apps/engine/views.py b/cvat/apps/engine/views.py
index 61be2a36..53b4c763 100644
--- a/cvat/apps/engine/views.py
+++ b/cvat/apps/engine/views.py
@@ -306,10 +306,12 @@ class ProjectViewSet(viewsets.GenericViewSet, mixins.ListModelMixin,
             queryset = perm.filter(queryset)
         return queryset
 
-    def perform_create(self, serializer, **kwargs):
-        kwargs.setdefault('owner', self.request.user)
-        kwargs.setdefault('organization', self.request.iam_context['organization'])
-        super().perform_create(serializer, **kwargs)
+    def perform_create(self, serializer):
+        super().perform_create(
+            serializer,
+            owner=self.request.user,
+            organization=self.request.iam_context['organization']
+        )
 
     @extend_schema(
         summary='Method returns information of the tasks of the project with the selected id',
@@ -812,11 +814,12 @@ class TaskViewSet(viewsets.GenericViewSet, mixins.ListModelMixin,
         if updated_instance.project:
             updated_instance.project.save()
 
-    def perform_create(self, serializer, **kwargs):
-        kwargs.setdefault('owner', self.request.user)
-        kwargs.setdefault('organization', self.request.iam_context['organization'])
-        super().perform_create(serializer, **kwargs)
-
+    def perform_create(self, serializer):
+        super().perform_create(
+            serializer,
+            owner=self.request.user,
+            organization=self.request.iam_context['organization']
+        )
         if serializer.instance.project:
             db_project = serializer.instance.project
             db_project.save()
@@ -1738,9 +1741,8 @@ class IssueViewSet(viewsets.GenericViewSet, mixins.ListModelMixin,
         else:
             return IssueWriteSerializer
 
-    def perform_create(self, serializer, **kwargs):
-        kwargs.setdefault('owner', self.request.user)
-        super().perform_create(serializer, **kwargs)
+    def perform_create(self, serializer):
+        super().perform_create(serializer, owner=self.request.user)
 
     @extend_schema(summary='The action returns all comments of a specific issue',
         responses=CommentReadSerializer(many=True)) # Duplicate to still get 'list' op. name
@@ -1814,9 +1816,8 @@ class CommentViewSet(viewsets.GenericViewSet, mixins.ListModelMixin,
         else:
             return CommentWriteSerializer
 
-    def perform_create(self, serializer, **kwargs):
-        kwargs.setdefault('owner', self.request.user)
-        super().perform_create(serializer, **kwargs)
+    def perform_create(self, serializer):
+        super().perform_create(serializer, owner=self.request.user)
 
 @extend_schema(tags=['users'])
 @extend_schema_view(
@@ -1963,10 +1964,10 @@ class CloudStorageViewSet(viewsets.GenericViewSet, mixins.ListModelMixin,
             raise ValidationError('Unsupported type of cloud provider')
         return queryset
 
-    def perform_create(self, serializer, **kwargs):
-        kwargs.setdefault('owner', self.request.user)
-        kwargs.setdefault('organization', self.request.iam_context['organization'])
-        super().perform_create(serializer, **kwargs)
+    def perform_create(self, serializer):
+        serializer.save(
+            owner=self.request.user,
+            organization=self.request.iam_context['organization'])
 
     def perform_destroy(self, instance):
         cloud_storage_dirname = instance.get_storage_dirname()
diff --git a/cvat/apps/organizations/views.py b/cvat/apps/organizations/views.py
index e739d791..3e4da2f3 100644
--- a/cvat/apps/organizations/views.py
+++ b/cvat/apps/organizations/views.py
@@ -201,11 +201,13 @@ class InvitationViewSet(viewsets.GenericViewSet,
         permission = InvitationPermission.create_scope_list(self.request)
         return permission.filter(queryset)
 
-    def perform_create(self, serializer, **kwargs):
-        kwargs.setdefault('owner', self.request.user)
-        kwargs.setdefault('organization', self.request.iam_context['organization'])
-        kwargs['key'] = get_random_string(length=64)
-        super().perform_create(serializer, **kwargs)
+    def perform_create(self, serializer):
+        extra_kwargs = {
+            'owner': self.request.user,
+            'key': get_random_string(length=64),
+            'organization': self.request.iam_context['organization']
+        }
+        super().perform_create(serializer, **extra_kwargs)
 
     def perform_update(self, serializer):
         if 'accepted' in self.request.query_params: