Merge remote-tracking branch 'origin/dev' into dev

GeneralApp/views.py

@@ -3,6 +3,7 @@ import json
 from django.http import HttpResponse, Http404, FileResponse
 from django.template import loader, RequestContext
 from django.contrib.auth.decorators import login_required
+
 from .models import *
 from django.conf import settings
 from .funcs import get_inter_http_response
@@ -24,29 +25,33 @@ def test_code(request):
     ):
         raise Http404
 
-    from RoutesApp.funcs import get_city_by_type_transport_and_address_point
+    from RoutesApp.search_matches import search_matches
     from RoutesApp.models import Route
-    from ReferenceDataApp.models import Airport, City
+    search_matches(Route.objects.filter(from_city__id=57062))
 
-    res = None
+    # from RoutesApp.funcs import get_city_by_type_transport_and_address_point
-
+    # from RoutesApp.models import Route
-    from_air = Airport.objects.get(iata_code='MSQ')
+    # from ReferenceDataApp.models import Airport, City
-    to_air = Airport.objects.get(iata_code='SVO')
+    #
-
+    # res = None
-    routes = [
+    #
-        Route(
+    # from_air = Airport.objects.get(iata_code='MSQ')
-            type_transport='road',
+    # to_air = Airport.objects.get(iata_code='SVO')
-            departure_DT=datetime.now() + timedelta(days=7),
+    #
-            arrival_DT=datetime.now() + timedelta(days=8),
+    # routes = [
-            from_address_point=to_air.city.id,
+    #     Route(
-            to_address_point=from_air.city.id,
+    #         type_transport='road',
-            from_city=to_air.city,
+    #         departure_DT=datetime.now() + timedelta(days=7),
-            to_city=from_air.city,
+    #         arrival_DT=datetime.now() + timedelta(days=8),
-            weight=item,
+    #         from_address_point=to_air.city.id,
-            phone='0987654321',
+    #         to_address_point=from_air.city.id,
-            owner=request.user
+    #         from_city=to_air.city,
-        ) for item in range(100)
+    #         to_city=from_air.city,
-    ]
+    #         weight=item,
+    #         phone='0987654321',
+    #         owner=request.user
+    #     ) for item in range(100)
+    # ]
 
     # routes = [
     #     Route(
@@ -62,8 +67,8 @@ def test_code(request):
     #         owner = request.user
     #     ) for item in range(1000)
     # ]
-
+    #
-    Route.objects.bulk_create(routes)
+    # Route.objects.bulk_create(routes)
 
 
     # from RoutesApp.search_matches import search_matches

RoutesApp/search_matches.py

@@ -91,8 +91,11 @@ def search_matches(for_routes=None):
             )
 
         check_fields = [
-            'type_transport', 'departure_DT', 'arrival_DT', 'from_address_point', 'to_address_point',
+            'type_transport', 'departure_DT', 'arrival_DT',
-            'from_place', 'to_place', 'cargo_type', 'weight'
+            # 'from_address_point', 'to_address_point',
+            'from_place', 'to_place',
+            'cargo_type', 'weight',
+            'from_city', 'to_city',
         ]
 
         if for_routes:
@@ -118,6 +121,14 @@ def search_matches(for_routes=None):
                             kwargs.update({f"{field_name}__lte": field_val})
                         else:
                             kwargs.update({f"{field_name}__gte": field_val})
+                    elif field_name == 'from_city':
+                        params.update({'from_address_point': field_val.id})
+                        kwargs.update({field_name: field_val})
+                    elif field_name == 'to_city':
+                        params.update({'to_address_point': field_val.id})
+                        kwargs.update({field_name: field_val})
+                    # elif field_name in ['from_address_point', 'to_address_point']:
+                    #     kwargs.update({field_name: field_val})
                     else:
                         kwargs.update({field_name: field_val})
                         params.update({field_name: field_val})