Added hotfixes

app.py

@@ -1,3 +1,3 @@
-from src.app import create_app
+from app import create_app
 
 app = create_app()

src/app.py

@@ -5,14 +5,19 @@ from werkzeug.serving import run_simple
 from flask_cors import CORS
 from pymongo import MongoClient
 
-from src.config import Config
-from src.singletons.database_singleton import DatabaseSingleton
+import os
+import sys
+path = os.path.dirname(os.path.abspath(__file__))
+sys.path.insert(1, path + '/src')
 
-from src.infra.server import app, socketio
-from src.controllers.user_controller import user_blueprint
-from src.controllers.reservation_controller import reservation_blueprint
-from src.controllers.health_controller import health_blueprint
-from src.controllers.room_controller import room_blueprint
+from config import Config
+from singletons.database_singleton import DatabaseSingleton
+
+from infra.server import app, socketio
+from controllers.user_controller import user_blueprint
+from controllers.reservation_controller import reservation_blueprint
+from controllers.health_controller import health_blueprint
+from controllers.room_controller import room_blueprint
 
 CORS(app)
 app.config['JWT_SECRET_KEY'] = Config.JWT_SECRET_KEY

src/controllers/reservation_controller.py

@@ -2,11 +2,11 @@ from flask import Blueprint, request, jsonify
 from flask_socketio import emit
 from flask_jwt_extended import jwt_required, get_jwt_identity
 
-from src.controllers.websocket_controller import notify_clients
-from src.middlewares.validate_request import validate_request
-from src.dtos.reservation_dtos import CreateReservationDTO, UpdateReservationDTO
-from src.models.reservation_model import Reservation
-from src.repos.reservation_repo import ReservationRepository
+from controllers.websocket_controller import notify_clients
+from middlewares.validate_request import validate_request
+from dtos.reservation_dtos import CreateReservationDTO, UpdateReservationDTO
+from models.reservation_model import Reservation
+from repos.reservation_repo import ReservationRepository
 
 reservation_blueprint = Blueprint('reservation', __name__)
 

src/controllers/room_controller.py

@@ -6,8 +6,8 @@ room_blueprint = Blueprint('room', __name__)
 #@jwt_required()
 def list_rooms():
     return jsonify([
-        {"id": "67d28e7004bda1d7130c9825", "title": "Маркетинг"},
-        {"id": "67d28e7004bda1d7130c9826", "title": "Green"},
         {"id": "67d28e7004bda1d7130c9827", "title": "Конференц-зал"},
+        {"id": "67d28e7004bda1d7130c9826", "title": "Green"},
+        {"id": "67d28e7004bda1d7130c9825", "title": "Маркетинг"},
         {"id": "67d28e7004bda1d7130c9828", "title": "Dipal"}
     ])

src/controllers/user_controller.py

@@ -1,10 +1,10 @@
 from flask import Blueprint, request, jsonify
 from flask_jwt_extended import create_access_token
 
-from src.middlewares.validate_request import validate_request
-from src.dtos.user_dtos import RegisterUserDTO, LoginUserDTO
-from src.repos.user_repo import UserRepo
-from src.models.user_model import User
+from middlewares.validate_request import validate_request
+from dtos.user_dtos import RegisterUserDTO, LoginUserDTO
+from repos.user_repo import UserRepo
+from models.user_model import User
 
 user_blueprint = Blueprint('user', __name__)
 

src/controllers/websocket_controller.py

@@ -1,21 +1,21 @@
 from flask_jwt_extended import get_jwt_identity, jwt_required
 from flask_socketio import emit, join_room, leave_room
 
-from src.infra.server import socketio
-from src.repos.reservation_repo import ReservationRepository
+from infra.server import socketio
+from repos.reservation_repo import ReservationRepository
 
-@socketio.on('connect', namespace='/api')
+@socketio.on('connect')
 #@jwt_required()
 def handle_connect():
     #current_user = get_jwt_identity()
     #print(f'Client connected: {current_user}')
     emit('status', {'message': 'Connected'})
 
-@socketio.on('disconnect', namespace='/api')
+@socketio.on('disconnect')
 def handle_disconnect():
     print('Client disconnected')
 
-@socketio.on('subscribe_reservations', namespace='/api')
+@socketio.on('subscribe_reservations')
 def handle_subscribe(data):
     date = data.get('date')
     room_id = data.get('room_id')
@@ -31,7 +31,7 @@ def handle_subscribe(data):
     reservations = ReservationRepository.list_all(filters)
     emit('reservations_update', reservations)
 
-@socketio.on('unsubscribe_reservations', namespace='/api')
+@socketio.on('unsubscribe_reservations')
 def handle_unsubscribe(data):
     date = data.get('date')
     leave_room(date)

src/dtos/reservation_dtos.py

@@ -1,7 +1,7 @@
 from typing import Optional
 from pydantic import BaseModel
 
-from src.dtos.time_dtos import TimeDTO
+from dtos.time_dtos import TimeDTO
 
 class CreateReservationDTO(BaseModel):
     title: str

src/models/reservation_model.py

@@ -1,4 +1,4 @@
-from src.models.time_model import Time
+from models.time_model import Time
 
 class Reservation:
     def __init__(self, title, room_id, creator, date, start_time, finish_time, color, description=""):

src/repos/reservation_repo.py

@@ -1,7 +1,7 @@
 import json
 from bson import ObjectId, json_util
 
-from src.singletons.database_singleton import DatabaseSingleton
+from singletons.database_singleton import DatabaseSingleton
 
 class ReservationRepository:
     db = DatabaseSingleton.get_instance()

src/repos/user_repo.py

@@ -1,4 +1,4 @@
-from src.singletons.database_singleton import DatabaseSingleton
+from singletons.database_singleton import DatabaseSingleton
 
 class UserRepo:
     db = DatabaseSingleton.get_instance()

src/singletons/app_singleton.py

@@ -1,4 +1,4 @@
-from src.config import Config
+from config import Config
 from flask import Flask
 
 class AppSingleton:

src/singletons/database_singleton.py

@@ -1,4 +1,4 @@
-from src.config import Config
+from config import Config
 from pymongo import MongoClient
 
 class DatabaseSingleton: