refactoring code using pycharm

admin/__init__.py

@@ -7,4 +7,4 @@ from .provider import ProviderAdmin
 from .relationship import RelationshipAdmin
 from .resource import ResourceAdmin
 from .service import ServiceAdmin
-from .servicetype import ServiceTypeAdmin
+from .servicetype import ServiceTypeAdmin

admin/client.py

@@ -1,6 +1,8 @@
 from django.contrib import admin
+
 from dbsynce.models import Client
 
+
 @admin.register(Client)
 class ClientAdmin(admin.ModelAdmin):
     list_display = (
@@ -13,4 +15,4 @@ class ClientAdmin(admin.ModelAdmin):
         'is_global',
         'is_visible',
     )
-    list_filter = ('user', 'ticket_status')
+    list_filter = ('user', 'ticket_status')

admin/company.py

@@ -1,6 +1,8 @@
 from django.contrib import admin
+
 from dbsynce.models import Company
 
+
 @admin.register(Company)
 class CompanyAdmin(admin.ModelAdmin):
     list_display = (
@@ -22,4 +24,4 @@ class CompanyAdmin(admin.ModelAdmin):
         'is_global',
         'is_visible',
     )
-    list_filter = ('repr_id', 'ticket_status')
+    list_filter = ('repr_id', 'ticket_status')

admin/documents.py

@@ -1,4 +1,5 @@
 from django.contrib import admin
+
 from dbsynce.models import Documents, DocumentFile
 
 
@@ -35,4 +36,4 @@ class DocumentsAdmin(admin.ModelAdmin):
         'checked_by',
     )
 
-    inlines = [DocumentFileInline]
+    inlines = [DocumentFileInline]

admin/orders.py

@@ -1,6 +1,8 @@
 from django.contrib import admin
+
 from dbsynce.models import Orders
 
+
 @admin.register(Orders)
 class OrdersAdmin(admin.ModelAdmin):
     list_display = (
@@ -37,4 +39,4 @@ class OrdersAdmin(admin.ModelAdmin):
         'time_start',
         'time_finish_predicted',
         'time_finish_real',
-    )
+    )

admin/permissions.py

@@ -1,6 +1,8 @@
 from django.contrib import admin
+
 from dbsynce.models import Permissions
 
+
 @admin.register(Permissions)
 class PermissionsAdmin(admin.ModelAdmin):
     list_display = (
@@ -16,4 +18,4 @@ class PermissionsAdmin(admin.ModelAdmin):
         'is_global',
         'is_visible',
     )
-    list_filter = ('check_date', 'checked_by', 'user_id', 'ticket_status')
+    list_filter = ('check_date', 'checked_by', 'user_id', 'ticket_status')

admin/provider.py

@@ -1,6 +1,8 @@
 from django.contrib import admin
+
 from dbsynce.models import Provider
 
+
 @admin.register(Provider)
 class ProviderAdmin(admin.ModelAdmin):
     list_display = (
@@ -17,4 +19,4 @@ class ProviderAdmin(admin.ModelAdmin):
         'is_global',
         'is_visible',
     )
-    list_filter = ('company_id', 'user_id', 'ticket_status')
+    list_filter = ('company_id', 'user_id', 'ticket_status')

admin/relationship.py

@@ -1,6 +1,8 @@
 from django.contrib import admin
+
 from dbsynce.models import Relationship
 
+
 @admin.register(Relationship)
 class RelationshipAdmin(admin.ModelAdmin):
     list_display = (
@@ -15,4 +17,4 @@ class RelationshipAdmin(admin.ModelAdmin):
         'is_global',
         'is_visible',
     )
-    list_filter = ('user_id_who', 'user_id_whom', 'ticket_status')
+    list_filter = ('user_id_who', 'user_id_whom', 'ticket_status')

admin/resource.py

@@ -1,6 +1,8 @@
 from django.contrib import admin
+
 from dbsynce.models import Resource
 
+
 @admin.register(Resource)
 class ResourceAdmin(admin.ModelAdmin):
     list_display = (
@@ -14,4 +16,4 @@ class ResourceAdmin(admin.ModelAdmin):
         'ticket_status',
         'user_id',
     )
-    list_filter = ('user_id', 'ticket_status')
+    list_filter = ('user_id', 'ticket_status')

admin/service.py

@@ -1,6 +1,8 @@
 from django.contrib import admin
+
 from dbsynce.models import Service
 
+
 @admin.register(Service)
 class ServiceAdmin(admin.ModelAdmin):
     list_display = (
@@ -23,4 +25,4 @@ class ServiceAdmin(admin.ModelAdmin):
         'servicetype_id',
         'resource_id',
         'ticket_status',
-    )
+    )

admin/servicetype.py

@@ -1,6 +1,8 @@
 from django.contrib import admin
+
 from dbsynce.models import ServiceType
 
+
 @admin.register(ServiceType)
 class ServiceTypeAdmin(admin.ModelAdmin):
     list_display = (
@@ -17,4 +19,4 @@ class ServiceTypeAdmin(admin.ModelAdmin):
         'is_global',
         'is_visible',
     )
-    list_filter = ('ticket_status',)
+    list_filter = ('ticket_status',)

apiviews/__init__.py

@@ -7,4 +7,4 @@ from .provider import ProviderMVS
 from .relationship import RelationshipMVS
 from .resource import ResourceMVS
 from .service import ServiceMVS
-from .servicetype import ServiceTypeMVS
+from .servicetype import ServiceTypeMVS

apiviews/client.py

@@ -1,10 +1,11 @@
-from dbsynce.serializer import ClientSerializer
 from rest_framework import viewsets, permissions
+
 from dbsynce.models import Client
+from dbsynce.serializer import ClientSerializer
 
-class ClientMVS(viewsets.ModelViewSet):
 
+class ClientMVS(viewsets.ModelViewSet):
     queryset = Client.objects.all()
     serializer_class = ClientSerializer
-    #permission_classes = [IsOwnerOrReadOnly]
-    permission_classes = [permissions.IsAuthenticated]
+    # permission_classes = [IsOwnerOrReadOnly]
+    permission_classes = [permissions.IsAuthenticated]

apiviews/company.py

@@ -1,10 +1,11 @@
-from dbsynce.serializer import CompanySerializer
 from rest_framework import viewsets, permissions
+
 from dbsynce.models import Company
+from dbsynce.serializer import CompanySerializer
 
-class CompanyMVS(viewsets.ModelViewSet):
 
+class CompanyMVS(viewsets.ModelViewSet):
     queryset = Company.objects.all()
     serializer_class = CompanySerializer
-    #permission_classes = [IsOwnerOrReadOnly]
-    permission_classes = [permissions.IsAuthenticated]
+    # permission_classes = [IsOwnerOrReadOnly]
+    permission_classes = [permissions.IsAuthenticated]

apiviews/documents.py

@@ -1,11 +1,11 @@
-from django.http import HttpResponse
-from dbsynce.serializer import DocumentsSerializer
 from rest_framework import viewsets, permissions
+
 from dbsynce.models import Documents
+from dbsynce.serializer import DocumentsSerializer
 
-class DocumentsMVS(viewsets.ModelViewSet):
 
+class DocumentsMVS(viewsets.ModelViewSet):
     queryset = Documents.objects.all()
     serializer_class = DocumentsSerializer
-    #permission_classes = [IsOwnerOrReadOnly]
-    permission_classes = [permissions.IsAuthenticated]
+    # permission_classes = [IsOwnerOrReadOnly]
+    permission_classes = [permissions.IsAuthenticated]

apiviews/orders.py

@@ -1,10 +1,11 @@
-from dbsynce.serializer import OrdersSerializer
 from rest_framework import viewsets, permissions
+
 from dbsynce.models import Orders
+from dbsynce.serializer import OrdersSerializer
 
