Browse Source

format code

blezz-tech 1 month ago
parent
commit
e234c2c8da

+ 4 - 1
admin/favoritecontacts.py

@@ -11,4 +11,7 @@ class FavoritecontactsAdmin(admin.ModelAdmin):
         'full_name',
         'phone_number',
     )
-    list_filter = ('id', 'client_id')
+    list_filter = (
+        'id',
+        'client_id'
+    )

+ 4 - 1
admin/frequentaddress.py

@@ -11,4 +11,7 @@ class FrequentaddressAdmin(admin.ModelAdmin):
         'description',
         'id',
     )
-    list_filter = ('client_id', 'id')
+    list_filter = (
+        'client_id',
+        'id'
+    )

+ 5 - 1
admin/preferreddrivers.py

@@ -10,4 +10,8 @@ class PreferreddriversAdmin(admin.ModelAdmin):
         'client_id',
         'provider_id',
     )
-    list_filter = ('id', 'client_id', 'provider_id')
+    list_filter = (
+        'id',
+        'client_id',
+        'provider_id'
+    )

+ 17 - 8
apiviews/favoritecontacts.py

@@ -10,14 +10,17 @@ from webservice_running.serializer import FavoritecontactsSerializer
 class FavoritecontactsMVS(viewsets.ModelViewSet):
     queryset = Favoritecontacts.objects.all()
     serializer_class = FavoritecontactsSerializer
-    permission_classes = [permissions.IsAuthenticated]
+    permission_classes = [
+        permissions.IsAuthenticated
+    ]
 
     def list(self, request, *args, **kwargs):
         client_id = self.request.query_params.get('client_id')
         queryset = Favoritecontacts.objects.all()
         if client_id is not None:
-            queryset = queryset.annotate(client_id_int=Cast('client_id', output_field=CharField())).filter(
-                client_id_int=client_id)
+            queryset = queryset \
+                .annotate(client_id_int=Cast('client_id', output_field=CharField())) \
+                .filter(client_id_int=client_id)
         serializer = self.get_serializer(queryset, many=True)
         return Response(serializer.data)
 
@@ -25,11 +28,17 @@ class FavoritecontactsMVS(viewsets.ModelViewSet):
         client_id = self.request.query_params.get('client_id')
         queryset = Favoritecontacts.objects.all()
         if not client_id:
-            return Response({'error': 'client_id parameter is required'}, status=status.HTTP_400_BAD_REQUEST)
+            return Response(
+                {'error': 'client_id parameter is required'},
+                status=status.HTTP_400_BAD_REQUEST
+            )
 
-        queryset = queryset.annotate(client_id_int=Cast('client_id', output_field=CharField())).filter(
-            client_id_int=client_id)
+        queryset = queryset \
+            .annotate(client_id_int=Cast('client_id', output_field=CharField())) \
+            .filter(client_id_int=client_id)
         queryset.delete()
 
-        return Response({'message': f'Objects with client_id {client_id} were deleted'},
-                        status=status.HTTP_204_NO_CONTENT)
+        return Response(
+            {'message': f'Objects with client_id {client_id} were deleted'},
+            status=status.HTTP_204_NO_CONTENT
+        )

+ 17 - 8
apiviews/frequentaddress.py

@@ -10,14 +10,17 @@ from webservice_running.serializer import FrequentaddressSerializer
 class FrequentaddressMVS(viewsets.ModelViewSet):
     queryset = Frequentaddress.objects.all()
     serializer_class = FrequentaddressSerializer
-    permission_classes = [permissions.IsAuthenticated]
+    permission_classes = [
+        permissions.IsAuthenticated
+    ]
 
     def list(self, request, *args, **kwargs):
         client_id = self.request.query_params.get('client_id')
         queryset = Frequentaddress.objects.all()
         if client_id is not None:
-            queryset = queryset.annotate(client_id_int=Cast('client_id', output_field=CharField())).filter(
-                client_id_int=client_id)
+            queryset = queryset \
+                .annotate(client_id_int=Cast('client_id', output_field=CharField())) \
+                .filter(client_id_int=client_id)
         serializer = self.get_serializer(queryset, many=True)
         return Response(serializer.data)
 
@@ -25,11 +28,17 @@ class FrequentaddressMVS(viewsets.ModelViewSet):
         client_id = self.request.query_params.get('client_id')
         queryset = Frequentaddress.objects.all()
         if not client_id:
