Backend django

.github/workflows/deploy.yaml

@@ -27,6 +27,8 @@ jobs:
           DATABASE_HOST=database
           DATABASE_PORT=5432
           GIGACHAT_AUTH_KEY=${{ secrets.GIGACHAT_AUTH_KEY }}
+          YOOKASSA_AUTH_KEY=${{ secrets.YOOKASSA_AUTH_KEY }}
+          YOOKASSA_STORE_ID=${{ secrets.YOOKASSA_STORE_ID }}
           EOF
 
       - name: Local deploy for test
@@ -85,6 +87,9 @@ jobs:
         DATABASE_HOST=database
         DATABASE_PORT=5432
         GIGACHAT_AUTH_KEY=${{ secrets.GIGACHAT_AUTH_KEY }}
+        YOOKASSA_AUTH_KEY=${{ secrets.YOOKASSA_AUTH_KEY }}
+        YOOKASSA_STORE_ID=${{ secrets.YOOKASSA_STORE_ID }}
+        SERVER_HOST=${{ secrets.SERVER_HOST }}
         EOF
 
     - name: Log in to Docker hub
@@ -103,7 +108,7 @@ jobs:
         host: ${{ secrets.SERVER_HOST }}
         username: ${{ secrets.SERVER_USER }}
         password: ${{ secrets.SERVER_PASSWORD }}
-        source: backend/docker-compose.yaml, backend/.env
+        source: backend/docker-compose.yaml, backend/.env, backend/nginx.conf
         target: /home/${{ secrets.SERVER_USER }}/app/
 
     - name: Deploy
@@ -123,10 +128,10 @@ jobs:
     - name: Check if app is responding on port
       run: |
         echo "Waiting for server to be reachable..."
-        for i in {1..30}; do
-          nc -zv ${{ secrets.SERVER_HOST }} 8000 && echo "OK: Port is open!" && exit 0
+        for i in {1..10}; do
+          nc -zv ${{ secrets.SERVER_HOST }} 80 && echo "OK: Port is open!" && exit 0
           echo "Attempt $i: Server not ready yet..."
           sleep 10
         done
-        echo "ERROR: Server is not responding on port 8000"
+        echo "ERROR: Server is not responding on port 80"
         exit 1

.github/workflows/test.yaml

@@ -27,6 +27,8 @@ jobs:
           DATABASE_HOST=database
           DATABASE_PORT=5432
           GIGACHAT_AUTH_KEY=${{ secrets.GIGACHAT_AUTH_KEY }}
+          YOOKASSA_AUTH_KEY=${{ secrets.YOOKASSA_AUTH_KEY }}
+          YOOKASSA_STORE_ID=${{ secrets.YOOKASSA_STORE_ID }}
           EOF
 
       - name: Local deploy for test

backend/.dockerignore

@@ -0,0 +1,6 @@
+__pycache__/
+*.pyc
+*.log
+.env
+venv/
+.git/

backend/.gitignore

@@ -1,3 +1,6 @@
 .idea
 .env
 **/__pycache__/
+**.crt
+**.key
+**/nginx-logs/

backend/README.md

@@ -11,9 +11,14 @@
     > DATABASE_PASSWORD - пароль от базы данных
 
     > GIGACHAT_AUTH_KEY - API ключ от Gigachat
-   - Используются в github actions
+
+    > YOOKASSA_AUTH_KEY - API ключ от ЮKassa
+
+    > YOOKASSA_STORE_ID - идентификатор от магазина в ЮKassa
+
     > SERVER_HOST - ip сервера
 
+   - Используются в github actions
     > SERVER_USER - ssh пользователь
 
     > SERVER_PASSWORD - пароль от ssh пользователя
