From d850f50e25105012aa89c20b8a45bd432ef35147 Mon Sep 17 00:00:00 2001
From: trevor <a.choi@smartsoltech.kr>
Date: Mon, 23 Dec 2024 15:11:49 +0900
Subject: [PATCH] several FontAwesome icons changed.

---
 antifroud/check_fraud.py                      |   2 +-
 .../external_db_settings_change_form.html     |  23 +--
 bot/operations/statistics.py                  | 164 +++++++++++-------
 bot/utils/pdf_report.py                       | 161 ++++++++++++-----
 touchh/settings.py                            |   6 +
 touchh/urls.py                                |   3 +-
 touchh/utils/log.py                           |   5 +-
 7 files changed, 244 insertions(+), 120 deletions(-)

diff --git a/antifroud/check_fraud.py b/antifroud/check_fraud.py
index 3e86e7e0..97df113e 100644
--- a/antifroud/check_fraud.py
+++ b/antifroud/check_fraud.py
@@ -5,7 +5,7 @@ from django.utils import timezone
 from django.db.models import Q
 from hotels.models import Reservation, Hotel
 from .models import UserActivityLog, ViolationLog
-
+from touchh.utils.log import CustomLogger
 # Настройка логирования
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
diff --git a/antifroud/templates/antifroud/admin/external_db_settings_change_form.html b/antifroud/templates/antifroud/admin/external_db_settings_change_form.html
index 1adfb17d..cba4fd0e 100644
--- a/antifroud/templates/antifroud/admin/external_db_settings_change_form.html
+++ b/antifroud/templates/antifroud/admin/external_db_settings_change_form.html
@@ -4,7 +4,7 @@
 
 <style>
     #table-data-preview {
-        max-height: 300px; /* Ограничиваем высоту предпросмотра */
+        max-height: 500px; /* Ограничиваем высоту предпросмотра */
         overflow-y: auto; /* Прокрутка по вертикали */
         overflow-x: auto; /* Прокрутка по горизонтали */
     }
@@ -36,27 +36,27 @@
     <form id="connection-form" method="post">
         {% csrf_token %}
         <div class="form-group mb-3">
-            <label for="db-name">Name</label>
+            <label for="db-name">Имя подключения</label>
             <input id="db-name" class="form-control" type="text" name="name" value="{{ original.name }}" required />
         </div>
         <div class="form-group mb-3">
-            <label for="db-host">DB Host</label>
+            <label for="db-host">Сервер БД</label>
             <input id="db-host" class="form-control" type="text" name="host" value="{{ original.host }}" required />
         </div>
         <div class="form-group mb-3">
-            <label for="db-port">DB Port</label>
+            <label for="db-port">Порт БД</label>
             <input id="db-port" class="form-control" type="number" name="port" value="{{ original.port }}" required />
         </div>
         <div class="form-group mb-3">
-            <label for="db-user">User</label>
+            <label for="db-user">Пользователь</label>
             <input id="db-user" class="form-control" type="text" name="user" value="{{ original.user }}" required />
         </div>
         <div class="form-group mb-3">
-            <label for="db-password">Password</label>
+            <label for="db-password">Пароль</label>
             <input id="db-password" class="form-control" type="password" name="password" value="{{ original.password }}" />
         </div>
         <div class="form-group mb-3">
-            <label for="db-database">Database</label>
+            <label for="db-database">Имя Базы данных</label>
             <input id="db-database" class="form-control" type="text" name="database" value="{{ original.database }}" required />
         </div>
         <div class="form-group mb-3">
@@ -78,10 +78,11 @@
                 </table>
             </div>
         </div>
-        <div class="form-group mb-3">
-            <label for="is-active">Активное подключение</label>
-            <input id="is-active" class="form-check-input" type="checkbox" name="is_active" {% if original.is_active %}checked{% endif %} />
-        </div>
+        <div class="form-group mb-3" style="text-center">
+
+            <input class="form-check-input" id="is-active" class="form-check-input" type="checkbox" name="is_active" {% if original.is_active %}checked{% endif %}>
+            <label class="form-check-label" for="inlineCheckbox2"><b>Активное подключение</b></label>
+                 
         <div class="form-group text-center">
             <button class="btn btn-success" type="submit">Сохранить</button>
             <button class="btn btn-secondary" type="button" id="close-button">Закрыть</button>
