Merge pull request #170 from MothScientist/fix

update

Author: MothScientist

.github/CODE_OF_CONDUCT.md

@@ -0,0 +1,7 @@
+## Codes of conduct help create a community based on kindness, cooperation, and mutual respect
+
+1. Respect other participants, avoid offensive language and discrimination
+2. Interact openly and constructively, value diversity of opinions and ideas
+3. Be honest and transparent in your actions and communications
+4. Seek to collaborate and support each other to achieve common goals
+5. Avoid breaches of confidentiality and respect the personal space of each participant

.github/workflows/eslint.yml

@@ -0,0 +1,30 @@
+name: Eslint
+
+on:
+  push:
+    paths-ignore:
+      - 'tests/**'
+  pull_request:
+    paths-ignore:
+      - 'tests/**'
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: '22'
+
+      - name: npm install
+        run: |
+          npm install
+
+      - name: Lint with eslint
+        run: |
+          npx eslint . --ignore-pattern 'tests/**' # Запускаем ESLint, исключая папку tests

.github/workflows/flake8.yml

@@ -34,4 +34,4 @@ jobs:
         # stop the build if there are Python syntax errors or undefined names
         flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
         # --exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 . --count --max-complexity=10 --max-line-length=127 --statistics
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=120 --statistics

.github/workflows/go_lint.yml

@@ -0,0 +1,27 @@
+name: Golangci-lint
+
+on:
+  push:
+    paths-ignore:
+      - 'tests/**'
+  pull_request:
+    paths-ignore:
+      - 'tests/**'
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: '1.23'
+
+      - name: Lint with golangci-lint
+        run: |
+          go get -u github.com/golangci/golangci-lint/cmd/golangci-lint
+          golangci-lint run ./... --exclude-use-default # Запускаем линтер для всех файлов, исключая папку tests

.github/workflows/unit_tests.yml

@@ -36,6 +36,7 @@ jobs:
           pip install --upgrade pip
           pip install -r requirements.txt
           pip install pytest
+          pip install pytest-asyncio
 
       - name: Create .env file
         env:
@@ -47,9 +48,14 @@ jobs:
       - name: Run UnitTests
         run: |
           cd tests || exit 1
-          python -m pytest test_sources.py test_validators.py test_localization.py test_user_cache.py test_csv_tables.py
+          python -m pytest \
+          test_sources.py \
+          test_validators.py \
+          test_localization.py \
+          test_user_cache.py \
+          test_csv_tables.py
 
-  database-queries-unit-tests:
+  database-queries-unit-tests-1:
     runs-on: ubuntu-latest
 
     services:
@@ -107,4 +113,66 @@ jobs:
       - name: Run UnitTests
         run: |
           cd tests || exit 1
-          python -m pytest test_database_queries.py
+          rm -f pytest.ini # no need to run async tests
+          python -m pytest test_database_queries_1.py
+
+  database-queries-unit-tests-2:
+    runs-on: ubuntu-latest
+
+    services:
+      postgres:
+        image: postgres:16.2-alpine3.18
+        env:
+          POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+          architecture: 'x64'
+          check-latest: true
+
+      - name: Install dependencies
+        run: |
+          pip install --upgrade pip
+          pip install -r requirements.txt
+          pip install pytest
+
+      - name: Create .env file
+        env:
+          POSTGRES_HOST: ${{ secrets.POSTGRES_HOST }}
+          POSTGRES_PORT: ${{ secrets.POSTGRES_PORT }}
+          POSTGRES_NAME: ${{ secrets.POSTGRES_NAME }}
+          POSTGRES_USERNAME: ${{ secrets.POSTGRES_USERNAME }}
+          POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
+          HASH_LOG_SALT_TEST: ${{ secrets.HASH_LOG_SALT_TEST }}
+        run: |
+          cd budget_graph
+          echo "POSTGRES_HOST=${POSTGRES_HOST}" >> .env
+          echo "POSTGRES_PORT=${POSTGRES_PORT}" >> .env
+          echo "POSTGRES_NAME=${POSTGRES_NAME}" >> .env
+          echo "POSTGRES_USERNAME=${POSTGRES_USERNAME}" >> .env
+          echo "POSTGRES_PASSWORD=${POSTGRES_PASSWORD}" >> .env
+          echo "HASH_LOG_SALT"=${HASH_LOG_SALT_TEST} >> .env
+
+      - name: Build infrastructure
+        run: |
+          cd tests || exit 1
+          python build_test_infrastructure.py
+
+      - name: Run UnitTests
+        run: |
+          cd tests || exit 1
+          rm -f pytest.ini # no need to run async tests
+          python -m pytest test_database_queries_2.py

.pylintrc

@@ -1,16 +1,20 @@
 [MASTER]
+fail-under=9.9
 ignore-paths=
     tests/.*
 
 disable=
     logging-fstring-interpolation,
-    missing-module-docstring,
     missing-function-docstring,
-    wrong-import-position,
+    missing-module-docstring,
+    consider-using-f-string,
     missing-class-docstring,
     too-few-public-methods,
+    no-value-for-parameter,
+    wrong-import-position,
     trailing-whitespace,
-    consider-using-f-string,
+    bad-indentation,
     fixme
+
 [FORMAT]
 max-line-length=120

Dockerfile-bot

@@ -26,7 +26,8 @@ RUN rm build_project.py \
        sql/create_db.sql \
        sql/indexes.sql \
        sql/func_auto_count_users_of_group.sql \
-       sql/func_transaction_number.sql
+       sql/func_transaction_number.sql \
+       sql/update_group_uuid_after_transaction.sql
 
 # Removing some unnecessary directories
 RUN rm -rf /static \

budget_graph/bot.py

@@ -13,13 +13,12 @@
 
 sys_path.append('../')
 from budget_graph.logger import setup_logger
-# from budget_graph.time_checking import timeit
-from budget_graph.create_csv import CsvFileWithTable
 from budget_graph.registration_service import user_registration
 from budget_graph.dictionary import Stickers, receive_translation
 from budget_graph.encryption import getting_hash, get_salt, logging_hash
+from budget_graph.create_csv import CsvFileWithTable, check_csv_is_actual
 from budget_graph.user_cache_structure import UserLanguageCache, UserRegistrationStatusCache
-from budget_graph.db_manager import DatabaseQueries, connect_db, close_db, connect_defer_close_db
+from budget_graph.db_manager import connect_defer_close_db
 from budget_graph.validation import date_validation, value_validation, description_validation, username_validation, \
     password_validation, category_validation
 from budget_graph.helpers import StorageMsgIdForDeleteAfterOperation, get_category_button_labels, get_bot_commands, \
@@ -553,16 +552,18 @@ def get_csv(db_connection, message, user_language: str) -> None:
     telegram_id: int = message.from_user.id
     group_id: int = db_connection.get_group_id_by_telegram_id(telegram_id)
     # to be able to call a function from any file
-    file_path: str = path.join(path.dirname(__file__), f'csv_tables/table_{group_id}.csv')
+    group_uuid: str = db_connection.get_group_transaction_uuid(group_id)
+    file_path: str = path.join(path.dirname(__file__), f'csv_tables/{group_id}_{group_uuid}.csv')
     # 10_000 row limit
     table_data: tuple[tuple, ...] = db_connection.select_data_for_household_table(group_id, 0)
     if table_data:
         try:
             csv_obj = CsvFileWithTable(file_path, table_data)
-            csv_obj.create_csv_file()
+            if not check_csv_is_actual(group_id, group_uuid):
+                csv_obj.create_csv_file()
             file_size: float = csv_obj.get_file_size_kb()
             file_checksum: str = csv_obj.get_file_checksum()
-            with open(f'csv_tables/table_{group_id}.csv', 'rb') as csv_table_file:
+            with open(f'csv_tables/{group_id}_{group_uuid}.csv', 'rb') as csv_table_file:
                 caption: str = (f"{receive_translation(user_language, 'file_size')}: "
                                 f"{'{:.3f}'.format(file_size)} kB\n\n"
                                 f"{receive_translation(user_language, 'hashsum')} "
@@ -820,13 +821,12 @@ def process_delete_group(db_connection, message, group_id: int, user_language: s
 
 
 # TODO reuse func
-def get_str_with_group_users(telegram_id: int, with_owner: bool) -> str:
+@connect_defer_close_db
+def get_str_with_group_users(db_connection, telegram_id: int, with_owner: bool) -> str:
     user_language: str = check_user_language(telegram_id)
-    connection = connect_db()
-    bot_db = DatabaseQueries(connection)
-    group_id: int = bot_db.get_group_id_by_telegram_id(telegram_id)
-    group_owner_username: str = bot_db.get_group_owner_username_by_group_id(group_id)
-    group_users_list: tuple = bot_db.get_group_usernames(group_id)
+    group_id: int = db_connection.get_group_id_by_telegram_id(telegram_id)
+    group_owner_username: str = db_connection.get_group_owner_username_by_group_id(group_id)
+    group_users_list: tuple = db_connection.get_group_usernames(group_id)
 
     if with_owner:
         res: str = '\n'.join(
@@ -842,7 +842,6 @@ def get_str_with_group_users(telegram_id: int, with_owner: bool) -> str:
             for user in group_users_list
             if user != group_owner_username
         )
-    close_db(connection)
     return res
 
 

budget_graph/build_project.py

@@ -32,7 +32,8 @@ def create_tables_in_db() -> None:
     Creating a Database Infrastructure
     """
     conn = connect_db()
-    sql_filenames: tuple = ('create_db', 'indexes', 'func_transaction_number', 'func_auto_count_users_of_group')
+    sql_filenames: tuple = ('create_db', 'indexes', 'func_transaction_number', 'func_auto_count_users_of_group',
+                            'update_group_uuid_after_transaction')
     try:
         with conn.cursor() as cur:
             for filename in sql_filenames:

budget_graph/create_csv.py

@@ -83,3 +83,13 @@ def validate_incoming_data(self):
         # the length of each nested tuple is equal to the number of columns in the table
         if not all(len(self.table_headers) == len(_row) for _row in self.table_data):
             raise ValueError('Data tuples have different lengths and/or their lengths do not match the headers')
+
+
+def check_csv_is_actual(group_id: int, group_uuid: str) -> bool:
+    """
+    Checks for the presence of an up-to-date file, if there is one, returns True, otherwise False
+    If this group already has such a file, but its uuid is not up-to-date, then deletes it
+    """
+    if os_path.isfile(f'csv_tables/{group_id}_{group_uuid}.csv'):
+        return True
+    return False