adding functionality with graphing

Author: MothScientist

.gitignore

@@ -12,6 +12,7 @@ qodana.yaml
 **/develop
 **/docs
 **/csv_tables
+**/graphs
 
 # Databases
 *.sqlite3

budget_graph/bot.py

@@ -7,12 +7,14 @@
 from os import getenv, path
 from secrets import compare_digest
 from datetime import datetime, UTC
+from uuid import UUID, uuid4
 from dotenv import load_dotenv
 from telebot import TeleBot
 from telebot.types import InlineKeyboardMarkup, InlineKeyboardButton, ReplyKeyboardMarkup, KeyboardButton
 
 sys_path.append('../')
 from budget_graph.logger import setup_logger
+from budget_graph.plot_builder import build_diagram
 from budget_graph.global_config import GlobalConfig
 from budget_graph.registration_service import user_registration
 from budget_graph.dictionary import Stickers, receive_translation
@@ -305,15 +307,24 @@ def get_diagram(db_connection, message, user_language: str) -> None:
 
 
 @bot.callback_query_handler(func=lambda call: call.data.startswith('get_diagram'))
-@connect_defer_close_db
-def callback_query_get_diagram(db_connection, call):
+def callback_query_get_diagram(call):
+    # TODO - логи по всей операции
     telegram_id: int = call.from_user.id
     user_language: str = check_user_language(telegram_id)
-    group_id: int = db_connection.get_group_id_by_telegram_id(telegram_id)
     diagram_type: int = int(call.data[-1])
-    build_diagram(diagram_type, call.message.chat.id, telegram_id, group_id)
-    bot.answer_callback_query(call.id, f'{receive_translation(user_language, "wait_diagram")}')
-    bot.delete_message(call.message.chat.id, call.message.message_id)
+    uuid: UUID = uuid4()
+    # TODO - поддержать 3 тип диаграммы
+    status: bool | None = build_diagram(call.message.chat.id, telegram_id, uuid, diagram_type)
+    if status:
+        bot.answer_callback_query(call.id, f'{receive_translation(user_language, "wait_diagram")}')
+        bot.send_message(call.message.chat.id, f"{receive_translation(user_language, "feature_uuid_filename")}: {uuid}")
+        bot.delete_message(call.message.chat.id, call.message.message_id)
+    elif status is None:
+        bot.send_message(call.message.chat.id, f"{receive_translation(user_language, "table_is_empty")}")
+        bot.delete_message(call.message.chat.id, call.message.message_id)
+    else:
+        bot.send_message(call.message.chat.id, f"{receive_translation(user_language, "csv_not_found_error")}")
+        bot.delete_message(call.message.chat.id, call.message.message_id)
 
 
 @connect_defer_close_db
@@ -864,19 +875,6 @@ def get_str_with_group_users(db_connection, telegram_id: int, with_owner: bool)
     return res
 
 
-def build_diagram(diagram_type: int, chat_id: int, telegram_id: int | None, group_id: int | None):
-    """
-    :param diagram_type:
-        0 - по запросившему пользователю
-        1 - по группе
-        2 - по конкретному пользователю (доступно только владельцу группы)
-    :param chat_id:
-    :param telegram_id:
-    :param group_id:
-    """
-    pass
-
-
 @connect_defer_close_db
 def user_is_registered(db_connection, telegram_id: int) -> bool:
     """

budget_graph/build_project.py

@@ -21,6 +21,7 @@ def drop_tables_in_db() -> None:
 def create_directories() -> None:
     try:
         makedirs('csv_tables', exist_ok=True)
+        makedirs('graphs', exist_ok=True)
         makedirs('logs', exist_ok=True)
     # pylint: disable=broad-exception-caught
     except Exception as err:

budget_graph/db_manager.py

@@ -381,7 +381,28 @@ def get_group_owner_username_by_group_id(self, group_id: int) -> str:
         except (DatabaseError, TypeError) as err:
             logger_database.error(f"[DB_QUERY] {str(err)}, "
                                   f"group id: {group_id}")
-            return ""
+            return ''
+
+    def get_data_for_plot_builder(
+            self,
+            telegram_id: int,
+            diagram_type: int,
+            dates: list | tuple = tuple([None, None])
+    ) -> dict[str, tuple]:
+        try:
+            with self.__conn as conn:
+                with conn.cursor() as cur:
+                    cur.execute(read_sql_file('get_data_for_plot_builder'), {
+                        'telegram_id': telegram_id, 'diagram_type': diagram_type,
+                        'start_date': dates[0], 'end_date': dates[1]
+                    })
+                    return {item[0]: (item[1], item[2]) for item in cur.fetchall()}
+
+        except (DatabaseError, TypeError) as err:
+            logger_database.error(f"[DB_QUERY] {str(err)}, "
+                                  f"telegram_id: {telegram_id}, diagram_type: {diagram_type}, "
+                                  f"dates: {dates}, start_date: {dates[0]}, end_date: {dates[1]}")
+            return {}
 
     def get_group_owner_telegram_id_by_group_id(self, group_id: int) -> int:
         try:

budget_graph/localization/de.json

@@ -139,5 +139,6 @@
     "budget_diagram_for_group": "Graph gruppieren",
     "specific_user_budget_diagram": "Diagramm nach bestimmtem Benutzer",
     "choose_diagram_type": "Wählen Sie einen verfügbaren Diagrammtyp aus:",
-    "wait_diagram": "🛠 Wir erstellen bereits ein Diagramm. Bitte warten..."
+    "wait_diagram": "🛠 Wir erstellen bereits ein Diagramm. Bitte warten...",
+    "feature_uuid_filename": "Anwendungs-ID (Name der zukünftigen Datei)"
 }

budget_graph/localization/en.json

@@ -139,5 +139,6 @@
     "budget_diagram_for_group": "Group graph",
     "specific_user_budget_diagram": "Graph by specific user",
     "choose_diagram_type": "Select an available graph type:",
-    "wait_diagram": "🛠 We are already building a graph, please wait..."
+    "wait_diagram": "🛠 We are already building a graph, please wait...",
+    "feature_uuid_filename": "Application ID (name of future file)"
 }

budget_graph/localization/es.json

@@ -139,5 +139,6 @@
     "budget_diagram_for_group": "Gráfico de grupo",
     "specific_user_budget_diagram": "Gráfico por usuario específico",
     "choose_diagram_type": "Seleccionar un tipo de gráfico disponible:",
-    "wait_diagram": "🛠 Ya estamos creando un gráfico, por favor espere..."
+    "wait_diagram": "🛠 Ya estamos creando un gráfico, por favor espere...",
+    "feature_uuid_filename": "ID de la aplicación (nombre del archivo futuro)"
 }

budget_graph/localization/fr.json

@@ -139,5 +139,6 @@
     "budget_diagram_for_group": "Graphique de groupe",
     "specific_user_budget_diagram": "Graphique par utilisateur spécifique",
     "choose_diagram_type": "Sélectionner un type de graphique disponible:",
-    "wait_diagram": "🛠 Nous créons déjà un graphique, veuillez patienter..."
+    "wait_diagram": "🛠 Nous créons déjà un graphique, veuillez patienter...",
+    "feature_uuid_filename": "ID de l'application (nom du futur fichier)"
 }

budget_graph/localization/is.json

@@ -139,5 +139,6 @@
     "budget_diagram_for_group": "Hópgraf",
     "specific_user_budget_diagram": "Línurit eftir tiltekinn notanda",
     "choose_diagram_type": "Veldu tiltæka línuritsgerð:",
-    "wait_diagram": "🛠 Við erum nú þegar að smíða línurit, vinsamlegast bíðið..."
+    "wait_diagram": "🛠 Við erum nú þegar að smíða línurit, vinsamlegast bíðið...",
+    "feature_uuid_filename": "Auðkenni umsóknar (nafn framtíðarskráar)"
 }

budget_graph/localization/kk.json

@@ -139,5 +139,6 @@
     "budget_diagram_for_group": "Топтық диаграмма",
     "specific_user_budget_diagram": "Нақты пайдаланушының графигі",
     "choose_diagram_type": "Қол жетімді график түрін таңдаңыз:",
-    "wait_diagram": "🛠 Біз график құрастырып жатырмыз, күте тұрыңыз..."
+    "wait_diagram": "🛠 Біз график құрастырып жатырмыз, күте тұрыңыз...",
+    "feature_uuid_filename": "Қолданба идентификаторы (болашақ файлдың атауы)"
 }

budget_graph/localization/pt.json

@@ -139,5 +139,6 @@
     "budget_diagram_for_group": "Gráfico de grupo",
     "specific_user_budget_diagram": "Gráfico por utilizador específico",
     "choose_diagram_type": "Selecione um tipo de gráfico disponível:",
-    "wait_diagram": "🛠 Já estamos a construir um gráfico, aguarde..."
+    "wait_diagram": "🛠 Já estamos a construir um gráfico, aguarde...",
+    "feature_uuid_filename": "ID da aplicação (nome do ficheiro futuro)"
 }

budget_graph/localization/ru.json

@@ -139,5 +139,6 @@
     "budget_diagram_for_group": "График группы",
     "specific_user_budget_diagram": "График по конкретному пользователю",
     "choose_diagram_type": "Выберите доступный тип диаграммы:",
-    "wait_diagram": "🛠 Уже строим график, ожидайте..."
+    "wait_diagram": "🛠 Уже строим график, ожидайте...",
+    "feature_uuid_filename": "ID заявки (имя будущего файла)"
 }

budget_graph/plot_builder.py

@@ -1,23 +1,56 @@
+from sys import path as sys_path
 from os import getenv
 from uuid import UUID
 from requests import post
 from dotenv import load_dotenv
 
+sys_path.append('../')
+from budget_graph.db_manager import connect_defer_close_db
+
 load_dotenv()  # Load environment variables from .env file
 host = getenv('PLOT_BUILDER_HOST')
 port = getenv('PLOT_BUILDER_PORT')
 
 
-def send_report_request(data: dict[str, tuple | list], uuid: UUID | str) -> bool | None:
+class Reports:
+    """
+    TODO
+    """
+    await_list = {}
+
+    @staticmethod
+    def send_report_request(
+            chat_id: int, data: dict[str, tuple | list], uuid: UUID | str
+    ) -> bool | None:
+        """
+        :param chat_id:
+        :param data: {"username_1": (float(income sum), float(expense sum)), "username_2": etc.}
+        :param uuid: uuid4()
+        Sending a request with data to the server deployed on the main application machine (local server)
+        """
+        if not isinstance(uuid, (UUID, str)) or not data or not all(len(elem) == 2 for elem in data.values()):
+            return False
+
+        json_data = {
+            "data": data,
+            "uuid": str(uuid)
+        }
+        status: bool = post(f'http://{host}:{port}/generate', json=json_data).status_code == 200
+
+        if status:
+            Reports.await_list[uuid] = chat_id
+            return True
+        else:
+            return False
+
+
+@connect_defer_close_db
+def build_diagram(db_connection, chat_id: int, telegram_id: int, uuid: UUID,  diagram_type: int) -> bool:
+    """
+    diagram_type:
+        0 - по запросившему пользователю
+        1 - по группе
+        2 - по конкретному пользователю (доступно только владельцу группы)
     """
-    :param data: {"username_1": (float(income sum), float(expense sum)), "username_2": etc.}
-    :param uuid: uuid4()
-    Sending a request with data to the server deployed on the main application machine (local server)    """
-    if not isinstance(uuid, (UUID, str)) or not data or not all(len(elem) == 2 for elem in data.values()):
-        return
-
-    json_data = {
-        "data": data,
-        "uuid": str(uuid)
-    }
-    return post(f'http://{host}:{port}/generate', json=json_data).status_code == 200
+    data: dict[str, tuple] = db_connection.get_data_for_plot_builder(telegram_id, diagram_type)
+    return Reports.send_report_request(chat_id, data, uuid) if data else None

