Making more commits

main.py

@@ -6,14 +6,14 @@ import uvicorn
 from contextlib import asynccontextmanager
 
 
-from src.database import create_db_tables, get_db 
+from src.database import create_db_and_tables, get_db 
 from src.routers import students, devices, clearance, token, users, admin
 
 @asynccontextmanager
 async def lifespan(app_instance: FastAPI):
     """Handles application startup and shutdown events."""
     print("Application startup...")
-    create_db_tables()
+    create_db_and_tables()
     print("Database tables checked/created.")
     yield
     print("Application shutdown...")

requirements.txt

@@ -1,14 +1,14 @@
-fastapi 
-uvicorn 
-databases[postgresql] 
-asyncpg
-pydantic
-pydantic[email]
-pydantic[email,cryptography]
-python-dotenv 
-sqlalchemy
-supabase
-psycopg2-binary
-bcrypt
-python-multipart
-python-jose
+fastapi==0.104.1
+uvicorn[standard]==0.24.0
+databases[postgresql]==0.8.0
+asyncpg==0.29.0
+pydantic==2.5.0
+pydantic[email]==2.5.0
+pydantic-settings==2.1.0
+python-dotenv==1.0.0
+sqlalchemy==2.0.23
+supabase==2.0.0
+psycopg2-binary==2.9.9
+bcrypt==4.1.2
+python-multipart==0.0.6
+python-jose[cryptography]==3.3.0

src/database.py

@@ -91,3 +91,6 @@ def initialize_student_clearance_statuses(db: SQLAlchemySessionType, student_id_
         print(f"Error committing initial clearance statuses for student {student_id_str}: {e}")
         db.rollback()
         raise
+
+# Alias for backward compatibility
+initialize_student_clearance_statuses_orm = initialize_student_clearance_statuses

src/models.py

@@ -5,17 +5,48 @@ SQLAlchemy Models for database table definitions.
 from pydantic import BaseModel, Field
 from typing import List, Optional, Union
 from enum import Enum
+from datetime import datetime
 
 from sqlalchemy import (
-    Boolean, Column, ForeignKey, Integer, String,
+    Boolean, Column, ForeignKey, Integer, String, DateTime,
     create_engine, Enum as SQLAlchemyEnum
 )
 from sqlalchemy.orm import relationship, sessionmaker, declarative_base
 
 # ==============================================================================
-# Database (SQLAlchemy) Models
+# Shared Enums (used by both SQLAlchemy and Pydantic)
 # ==============================================================================
 
+class ClearanceStatusEnum(str, Enum):
+    NOT_COMPLETED = "NOT_COMPLETED"
+    PENDING = "PENDING"
+    COMPLETED = "COMPLETED"
+    REJECTED = "REJECTED"
+
+class ClearanceDepartment(str, Enum):
+    DEPARTMENT = "DEPARTMENT"
+    BURSARY = "BURSARY"
+    LIBRARY = "LIBRARY"
+    ALUMNI = "ALUMNI"
+
+class UserRole(str, Enum):
+    ADMIN = "ADMIN"
+    STAFF = "STAFF"
+
+class TargetUserType(str, Enum):
+    STUDENT = "STUDENT"
+    STAFF_ADMIN = "STAFF_ADMIN"
+
+class OverallClearanceStatusEnum(str, Enum):
+    PENDING = "PENDING"
+    COMPLETED = "COMPLETED"
+
+class UserTypeEnum(str, Enum):
+    """Enum for user types."""
+    STUDENT = "student"
+    USER = "user"
+
+
 Base = declarative_base()
 
 class User(Base):
@@ -25,9 +56,12 @@ class User(Base):
     username = Column(String, unique=True, index=True, nullable=False)
     hashed_password = Column(String, nullable=False)
     name = Column(String, nullable=False)
-    role = Column(String, default="staff")
+    role = Column(SQLAlchemyEnum(UserRole), default=UserRole.STAFF, nullable=False)
+    department = Column(SQLAlchemyEnum(ClearanceDepartment), nullable=True)
     is_active = Column(Boolean, default=True)
     tag_id = Column(String, unique=True, index=True, nullable=True)
+    created_at = Column(DateTime, default=datetime.utcnow)
+    updated_at = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
 
 
 class Student(Base):
@@ -38,6 +72,8 @@ class Student(Base):
     name = Column(String, nullable=False)
     department = Column(String, nullable=False)
     tag_id = Column(String, unique=True, index=True, nullable=True)
+    created_at = Column(DateTime, default=datetime.utcnow)
+    updated_at = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
 
     clearance_statuses = relationship("ClearanceStatus", back_populates="student")
 
@@ -47,46 +83,76 @@ class ClearanceStatus(Base):
     __tablename__ = "clearance_statuses"
     id = Column(Integer, primary_key=True, index=True)
     student_id = Column(String, ForeignKey("students.student_id"), nullable=False)
-    department = Column(String, nullable=False)
-    status = Column(String, default="PENDING")
+    department = Column(SQLAlchemyEnum(ClearanceDepartment), nullable=False)
+    status = Column(SQLAlchemyEnum(ClearanceStatusEnum), default=ClearanceStatusEnum.NOT_COMPLETED, nullable=False)
+    remarks = Column(String, nullable=True)
+    cleared_by = Column(Integer, ForeignKey("users.id"), nullable=True)
+    created_at = Column(DateTime, default=datetime.utcnow)
+    updated_at = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
     
     student = relationship("Student", back_populates="clearance_statuses")
-
-
-class UserTypeEnum(str, Enum):
-    """Enum for user types."""
-    STUDENT = "student"
-    USER = "user"
+    cleared_by_user = relationship("User", foreign_keys=[cleared_by])
 
 
 class Device(Base):
     """Database model for RFID reader devices."""
     __tablename__ = "devices"
     id = Column(Integer, primary_key=True, index=True)
-    device_id_str = Column(String, unique=True, index=True, nullable=False)
+    name = Column(String, nullable=False)
+    description = Column(String, nullable=True)
+    device_id = Column(String, unique=True, index=True, nullable=True)
     location = Column(String, nullable=True)
-    # Fields to temporarily link a device to a user for tag registration
-    link_for_user_id = Column(String, nullable=True)
-    link_for_user_type = Column(SQLAlchemyEnum(UserTypeEnum), nullable=True)
+    api_key = Column(String, unique=True, index=True, nullable=False)
+    is_active = Column(Boolean, default=True)
+    created_at = Column(DateTime, default=datetime.utcnow)
+    updated_at = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
+
+
+class PendingTagLink(Base):
+    """Database model for pending tag link requests."""
+    __tablename__ = "pending_tag_links"
+    id = Column(Integer, primary_key=True, index=True)
+    tag_id = Column(String, nullable=False)
+    target_user_id = Column(String, nullable=False)
+    target_user_type = Column(SQLAlchemyEnum(TargetUserType), nullable=False)
+    initiated_by_user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
+    created_at = Column(DateTime, default=datetime.utcnow)
+
+
+class DeviceLog(Base):
+    """Database model for device activity logs."""
+    __tablename__ = "device_logs"
+    id = Column(Integer, primary_key=True, index=True)
+    device_fk_id = Column(Integer, ForeignKey("devices.id"), nullable=True)
+    actual_device_id_str = Column(String, nullable=True)
+    tag_id_scanned = Column(String, nullable=True)
+    user_type = Column(String, nullable=True)
+    action = Column(String, nullable=False)
+    timestamp = Column(DateTime, default=datetime.utcnow)
 
-# ==============================================================================
-# API (Pydantic) Models
-# ==============================================================================
 
 # --- User and Auth Models ---
 class UserBase(BaseModel):
     username: str
     name: str
+    role: UserRole = UserRole.STAFF
+    department: Optional[ClearanceDepartment] = None
+    tag_id: Optional[str] = None
+    is_active: Optional[bool] = True
 
 class UserCreate(UserBase):
     password: str
-    role: str = "staff"
 
-class UserResponse(UserBase):
+class UserResponse(BaseModel):
     id: int
-    is_active: bool
-    role: str
+    username: str
+    name: str
+    role: UserRole
+    department: Optional[ClearanceDepartment] = None
     tag_id: Optional[str] = None
+    is_active: bool
+    created_at: datetime
+    updated_at: datetime
     
     class Config:
         from_attributes = True
@@ -98,7 +164,6 @@ class Token(BaseModel):
 class TokenData(BaseModel):
     username: Optional[str] = None
 
-
 # --- Student and Clearance Models ---
 class StudentBase(BaseModel):
     student_id: str = Field(..., example="CST/18/123")
@@ -106,33 +171,41 @@ class StudentBase(BaseModel):
     department: str = Field(..., example="Computer Science")
 
 class StudentCreate(StudentBase):
-    pass
+    tag_id: Optional[str] = None
 
 class StudentResponse(StudentBase):
     id: int
     tag_id: Optional[str] = None
+    created_at: datetime
+    updated_at: datetime
     
     class Config:
         from_attributes = True
 
-class ClearanceStatusEnum(str, Enum):
-    PENDING = "PENDING"
-    COMPLETED = "COMPLETED"
-    REJECTED = "REJECTED"
-
-class ClearanceDepartment(str, Enum):
-    DEPARTMENT = "DEPARTMENT"
-    BURSARY = "BURSARY"
-    LIBRARY = "LIBRARY"
-    ALUMNI = "ALUMNI"
+class ClearanceStatusCreate(BaseModel):
+    student_id: str
+    department: ClearanceDepartment
+    status: ClearanceStatusEnum
+    remarks: Optional[str] = None
 
-class OverallClearanceStatusEnum(str, Enum):
-    PENDING = "PENDING"
-    COMPLETED = "COMPLETED"
+class ClearanceStatusResponse(BaseModel):
+    id: int
+    student_id: str
+    department: ClearanceDepartment
+    status: ClearanceStatusEnum
+    remarks: Optional[str] = None
+    cleared_by: Optional[int] = None
+    created_at: datetime
+    updated_at: datetime
+    
+    class Config:
+        from_attributes = True
 
 class ClearanceStatusItem(BaseModel):
-    department: str
+    department: ClearanceDepartment
     status: ClearanceStatusEnum
+    remarks: Optional[str] = None
+    updated_at: datetime
     
     class Config:
         from_attributes = True
@@ -145,9 +218,34 @@ class ClearanceDetail(BaseModel):
     clearance_items: List[ClearanceStatusItem]
 
 class ClearanceStatusUpdate(BaseModel):
-    department: str
+    department: ClearanceDepartment
     status: ClearanceStatusEnum
+    remarks: Optional[str] = None
 
+# --- Device Models ---
+class DeviceCreateAdmin(BaseModel):
+    name: str
+    description: Optional[str] = None
+    device_id: Optional[str] = None
+    location: Optional[str] = None
+
+class DeviceRegister(BaseModel):
+    device_id: str
+    location: str
+
+class DeviceResponse(BaseModel):
+    id: int
+    name: str
+    description: Optional[str] = None
+    device_id: Optional[str] = None
+    location: Optional[str] = None
+    api_key: str
+    is_active: bool
+    created_at: datetime
+    updated_at: datetime
+    
+    class Config:
+        from_attributes = True
 
 # --- Tag and Device Models ---
 class TagLinkRequest(BaseModel):
@@ -169,3 +267,7 @@ class RfidLinkSuccessResponse(BaseModel):
     message: str = "Tag linked successfully."
     user_id: str
     user_type: UserTypeEnum
+
+# JWT Configuration
+import os
+JWT_SECRET_KEY = os.getenv("JWT_SECRET_KEY", "your-secret-key")