-            return Response({'error': 'client_id parameter is required'}, status=status.HTTP_400_BAD_REQUEST)
+            return Response(
+                {'error': 'client_id parameter is required'},
+                status=status.HTTP_400_BAD_REQUEST
+            )
 
-        queryset = queryset.annotate(client_id_int=Cast('client_id', output_field=CharField())).filter(
-            client_id_int=client_id)
+        queryset = queryset \
+            .annotate(client_id_int=Cast('client_id', output_field=CharField())) \
+            .filter(client_id_int=client_id)
         queryset.delete()
 
-        return Response({'message': f'Objects with client_id {client_id} were deleted'},
-                        status=status.HTTP_204_NO_CONTENT)
+        return Response(
+            {'message': f'Objects with client_id {client_id} were deleted'},
+            status=status.HTTP_204_NO_CONTENT
+        )

+ 3 - 1
apiviews/orders_local.py

@@ -15,7 +15,9 @@ class OrdersLocalMVS(viewsets.ModelViewSet):
     queryset = OrdersLocal.objects.all()
     serializer_class = OrdersLocalSerializer
     # permission_classes = [IsOwnerOrReadOnly]
-    permission_classes = [permissions.IsAuthenticated]
+    permission_classes = [
+        permissions.IsAuthenticated
+    ]
 
     def get_object(self):
         """

+ 3 - 1
apiviews/personinfo.py

@@ -7,4 +7,6 @@ from webservice_running.serializer import PersonInfoSerializer
 class PersonInfoMVS(viewsets.ReadOnlyModelViewSet):
     queryset = get_user_model().objects.all()
     serializer_class = PersonInfoSerializer
-    permission_classes = [permissions.IsAuthenticated]
+    permission_classes = [
+        permissions.IsAuthenticated
+    ]

+ 17 - 8
apiviews/preferreddrivers.py

@@ -10,14 +10,17 @@ from webservice_running.serializer import PreferreddriversSerializer
 class PreferreddriversMVS(viewsets.ModelViewSet):
     queryset = Preferreddrivers.objects.all()
     serializer_class = PreferreddriversSerializer
-    permission_classes = [permissions.IsAuthenticated]
+    permission_classes = [
+        permissions.IsAuthenticated
+    ]
 
     def list(self, request, *args, **kwargs):
         client_id = self.request.query_params.get('client_id')
         queryset = Preferreddrivers.objects.all()
         if client_id is not None:
-            queryset = queryset.annotate(client_id_int=Cast('client_id', output_field=CharField())).filter(
-                client_id_int=client_id)
+            queryset = queryset \
+                .annotate(client_id_int=Cast('client_id', output_field=CharField())) \
+                .filter(client_id_int=client_id)
         serializer = self.get_serializer(queryset, many=True)
         return Response(serializer.data)
 
@@ -25,11 +28,17 @@ class PreferreddriversMVS(viewsets.ModelViewSet):
         client_id = self.request.query_params.get('client_id')
         queryset = Preferreddrivers.objects.all()
         if not client_id:
-            return Response({'error': 'client_id parameter is required'}, status=status.HTTP_400_BAD_REQUEST)
+            return Response(
+                {'error': 'client_id parameter is required'},
+                status=status.HTTP_400_BAD_REQUEST
+            )
 
-        queryset = queryset.annotate(client_id_int=Cast('client_id', output_field=CharField())).filter(
-            client_id_int=client_id)
+        queryset = queryset \
+            .annotate(client_id_int=Cast('client_id', output_field=CharField())) \
+            .filter(client_id_int=client_id)
         queryset.delete()
 
-        return Response({'message': f'Objects with client_id {client_id} were deleted'},
-                        status=status.HTTP_204_NO_CONTENT)
+        return Response(
+            {'message': f'Objects with client_id {client_id} were deleted'},
+            status=status.HTTP_204_NO_CONTENT
+        )

+ 2 - 1
handlers/BotClass.py

@@ -1,8 +1,9 @@
 import json
 import sys
-import xmpp
 from datetime import datetime
 
+import xmpp
+
 
 # Основной класс бота
 class JabberBot:

+ 6 - 1
handlers/classes/Answer.py

@@ -1,5 +1,10 @@
 class Answer(object):
-    def __init__(self, order_id, provider, answer):
+    def __init__(
+            self,
+            order_id,
+            provider,
+            answer
+    ):
         self.order_id = order_id
         self.provider = provider
         self.answer = answer

+ 88 - 18
handlers/classes/Order.py

@@ -1,13 +1,49 @@
 class Order(object):
-    def __init__(self, id, ticket, status, title, note, id_metaservice, is_global, is_visible, service, service_type,
-                 time_created, time_placed, time_start=None, time_start_predicted=None, time_finish_predicted=None,
-                 time_start_real=None, time_finish_real=None, order_place_type=None, order_place_start=None,
-                 order_place_start_gps=None, order_place_start_real=None, order_place_start_real_gps=None,
-                 order_place_finish_predicted=None, order_place_finish_predicted_gps=None, order_place_finish_real=None,
-                 order_place_finish_real_gps=None, predicted_price=None, real_price=None, payment_transaction_id=None,
-                 rating_id=None, provider=None, provider_screen_name=None, receiver=None, receiver_screen_name=None,
-                 client_id=None, resource_id=None, attempts=None, asap=None, money_limit=None, tasks=None,
-                 proceed_before_arrival=False, confirmation=False):
+    def __init__(
+            self,
+            id,
+            ticket,
+            status,
+            title,
+            note,
+            id_metaservice,
+            is_global,
+            is_visible,
+            service,
+            service_type,
+            time_created,
+            time_placed,
+            time_start=None,
+            time_start_predicted=None,
+            time_finish_predicted=None,
+            time_start_real=None,
+            time_finish_real=None,
+            order_place_type=None,
+            order_place_start=None,
+            order_place_start_gps=None,
+            order_place_start_real=None,
+            order_place_start_real_gps=None,
+            order_place_finish_predicted=None,
+            order_place_finish_predicted_gps=None,
+            order_place_finish_real=None,
+            order_place_finish_real_gps=None,
+            predicted_price=None,
+            real_price=None,
+            payment_transaction_id=None,
+            rating_id=None,
+            provider=None,
+            provider_screen_name=None,
+            receiver=None,
+            receiver_screen_name=None,
+            client_id=None,
+            resource_id=None,
+            attempts=None,
+            asap=None,
+            money_limit=None,
+            tasks=None,
+            proceed_before_arrival=False,
+            confirmation=False
+    ):
         self.id = id
         self.ticket = ticket
         self.status = status
@@ -53,15 +89,49 @@ class Order(object):
 
     def __str__(self):
         return "{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}, {8}, {9}, {10}, {11}, {12}, {13}, {14}, {15}, {16}, {17}, {18}, {19}, {20}, {21}, {22}, {23}, {24}, {25}, {26}, {27}, {28}, {29}, {30}, {31}, {32}, {33}, {34}, {35}, {36}, {37}, {38}".format(
-            self.id, self.ticket, self.status, self.title, self.note, self.id_metaservice, self.is_global,
-            self.is_visible, self.service, self.service_type, self.time_created, self.time_placed, self.time_start,
-            self.time_start_predicted, self.time_finish_predicted, self.time_start_real, self.time_finish_real,
-            self.order_place_type, self.order_place_start, self.order_place_start_gps, self.order_place_start_real,
-            self.order_place_start_real_gps, self.order_place_finish_predicted, self.order_place_finish_predicted_gps,
-            self.order_place_finish_real, self.order_place_finish_real_gps, self.predicted_price, self.real_price,
-            self.payment_transaction_id, self.rating_id, self.provider, self.provider_screen_name, self.receiver,
-            self.receiver_screen_name, self.client_id, self.resource_id, self.attempts, self.asap, self.money_limit,
-            self.tasks, self.proceed_before_arrival, self.confirmation)
+            self.id,
+            self.ticket,
+            self.status,
+            self.title,
+            self.note,
+            self.id_metaservice,
+            self.is_global,
+            self.is_visible,
+            self.service,
+            self.service_type,
+            self.time_created,
+            self.time_placed,
+            self.time_start,
+            self.time_start_predicted,
+            self.time_finish_predicted,
+            self.time_start_real,
+            self.time_finish_real,
+            self.order_place_type,
+            self.order_place_start,
+            self.order_place_start_gps,
+            self.order_place_start_real,
+            self.order_place_start_real_gps,
+            self.order_place_finish_predicted,
+            self.order_place_finish_predicted_gps,
+            self.order_place_finish_real,
+            self.order_place_finish_real_gps,
+            self.predicted_price,
+            self.real_price,
+            self.payment_transaction_id,
+            self.rating_id,
+            self.provider,
+            self.provider_screen_name,
+            self.receiver,
+            self.receiver_screen_name,
+            self.client_id,
+            self.resource_id,
+            self.attempts,
+            self.asap,
+            self.money_limit,
+            self.tasks,
+            self.proceed_before_arrival,
+            self.confirmation
+        )
 
 
 # Тестовый класс User и Address (ВАЖНО!!!) поля классов должны называться также как и поля json объекта

+ 13 - 2
handlers/classes/OrderTicket.py

@@ -1,6 +1,17 @@
 class OrderTicket(object):
-    def __init__(self, serviceType, driverSearchEngine, comment, arrivalTime, additionalServices, tasks, spendingLimit,
-                 isWithPaymentDocument, id, isProceedBeforeArrival):
+    def __init__(
+            self,
+            serviceType,
+            driverSearchEngine,
+            comment,
+            arrivalTime,
+            additionalServices,
+            tasks,
+            spendingLimit,
+            isWithPaymentDocument,
+            id,
+            isProceedBeforeArrival
+    ):
         self.serviceType = serviceType
         self.driverSearchEngine = driverSearchEngine
         self.comment = comment

+ 11 - 2
handlers/classes/Ticket.py

@@ -1,8 +1,17 @@
 class Ticket(object):
-    def __init__(self, id, name, group):
+    def __init__(
+            self,
+            id,
+            name,
+            group
+    ):
         self.id = id
         self.name = name
         self.group = group
 
     def __str__(self):
-        return "{0}, {1}, {2},\n".format(self.id, self.name, self.group)
+        return "{0}, {1}, {2},\n".format(
+            self.id,
+            self.name,
+            self.group
+        )

+ 23 - 5
handlers/classes/Ticket_user.py

@@ -1,6 +1,17 @@
 class Ticket_user(object):
-    def __init__(self, id, status, title, ticket_type, created_at, updated_at, due_date, priority, created_by,
-                 assigned_to):
+    def __init__(
+            self,
+            id,
+            status,
+            title,
+            ticket_type,
+            created_at,
+            updated_at,
+            due_date,
+            priority,
+            created_by,
+            assigned_to
+    ):
         self.id = id
         self.status = status
         self.title = title
@@ -14,7 +25,14 @@ class Ticket_user(object):
 
     def __str__(self):
         return "{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}, {8}, {9}\n".format(
-            self.id, self.status, self.title, self.ticket_type, self.created_at,
-            self.updated_at, self.due_date, self.priority,
-            self.created_by, self.assigned_to
+            self.id,
+            self.status,
+            self.title,
+            self.ticket_type,
+            self.created_at,
+            self.updated_at,
+            self.due_date,
+            self.priority,
+            self.created_by,
+            self.assigned_to
         )

+ 9 - 2
handlers/config.py

@@ -1,6 +1,13 @@
 # rename this file to config.py
-BOTLIST = ["open_basic_bot", 'status_changer', 'st_request_done', 'st_request_wontfix', 'st_request_assigned',
-           'st_request_new', 'st_request_in_process']
+BOTLIST = [
+    'open_basic_bot',
+    'status_changer',
+    'st_request_done',
+    'st_request_wontfix',
+    'st_request_assigned',
+    'st_request_new',
+    'st_request_in_process'
+]
 JSERVER = "ej.sharix-app.org"
 PASSWORD = "12345"
 PORT = 5222

+ 4 - 1
handlers/gen-passwords.py

@@ -5,4 +5,7 @@ import config
 botlist = config.BOTLIST
 
 for i in range(len(botlist)):
-    print(botlist[i], hashlib.md5((botlist[i] + config.PASSWORD).encode('utf-8')).hexdigest())
+    print(
+        botlist[i],
+        hashlib.md5((botlist[i] + config.PASSWORD).encode('utf-8')).hexdigest()
+    )

+ 10 - 4
handlers/gen_web_users.py

@@ -6,7 +6,13 @@ import jsonAndRequest as jsreq
 botlist = config.BOTLIST
 
 for i in range(len(botlist)):
-    print(botlist[i], hashlib.md5((botlist[i] + config.PASSWORD).encode('utf-8')).hexdigest())
-    print(jsreq.createUser(botlist[i], botlist[i],
-                           hashlib.md5((botlist[i] + config.PASSWORD).encode('utf-8')).hexdigest(),
-                           config.API_URL + "/v1/auth/users/"))
+    print(
+        botlist[i],
+        hashlib.md5((botlist[i] + config.PASSWORD).encode('utf-8')).hexdigest()
+    )
+    print(jsreq.createUser(
+        botlist[i],
+        botlist[i],
+        hashlib.md5((botlist[i] + config.PASSWORD).encode('utf-8')).hexdigest(),
+        config.API_URL + "/v1/auth/users/"
+    ))

+ 11 - 3
models/favoritecontacts.py

@@ -2,9 +2,17 @@ from django.db import models
 
 
 class Favoritecontacts(models.Model):
-    client_id = models.IntegerField(help_text="id")
-    phone_number = models.CharField(max_length=50, help_text="Номер телефона")
-    full_name = models.CharField(max_length=100, help_text="Полное ФИО")
+    client_id = models.IntegerField(
+        help_text="id"
+    )
+    phone_number = models.CharField(
+        max_length=50,
+        help_text="Номер телефона"
+    )
+    full_name = models.CharField(
+        max_length=100,
+        help_text="Полное ФИО"
+    )
 
     class Meta:
         db_table = "favoritecontacts"

+ 11 - 3
models/frequentaddress.py

@@ -2,9 +2,17 @@ from django.db import models
 
 
 class Frequentaddress(models.Model):
-    client_id = models.IntegerField(help_text="id клиента")
-    address = models.CharField(max_length=150, help_text="Адрес")
-    description = models.CharField(max_length=150, help_text="Описание")
+    client_id = models.IntegerField(
+        help_text="id клиента"
+    )
+    address = models.CharField(
+        max_length=150,
+        help_text="Адрес"
+    )
+    description = models.CharField(
+        max_length=150,
+        help_text="Описание"
+    )
 
     class Meta:
         db_table = "frequentaddress"

+ 6 - 2
models/preferreddrivers.py

@@ -2,8 +2,12 @@ from django.db import models
 
 
 class Preferreddrivers(models.Model):
-    client_id = models.IntegerField(help_text="Client id")
-    provider_id = models.IntegerField(help_text="Provider id")
+    client_id = models.IntegerField(
+        help_text="Client id"
+    )
+    provider_id = models.IntegerField(
+        help_text="Provider id"
+    )
 
     class Meta:
         db_table = "Prefereddrivers"

+ 55 - 15
models/webservice_running.py

@@ -8,23 +8,63 @@ class OrdersLocal(models.Model):
     OrdersLocal - таблица с заказами
     """
     order_synced = models.ForeignKey(Orders, on_delete=models.DO_NOTHING)