-class OrdersMVS(viewsets.ModelViewSet):
 
+class OrdersMVS(viewsets.ModelViewSet):
     queryset = Orders.objects.all()
     serializer_class = OrdersSerializer
-    #permission_classes = [IsOwnerOrReadOnly]
-    permission_classes = [permissions.IsAuthenticated]
+    # permission_classes = [IsOwnerOrReadOnly]
+    permission_classes = [permissions.IsAuthenticated]

apiviews/permissions.py

@@ -1,10 +1,11 @@
-from dbsynce.serializer import PermissionsSerializer
 from rest_framework import viewsets, permissions
+
 from dbsynce.models import Permissions
+from dbsynce.serializer import PermissionsSerializer
 
-class PermissionsMVS(viewsets.ModelViewSet):
 
+class PermissionsMVS(viewsets.ModelViewSet):
     queryset = Permissions.objects.all()
     serializer_class = PermissionsSerializer
-    #permission_classes = [IsOwnerOrReadOnly]
-    permission_classes = [permissions.IsAuthenticated]
+    # permission_classes = [IsOwnerOrReadOnly]
+    permission_classes = [permissions.IsAuthenticated]

apiviews/provider.py

@@ -1,10 +1,11 @@
-from dbsynce.serializer import ProviderSerializer
 from rest_framework import viewsets, permissions
+
 from dbsynce.models import Provider
+from dbsynce.serializer import ProviderSerializer
 
-class ProviderMVS(viewsets.ModelViewSet):
 
+class ProviderMVS(viewsets.ModelViewSet):
     queryset = Provider.objects.all()
     serializer_class = ProviderSerializer
-    #permission_classes = [IsOwnerOrReadOnly]
-    permission_classes = [permissions.IsAuthenticated]
+    # permission_classes = [IsOwnerOrReadOnly]
+    permission_classes = [permissions.IsAuthenticated]

apiviews/relationship.py

@@ -1,10 +1,11 @@
-from dbsynce.serializer import RelationshipSerializer
 from rest_framework import viewsets, permissions
+
 from dbsynce.models import Relationship
+from dbsynce.serializer import RelationshipSerializer
 
-class RelationshipMVS(viewsets.ModelViewSet):
 
+class RelationshipMVS(viewsets.ModelViewSet):
     queryset = Relationship.objects.all()
     serializer_class = RelationshipSerializer
-    #permission_classes = [IsOwnerOrReadOnly]
-    permission_classes = [permissions.IsAuthenticated]
+    # permission_classes = [IsOwnerOrReadOnly]
+    permission_classes = [permissions.IsAuthenticated]

apiviews/resource.py

@@ -1,10 +1,11 @@
-from dbsynce.serializer import ResourceSerializer
 from rest_framework import viewsets, permissions
+
 from dbsynce.models import Resource
+from dbsynce.serializer import ResourceSerializer
 
-class ResourceMVS(viewsets.ModelViewSet):
 
+class ResourceMVS(viewsets.ModelViewSet):
     queryset = Resource.objects.all()
     serializer_class = ResourceSerializer
-    #permission_classes = [IsOwnerOrReadOnly]
-    permission_classes = [permissions.IsAuthenticated]
+    # permission_classes = [IsOwnerOrReadOnly]
+    permission_classes = [permissions.IsAuthenticated]

apiviews/service.py

@@ -1,10 +1,11 @@
-from dbsynce.serializer import ServiceSerializer
 from rest_framework import viewsets, permissions
+
 from dbsynce.models import Service
+from dbsynce.serializer import ServiceSerializer
 
-class ServiceMVS(viewsets.ModelViewSet):
 
+class ServiceMVS(viewsets.ModelViewSet):
     queryset = Service.objects.all()
     serializer_class = ServiceSerializer
-    #permission_classes = [IsOwnerOrReadOnly]
-    permission_classes = [permissions.IsAuthenticated]
+    # permission_classes = [IsOwnerOrReadOnly]
+    permission_classes = [permissions.IsAuthenticated]

