diff --git a/backend/src/db_client.py b/backend/src/db_client.py index 41d954f..fa5fdc9 100644 --- a/backend/src/db_client.py +++ b/backend/src/db_client.py @@ -1,13 +1,15 @@ from enum import Enum import mysql.connector import os +import random from mysql.connector import pooling STARTUP_TABLE_CREATION_QUERIES = { "users": """CREATE TABLE IF NOT EXISTS users ( Name varchar(255), Attendance bool, - Password VARCHAR(2048) + Password VARCHAR(2048), + WishListUrl VARCHAR(2048) );""", "sessions": """CREATE TABLE IF NOT EXISTS sessions ( Token VARCHAR(2048), @@ -19,6 +21,10 @@ STARTUP_TABLE_CREATION_QUERIES = { Capacity INT, reservedBy varchar(255) );""", + "santa": """CREATE TABLE IF NOT EXISTS santa ( + Name varchar(255), + Santa varchar(255) + );""", } INJECT_TABLE_CREATION_QUERIES = { @@ -55,6 +61,7 @@ class DBClient: self.pool = self.create_pool() # Create a connection pool self.initialize_database() + self.initialize_secret_santa() # Initialize Secret Santa def validate_env_variables(self): if not self.db_server or not self.db_port or not self.password or not self.database: @@ -78,6 +85,57 @@ class DBClient: self.query(STARTUP_TABLE_CREATION_QUERIES['hosting']) self.query(INJECT_TABLE_CREATION_QUERIES['hosting']) + def initialize_secret_santa(self): + table_exists = self.query("SHOW TABLES LIKE 'santa';") + + if not table_exists: + self.query(STARTUP_TABLE_CREATION_QUERIES['santa']) + + count_query = self.query('SELECT COUNT(*) FROM santa;') + if count_query[0][0] > 0: + self.app.logger.warning('The santa table is not empty. No assignments will be made.') + return + + attendees = self.query('SELECT Name FROM users WHERE Attendance = 1;') + + if not attendees: + return + + attendees = [user[0] for user in attendees] + couples = [("Тюлень", "Тюлениха"), ("Медведь", "Ксения")] + + max_attempts = 1000 + + for attempt in range(max_attempts): + shuffled_attendees = attendees.copy() + random.shuffle(shuffled_attendees) + + santa_assignments = {} + valid = True + + for index, user in enumerate(shuffled_attendees): + prev_user = shuffled_attendees[index - 1] + next_user = shuffled_attendees[(index + 1) % len(shuffled_attendees)] + + if any(user in couple and (prev_user in couple or next_user in couple) for couple in couples): + valid = False + break + + santa_assignments[user] = prev_user + + if valid: + break + + else: + self.app.logger.warning('Could not find valid Santa assignments after multiple attempts.') + return + + self.app.logger.info(f'Santa assignments: {santa_assignments}') + + for user, santa in santa_assignments.items(): + self.query('INSERT INTO santa (Name, Santa) VALUES (%s, %s);', (user, santa)) + + def query(self, query_str, params=None): max_retries = 3 for attempt in range(max_retries): @@ -87,7 +145,7 @@ class DBClient: connection = self.pool.get_connection() with connection.cursor() as cursor: cursor.execute(query_str, params) - if 'SELECT' in query_str: + if 'SELECT' in query_str or 'SHOW' in query_str: results = cursor.fetchall() self.app.logger.info(f'Query results: {results}') return results diff --git a/backend/src/user.py b/backend/src/user.py index 1da1a64..5b5e555 100644 --- a/backend/src/user.py +++ b/backend/src/user.py @@ -166,6 +166,63 @@ def registerUserEndpoints(app, database): return jsonify(success=False, message=str(e)), 500 + @app.route('/users/wishlist', methods=['PUT']) + def update_wishlist(): + data = request.json + token = data.get('token') + wishlist_url = data.get('wishlist') + if wishlist_url is None: + return jsonify(success=False, message="Wishlist URL is required"), 400 + query_session = "SELECT * FROM sessions WHERE Token=%s" + try: + result = database.query(query_session, params=(token,)) + if not result: + return jsonify(success=False, message="Token is invalid or expired"), 401 + user_name = result[0][1] + wishlist_query = "UPDATE users SET WishListUrl = %s WHERE Name = %s" + update_result = database.query(wishlist_query, params=(wishlist_url, user_name)) + + return jsonify(success=True, message="WishListUrl updated successfully"), 200 + + except Exception as e: + return jsonify(success=False, message=str(e)), 500 + + @app.route('/users/santa', methods=['GET']) + def get_santainfo(): + token = request.args.get('token') + + if not token: + return jsonify(success=False, message="Token is required"), 400 + + query_session = "SELECT * FROM sessions WHERE Token=%s" + + try: + result = database.query(query_session, params=(token,)) + if not result: + return jsonify(success=False, message="Token is invalid or expired"), 401 + + user_name = result[0][1] + + santa_query = "SELECT Name FROM santa WHERE Santa = %s" + santa_result = database.query(santa_query, params=(user_name,)) + + if not santa_result: + return jsonify(success=False, message=f"User's {user_name} Santa info not found"), 404 + + santa_to = santa_result[0][0] + + wishlist_query = "SELECT WishListUrl FROM users WHERE Name = %s" + wishlist_result = database.query(wishlist_query, params=(santa_to,)) + + santa_info = { + "santa_to": santa_to, + "wishlist": wishlist_result[0][0] + } + + return jsonify(success=True, santa_info=santa_info), 200 + + except Exception as e: + return jsonify(success=False, message=str(e)), 500 diff --git a/frontend/src/components/SecretSanta.tsx b/frontend/src/components/SecretSanta.tsx index 000cbf9..734eede 100644 --- a/frontend/src/components/SecretSanta.tsx +++ b/frontend/src/components/SecretSanta.tsx @@ -1,7 +1,36 @@ import CenteredContainer from "./ChildrenContainer"; +import useFetchUser from "../utils/fetchUser.tsx" +import type { SantaInfo } from "../types/index"; +import { useEffect, useState } from "react"; +import { useNotification } from "../NotificationContext.tsx"; function SecretSanta() { + const { updateWishlist, getSantaInfo } = useFetchUser() + const [ santaInfo, setSantaInfo ] = useState(null) + const [ wishListUrl, setWishListUrl ] = useState('') + + const notify = useNotification(); + + const fetchSecretSanta = async () => { + const santaInfoData = await getSantaInfo() + setSantaInfo(santaInfoData) + } + const handleSubmit = async (event: React.FormEvent) => { + event.preventDefault() + const updated = await updateWishlist(wishListUrl) + + if (updated) { + notify('Вишлсит обновлен', 'success') + } else { + notify('Не удалось обновить вишлист, все вопросы к админу', 'error') + } + } + + useEffect(() => { + fetchSecretSanta() + }, []) + return ( <> @@ -9,11 +38,33 @@ function SecretSanta() {

Тут вы сможете узнать кому вы дарите свой подарок, а так же увидеть его вишлист, если он его добавит. Вы тоже сможете добавить свой вишлист, если захотите, чтобы ваш санта его видел!

- Таблица в производстве... Ожидайте к середине-концу ноября +

Добавить свой вишлист

+
+
+ +
+ +
+

Вы санта для Пятки: {santaInfo?.santa_to}

+ {santaInfo?.wishlist ? ( +

Пятка оставила вам вишлсит

+ ): ( +

Пятка не оставила вам вишлист, используйте свое воображение. Либо ждите пока добавит....

+ )}

) } -export default SecretSanta; \ No newline at end of file +export default SecretSanta; diff --git a/frontend/src/types/index.d.ts b/frontend/src/types/index.d.ts index 7059a63..e789408 100644 --- a/frontend/src/types/index.d.ts +++ b/frontend/src/types/index.d.ts @@ -14,4 +14,9 @@ export interface Hosting { export interface User { attendance: boolean | null name: string -} \ No newline at end of file +} + +export interface SantaInfo { + santa_to: string, + wishlist: string +} diff --git a/frontend/src/utils/fetchUser.tsx b/frontend/src/utils/fetchUser.tsx index b2627b2..c7d314a 100644 --- a/frontend/src/utils/fetchUser.tsx +++ b/frontend/src/utils/fetchUser.tsx @@ -2,7 +2,7 @@ import { useCookies } from 'react-cookie'; import { API_URL } from '../constants/constants'; import { hashPassword } from './hashPassword'; import { useState } from 'react'; -import type { User } from '../types'; +import type { User, SantaInfo } from '../types'; const useFetchUser = () => { const [isLoading, setIsLoading] = useState(false) @@ -137,6 +137,54 @@ const useFetchUser = () => { } } + const updateWishlist = async (wishlistUrl: string): Promise => { + const token = apiCookie.apiToken + try { + const response = await fetch(`${API_URL}/users/wishlist`, { + method: 'PUT', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ + token, + wishlist: wishlistUrl, + }), + }); + + if (!response.ok) throw new Error(`HTTP error! status: ${response.status}`); + const data = await response.json(); + + if (!data.success) throw new Error(data.message); + + return true; // Attendance updated successfully + } catch (error) { + console.error('Error updating wishlist:', error); + return false; // Attendance update failed + } + } + + const getSantaInfo = async (): Promise => { + const token = apiCookie.apiToken + try { + const response = await fetch(`${API_URL}/users/santa?token=${encodeURIComponent(token)}`, { + method: 'GET', + headers: { + 'Content-Type': 'application/json', + } + }); + + if (!response.ok) throw new Error(`HTTP error! status: ${response.status}`); + const data = await response.json(); + + if (!data.success) throw new Error(data.message); + + return data.santa_info + } catch (error) { + console.error('Error retrieving attendance:', error); + return null + } + } + const updateAttendance = async (attendanceStatus: boolean): Promise => { const token = apiCookie.apiToken try { @@ -186,7 +234,7 @@ const useFetchUser = () => { } - return { userSet, passwordCreate, signUser, validToken, updateAttendance, getAttendance, isLoading, getAttendanceAll }; + return { userSet, passwordCreate, signUser, validToken, updateAttendance, updateWishlist, getAttendance, isLoading, getAttendanceAll, getSantaInfo }; }; export default useFetchUser;