fix(types): resolver diagnosticos estaticos de tipado y modelos v3.6.1
This commit is contained in:
@@ -1,12 +1,12 @@
|
||||
from flask import Flask, request, session
|
||||
from flask_sqlalchemy import SQLAlchemy
|
||||
from flask_migrate import Migrate
|
||||
from flask_migrate import Migrate # type: ignore
|
||||
from flask_cors import CORS
|
||||
from flask_babel import Babel, gettext as _
|
||||
from config.config import Config
|
||||
|
||||
# Initialize extensions
|
||||
__version__ = "3.6.0"
|
||||
__version__ = "3.6.1"
|
||||
db = SQLAlchemy()
|
||||
migrate = Migrate()
|
||||
cors = CORS()
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
from app import db
|
||||
from datetime import datetime, timedelta
|
||||
from datetime import datetime, timedelta, timezone
|
||||
from enum import Enum
|
||||
from sqlalchemy.types import TypeDecorator, String
|
||||
|
||||
@@ -33,8 +33,15 @@ class ReservationStatus(Enum):
|
||||
COMPLETED = 'COMPLETED'
|
||||
NO_SHOW = 'NO_SHOW'
|
||||
|
||||
from typing import Any, TYPE_CHECKING
|
||||
|
||||
class Reservation(db.Model):
|
||||
__tablename__ = 'reservations'
|
||||
__allow_unmapped__ = True
|
||||
if TYPE_CHECKING:
|
||||
user: Any
|
||||
classroom: Any
|
||||
commission: Any
|
||||
|
||||
id = db.Column(db.Integer, primary_key=True)
|
||||
classroom_id = db.Column(db.Integer, db.ForeignKey('classrooms.id'), nullable=False)
|
||||
@@ -50,8 +57,8 @@ class Reservation(db.Model):
|
||||
virtual_link = db.Column(db.String(500), nullable=True) # Zoom, Meet, Teams, etc.
|
||||
notes = db.Column(db.Text)
|
||||
|
||||
created_at = db.Column(db.DateTime, default=datetime.utcnow)
|
||||
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
|
||||
created_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None))
|
||||
updated_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None), onupdate=lambda: datetime.now(timezone.utc).replace(tzinfo=None))
|
||||
|
||||
def __init__(self, **kwargs):
|
||||
super().__init__(**kwargs)
|
||||
@@ -137,8 +144,8 @@ class Reservation(db.Model):
|
||||
|
||||
def can_be_cancelled(self):
|
||||
"""Check if reservation can be cancelled (24 hours before start)"""
|
||||
from datetime import timedelta
|
||||
return self.start_time > datetime.utcnow() + timedelta(hours=24)
|
||||
now = datetime.now(timezone.utc).replace(tzinfo=None)
|
||||
return self.start_time > now + timedelta(hours=24)
|
||||
|
||||
def check_conflict(self, other_reservation):
|
||||
"""Check if this reservation conflicts with another"""
|
||||
|
||||
@@ -1,9 +1,14 @@
|
||||
from typing import Any, TYPE_CHECKING
|
||||
from app import db
|
||||
from werkzeug.security import generate_password_hash, check_password_hash
|
||||
from datetime import datetime
|
||||
|
||||
class User(db.Model):
|
||||
__tablename__ = 'users'
|
||||
__allow_unmapped__ = True
|
||||
if TYPE_CHECKING:
|
||||
role_obj: Any
|
||||
reservations: Any
|
||||
|
||||
id = db.Column(db.Integer, primary_key=True)
|
||||
email = db.Column(db.String(255), unique=True, nullable=False, index=True)
|
||||
|
||||
@@ -7,7 +7,7 @@ OPENAPI_SPEC = {
|
||||
"info": {
|
||||
"title": "Edu-Space REST API",
|
||||
"description": "Enterprise Academic & Physical Space Management REST API with JWT Authentication and Role-Based Access Control.",
|
||||
"version": "3.6.0"
|
||||
"version": "3.6.1"
|
||||
},
|
||||
"servers": [
|
||||
{
|
||||
|
||||
@@ -40,13 +40,14 @@ class JWTService:
|
||||
"""Emite un token de acceso de corta duración (15 min) con claims de rol y permisos."""
|
||||
now = datetime.now(timezone.utc)
|
||||
delta = expires_delta or cls.ACCESS_TOKEN_EXPIRES
|
||||
role_name = user.role_obj.name if user.role_obj else user.role
|
||||
role_obj = getattr(user, 'role_obj', None)
|
||||
role_name = getattr(role_obj, 'name', None) or user.role
|
||||
|
||||
# Mapeo de permisos para claims del token
|
||||
permissions = {}
|
||||
if user.role_obj and hasattr(user.role_obj, 'permissions'):
|
||||
for p in user.role_obj.permissions:
|
||||
permissions[p.module] = p.access_level
|
||||
if role_obj and hasattr(role_obj, 'permissions'):
|
||||
for p in getattr(role_obj, 'permissions', []):
|
||||
permissions[getattr(p, 'module', '')] = getattr(p, 'access_level', '')
|
||||
|
||||
payload = {
|
||||
'sub': str(user.id),
|
||||
|
||||
Reference in New Issue
Block a user