apiviews/servicetype.py

@@ -1,10 +1,11 @@
-from dbsynce.serializer import ServiceTypeSerializer
 from rest_framework import viewsets, permissions
+
 from dbsynce.models import ServiceType
+from dbsynce.serializer import ServiceTypeSerializer
 
-class ServiceTypeMVS(viewsets.ModelViewSet):
 
+class ServiceTypeMVS(viewsets.ModelViewSet):
     queryset = ServiceType.objects.all()
     serializer_class = ServiceTypeSerializer
-    #permission_classes = [IsOwnerOrReadOnly]
-    permission_classes = [permissions.IsAuthenticated]
+    # permission_classes = [IsOwnerOrReadOnly]
+    permission_classes = [permissions.IsAuthenticated]

apps.py

@@ -1,5 +1,6 @@
 from django.apps import AppConfig
 
+
 class DbsyncedConfig(AppConfig):
     default_auto_field = "django.db.models.BigAutoField"
     name = "dbsynce"

lib/core.py

@@ -1,6 +1,7 @@
 import re
-from django.urls import reverse
+
 from django.contrib.contenttypes.models import ContentType
+from django.urls import reverse
 
 
 def choose_support():

lib/ejabberd.py

@@ -1,6 +1,7 @@
-from core.settings_vars import EJ_URL, DEBUG
 import requests
 
+from core.settings_vars import EJ_URL, DEBUG
+
 
 def ej_execute(command, data):
     """
@@ -24,8 +25,8 @@ def get_rooms(service, order_num, support, client, provider):
     room_name3 = "_".join(str(attr) for attr in (service, order_num, provider, support))
     # Set room participants
     rooms = {
-       room_name1: ("client", "support", "owner"),
-       room_name2: ("client", "provider", "owner"),
-       room_name3: ("provider", "support", "owner"),
+        room_name1: ("client", "support", "owner"),
+        room_name2: ("client", "provider", "owner"),
+        room_name3: ("provider", "support", "owner"),
     }
     return rooms

models/__init__.py

@@ -7,4 +7,4 @@ from .provider import Provider
 from .relationship import Relationship
 from .resource import Resource
 from .service import Service
-from .servicetype import ServiceType
+from .servicetype import ServiceType

models/client.py

@@ -1,5 +1,5 @@
-from django.db import models
 from django.contrib.auth import get_user_model
+from django.db import models
 
 from tickets.models import Ticket
 

models/company.py

@@ -1,5 +1,5 @@
-from django.db import models
 from django.contrib.auth import get_user_model
+from django.db import models
 
 from tickets.models import Ticket
 
@@ -94,7 +94,7 @@ class Company(models.Model):
     )
 
     # FK
-    repr =models.ForeignKey(
+    repr = models.ForeignKey(
         get_user_model(),
         blank=True,
         verbose_name="Представитель организации",

models/documents.py

@@ -1,7 +1,7 @@
 import os
 
-from django.db import models
 from django.contrib.auth import get_user_model
+from django.db import models
 
 from dbsynce.models.company import Company
 from tickets.models import Ticket

models/orders.py

@@ -1,12 +1,11 @@
-from django.db import models
 from django.contrib.auth import get_user_model
+from django.db import models
 
 from dbsynce.models.client import Client
+from dbsynce.models.company import Company
 from dbsynce.models.provider import Provider
 from dbsynce.models.service import Service
 from dbsynce.models.servicetype import ServiceType
-from dbsynce.models.company import Company
-
 from tickets.models import Ticket
 
 
@@ -33,12 +32,12 @@ class Orders(models.Model):
     title = models.CharField(
         max_length=150,
         help_text="заголовок заказа",
-        default = 'Заголовок'
+        default='Заголовок'
     )
     note = models.CharField(
         max_length=150,
         help_text="задание к заказу",
-        default = 'Записи'
+        default='Записи'
     )
     time_created = models.DateTimeField(
         auto_now_add=True,

models/permissions.py

@@ -1,7 +1,9 @@
-from django.db import models
 from django.contrib.auth import get_user_model
+from django.db import models
+
 from tickets.models import Ticket
 
+
 class Permissions(models.Model):
     """
     Разрешения - (проверки/экзамены). 