@@ -48,4 +53,13 @@
 или 
 ```
    docker logs taskbench-backend -f
-```
+```
+
+# Создание резервных копий базы данных
+Версия postgresql: 17
+
+В директории [/scripts/database_backup_service](https://github.com/AlexanderLaptev/Taskbench/tree/backend-django/backend/scripts/database_backup_service) находится bash-скрипт, добавляющий задачу создания резервных копий в crontab. 
+
+`install.sh` - установка задачи 
+`restore.sh` - восстановление резервной копии
+`uninstall.sh` - удаление задачи, очистка сохраненных копий.

backend/backend/asgi.py

@@ -1,12 +1,3 @@
-"""
-ASGI config for backend project.
-
-It exposes the ASGI callable as a module-level variable named ``application``.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/5.2/howto/deployment/asgi/
-"""
-
 import os
 
 from django.core.asgi import get_asgi_application

backend/backend/settings.py

@@ -1,42 +1,23 @@
-"""
-Django settings for backend project.
-
-Generated by 'django-dashboard startproject' using Django 5.2.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/5.2/topics/settings/
-
-For the full list of settings and their values, see
-https://docs.djangoproject.com/en/5.2/ref/settings/
-"""
 import os
 from datetime import timedelta
 from pathlib import Path
 
-# Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
 
-# Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/5.2/howto/deployment/checklist/
-
-# SECURITY WARNING: keep the secret key used in production secret!
-# SECRET_KEY = ''
 SECRET_KEY = os.environ.get("DJANGO_SECRET_KEY")
 GIGACHAT_KEY = os.environ.get("GIGACHAT_AUTH_KEY")
-# SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = bool(os.environ.get("DEBUG", default=True))
-
+SERVER_HOST = os.environ.get("SERVER_HOST", default="127.0.0.1")
 ALLOWED_HOSTS = os.environ.get("DJANGO_ALLOWED_HOSTS", "127.0.0.1").split(",")
 
-# Application definition
-
 INSTALLED_APPS = [
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'django_apscheduler',
     'taskbench.apps.TaskbenchConfig',
     'rest_framework',
     'rest_framework_simplejwt',
@@ -70,10 +51,14 @@
     },
 ]
 
-WSGI_APPLICATION = 'backend.wsgi.application'
+CSRF_TRUSTED_ORIGINS = [
+    "https://" + SERVER_HOST,
+    "https://" + SERVER_HOST + ":443",
+]
+USE_X_FORWARDED_HOST = True
+SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
 
-# Database
-# https://docs.djangoproject.com/en/5.2/ref/settings/#databases
+WSGI_APPLICATION = 'backend.wsgi.application'
 
 DATABASES = {
     'default': {
@@ -86,12 +71,6 @@
     }
 }
 
-# REST_FRAMEWORK = {
-    # 'DEFAULT_AUTHENTICATION_CLASSES': (
-    #     'rest_framework_simplejwt.authentication.JWTAuthentication',
-    # )
-# }
-
 SIMPLE_JWT = {
     'USER_ID_FIELD': 'user_id',
     'USER_ID_CLAIM': 'user_id',
@@ -106,9 +85,6 @@
     'ISSUER': None,
 }
 
-# Password validation
-# https://docs.djangoproject.com/en/5.2/ref/settings/#auth-password-validators
-
 AUTH_PASSWORD_VALIDATORS = [
     {
         'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
@@ -127,7 +103,6 @@
     },
 ]
 
-
 LOGGING = {
     'version': 1,
     'disable_existing_loggers': False,
@@ -166,24 +141,17 @@
     }
 }
 
-
-# Internationalization
-# https://docs.djangoproject.com/en/5.2/topics/i18n/
+APSCHEDULER_DATETIME_FORMAT = "N j, Y, f:s a"
+APSCHEDULER_RUN_NOW_TIMEOUT = 25
 
 LANGUAGE_CODE = 'en-us'
-
 TIME_ZONE = 'UTC'
-
 USE_I18N = True
-
 USE_TZ = True
-
-# Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/5.2/howto/static-files/
-
 STATIC_URL = 'static/'
-
-# Default primary key field type
-# https://docs.djangoproject.com/en/5.2/ref/settings/#default-auto-field
-
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+
+SUBSCRIPTION_PRICE = 149.00
+SUBSCRIPTION_CURRENCY = "RUB"
+YOOKASSA_STORE_ID = os.environ.get("YOOKASSA_STORE_ID")
+YOOKASSA_AUTH_KEY = os.environ.get("YOOKASSA_AUTH_KEY")

backend/backend/urls.py

@@ -1,56 +1,39 @@
-"""
-URL configuration for backend project.
-
-The `urlpatterns` list routes URLs to views. For more information please see:
-    https://docs.djangoproject.com/en/5.2/topics/http/urls/
-Examples:
-Function views
-    1. Add an import:  from my_app import views
-    2. Add a URL to urlpatterns:  path('', views.home, name='home')
-Class-based views
-    1. Add an import:  from other_app.views import Home
-    2. Add a URL to urlpatterns:  path('', Home.as_view(), name='home')
-Including another URLconf
-    1. Import the include() function: from django.urls import include, path
-    2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
-"""
-from django.contrib import admin
 from django.urls import path, include
 
-from taskbench.views.statisctics_views import StatisticsView
-from taskbench.views.suggestion_views import SuggestionView
+from taskbench.views.category_views import CategoryListView, CategoryDetailView
+from taskbench.views.statistics_views import StatisticsView
+from taskbench.views.subtask_views import (
+    SubtaskCreateView,
+    SubtaskDetailView
+)
 from taskbench.views.task_views import (
     TaskListView,
     TaskDetailView,
-    SubtaskCreateView,
-    SubtaskDetailView,
-    CategoryListView
 )
 from taskbench.views.user_views import (
     RegisterView,
     LoginView,
     DeleteUserView,
     TokenRefreshView,
-    ChangePasswordView,
-    SubscriptionStatusView,
-    CreateSubscriptionView
+    ChangePasswordView
 )
 
+
 urlpatterns = [
     path("", include("dashboard.urls")),
+    path("", include("subscription.urls")),
+    path("", include("suggestion.urls")),
     path('tasks/', TaskListView.as_view(), name='task_list'),
     path('tasks/<int:task_id>/', TaskDetailView.as_view(), name='task_detail'),
     path('subtasks/', SubtaskCreateView.as_view(), name='subtask_create'),
     path('subtasks/<int:subtask_id>/', SubtaskDetailView.as_view(), name='subtask_detail'),
     path('categories/', CategoryListView.as_view(), name='categories'),
+    path('categories/<int:category_id>/', CategoryDetailView.as_view(), name='category_detail'),
     path('user/register/', RegisterView.as_view(), name='register'), # POST - создание пользователя
     path('user/login/', LoginView.as_view(), name='login'), # POST - валидация пользователя, возвращение jwt
     path('user/delete/', DeleteUserView.as_view(), name='delete_user'), # POST - валидация пользователя, возвращение jwt
     path('user/password/', ChangePasswordView.as_view(), name='change_password'),
     path('token/refresh/', TokenRefreshView.as_view(), name="token_refresh"),
     path('statistics/', StatisticsView.as_view(), name='statistics'),
-    path('ai/suggestions/', SuggestionView.as_view(), name="ai_suggestions"),
-    path('user/subscription/status/', SubscriptionStatusView.as_view()),
-    path('user/subscription/', CreateSubscriptionView.as_view()),
 ]
 

backend/backend/wsgi.py

@@ -1,12 +1,3 @@
-"""
-WSGI config for backend project.
-
-It exposes the WSGI callable as a module-level variable named ``application``.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/5.2/howto/deployment/wsgi/
-"""
-
 import os
 
 from django.core.wsgi import get_wsgi_application

backend/dashboard/urls.py

@@ -5,6 +5,6 @@
     path("admin/login/", custom_login, name="custom_login"),
     path("admin/dashboard/", dashboard_view, name="dashboard"),
     path("admin/subscriptions/", subscription_page, name="admin_subscriptions"),
-    path("admin/api/stats/", stats_api, name="stats_api"),
+    path("admin/dashboard/stats/", stats_api, name="stats_api"),
     path("admin/api/subscriptions/", subscription_list_api, name="subscription_list_api"),
 ]

backend/dashboard/views.py

@@ -1,11 +1,13 @@
+from datetime import timedelta
+from django.utils import timezone
 from django.contrib.auth import authenticate, login
 from django.contrib.auth.decorators import login_required, user_passes_test
 from django.core.paginator import Paginator
-from django.shortcuts import render, redirect
 from django.http import HttpResponseForbidden, JsonResponse
-from django.views.decorators.csrf import csrf_protect, csrf_exempt
+from django.shortcuts import render, redirect
+from django.views.decorators.csrf import csrf_protect
 
-from taskbench.models.models import Subscription
+from taskbench.models.models import Subscription, Subtask, Task, User
 
 
 @csrf_protect
@@ -35,21 +37,27 @@ def subscription_page(request):
 
 @user_passes_test(lambda u: u.is_staff)
 def stats_api(request):
-    data = {
-        "total_users": 280,
-        "total_subscribers": 28,
-        "new_users_week": 40,
-        "new_users_today": 10,
-        "new_subs_week": 6,
-        "new_subs_today": 2,
-        "active_users_week": 144,
-        "active_users_today": 67,
-        "total_tasks": 20509,
-        "tasks_week": 1563,
-        "tasks_today": 250,
-        "total_subtasks": 48524,
-    }
-    return JsonResponse(data)
+    if request.method == "GET":
+        now = timezone.now()
+        today = now.date()
+        start_of_week = now - timedelta(days=now.weekday())
+        start_of_week = start_of_week.replace(hour=0, minute=0, second=0, microsecond=0)
+
+        data = {
+            "total_users": User.objects.all().count(),
+            "total_subscribers": Subscription.objects.values('user').distinct().count(),
+            "new_users_week": User.objects.filter(created_at__gte=start_of_week).count(),
+            "new_users_today": User.objects.filter(created_at__date=today).count(),
+            "new_subs_week": Subscription.objects.filter(start_date__gt=start_of_week).count(),
+            "new_subs_today": Subscription.objects.filter(start_date__date=today).count(),
+            "active_users_week": User.objects.filter(access_at__gt=start_of_week).count(),
+            "active_users_today": User.objects.filter(access_at__date=today).count(),
+            "total_tasks": Task.objects.all().count(),
+            "tasks_week": Task.objects.filter(created_at__gte=start_of_week).count(),
+            "tasks_today": Task.objects.filter(created_at__date=today).count(),
+            "total_subtasks": Subtask.objects.all().count(),
+        }
+        return JsonResponse(data)
 
 @user_passes_test(lambda u: u.is_staff)
 def subscription_list_api(request):
@@ -65,10 +73,10 @@ def subscription_list_api(request):
             {
                 "id": sub.subscription_id,
                 "email": sub.user.email,
-                "start_date": sub.start_date.strftime("%Y-%m-%d"),
-                "end_date": sub.end_date.strftime("%Y-%m-%d"),
+                "start_date": sub.start_date.strftime("%Y-%m-%d") if sub.start_date else "N/A",
+                "end_date": sub.end_date.strftime("%Y-%m-%d") if sub.end_date else "N/A",
                 "is_active": sub.is_active,
-                "transaction_id": sub.transaction_id or "-",
+                "transaction_id": sub.latest_yookassa_payment_id or "-",
             }
             for sub in page.object_list
         ],