0.6.2

fix routes models

GeneralApp/urls.py

@@ -6,4 +6,5 @@ from .views import *
 
 urlpatterns = [
     path('', MainPage, name='main'),
+    path('test_code', test_code, name='test_code'),
 ]

GeneralApp/views.py

@@ -7,6 +7,29 @@ from .models import *
 from django.conf import settings
 
 
+def test_code(request):
+    from RoutesApp.funcs import get_city_by_type_transport_and_address_point
+    from RoutesApp.models import Route
+    from ReferenceDataApp.models import Airport, City
+
+    routes = Route.objects.all()
+
+    for route in routes:
+        print(route.id)
+        required_save = False
+        if not route.from_address_point:
+            route.from_city = get_city_by_type_transport_and_address_point(route.type_transport, route.from_address_point)
+            required_save = True
+
+        if not route.to_address_point:
+            route.to_address_point = get_city_by_type_transport_and_address_point(route.type_transport,
+                                                                                route.to_address_point)
+            required_save = True
+
+        if required_save:
+            route.save()
+
+    return HttpResponse('finished')
 
 
 def MainPage(request):

RoutesApp/funcs.py

@@ -1,4 +1,19 @@
 from .models import *
+
+
+def get_city_by_type_transport_and_address_point(type_transport, address_point):
+    from ReferenceDataApp.models import Airport, City
+
+    try:
+        if type_transport == 'avia':
+            return Airport.objects.get(id=address_point).city
+        else:
+            return City.objects.get(id=address_point)
+    except Exception as e:
+        msg = f'get_city_by_type_transport_and_address_point Error = {str(e)}, type_transport = {type_transport}, address_point = {address_point}'
+        print(msg)
+        return None
+
 def get_routes_Dict(user=None, data=None):
     from ReferenceDataApp.models import Airport, Country, City
 
@@ -29,10 +44,16 @@ def get_routes_Dict(user=None, data=None):
                         kwargs.update({f'{key}__lte': int(weight_list[1])})
                 if key not in (
                     'from_address_point_txt', 'to_address_point_txt', 'csrfmiddlewaretoken', 'sort', 'weight',
-                    'from_el', 'to_el'
+                    'from_el', 'to_el', 'from_address_point', 'to_address_point'
                 ):
                     kwargs.update({key: val})
 
+                if key == 'from_address_point':
+                    kwargs.update({f'from_city__id': val})
+
+                if key == 'to_address_point':
+                    kwargs.update({f'to_city__id': val})
+
                 if key == 'from_el':
                     from_el = int(val)
                 if key == 'to_el':

RoutesApp/js_views.py

@@ -14,7 +14,7 @@ from datetime import datetime
 from django.template.loader import render_to_string
 from django.urls import reverse
 from .forms import *
-from .funcs import get_routes_Dict
+from .funcs import *
 
 
 def edit_route_ajax(request):
@@ -217,6 +217,7 @@ def get_routes_ajax(request):
 
 
 def create_or_change_route_ajax(request, route_id=None):
+    from ReferenceDataApp.models import Airport, City
 
     if request.method != 'POST':
         raise Http404
@@ -249,6 +250,13 @@ def create_or_change_route_ajax(request, route_id=None):
         obj = form.save(commit=False)
         if 'owner_type' in data:
             obj.owner_type = data['owner_type']
+
+        if obj.from_address_point:
+            obj.from_city = get_city_by_type_transport_and_address_point(obj.type_transport, obj.from_address_point)
+
+        if obj.to_address_point:
+            obj.to_address_point = get_city_by_type_transport_and_address_point(obj.type_transport, obj.to_address_point)
+
         obj.owner = request.user
         obj.save()
 

RoutesApp/migrations/0005_route_from_city_route_to_city.py

@@ -0,0 +1,25 @@
+# Generated by Django 4.2.2 on 2023-08-29 18:02
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ReferenceDataApp', '0005_remove_airport_parsing_finished_and_more'),
+        ('RoutesApp', '0004_alter_route_type_transport'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='route',
+            name='from_city',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='rel_routes_for_cityFrom', to='ReferenceDataApp.city', verbose_name='Город отправки'),
+        ),
+        migrations.AddField(
+            model_name='route',
+            name='to_city',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='rel_routes_for_cityTo', to='ReferenceDataApp.city', verbose_name='Город получения'),
+        ),
+    ]

RoutesApp/models.py

@@ -31,6 +31,7 @@ owner_type_choices = (
 
 class Route(BaseModel):
     from django.contrib.auth.models import User
+    from ReferenceDataApp.models import City
 
     owner_type = models.CharField(
         choices=owner_type_choices, default='customer', verbose_name=_('Тип опреации'))
@@ -41,8 +42,14 @@ class Route(BaseModel):
     arrival_DT = models.DateTimeField(default=True, verbose_name=_('Дата и время прибытия'))
     from_address_point = models.IntegerField(verbose_name=_('Пункт выезда'))
     to_address_point = models.IntegerField(verbose_name=_('Пункт приезда'))
-    # from_city = forms.CharField(required=True)
-    # to_city = forms.CharField(required=True)
+    from_city = models.ForeignKey(
+        City, verbose_name=_('Город отправки'), related_name='rel_routes_for_cityFrom', on_delete=models.SET_NULL,
+        null=True, blank=True
+    )
+    to_city = models.ForeignKey(
+        City, verbose_name=_('Город получения'), related_name='rel_routes_for_cityTo', on_delete=models.SET_NULL,
+        null=True, blank=True
+    )
     from_place = models.CharField(choices=transfer_location_choices, default='other',
                                    verbose_name=_('Откуда можете забрать?'))
     to_place = models.CharField(choices=transfer_location_choices, default='other',