models/provider.py

@@ -1,9 +1,8 @@
-from django.db import models
 from django.contrib.auth import get_user_model
+from django.db import models
 
 from dbsynce.models.company import Company
 from dbsynce.models.service import Service
-
 from tickets.models import Ticket
 
 

models/relationship.py

@@ -1,5 +1,5 @@
-from django.db import models
 from django.contrib.auth import get_user_model
+from django.db import models
 
 from tickets.models import Ticket
 

models/resource.py

@@ -1,5 +1,5 @@
-from django.db import models
 from django.contrib.auth import get_user_model
+from django.db import models
 
 from tickets.models import Ticket
 
@@ -55,8 +55,7 @@ class Resource(models.Model):
         help_text="уникальный идентификатор ответственного (за состояние, доступность и так далее - то есть для договора) пользователя - идентификатор провайдера, по которому восстанавливается конкретный пользовательский аккаунт"
     )
 
-    
     class Meta:
         db_table = "resource"
         verbose_name = "Ресурс"
-        verbose_name_plural = "Ресурсы"
+        verbose_name_plural = "Ресурсы"

models/service.py

@@ -1,8 +1,8 @@
 from django.db import models
 
+from dbsynce.models.resource import Resource
 from dbsynce.models.servicetype import ServiceType
 from tickets.models import Ticket
-from dbsynce.models.resource import Resource
 
 
 class Service(models.Model):
@@ -32,12 +32,12 @@ class Service(models.Model):
         decimal_places=2,
         help_text="значение параметра стоимости 1км данного поставщика для данного шаблона услуги"
     )