budget_graph/sql/get_data_for_plot_builder.sql

@@ -0,0 +1,51 @@
+WITH
+
+usernames AS (
+  SELECT
+    users."username"
+  FROM
+    "budget_graph"."users_groups" users_groups
+    JOIN "budget_graph"."users" users ON users."telegram_id" = users_groups."telegram_id"
+  WHERE
+    users_groups."group_id" = (SELECT "group_id" FROM "budget_graph"."users_groups" WHERE "telegram_id" = %(telegram_id)s::bigint)
+    AND
+    (
+      %(diagram_type)s::smallint = 0 AND users."telegram_id" = %(telegram_id)s::bigint
+      OR
+      %(diagram_type)s::smallint = 1
+    )
+)
+
+SELECT
+  "username",
+  SUM(CASE WHEN "transfer" > 0 THEN "transfer" ELSE 0 END) "incomeSum",
+  SUM(CASE WHEN "transfer" < 0 THEN "transfer" ELSE 0 END) "expenseSum"
+FROM
+  "budget_graph"."monetary_transactions"
+WHERE
+  "username" = ANY(SELECT "username" FROM usernames)
+  AND
+  (
+    (
+      %(start_date)s::date IS NULL AND %(end_date)s::date IS NULL
+    )
+    OR
+    (
+      %(start_date)s::date IS NOT NULL AND %(end_date)s::date IS NOT NULL
+      AND
+      "record_date" BETWEEN %(start_date)s::date AND %(end_date)s::date
+    )
+    OR
+    (
+      %(start_date)s::date IS NOT NULL AND %(end_date)s::date IS NULL
+      AND
+      "record_date" >= %(start_date)s::date
+    )
+    OR
+    (
+      %(start_date)s::date IS NULL AND %(end_date)s::date IS NOT NULL
+      AND
+      "record_date" <= %(end_date)s::date
+    )
+  )
+GROUP BY "username"

go-graph-server/builder.go

@@ -42,8 +42,8 @@ func createReport(data map[string][2]float32, uuid string, ch chan string) {
 	bar.AddSeries("Income", compositionDataColumns(incomeElements)).
 		AddSeries("Expense", compositionDataColumns(expenseElements))
 
-	fileName := fmt.Sprintf("%s.html", uuid)
-	f, err := os.Create(fileName)
+	PathFilename := fmt.Sprintf("../budget_graph/graphs/%s.html", uuid)
+	f, err := os.Create(PathFilename)
 	if err != nil {
 		panic(err)
 	}