sender page

backend/api/account/client/serializers.py

@@ -6,6 +6,26 @@ from api.models import UserProfile
 from django.shortcuts import get_object_or_404
 import pytz
 
+class CountrySerializer(serializers.ModelSerializer):
+    value = serializers.CharField(source='international_name')  # для совместимости с селектом на фронте
+    label = serializers.SerializerMethodField()  # для отображения в селекте
+
+    class Meta:
+        model = Country
+        fields = ['id', 'value', 'label', 'flag_img_url']
+
+    def get_label(self, obj):
+        return obj.international_name or obj.official_name
+
+class CitySerializer(serializers.ModelSerializer):
+    value = serializers.CharField(source='name')  # для совместимости с селектом
+    label = serializers.CharField(source='name')  # для отображения в селекте
+    country_name = serializers.CharField(source='country.international_name')
+
+    class Meta:
+        model = City
+        fields = ['id', 'value', 'label', 'country_name']
+
 class RouteSerializer(serializers.ModelSerializer):
     from_city_name = serializers.SerializerMethodField()
     to_city_name = serializers.SerializerMethodField()
@@ -160,16 +180,16 @@ class CreateRouteSerializer(serializers.ModelSerializer):
         to_city = City.objects.get(name=validated_data.pop('city_to'), country=country_to)
 
         # обновляем номер телефона в профиле пользователя
-        contact_number = validated_data.pop('contact_number')
+        phone_number = validated_data.pop('phone_number')
         user_profile = get_object_or_404(UserProfile, user=self.context['request'].user)
         
         # проверяем, не используется ли этот номер другим пользователем
-        if UserProfile.objects.filter(phone_number=contact_number).exclude(user=self.context['request'].user).exists():
+        if UserProfile.objects.filter(phone_number=phone_number).exclude(user=self.context['request'].user).exists():
             raise serializers.ValidationError({
-                "contact_number": "Этот номер телефона уже используется другим пользователем"
+                "phone_number": "Этот номер телефона уже используется другим пользователем"
             })
             
-        user_profile.phone_number = contact_number
+        user_profile.phone_number = phone_number
         user_profile.save()
         
         # создаем маршрут

backend/api/account/client/views.py

@@ -7,12 +7,13 @@ from rest_framework.response import Response
 from django.shortcuts import get_object_or_404
 from django.core.validators import validate_email
 from django.core.exceptions import ValidationError
+from django.db import models
 
 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, CreateRouteSerializer
+from routes.models import Route, City, Country
+from .serializers import RouteSerializer, CreateRouteSerializer, CitySerializer, CountrySerializer
 
 class UserDataView(ViewSet):
     permission_classes = [IsAuthenticated]
@@ -95,8 +96,53 @@ class AccountActionsView(ViewSet):
     
     @action(detail=False, methods=['post'])
     @handle_exceptions
-    def create_sender_route(self, request):
+    def create_route(self, request):
         serializer = CreateRouteSerializer(data=request.data)
         serializer.is_valid(raise_exception=True)
         serializer.save()
         return Response(serializer.data, status=status.HTTP_201_CREATED)
+
+class CityView(ViewSet):
+    
+    @action(detail=False, methods=['get'])
+    @handle_exceptions
+    def get_cities(self, request):
+        # получаем параметр country_id из query params
+        country_id = request.query_params.get('country_id')
+        
+        # базовый QuerySet
+        cities = City.objects.all()
+        
+        # фильтруем города по стране, если указан country_id
+        if country_id:
+            cities = cities.filter(country_id=country_id)
+            
+        # поиск по названию города
+        search = request.query_params.get('search')
+        if search:
+            cities = cities.filter(name__icontains=search)
+            
+        # ограничиваем количество результатов и сортируем по имени
+        cities = cities.order_by('name')[:100]
+        
+        return Response(CitySerializer(cities, many=True).data, status=status.HTTP_200_OK)
+
+class CountryView(ViewSet):
+    @action(detail=False, methods=['get'])
+    @handle_exceptions
+    def get_countries(self, request):
+        # базовый QuerySet
+        countries = Country.objects.all()
+        
+        # поиск по названию страны
+        search = request.query_params.get('search')
+        if search:
+            countries = countries.filter(
+                models.Q(international_name__icontains=search) |
+                models.Q(official_name__icontains=search)
+            )
+        
+        # сортируем по международному названию
+        countries = countries.order_by('international_name')
+        
+        return Response(CountrySerializer(countries, many=True).data, status=status.HTTP_200_OK)

backend/api/urls.py

@@ -8,7 +8,7 @@ LoginViewSet,
 LogoutView,
 RefreshTokenView)
 
-from api.account.client.views import UserDataView, AccountActionsView
+from api.account.client.views import UserDataView, AccountActionsView, CityView, CountryView
 
 urlpatterns = [
     path("v1/faq/", FAQView.as_view(), name='faqMain'),
@@ -24,5 +24,8 @@ urlpatterns = [
     
     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'),
-    path("v1/account/create_sender/", AccountActionsView.as_view({'post':'create_sender_route'}), name='create_sender_route')
+    path("v1/account/create_route/", AccountActionsView.as_view({'post':'create_route'}), name='create_route'),
+    
+    path("v1/cities/", CityView.as_view({'get':'get_cities'}), name='get_cities'),
+    path("v1/countries/", CountryView.as_view({'get':'get_countries'}), name='get_countries')
 ]