-    resource_id = models.ForeignKey(Resource, null=True, on_delete=models.DO_NOTHING)
-    rating_id = models.IntegerField(null=True)  # Need create table with rating
+    resource_id = models.ForeignKey(
+        Resource,
+        null=True,
+        on_delete=models.DO_NOTHING
+    )
+    rating_id = models.IntegerField(
+        null=True
+    )  # Need create table with rating
     payment_transaction_id = models.IntegerField(
-        null=True)  # Need create table with payment_transaction or it get from platform (i dont know)
-    attempts = models.IntegerField(null=True, help_text="Попытки")
+        null=True
+    )  # Need create table with payment_transaction or it get from platform (i dont know)
+    attempts = models.IntegerField(
+        null=True, help_text="Попытки"
+    )
 
-    order_place_type = models.CharField(null=True, max_length=150)
-    order_place_start = models.CharField(null=True, max_length=150)
-    order_place_start_gps = models.CharField(null=True, max_length=150)
-    order_place_start_sector = models.IntegerField(null=True)
-    order_place_start_real = models.CharField(null=True, max_length=150)
-    order_place_start_real_gps = models.CharField(null=True, max_length=150)
-    order_place_finish_predicted = models.CharField(null=True, max_length=150)
-    order_place_finish_predicted_gps = models.CharField(null=True, max_length=150)
-    order_place_finish_sector = models.IntegerField(null=True)
-    order_place_finish_real = models.CharField(null=True, max_length=150)
-    order_place_finish_real_gps = models.CharField(null=True, max_length=150)
+    order_place_type = models.CharField(
+        null=True,
+        max_length=150
+    )
+    order_place_start = models.CharField(
+        null=True,
+        max_length=150
+    )
+    order_place_start_gps = models.CharField(
+        null=True,
+        max_length=150
+    )
+    order_place_start_sector = models.IntegerField(
+        null=True
+    )
+    order_place_start_real = models.CharField(
+        null=True,
+        max_length=150
+    )
+    order_place_start_real_gps = models.CharField(
+        null=True,
+        max_length=150
+    )
+    order_place_finish_predicted = models.CharField(
+        null=True,
+        max_length=150
+    )
+    order_place_finish_predicted_gps = models.CharField(
+        null=True,
+        max_length=150
+    )
+    order_place_finish_sector = models.IntegerField(
+        null=True
+    )
+    order_place_finish_real = models.CharField(
+        null=True,
+        max_length=150
+    )
+    order_place_finish_real_gps = models.CharField(
+        null=True,
+        max_length=150
+    )
 
     class Meta:
         db_table = "orders_local"

