From 38040368ed73387eac8f935354fd4120e66288aa Mon Sep 17 00:00:00 2001
From: Whyverum <sergeyzavalin@outlook.com>
Date: Mon, 23 Dec 2024 22:04:34 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D0=BD=D0=B0=20=D0=B4=D0=B5=D0=BD=D1=8C=20=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B6=D0=B4=D0=B5=D0=BD=D0=B8=D0=B5=20(=D0=BF=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B5=D1=80=D0=B8=D1=82=D1=8C)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BotLibrary/analitics/user_data_to_file.py | 32 ++++++++++++++---------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/BotLibrary/analitics/user_data_to_file.py b/BotLibrary/analitics/user_data_to_file.py
index 7447315..8ff4f2d 100644
--- a/BotLibrary/analitics/user_data_to_file.py
+++ b/BotLibrary/analitics/user_data_to_file.py
@@ -1,10 +1,13 @@
 # BotLibrary/analitics/user_data_to_file.py
-# Запись информации о пользователях в файл "user_data.db"   (Сделать счетчик пользователей)
+# Запись информации о пользователи в базу данных
 
 import os
 import json
 import datetime
-from config import ImportantPath, BotVariables
+
+from aiogram.types import User, Birthdate
+from configs import *
+from ..library.time import TimeVariable
 
 # Настройка экспорта модулей и логирования
 __all__ = ("write_user_info_to_file", "format_user_record",)
@@ -12,13 +15,13 @@ log_type = "User_data_file"
 
 
 # Функция записи информации в JSON-файл
-def write_user_info_to_file(user):
-    directory = os.path.dirname(ImportantPath.user_info_file)
+def write_user_info_to_file(user: User):
+    directory = os.path.dirname(ProjectPath.user_info_file)
     if not os.path.exists(directory):
         os.makedirs(directory)
 
-    if os.path.exists(ImportantPath.user_info_file):
-        with open(ImportantPath.user_info_file, "r", encoding=BotVariables.encoding) as file:
+    if os.path.exists(ProjectPath.user_info_file):
+        with open(ProjectPath.user_info_file, "r", encoding=default_encod) as file:
             try:
                 user_data = json.load(file)
             except json.JSONDecodeError:
@@ -29,19 +32,24 @@ def write_user_info_to_file(user):
     user_record = format_user_record(user)
     user_data[str(user.id)] = user_record
 
-    with open(ImportantPath.user_info_file, "w", encoding=BotVariables.encoding) as file:
+    with open(ProjectPath.user_info_file, "w", encoding=default_encod) as file:
         json.dump(user_data, file, ensure_ascii=False, indent=4)
 
-    return f"Информация о пользователе успешно записана или обновлена."
-
 
 # Функция форматирования вывода в JSON-файл
-def format_user_record(user):
+def format_user_record(user: User):
     first_name = getattr(user, 'first_name', '')  # Получаем имя
     last_name = getattr(user, 'last_name', '')    # Получаем фамилию или пустую строку
 
+    # Получение даты рождения
+    birthdate = getattr(user, 'birthdate', None)
+    if isinstance(birthdate, Birthdate):
+        birthdate_str = f"{birthdate.day:02d}.{birthdate.month:02d}.{birthdate.year or 'Не указано'}"
+    else:
+        birthdate_str = "Не указано"
+
     return {
-        "Время знакомства": datetime.datetime.now().strftime(BotVariables.time_format),
+        "Время знакомства": datetime.datetime.now().strftime(TimeVariable.format),
         "Имя": first_name,
         "Фамилия": last_name,
         "Юзернейм": f"@{getattr(user, 'username', 'Не указано')}",
@@ -50,5 +58,5 @@ def format_user_record(user):
         "Бот": getattr(user, 'is_bot', False),
         "Премиум": getattr(user, 'is_premium', False),
         "Язык": getattr(user, 'language_code', 'Не указано'),
+        "Дата рождения": birthdate_str,  # Добавляем дату рождения
     }
-