From a99ffcc9d2deaa8814c8e5b5e0c91e6fea20f172 Mon Sep 17 00:00:00 2001
From: SDE <strigevitch@syncsystems.net>
Date: Tue, 13 Aug 2024 12:58:41 +0300
Subject: [PATCH] 1.6.11 fix next package for my_routes

---
 GeneralApp/views.py   |  4 ++--
 RoutesApp/funcs.py    | 41 +++++++++++++++++++++++++++--------------
 RoutesApp/js_views.py |  6 +++++-
 3 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/GeneralApp/views.py b/GeneralApp/views.py
index 831e2e6..7c0ea14 100644
--- a/GeneralApp/views.py
+++ b/GeneralApp/views.py
@@ -22,8 +22,8 @@ def test_code(request):
 
     res = None
 
-    from ReferenceDataApp.funcs import parse_data
-    parse_data()
+    # from ReferenceDataApp.funcs import parse_data
+    # parse_data()
 
     # from SubscribesApp.reports import send_mail_for_user_subscribes_that_is_going_to_finish
     # send_mail_for_user_subscribes_that_is_going_to_finish()
diff --git a/RoutesApp/funcs.py b/RoutesApp/funcs.py
index 50e7070..4138d0b 100644
--- a/RoutesApp/funcs.py
+++ b/RoutesApp/funcs.py
@@ -118,15 +118,25 @@ 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)
+        # 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_city_by_address_point(address_point):
+    from ReferenceDataApp.models import Airport, City
+
+    try:
+        return City.objects.get(id=address_point)
+    except Exception as e:
+        msg = f'get_city_by_address_point Error = {str(e)}, address_point = {address_point}'
+        print(msg)
+        return None
+
 
 def get_profile_my_routes_page_content_html(request):
     routes_Dict = get_routes_Dict(request.user)
@@ -210,15 +220,18 @@ def get_routes_Dict(user=None, data=None):
                     kwargs.update({key: val})
 
                 if key == 'from_address_point':
-                    city = get_city_by_type_transport_and_address_point(type_transport, val)
+                    # city = get_city_by_type_transport_and_address_point(type_transport, val)
+                    city = get_city_by_address_point(val)
                     kwargs.update({f'from_city': city})
 
+
                     res_Dict.update({
                         'from_address_point_txt': city.get_country_n_city_str()
                     })
 
                 if key == 'to_address_point':
-                    city = get_city_by_type_transport_and_address_point(type_transport, val)
+                    # city = get_city_by_type_transport_and_address_point(type_transport, val)
+                    city = get_city_by_address_point(val)
                     kwargs.update({f'to_city': city})
                     res_Dict.update({
                         'to_address_point_txt': city.get_country_n_city_str()
@@ -236,14 +249,14 @@ def get_routes_Dict(user=None, data=None):
     # ).order_by(
     #     '-rising_DT', '-departure_DT', '-arrival_DT', '-modifiedDT'
     # )
-    routes = Route.objects.exclude(
-        rising_DT=None
-    ).filter(
-        departure_DT__lt=datetime.now()
-    )
-    routes.update(
-        rising_DT=None
-    )
+    # routes = Route.objects.exclude(
+    #     rising_DT=None
+    # ).filter(
+    #     departure_DT__lt=datetime.now()
+    # )
+    # routes.update(
+    #     rising_DT=None
+    # )
 
     routes = Route.objects.filter(
         **kwargs
diff --git a/RoutesApp/js_views.py b/RoutesApp/js_views.py
index 60125e4..9125c1e 100644
--- a/RoutesApp/js_views.py
+++ b/RoutesApp/js_views.py
@@ -293,8 +293,12 @@ def get_my_routes_ajax(request):
 
     lang = get_and_set_lang(request)
 
+    data = request.POST.dict()
+    if not data and request.body:
+        data = json.loads(request.body)
+
     try:
-        routes_Dict = get_routes_Dict(request.user)
+        routes_Dict = get_routes_Dict(request.user, data)
         if 'errors' in routes_Dict:
             return JsonResponse(routes_Dict, status=400)