+ 5 - 1
serializer/favoritecontacts.py

@@ -6,4 +6,8 @@ from webservice_running.models import Favoritecontacts
 class FavoritecontactsSerializer(serializers.ModelSerializer):
     class Meta:
         model = Favoritecontacts
-        fields = ['full_name', 'phone_number', 'id']
+        fields = [
+            'full_name',
+            'phone_number',
+            'id'
+        ]

+ 4 - 1
serializer/frequentaddress.py

@@ -6,4 +6,7 @@ from webservice_running.models import Frequentaddress
 class FrequentaddressSerializer(serializers.ModelSerializer):
     class Meta:
         model = Frequentaddress
-        exclude = ["id", "client_id"]
+        exclude = [
+            "id",
+            "client_id"
+        ]

+ 121 - 34
serializer/orders_local.py

@@ -17,46 +17,133 @@ class OrderNotDefined(Exception):
 
 
 class OrdersLocalSerializer(serializers.ModelSerializer):
-    service = serializers.IntegerField(source="order_synced.service.pk", allow_null=True)
-    service_type = serializers.IntegerField(source="order_synced.service_type.pk", allow_null=True)
-    state = serializers.CharField(source="order_synced.state", allow_null=True)
-    id_metaservice = serializers.IntegerField(source="order_synced.id_metaservice", allow_null=True)
-
-    provider = serializers.IntegerField(source="order_synced.provider.pk", allow_null=True)
-    provider_screen_name = serializers.CharField(source="order_synced.provider.user_id.full_name", allow_null=True)
-
-    receiver = serializers.IntegerField(source="order_synced.receiver.pk", allow_null=True)
-    receiver_screen_name = serializers.CharField(source="order_synced.receiver.full_name", allow_null=True)
-
-    client_id = serializers.CharField(source="order_synced.client_id.pk", allow_null=True)
-    client_screen_name = serializers.CharField(source="order_synced.client.user.full_name", allow_null=True)
-
-    # time_created = serializers.DateTimeField(source="order_synced.time_created", allow_null=True)
-    time_placed = serializers.DateTimeField(source="order_synced.time_placed", allow_null=True)
-    time_start = serializers.DateTimeField(source="order_synced.time_start", allow_null=True)
-    time_start_real = serializers.DateTimeField(source="order_synced.time_start_real", allow_null=True)
-    time_start_predicted = serializers.DateTimeField(source="order_synced.time_start_predicted", allow_null=True)
-    time_finish_predicted = serializers.DateTimeField(source="order_synced.time_finish_predicted", allow_null=True)
-    time_finish_real = serializers.DateTimeField(source="order_synced.time_finish_real", allow_null=True)
-
-    predicted_price = serializers.FloatField(source="order_synced.predicted_price", allow_null=True)
-    real_price = serializers.FloatField(source="order_synced.real_price", allow_null=True)
-    is_global = serializers.BooleanField(source="order_synced.is_global", allow_null=True)
-    is_visible = serializers.BooleanField(source="order_synced.is_visible", allow_null=True)
-    ticket = serializers.IntegerField(source="order_synced.ticket.pk", allow_null=True)
-    status = serializers.IntegerField(source="order_synced.ticket.stauts", allow_null=True)
-    priority = serializers.IntegerField(source="order_synced.ticket.priority", allow_null=True)
-    title = serializers.CharField(source="order_synced.ticket.title", allow_null=True)
-    note = serializers.CharField(source="order_synced.ticket.note", allow_null=True)
-    due_date = serializers.DateField(source="order_synced.ticket.due_date", allow_null=True)
-    status_changed_date = serializers.DateTimeField(source="order_synced.ticket.status_changed_date", allow_null=True)
+    service = serializers.IntegerField(
+        source="order_synced.service.pk",
+        allow_null=True
+    )
+    service_type = serializers.IntegerField(
+        source="order_synced.service_type.pk",
+        allow_null=True
+    )
+    state = serializers.CharField(
+        source="order_synced.state",
+        allow_null=True
+    )
+    id_metaservice = serializers.IntegerField(
+        source="order_synced.id_metaservice",
+        allow_null=True
+    )
+
+    provider = serializers.IntegerField(
+        source="order_synced.provider.pk",
+        allow_null=True
+    )
+    provider_screen_name = serializers.CharField(
+        source="order_synced.provider.user_id.full_name",
+        allow_null=True
+    )
+
+    receiver = serializers.IntegerField(
+        source="order_synced.receiver.pk",
+        allow_null=True
+    )
+    receiver_screen_name = serializers.CharField(
+        source="order_synced.receiver.full_name",
+        allow_null=True
+    )
+
+    client_id = serializers.CharField(
+        source="order_synced.client_id.pk",
+        allow_null=True
+    )
+    client_screen_name = serializers.CharField(
+        source="order_synced.client.user.full_name",
+        allow_null=True
+    )
+
+    # time_created = serializers.DateTimeField(
+    #     source="order_synced.time_created", 
+    #     allow_null=True
+    # )
+    time_placed = serializers.DateTimeField(
+        source="order_synced.time_placed",
+        allow_null=True
+    )
+    time_start = serializers.DateTimeField(
+        source="order_synced.time_start",
+        allow_null=True
+    )
+    time_start_real = serializers.DateTimeField(
+        source="order_synced.time_start_real",
+        allow_null=True
+    )
+    time_start_predicted = serializers.DateTimeField(
+        source="order_synced.time_start_predicted",
+        allow_null=True
+    )
+    time_finish_predicted = serializers.DateTimeField(
+        source="order_synced.time_finish_predicted",
+        allow_null=True
+    )
+    time_finish_real = serializers.DateTimeField(
+        source="order_synced.time_finish_real",
+        allow_null=True
+    )
+
+    predicted_price = serializers.FloatField(
+        source="order_synced.predicted_price",
+        allow_null=True
+    )
+    real_price = serializers.FloatField(
+        source="order_synced.real_price",
+        allow_null=True
+    )
+    is_global = serializers.BooleanField(
+        source="order_synced.is_global",
+        allow_null=True
+    )
+    is_visible = serializers.BooleanField(
+        source="order_synced.is_visible",
+        allow_null=True
+    )
+    ticket = serializers.IntegerField(
+        source="order_synced.ticket.pk",
+        allow_null=True
+    )
+    status = serializers.IntegerField(
+        source="order_synced.ticket.stauts",
+        allow_null=True
+    )
+    priority = serializers.IntegerField(
+        source="order_synced.ticket.priority",
+        allow_null=True
+    )
+    title = serializers.CharField(
+        source="order_synced.ticket.title",
+        allow_null=True
+    )
+    note = serializers.CharField(
+        source="order_synced.ticket.note",
+        allow_null=True
+    )
+    due_date = serializers.DateField(
+        source="order_synced.ticket.due_date",
+        allow_null=True
+    )
+    status_changed_date = serializers.DateTimeField(
+        source="order_synced.ticket.status_changed_date",
+        allow_null=True
+    )
 
     # order_synced = OrdersSerializer(read_only=True)
 
     class Meta:
         model = OrdersLocal
         fields = "__all__"
-        # fields = ["order", "order_synced"]
+        # fields = [
+        #     "order",
+        #     "order_synced"
+        # ]
         # depth = 2
 
     def update(self, instance, validated_data):

+ 3 - 1
serializer/personinfo.py

@@ -7,7 +7,9 @@ class PersonInfoSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = get_user_model()
-        fields = ['full_name']
+        fields = [
+            'full_name'
+        ]
 
     def validate(self, attrs):
         return super().validate(attrs)

+ 5 - 1
serializer/preferreddrivers.py

@@ -6,4 +6,8 @@ from webservice_running.models import Preferreddrivers
 class PreferreddriversSerializer(serializers.ModelSerializer):
     class Meta:
         model = Preferreddrivers
-        fields = ['provider_id', 'client_id', 'id']
+        fields = [
+            'provider_id',
+            'client_id',
+            'id'
+        ]