-    price_min =  models.DecimalField(
+    price_min = models.DecimalField(
         max_digits=9,
         decimal_places=2,
         help_text="значение параметра стоимости 1мин данного поставщика для данного шаблона услуги"
     )
-    price_amount =  models.DecimalField(
+    price_amount = models.DecimalField(
         max_digits=9,
         decimal_places=2,
         help_text="значение параметра стоимости 1 услуги данного поставщика для данного шаблона услуги"
@@ -86,7 +86,7 @@ class Service(models.Model):
         on_delete=models.DO_NOTHING,
         help_text="тип оказываемой услуги по классификатору услуг сервиса"
     )
-    
+
     class Meta:
         db_table = "service"
         verbose_name = "Услуга"

serializer/__init__.py

@@ -7,4 +7,4 @@ from .provider import ProviderSerializer
 from .relationship import RelationshipSerializer
 from .resource import ResourceSerializer
 from .service import ServiceSerializer
-from .servicetype import ServiceTypeSerializer
+from .servicetype import ServiceTypeSerializer

serializer/client.py

@@ -1,7 +1,9 @@
 from rest_framework import serializers
+
 from dbsynce.models import Client
 
+
 class ClientSerializer(serializers.ModelSerializer):
     class Meta:
         model = Client
-        exclude = ["id"]
+        exclude = ["id"]

serializer/company.py

@@ -1,7 +1,9 @@
 from rest_framework import serializers
+
 from dbsynce.models import Company
 
+
 class CompanySerializer(serializers.ModelSerializer):
     class Meta:
         model = Company
-        exclude = ["id"]
+        exclude = ["id"]

serializer/documents.py

@@ -1,7 +1,9 @@
 from rest_framework import serializers
+
 from dbsynce.models import Documents
 
+
 class DocumentsSerializer(serializers.ModelSerializer):
     class Meta:
         model = Documents
-        exclude = ["id"]
+        exclude = ["id"]

serializer/orders.py

@@ -1,34 +1,33 @@
+import traceback
+
 from rest_framework import serializers
-from dbsynce.models import Orders
-from tickets.models import Ticket, TicketList
+
+from core.settings_vars import DEBUG, WEBSERVICE_NAME, EJ_HOST, EJ_SERVICE
 from dbsynce.lib.core import *
 from dbsynce.lib.ejabberd import *
-from core.settings_vars import DEBUG, WEBSERVICE_NAME, EJ_HOST, EJ_SERVICE
-import traceback
-import requests
-    
+from dbsynce.models import Orders
+from tickets.models import Ticket, TicketList
+
 
 class OrdersSerializer(serializers.ModelSerializer):
     class Meta:
         model = Orders
         fields = '__all__'
 
-    
     def create(self, validated_data):
         ModelClass = self.Meta.model
-        
-        
+
         if "ticket" not in validated_data:
             # Create ticket with minimal required data
             ticket_data = {
-                "ticket_list": TicketList.objects.get(pk=9), # MS-SUP входящие обычные заявки ST_REQUEST
+                "ticket_list": TicketList.objects.get(pk=9),  # MS-SUP входящие обычные заявки ST_REQUEST
                 "status": None,
-                "created_date": "2000-01-01", # mandatory
+                "created_date": "2000-01-01",  # mandatory
                 "status_changed_date": None,
                 "created_by": None,
-                "priority": 0, # default: 0
+                "priority": 0,  # default: 0
                 "type": None,
-                "title": "New ticket title", # mandatory
+                "title": "New ticket title",  # mandatory
                 "note": None,
                 "due_date": None,
                 "assigned_to": None,

serializer/permissions.py

@@ -1,7 +1,9 @@
 from rest_framework import serializers
+
 from dbsynce.models import Permissions
 
+
 class PermissionsSerializer(serializers.ModelSerializer):
     class Meta:
         model = Permissions
-        exclude = ["id"]
+        exclude = ["id"]

serializer/provider.py

@@ -1,7 +1,9 @@
 from rest_framework import serializers
+
 from dbsynce.models import Provider
 
+
 class ProviderSerializer(serializers.ModelSerializer):
     class Meta:
         model = Provider
-        exclude = []
+        exclude = []

serializer/relationship.py

@@ -1,7 +1,9 @@
 from rest_framework import serializers
+
 from dbsynce.models import Relationship
 
+
 class RelationshipSerializer(serializers.ModelSerializer):
     class Meta:
         model = Relationship
-        exclude = ["id"]
+        exclude = ["id"]

serializer/resource.py

@@ -1,7 +1,9 @@
 from rest_framework import serializers
+
 from dbsynce.models import Resource
 
+
 class ResourceSerializer(serializers.ModelSerializer):
     class Meta:
         model = Resource
-        exclude = ["id"]
+        exclude = ["id"]

serializer/service.py

@@ -1,7 +1,9 @@
 from rest_framework import serializers
+
 from dbsynce.models import Service
 
+
 class ServiceSerializer(serializers.ModelSerializer):
     class Meta:
         model = Service
-        exclude = ["id"]
+        exclude = ["id"]

serializer/servicetype.py

@@ -1,7 +1,9 @@
 from rest_framework import serializers
+
 from dbsynce.models import ServiceType
 
+
 class ServiceTypeSerializer(serializers.ModelSerializer):
     class Meta:
         model = ServiceType
-        exclude = ["id"]
+        exclude = ["id"]

urls.py

@@ -1,6 +1,7 @@
-from dbsynce.apiviews import *
-from rest_framework import routers
 from django.urls import path, include
+from rest_framework import routers
+
+from dbsynce.apiviews import *
 
 router = routers.DefaultRouter()
 router.register(r'client', ClientMVS)
@@ -14,6 +15,6 @@ router.register(r'resource', ResourceMVS)
 router.register(r'service', ServiceMVS)
 router.register(r'servicetype', ServiceTypeMVS)
 
-urlpatterns = [  
+urlpatterns = [
     path('api/', include(router.urls), name="dbsynced"),
-]
+]