diff --git a/bot/operations/statistics.py b/bot/operations/statistics.py
index b83afcf0..66842dfc 100644
--- a/bot/operations/statistics.py
+++ b/bot/operations/statistics.py
@@ -11,6 +11,10 @@ from datetime import datetime
 from django.utils.timezone import make_aware, is_aware, is_naive
 import os
 import traceback
+import logging
+from touchh.utils.log import CustomLogger
+
+
 
 
 async def statistics(update: Update, context: ContextTypes.DEFAULT_TYPE):
@@ -61,106 +65,133 @@ async def stats_select_period(update: Update, context: ContextTypes.DEFAULT_TYPE
     
     
 def ensure_datetime(value):
-    # print(f"statistics.py [DEBUG] ensure_datetime: Received value: {value} ({type(value)})")
     """
-    Ensure that the given value is a timezone-aware datetime object.
-
-    If the given value is a string, it is assumed to be in the format
-    '%Y-%m-%d %H:%M:%S'. If the given value is a naive datetime object,
-    it is converted to a timezone-aware datetime object using
-    django.utils.timezone.make_aware.
-
-    :param value: The value to be converted
-    :type value: str or datetime
-    :return: A timezone-aware datetime object
-    :rtype: datetime
+    Преобразует значение в timezone-aware datetime объект, если это возможно.
+    
+    :param value: Значение для преобразования
+    :type value: str, datetime или другое
+    :return: timezone-aware datetime
     """
-    if isinstance(value, str):
-        value = datetime.strptime(value, '%Y-%m-%d %H:%M:%S')
-    if isinstance(value, datetime) and is_naive(value):
-        value = make_aware(value)
-    # print(f"statistics.py [DEBUG] ensure_datetime: Returning value: {value} ({type(value)})")
-    return value
+    if isinstance(value, datetime):
+        # Если это объект datetime, проверяем, наивен ли он
+        return make_aware(value) if is_naive(value) else value
+    elif isinstance(value, str):
+        # Если это строка, пытаемся преобразовать в datetime
+        try:
+            return make_aware(datetime.strptime(value, '%Y-%m-%d %H:%M:%S'))
+        except ValueError:
+            # Если формат не соответствует, пробуем более общую обработку
+            try:
+                return make_aware(datetime.fromisoformat(value))
+            except ValueError:
+                # Если не получилось распознать формат
+                logging.warning(f"Невозможно преобразовать строку в datetime: {value}")
+    else:
+        # Если тип неизвестен, просто возвращаем None
+        logging.warning(f"Получено значение неизвестного типа для преобразования в datetime: {value}")
+    return None
 
+# async def generate_statistics(update: Update, context: ContextTypes.DEFAULT_TYPE):
+#     """Генерация и отправка статистики."""
+#     query = update.callback_query
+#     await query.answer()
+
+#     try:
+#         hotel_id = context.user_data.get("selected_hotel")
+#         if not hotel_id:
+#             raise ValueError(f"ID отеля не найден в user_data: {context.user_data}")
+
+#         period = query.data.split("_")[2]
+#         now = ensure_datetime(datetime.utcnow())
+
+#         # Получаем диапазон дат
+#         start_date, end_date = get_period_dates(period, now)
+
+#         reservations = await sync_to_async(list)(
+#             Reservation.objects.filter(
+#                 hotel_id=hotel_id,
+#                 check_in__gte=start_date,
+#                 check_in__lte=end_date
+#             ).select_related('hotel')
+#         )
+
+#         if not reservations:
+#             await query.edit_message_text("Нет данных для статистики за выбранный период.")
+#             return
+
+#         hotel = await sync_to_async(Hotel.objects.get)(id=hotel_id)
+
+#         file_path = await generate_pdf_report(hotel.name, reservations, start_date, end_date)
+
+#         with open(file_path, "rb") as file:
+#             await query.message.reply_document(document=file, filename=f"{hotel.name}_report.pdf")
+
+#         if os.path.exists(file_path):
+#             os.remove(file_path)
+
+#     except Exception as e:
+#         logging.error(f"Ошибка в generate_statistics: {str(e)}", exc_info=True)
+#         logging.error(f'start_date_type: {type(start_date)}, \n end_date_type: {type(end_date)}\n')
+#         await query.edit_message_text(f"Произошла ошибка: {str(e)}")
 
 async def generate_statistics(update: Update, context: ContextTypes.DEFAULT_TYPE):
     """Генерация и отправка статистики."""
+    
+    logger = CustomLogger(__name__).get_logger()
     query = update.callback_query
     await query.answer()
 
     try:
         hotel_id = context.user_data.get("selected_hotel")
-
         if not hotel_id:
             raise ValueError(f"ID отеля не найден в user_data: {context.user_data}")
 
         period = query.data.split("_")[2]
+        now = ensure_datetime(datetime.utcnow())
 
-        
-        now = datetime.utcnow().replace(tzinfo=timezone.utc)
-
-        print(type(now))
-
-        print(type(period))
-
+        # Получаем диапазон дат
         start_date, end_date = get_period_dates(period, now)
 
-
-        try:
-            # Получаем бронирования
-            reservations = await sync_to_async(list)(
-                Reservation.objects.filter(
-                    hotel_id=hotel_id,
-                    check_in__gte=start_date,
-                    check_in__lte=end_date
-                ).select_related('hotel')
-            )
-
-
-        except Exception as e:
-            raise RuntimeError(f"statistics.py Ошибка при выборке бронирований: {e}") from e
+        reservations = await sync_to_async(list)(
+            Reservation.objects.filter(
+                hotel_id=hotel_id,
+                check_in__gte=start_date,
+                check_in__lte=end_date
+            ).select_related('hotel')
+        )
 
         if not reservations:
-            await query.edit_message_text("statistics.py Нет данных для статистики за выбранный период.")
+            await query.edit_message_text("Нет данных для статистики за выбранный период.")
             return
 
-        try:
-            # Получаем данные об отеле
-            hotel = await sync_to_async(Hotel.objects.get)(id=hotel_id)
-  
-        except Hotel.DoesNotExist:
-            raise RuntimeError(f"statistics.py Отель с ID {hotel_id} не найден")
-        except Exception as e:
-            raise RuntimeError(f"statistics.py Ошибка при выборке отеля: {e}") from e
+        hotel = await sync_to_async(Hotel.objects.get)(id=hotel_id)
 
-        try:
-            # Генерация отчета
-            file_path = await generate_pdf_report(hotel.name, reservations, start_date, end_date)
+        print(f"[DEBUG] start_date: {start_date}, type: {type(start_date)}")
+        print(f"[DEBUG] end_date: {end_date}, type: {type(end_date)}")
 
-        except Exception as e:
-            raise RuntimeError(f"statistics.py [ERROR] Ошибка при генерации PDF-отчета: {e}") from e
+        # Генерация PDF-отчета
+        file_path = await generate_pdf_report(
+            hotel.name,
+            reservations,
+            start_date=start_date.strftime('%Y-%m-%d %H:%M:%S'),
+            end_date=end_date.strftime('%Y-%m-%d %H:%M:%S')
+        )
 
-        try:
-            # Отправка файла через Telegram
-            with open(file_path, "rb") as file:
-                await query.message.reply_document(document=file, filename=f"{hotel.name}_report.pdf")
+        # Отправка PDF-файла
+        with open(file_path, "rb") as file:
+            await query.message.reply_document(document=file, filename=f"{hotel.name}_report.pdf")
 
-        except Exception as e:
-            raise RuntimeError(f"Ошибка при отправке PDF-файла: {e}") from e
-
-        # Удаляем временный файл
+        # Удаление временного файла
         if os.path.exists(file_path):
             os.remove(file_path)
-   
 
     except Exception as e:
-        # Логируем стек вызовов для детального анализа
-        error_trace = traceback.format_exc()
-
+        logger.error(f"Ошибка в generate_statistics: {str(e)}", exc_info=True)
         await query.edit_message_text(f"Произошла ошибка: {str(e)}")
 
 
 def get_period_dates(period, now):
+    now = ensure_datetime(now)
     if period == "day":
         start_date = (now - timedelta(days=1)).replace(hour=0, minute=0, second=0, microsecond=0)
         end_date = now.replace(hour=23, minute=59, second=59, microsecond=999999)
@@ -178,6 +209,7 @@ def get_period_dates(period, now):
         end_date = now.replace(hour=23, minute=59, second=59, microsecond=999999)
     return start_date, end_date
 
+
 async def stats_back(update: Update, context):
     """Возврат к выбору отеля."""
     query = update.callback_query
diff --git a/bot/utils/pdf_report.py b/bot/utils/pdf_report.py
index 8a4497b7..e0c12909 100644
--- a/bot/utils/pdf_report.py
+++ b/bot/utils/pdf_report.py
@@ -17,22 +17,49 @@ os.makedirs(REPORTS_DIR, exist_ok=True)
 
 # Асинхронная функция для извлечения данных о бронировании
 def ensure_datetime(value):
-    """Преобразует строку или naive datetime в timezone-aware datetime."""
+    """
+    Преобразует строку или naive datetime в timezone-aware datetime.
+    Если значение не удается преобразовать, возвращается None.
+    """
+    if isinstance(value, datetime):
+        return make_aware(value) if is_naive(value) else value
     if isinstance(value, str):
-        value = datetime.strptime(value, '%Y-%m-%d %H:%M:%S')
-    if isinstance(value, datetime) and is_naive(value):
-        value = make_aware(value)
-    return value
+        try:
+            return make_aware(datetime.strptime(value, '%Y-%m-%d %H:%M:%S'))
+        except ValueError:
+            print(f"[WARNING] Невозможно преобразовать строку в datetime: {value}")
+    return None
+
+# @sync_to_async
+# def get_reservation_data(res):
+#     print(f"[DEBUG] Processing reservation {res.id}")
+    
+#     # Убедитесь, что даты являются timezone-aware
+#     check_in = ensure_datetime(res.check_in)
+#     check_out = ensure_datetime(res.check_out)
+    
+#     result = {
+#         "hotel_name": res.hotel.name,
+#         "pms": getattr(res.hotel, 'pms', 'N/A'),
+#         "reservation_id": res.reservation_id,
+#         "room_number": res.room_number if res.room_number else "Не указан",
+#         "room_type": res.room_type,
+#         "check_in": check_in,
+#         "check_out": check_out,
+#         "status": res.status,
+#     }
+#     # print(f"[DEBUG] Reservation data: {result}")
+#     return result
 
 @sync_to_async
 def get_reservation_data(res):
-    print(f"[DEBUG] Processing reservation {res.id}")
-    
-    # Убедитесь, что даты являются timezone-aware
     check_in = ensure_datetime(res.check_in)
     check_out = ensure_datetime(res.check_out)
-    
-    result = {
+
+    if not check_in or not check_out:
+        raise ValueError(f"Некорректные даты бронирования: check_in={res.check_in}, check_out={res.check_out}")
+
+    return {
         "hotel_name": res.hotel.name,
         "pms": getattr(res.hotel, 'pms', 'N/A'),
         "reservation_id": res.reservation_id,
@@ -42,8 +69,6 @@ def get_reservation_data(res):
         "check_out": check_out,
         "status": res.status,
     }
-    # print(f"[DEBUG] Reservation data: {result}")
-    return result
 
 
 
@@ -61,27 +86,21 @@ class CustomPDF(FPDF):
         self.end_date = end_date
 
     def header(self):
-        """Добавление заголовка и заголовков таблицы на каждой странице."""
-        # Заголовок отчёта
-        if self.page == 1:  # Заголовок отчёта только на первой странице
+        if self.page == 1:
             self.set_font("DejaVuSans-Bold", size=14)
             self.cell(0, 10, f"Отчет о бронированиях отеля {self.hotel_name}", ln=1, align="C")
             self.ln(5)
 
             self.set_font("DejaVuSans", size=10)
-            self.cell(0, 10, f"за период {self.start_date.strftime('%Y-%m-%d %H:%M:%S')} - {self.end_date.strftime('%Y-%m-%d %H:%M:%S')}", ln=1, align="C")
+            self.cell(
+                0, 
+                10, 
+                f"за период {self.start_date.strftime('%Y-%m-%d %H:%M:%S')} - {self.end_date.strftime('%Y-%m-%d %H:%M:%S')}", 
+                ln=1, 
+                align="C"
+            )
             self.ln(10)
 
-        # Заголовки таблицы
-        self.set_font("DejaVuSans-Bold", size=8)
-        headers = ["Отель", "№ бронирования", "№ комнаты", "Тип комнаты", "Заезд", "Выезд", "Статус"]
-        col_widths = [30, 30, 30, 60, 35, 35, 30]
-        row_height = 10
-
-        for col_width, header in zip(col_widths, headers):
-            self.cell(col_width, row_height, header, border=1, align="C")
-        self.ln()
-
     def footer(self):
         """Добавление колонтитула внизу страницы."""
         self.set_y(-15)
@@ -97,13 +116,68 @@ class CustomPDF(FPDF):
             text = text[:-1]
         return text + "..." if len(text) > 3 else text
 
+# async def generate_pdf_report(hotel_name, reservations, start_date, end_date):
+    
+#     # Преобразование дат в timezone-aware datetime
+#     start_date = ensure_datetime(start_date)
+#     end_date = ensure_datetime(end_date)
+
+#     if not start_date or not end_date:
+#         raise ValueError(f"Некорректные периоды: start_date={start_date}, end_date={end_date}")
+
+#     # Создание экземпляра PDF с передачей параметров
+#     pdf = CustomPDF(hotel_name=hotel_name, start_date=start_date, end_date=end_date, orientation="L", unit="mm", format="A4")
+#     pdf.alias_nb_pages()
+#     pdf.add_page()  # Заголовок отчёта и таблица будут добавлены через методы header и footer
+
+#     # Таблица
+#     pdf.set_font("DejaVuSans", size=8)
+#     col_widths = [30, 30, 30, 60, 35, 35, 30]
+#     row_height = 10
+
+#     for res in reservations:
+#         try:
+#             res_data = await get_reservation_data(res)
+
+#             row_data = [
+#                 res_data["hotel_name"],
+#                 str(res_data["reservation_id"]),
+#                 res_data["room_number"],
+#                 res_data["room_type"],
+#                 res_data["check_in"].strftime('%Y-%m-%d %H:%M:%S'),
+#                 res_data["check_out"].strftime('%Y-%m-%d %H:%M:%S'),
+#                 res_data["status"],
+#             ]
+
+#             for col_width, data in zip(col_widths, row_data):
+#                 pdf.cell(col_width, row_height, data, border=1, align="C")
+#             pdf.ln()
+#         except Exception as e:
+#             print(f"pdf_report.py [ERROR] Error processing reservation {res.id}: {e}")
+
+#     # Сохранение PDF
+#     hotel_name_safe = hotel_name.replace(" ", "_").replace("/", "_")
+#     start_date_str = start_date.strftime('%Y-%m-%d')
+#     end_date_str = end_date.strftime('%Y-%m-%d')
+
+#     pdf_output_path = os.path.join(REPORTS_DIR, f"{hotel_name_safe}_report_{start_date_str}-{end_date_str}.pdf")
+#     pdf.output(pdf_output_path)
+
+#     if not os.path.exists(pdf_output_path):
+#         raise RuntimeError(f"PDF file was not created at: {pdf_output_path}")
+
+#     return pdf_output_path
+
+
 async def generate_pdf_report(hotel_name, reservations, start_date, end_date):
-    # Создание экземпляра PDF с передачей параметров
+    # Преобразование дат
+    start_date = ensure_datetime(start_date)
+    end_date = ensure_datetime(end_date)
+
     pdf = CustomPDF(hotel_name=hotel_name, start_date=start_date, end_date=end_date, orientation="L", unit="mm", format="A4")
     pdf.alias_nb_pages()
-    pdf.add_page()  # Заголовок отчёта и таблица будут добавлены через методы header и footer
+    pdf.add_page()
 
-    # Таблица
     pdf.set_font("DejaVuSans", size=8)
     col_widths = [30, 30, 30, 60, 35, 35, 30]
     row_height = 10
@@ -111,29 +185,36 @@ async def generate_pdf_report(hotel_name, reservations, start_date, end_date):
     for res in reservations:
         try:
             res_data = await get_reservation_data(res)
+            
+            # Отладочный вывод
+            print(f"[DEBUG] Reservation Data: {res_data}")
+            print(f"[DEBUG] check_in type: {type(res_data['check_in'])}, value: {res_data['check_in']}")
+            print(f"[DEBUG] check_out type: {type(res_data['check_out'])}, value: {res_data['check_out']}")
+
+            # Проверка и корректировка данных
+            res_data["check_in"] = ensure_datetime(res_data["check_in"])
+            res_data["check_out"] = ensure_datetime(res_data["check_out"])
 
             row_data = [
-                res_data["hotel_name"],
+                str(res_data["hotel_name"]),
                 str(res_data["reservation_id"]),
-                res_data["room_number"],
-                res_data["room_type"],
+                str(res_data["room_number"]),
+                str(res_data["room_type"]),
                 res_data["check_in"].strftime('%Y-%m-%d %H:%M:%S'),
                 res_data["check_out"].strftime('%Y-%m-%d %H:%M:%S'),
-                res_data["status"],
+                str(res_data["status"]),
             ]
 
+
             for col_width, data in zip(col_widths, row_data):
                 pdf.cell(col_width, row_height, data, border=1, align="C")
             pdf.ln()
         except Exception as e:
-            print(f"pdf_report.py [ERROR] Error processing reservation {res.id}: {e}")
+            print(f"[ERROR] Error processing reservation {res.id}: {e}")
+    
+    print("[DEBUG] PDF metadata:", vars(pdf))
 
-    # Сохранение PDF
-    hotel_name_safe = hotel_name.replace(" ", "_").replace("/", "_")
-    start_date_str = start_date.strftime('%Y-%m-%d')
-    end_date_str = end_date.strftime('%Y-%m-%d')
-
-    pdf_output_path = os.path.join(REPORTS_DIR, f"{hotel_name_safe}_report_{start_date_str}-{end_date_str}.pdf")
+    pdf_output_path = os.path.join(REPORTS_DIR, f"{hotel_name.replace(' ', '_')}_report_{start_date.strftime('%Y-%m-%d')}-{end_date.strftime('%Y-%m-%d')}.pdf")
     pdf.output(pdf_output_path)
 
     if not os.path.exists(pdf_output_path):
diff --git a/touchh/settings.py b/touchh/settings.py
index 504482ab..7d23a356 100644
--- a/touchh/settings.py
+++ b/touchh/settings.py
@@ -205,9 +205,15 @@ JAZZMIN_SETTINGS = {
         "hotels.reservation":"fas fa-calendar-week",
         "hotels.userhotel":"fas fa-user-shield",
         "app_settings": "fas fa-wrench",
+        "app_settings.telegramsettings":"fab fa-telegram",
+        "app_settings.emailsettings":"fab fa-at",
+        "app_settings.localdatabase":"fas fa-database",
+        "app_settings.globalhotelsettings":"fas fa-hammer",
+        "app_settings.globalsystemsettings":"fas fa-cogs",
         "scheduler": "fas fa-clock",
         "pms_integration": "fas fa-sync",  
         "antifroud": "fas fa-shield-alt",
+        "antifroud.externaldbsettings": "fas fa-database",
         
             
     },
diff --git a/touchh/urls.py b/touchh/urls.py
index 7e1dcdb3..8bba8705 100644
--- a/touchh/urls.py
+++ b/touchh/urls.py
@@ -5,7 +5,8 @@ from antifroud import views
 app_name = 'touchh'
 
 urlpatterns = [
-    path('admin/', admin.site.urls),
+    
+    path('', admin.site.urls),
     path('health/', include('health_check.urls')),
     path('antifroud/', include('antifroud.urls')),
 
diff --git a/touchh/utils/log.py b/touchh/utils/log.py
index bd8234d7..c7705b43 100644
--- a/touchh/utils/log.py
+++ b/touchh/utils/log.py
@@ -21,7 +21,10 @@ class CustomLogger:
 
         # Уровень логирования по умолчанию из .env
         default_level = os.getenv("LOG_LEVEL", "INFO").upper()
-        self.log_level = getattr(logging, log_level.upper(), getattr(logging, default_level, logging.INFO))
+        if log_level:
+            self.log_level = getattr(logging, log_level.upper(), getattr(logging, default_level, logging.INFO))
+        else:
+            self.log_level = getattr(logging, default_level, logging.INFO)
 
         self.setup_logger()