Andrey K. Choi
6fe0780113
All checks were successful
continuous-integration/drone/push Build is passing
✨ Major improvements: - Created organized folder structure with utils/, scripts/, backups/, temp/ - Moved Python scripts to scripts/ folder for better organization - Moved utility files (start, stop, update, cli, logs, drone) to utils/ folder - Moved backup files to backups/ folder for cleaner root directory - Added comprehensive README.md files for each new folder - Updated main README.md with new project structure documentation - Enhanced .gitignore with rules for new folders - Added real-time career vacancy counter on homepage - Improved homepage career stats styling with better visibility 🗂️ New folder structure: - utils/ - Project management utilities and tools - scripts/ - Python helper scripts for banners and data - backups/ - Configuration and file backups - temp/ - Temporary files and development data 🎨 UI improvements: - Fixed white text visibility issues on homepage career section - Added dynamic vacancy count from database - Implemented glassmorphism design for career stats card - Better color contrast and hover effects This reorganization makes the project more maintainable and professional.
427 lines
19 KiB
Python
427 lines
19 KiB
Python
from django.shortcuts import render, get_object_or_404, redirect
|
||
from .models import Service, Project, Client, BlogPost, Review, Order, ServiceRequest, HeroBanner, Category, ContactInfo, Team, Career
|
||
from django.db.models import Avg
|
||
from comunication.models import TelegramSettings
|
||
import qrcode
|
||
import os
|
||
from django.conf import settings
|
||
import uuid
|
||
from django.utils.http import urlsafe_base64_encode
|
||
from django.utils.encoding import force_bytes
|
||
from django.http import JsonResponse
|
||
from django.utils.crypto import get_random_string
|
||
from django.contrib.auth.models import User
|
||
from decouple import config
|
||
from django.urls import reverse
|
||
from django.contrib.auth.decorators import login_required
|
||
from django.core.mail import send_mail
|
||
from comunication.telegram_bot import TelegramBot
|
||
import hmac
|
||
import hashlib
|
||
import json
|
||
from django.views.decorators.csrf import csrf_exempt
|
||
import logging
|
||
from django.db import transaction, IntegrityError
|
||
from django.db.models import Q
|
||
|
||
logger = logging.getLogger(__name__)
|
||
|
||
# Initialize Telegram Bot
|
||
try:
|
||
bot = TelegramBot()
|
||
except Exception as e:
|
||
logger.error(f"Failed to initialize Telegram bot: {str(e)}")
|
||
|
||
def home(request):
|
||
services = Service.objects.all()[:6] # Показываем только первые 6 услуг на главной
|
||
hero_banners = HeroBanner.objects.filter(is_active=True).order_by('order', '-created_at')[:3] # Получаем активные баннеры
|
||
|
||
# Добавляем данные для полной главной страницы
|
||
latest_projects = Project.objects.all()[:3] # Последние проекты для портфолио
|
||
latest_blog_posts = BlogPost.objects.all()[:2] # Последние статьи блога
|
||
reviews = Review.objects.all()[:3] # Отзывы клиентов
|
||
|
||
# Данные для команды и карьеры
|
||
team_members = Team.objects.filter(is_active=True, show_on_about=True).order_by('display_order')[:4] # Показываем топ-4 участников команды
|
||
featured_careers = Career.objects.filter(status='active', is_featured=True).order_by('-created_at')[:3] # Топ-3 рекомендуемые вакансии
|
||
|
||
# Подсчет открытых вакансий
|
||
total_open_positions = Career.objects.filter(status='active').count()
|
||
|
||
return render(request, 'web/home_modern.html', {
|
||
'services': services,
|
||
'hero_banners': hero_banners,
|
||
'latest_projects': latest_projects,
|
||
'latest_blog_posts': latest_blog_posts,
|
||
'reviews': reviews,
|
||
'team_members': team_members,
|
||
'featured_careers': featured_careers,
|
||
'total_open_positions': total_open_positions,
|
||
})
|
||
|
||
def service_detail(request, pk):
|
||
service = get_object_or_404(Service, pk=pk)
|
||
projects_in_category = Project.objects.filter(category=service.category)
|
||
average_rating = service.reviews.aggregate(Avg('rating'))['rating__avg'] or 0
|
||
total_reviews = service.reviews.count()
|
||
reviews = service.reviews.all()
|
||
return render(request, 'web/service_detail.html', {
|
||
'service': service,
|
||
'projects_in_category': projects_in_category,
|
||
'average_rating': average_rating,
|
||
'total_reviews': total_reviews,
|
||
'reviews': reviews,
|
||
})
|
||
|
||
def project_detail(request, pk):
|
||
project = get_object_or_404(Project, pk=pk)
|
||
return render(request, 'web/project_detail.html', {'project': project})
|
||
|
||
def client_detail(request, pk):
|
||
client = get_object_or_404(Client, pk=pk)
|
||
return render(request, 'web/client_detail.html', {'client': client})
|
||
|
||
def blog_post_detail(request, pk):
|
||
blog_post = get_object_or_404(BlogPost, pk=pk)
|
||
return render(request, 'web/blog_post_detail.html', {'blog_post': blog_post})
|
||
|
||
def services_view(request):
|
||
# Получаем выбранную категорию из GET параметра
|
||
selected_category = request.GET.get('category', 'all')
|
||
|
||
# Получаем все категории для фильтра
|
||
categories = Category.objects.all().order_by('name')
|
||
|
||
# Фильтруем услуги по категории
|
||
if selected_category == 'all' or not selected_category:
|
||
services = Service.objects.all().order_by('name')
|
||
else:
|
||
services = Service.objects.filter(category__name__icontains=selected_category).order_by('name')
|
||
|
||
return render(request, 'web/services_modern.html', {
|
||
'services': services,
|
||
'categories': categories,
|
||
'selected_category': selected_category
|
||
})
|
||
|
||
def about_view(request):
|
||
contact_info = ContactInfo.get_active()
|
||
return render(request, 'web/about.html', {'contact_info': contact_info})
|
||
|
||
def portfolio_view(request):
|
||
projects = Project.objects.all()
|
||
return render(request, 'web/portfolio.html', {'projects': projects})
|
||
|
||
def blog_view(request):
|
||
blog_posts = BlogPost.objects.all().order_by('-created_at')
|
||
return render(request, 'web/blog.html', {'blog_posts': blog_posts})
|
||
|
||
def news_view(request):
|
||
# Можно создать модель News или использовать BlogPost с категорией
|
||
return render(request, 'web/news.html')
|
||
|
||
def career_view(request):
|
||
return render(request, 'web/career.html')
|
||
|
||
def create_service_request(request, service_id):
|
||
if request.method == 'POST':
|
||
try:
|
||
data = json.loads(request.body)
|
||
|
||
# Extract form data from new format
|
||
first_name = data.get('first_name', '').strip()
|
||
last_name = data.get('last_name', '').strip()
|
||
email = data.get('email', '').strip()
|
||
phone = data.get('phone', '').strip()
|
||
description = data.get('description', '').strip()
|
||
budget = data.get('budget', '')
|
||
timeline = data.get('timeline', '')
|
||
|
||
# Validate required fields
|
||
if not all([first_name, email, description]):
|
||
return JsonResponse({
|
||
'success': False,
|
||
'message': 'Пожалуйста, заполните все обязательные поля (имя, email, описание проекта)'
|
||
}, status=400)
|
||
|
||
service = get_object_or_404(Service, pk=service_id)
|
||
|
||
# Create or get client
|
||
client, client_created = Client.objects.get_or_create(
|
||
email=email,
|
||
defaults={
|
||
'first_name': first_name,
|
||
'last_name': last_name,
|
||
'phone_number': phone,
|
||
}
|
||
)
|
||
|
||
# Update client data if already exists
|
||
if not client_created:
|
||
client.first_name = first_name
|
||
client.last_name = last_name
|
||
if phone: # Only update phone if provided
|
||
client.phone_number = phone
|
||
client.save()
|
||
|
||
# Check for existing pending requests
|
||
existing_requests = ServiceRequest.objects.filter(
|
||
client=client,
|
||
service=service,
|
||
is_verified=False
|
||
)
|
||
if existing_requests.exists():
|
||
return JsonResponse({
|
||
'success': False,
|
||
'message': 'У вас уже есть активная заявка на данную услугу. Пожалуйста, проверьте ваш Telegram для завершения процесса.'
|
||
})
|
||
|
||
# Create service request with additional data
|
||
token = uuid.uuid4().hex
|
||
|
||
# Prepare full message with all provided information
|
||
full_description = f"Описание проекта: {description}"
|
||
if budget:
|
||
full_description += f"\nБюджет: {budget}"
|
||
if timeline:
|
||
full_description += f"\nЖелаемые сроки: {timeline}"
|
||
|
||
service_request = ServiceRequest.objects.create(
|
||
service=service,
|
||
client=client,
|
||
token=token,
|
||
message=full_description,
|
||
is_verified=False
|
||
)
|
||
|
||
return JsonResponse({
|
||
'success': True,
|
||
'message': 'Заявка успешно отправлена! Мы свяжемся с вами в ближайшее время.',
|
||
'service_request_id': service_request.id,
|
||
})
|
||
|
||
except json.JSONDecodeError:
|
||
logger.error("Invalid JSON format")
|
||
return JsonResponse({'success': False, 'message': 'Неверный формат данных'}, status=400)
|
||
except Exception as e:
|
||
logger.error(f"Error creating service request: {str(e)}")
|
||
return JsonResponse({'success': False, 'message': 'Произошла ошибка при создании заявки'}, status=500)
|
||
|
||
return JsonResponse({'success': False, 'message': 'Метод запроса должен быть POST'}, status=405)
|
||
|
||
def generate_qr_code(request, service_id):
|
||
if request.method == 'POST':
|
||
try:
|
||
data = json.loads(request.body)
|
||
client_email = data.get('client_email')
|
||
client_phone = data.get('client_phone')
|
||
client_name = data.get('client_name')
|
||
|
||
if not all([client_email, client_phone, client_name]):
|
||
logger.error("Все поля должны быть заполнены")
|
||
return JsonResponse({'error': 'Все поля должны быть заполнены'}, status=400)
|
||
|
||
# Используем транзакцию для предотвращения конкурентного создания дубликатов
|
||
with transaction.atomic():
|
||
user, user_created = User.objects.select_for_update().get_or_create(
|
||
email=client_email,
|
||
defaults={
|
||
"username": f"{client_email.split('@')[0]}_{get_random_string(5)}",
|
||
"first_name": client_name.split()[0] if client_name else "",
|
||
"last_name": client_name.split()[-1] if len(client_name.split()) > 1 else ""
|
||
}
|
||
)
|
||
if not user_created:
|
||
# Обновляем информацию о пользователе, если он уже существует
|
||
user.first_name = client_name.split()[0] if client_name else ""
|
||
user.last_name = client_name.split()[-1] if len(client_name.split()) > 1 else ""
|
||
user.save()
|
||
|
||
client, client_created = Client.objects.select_for_update().get_or_create(
|
||
email=client_email,
|
||
defaults={
|
||
'user': user,
|
||
'first_name': user.first_name,
|
||
'last_name': user.last_name,
|
||
'phone_number': client_phone
|
||
}
|
||
)
|
||
|
||
if not client_created:
|
||
# Обновляем информацию о клиенте, если он уже существует
|
||
client.first_name = user.first_name
|
||
client.last_name = user.last_name
|
||
client.phone_number = client_phone
|
||
client.save()
|
||
|
||
# Проверка на существование активной заявки
|
||
service = get_object_or_404(Service, pk=service_id)
|
||
existing_requests = ServiceRequest.objects.filter(client=client, service=service, is_verified=False)
|
||
if existing_requests.exists():
|
||
return JsonResponse({
|
||
'status': 'existing_request',
|
||
'message': 'У вас уже есть активная заявка на данную услугу. Пожалуйста, проверьте ваш Telegram для завершения процесса.'
|
||
})
|
||
|
||
# Создаем новую заявку на услугу
|
||
token = uuid.uuid4().hex
|
||
service_request = ServiceRequest.objects.create(
|
||
service=service,
|
||
client=client,
|
||
token=token,
|
||
is_verified=False
|
||
)
|
||
logger.info(f"Создана новая заявка: {service_request.id} для клиента: {client.email}")
|
||
|
||
# Генерация ссылки и QR-кода для Telegram
|
||
telegram_settings = get_object_or_404(TelegramSettings, pk=1)
|
||
registration_link = f'https://t.me/{telegram_settings.bot_name}?start=request_{service_request.id}_token_{urlsafe_base64_encode(force_bytes(token))}'
|
||
|
||
qr = qrcode.make(registration_link)
|
||
qr_code_dir = os.path.join(settings.STATICFILES_DIRS[0], 'qr_codes')
|
||
qr_code_path = os.path.join(qr_code_dir, f"request_{service_request.id}.png")
|
||
external_qr_link = f'static/qr_codes/request_{service_request.id}.png'
|
||
|
||
if not os.path.exists(qr_code_dir):
|
||
os.makedirs(qr_code_dir)
|
||
|
||
qr.save(qr_code_path)
|
||
|
||
except IntegrityError as e:
|
||
logger.error(f"Ошибка целостности данных при создании пользователя или клиента: {str(e)}")
|
||
return JsonResponse({'error': 'Ошибка при обработке данных. Пожалуйста, попробуйте позже.'}, status=500)
|
||
except Exception as e:
|
||
logger.error(f"Ошибка при обработке запроса: {str(e)}")
|
||
return JsonResponse({'error': f'Ошибка: {str(e)}'}, status=500)
|
||
|
||
return JsonResponse({
|
||
'registration_link': registration_link,
|
||
'qr_code_url': f"/{external_qr_link}",
|
||
'service_request_id': service_request.id,
|
||
'client_email': client_email,
|
||
'client_phone': client_phone,
|
||
'client_name': client_name
|
||
})
|
||
return JsonResponse({'error': 'Метод запроса должен быть POST'}, status=405)
|
||
|
||
def request_status(request, service_id):
|
||
try:
|
||
service_request = get_object_or_404(ServiceRequest, pk=service_id)
|
||
client = service_request.client
|
||
is_verified = service_request.is_verified
|
||
|
||
return JsonResponse({
|
||
'is_verified': is_verified,
|
||
'client_name': client.first_name if client else "Неизвестно",
|
||
'client_chat_id': client.chat_id if client else None,
|
||
})
|
||
except Exception as e:
|
||
logger.error(f"Ошибка при получении статуса заявки: {str(e)}")
|
||
return JsonResponse({'error': str(e)}, status=500)
|
||
|
||
@csrf_exempt
|
||
def send_telegram_notification(request):
|
||
if request.method == 'POST':
|
||
try:
|
||
data = json.loads(request.body)
|
||
|
||
# Логируем полученные данные для отладки
|
||
logging.info(f"Полученные данные для подтверждения заявки: {data}")
|
||
|
||
service_request_id = data.get('service_request_id')
|
||
client_chat_id = data.get('client_chat_id')
|
||
client_name = data.get('client_name')
|
||
|
||
if not service_request_id or not client_chat_id:
|
||
return JsonResponse({'error': 'Недостаточно данных для подтверждения'}, status=400)
|
||
|
||
# Проверяем существование заявки
|
||
service_request = ServiceRequest.objects.filter(id=service_request_id).first()
|
||
if not service_request:
|
||
return JsonResponse({'error': 'Заявка не найдена'}, status=404)
|
||
|
||
# Обновляем заявку с chat_id, если все верно
|
||
service_request.chat_id = client_chat_id
|
||
service_request.is_verified = True
|
||
service_request.save()
|
||
|
||
return JsonResponse({'status': 'Уведомление успешно отправлено в Telegram'})
|
||
|
||
except json.JSONDecodeError as e:
|
||
logging.error(f"Ошибка при декодировании JSON: {e}")
|
||
return JsonResponse({'error': 'Неверный формат данных'}, status=400)
|
||
|
||
logging.error(f"Неподдерживаемый метод запроса: {request.method}")
|
||
return JsonResponse({'error': 'Метод запроса должен быть POST'}, status=405)
|
||
|
||
|
||
def generate_secure_token(service_request_id, secret_key):
|
||
"""Генерация безопасного токена для подтверждения подлинности запроса."""
|
||
data = f'{service_request_id}:{secret_key}'
|
||
return hmac.new(secret_key.encode(), data.encode(), hashlib.sha256).hexdigest()
|
||
|
||
def complete_registration(request, request_id):
|
||
service_request = get_object_or_404(ServiceRequest, pk=request_id)
|
||
if request.method == 'POST':
|
||
client_email = request.POST.get('client_email', service_request.client.email)
|
||
client_phone = request.POST.get('client_phone', service_request.client.phone_number)
|
||
chat_id = request.POST.get('chat_id', service_request.chat_id)
|
||
|
||
if not all([client_email, client_phone, chat_id]):
|
||
return JsonResponse({'status': 'error', 'message': 'Все поля должны быть заполнены.'}, status=400)
|
||
|
||
client = service_request.client
|
||
client.email = client_email
|
||
client.phone_number = client_phone
|
||
client.save()
|
||
|
||
service_request.chat_id = chat_id
|
||
service_request.save()
|
||
|
||
return JsonResponse({'status': 'success', 'message': 'Регистрация успешно завершена.'})
|
||
|
||
return render(request, 'web/complete_registration.html', {'service_request': service_request})
|
||
|
||
|
||
def check_request_status(request, request_id):
|
||
"""API endpoint для проверки статуса подтверждения заявки"""
|
||
try:
|
||
service_request = get_object_or_404(ServiceRequest, pk=request_id)
|
||
return JsonResponse({
|
||
'is_verified': service_request.is_verified,
|
||
'chat_id': service_request.chat_id,
|
||
'created_at': service_request.created_at.isoformat() if service_request.created_at else None
|
||
})
|
||
except ServiceRequest.DoesNotExist:
|
||
return JsonResponse({'error': 'Заявка не найдена'}, status=404)
|
||
except Exception as e:
|
||
logger.error(f"Ошибка при проверке статуса заявки {request_id}: {str(e)}")
|
||
return JsonResponse({'error': 'Ошибка сервера'}, status=500)
|
||
|
||
|
||
def team_view(request):
|
||
"""Страница команды"""
|
||
team_members = Team.objects.filter(is_active=True).order_by('display_order', 'last_name')
|
||
return render(request, 'web/team.html', {
|
||
'team_members': team_members,
|
||
})
|
||
|
||
|
||
def career_view(request):
|
||
"""Страница карьеры"""
|
||
# Активные вакансии
|
||
active_careers = Career.objects.filter(status='active').order_by('-is_featured', '-created_at')
|
||
|
||
# Рекомендуемые вакансии
|
||
featured_careers = active_careers.filter(is_featured=True)
|
||
|
||
# Статистика
|
||
departments = Career.objects.filter(status='active').values_list('department', flat=True).distinct()
|
||
|
||
return render(request, 'web/career.html', {
|
||
'active_careers': active_careers,
|
||
'featured_careers': featured_careers,
|
||
'departments': departments,
|
||
'total_positions': active_careers.count(),
|
||
})
|