account/routes page

backend/Pipfile

@@ -13,6 +13,7 @@ transliterate = "*"
 djangorestframework-simplejwt = "*"
 django-cors-headers = "*"
 requests = "*"
+pytz = "*"
 
 [dev-packages]
 

backend/Pipfile.lock

@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "cb9b63f4897299c7cedf6a49a97a73a97587c60df970d9c7044fec2f6f3861c8"
+            "sha256": "94474e1990b5d4d58689cca46373a808771ba11de6b9dc4bda6cdbdd93a4bb70"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -296,6 +296,14 @@
             "markers": "python_version >= '3.9'",
             "version": "==1.1.0"
         },
+        "pytz": {
+            "hashes": [
+                "sha256:360b9e3dbb49a209c21ad61809c7fb453643e048b38924c765813546746e81c3",
+                "sha256:5ddf76296dd8c44c26eb8f4b6f35488f3ccbf6fbbd7adee0b7262d43f0ec2f00"
+            ],
+            "index": "pypi",
+            "version": "==2025.2"
+        },
         "requests": {
             "hashes": [
                 "sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760",

backend/api/account/client/serializers.py

@@ -0,0 +1,58 @@
+from rest_framework import serializers
+from routes.models import Route, City
+from django.conf import settings
+from routes.constants.routeChoices import cargo_type_choices, type_transport_choices
+import pytz
+
+class RouteSerializer(serializers.ModelSerializer):
+    from_city_name = serializers.SerializerMethodField()
+    to_city_name = serializers.SerializerMethodField()
+    formatted_departure = serializers.SerializerMethodField()
+    formatted_arrival = serializers.SerializerMethodField()
+    formatted_cargo_type = serializers.SerializerMethodField()
+    formatted_transport = serializers.SerializerMethodField()
+
+    class Meta:
+        model = Route
+        fields = '__all__'
+
+    def get_from_city_name(self, obj):
+        try:
+            city = City.objects.get(id=obj.from_city_id)
+            return city.name
+        except City.DoesNotExist:
+            return None
+
+    def get_to_city_name(self, obj):
+        try:
+            city = City.objects.get(id=obj.to_city_id)
+            return city.name
+        except City.DoesNotExist:
+            return None
+
+    def _convert_to_local_time(self, dt):
+        if dt is None:
+            return None
+        # проверяем что у datetime есть временная зона (если нет, считаем UTC)
+        if dt.tzinfo is None:
+            dt = pytz.UTC.localize(dt)
+        # конвертируем в локальную временную зону
+        local_tz = pytz.timezone(settings.TIME_ZONE)
+        local_dt = dt.astimezone(local_tz)
+        return local_dt
+
+    def get_formatted_departure(self, obj):
+        local_dt = self._convert_to_local_time(obj.departure_DT)
+        return local_dt.strftime("%d.%m.%Y, %H:%M") if local_dt else None
+
+    def get_formatted_arrival(self, obj):
+        local_dt = self._convert_to_local_time(obj.arrival_DT)
+        return local_dt.strftime("%d.%m.%Y, %H:%M") if local_dt else None
+
+    def get_formatted_cargo_type(self, obj):
+        cargo_types = dict(cargo_type_choices)
+        return cargo_types.get(obj.cargo_type, obj.cargo_type)
+
+    def get_formatted_transport(self, obj):
+        transport_types = dict(type_transport_choices)
+        return transport_types.get(obj.type_transport, obj.type_transport)

backend/api/account/client/views.py

@@ -11,6 +11,8 @@ from django.core.exceptions import ValidationError
 from api.auth.serializers import UserResponseSerializer
 from api.models import UserProfile
 from api.utils.decorators import handle_exceptions
+from routes.models import Route
+from .serializers import RouteSerializer
 
 class UserDataView(ViewSet):
     permission_classes = [IsAuthenticated]
@@ -82,4 +84,11 @@ class AccountActionsView(ViewSet):
         return Response({
             "message": "Данные успешно обновлены",
             "user": UserResponseSerializer(user).data
-        }, status=status.HTTP_200_OK)
+        }, status=status.HTTP_200_OK)
+        
+    @action(detail=False, methods=['get'])
+    @handle_exceptions
+    def user_routes(self, request):
+        user = request.user
+        routes = Route.objects.filter(owner=user)
+        return Response(RouteSerializer(routes, many=True).data, status=status.HTTP_200_OK)

backend/api/admin.py

@@ -6,8 +6,8 @@ from routes.models import Route
 
 class RouteInline(admin.TabularInline):
     model = Route
-    fields = ('owner_type', 'type_transport', 'from_city', 'to_city', 'cargo_type', 'departure_DT', 'arrival_DT')
-    readonly_fields = ('owner_type', 'type_transport', 'from_city', 'to_city', 'cargo_type', 'departure_DT', 'arrival_DT')
+    fields = ('owner_type', 'type_transport', 'from_city', 'to_city', 'cargo_type', 'departure_DT', 'arrival_DT', 'comment')
+    # readonly_fields = ('owner_type', 'type_transport', 'from_city', 'to_city', 'cargo_type', 'departure_DT', 'arrival_DT')
     extra = 0
     can_delete = False
     verbose_name = 'Маршрут пользователя'

backend/api/urls.py

@@ -22,5 +22,6 @@ urlpatterns = [
     
     path ("v1/user/", UserDataView.as_view({'get': 'user_data'}), name="user"),
     
-    path("v1/account/change_main_data/", AccountActionsView.as_view({'patch':'change_data_main_tab'}), name='change_data_main_tab')
+    path("v1/account/change_main_data/", AccountActionsView.as_view({'patch':'change_data_main_tab'}), name='change_data_main_tab'),
+    path("v1/account/routes/", AccountActionsView.as_view({'get':'user_routes'}), name='user_routes')
 ]

backend/requirements.txt

@@ -10,6 +10,7 @@ pillow==11.2.1
 psycopg2==2.9.10
 PyJWT==2.9.0
 python-dotenv==1.1.0
+pytz==2025.2
 requests==2.32.3
 six==1.17.0
 sqlparse==0.5.3