feat: Space Booking System - MVP complet
Sistem web pentru rezervarea de birouri și săli de ședință cu flux de aprobare administrativă. Stack: FastAPI + Vue.js 3 + SQLite + TypeScript Features implementate: - Autentificare JWT + Self-registration cu email verification - CRUD Spații, Utilizatori, Settings (Admin) - Calendar interactiv (FullCalendar) cu drag-and-drop - Creare rezervări cu validare (durată, program, overlap, max/zi) - Rezervări recurente (săptămânal) - Admin: aprobare/respingere/anulare cereri - Admin: creare directă rezervări (bypass approval) - Admin: editare orice rezervare - User: editare/anulare rezervări proprii - Notificări in-app (bell icon + dropdown) - Notificări email (async SMTP cu BackgroundTasks) - Jurnal acțiuni administrative (audit log) - Rapoarte avansate (utilizare, top users, approval rate) - Șabloane rezervări (booking templates) - Atașamente fișiere (upload/download) - Conflict warnings (verificare disponibilitate real-time) - Integrare Google Calendar (OAuth2) - Suport timezone (UTC storage + user preference) - 225+ teste backend Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
||||
.claude/HANDOFF.md
|
||||
178
README.md
Normal file
178
README.md
Normal file
@@ -0,0 +1,178 @@
|
||||
# Space Booking System
|
||||
|
||||
Web application for booking offices and meeting rooms with administrative approval flow.
|
||||
|
||||
## Tech Stack
|
||||
|
||||
**Backend:**
|
||||
- FastAPI 0.115+ (Python 3.12+)
|
||||
- SQLAlchemy 2.0 (ORM)
|
||||
- SQLite database
|
||||
- JWT authentication
|
||||
- Uvicorn (ASGI server)
|
||||
|
||||
**Frontend:**
|
||||
- Vue.js 3.4+
|
||||
- Vite 5.x (build tool)
|
||||
- Pinia (state management)
|
||||
- Vue Router 4.x
|
||||
- TypeScript
|
||||
- FullCalendar (calendar view)
|
||||
|
||||
## Getting Started
|
||||
|
||||
### Prerequisites
|
||||
|
||||
- Python 3.12+
|
||||
- Node.js 18+
|
||||
- npm or yarn
|
||||
|
||||
### Backend Setup
|
||||
|
||||
```bash
|
||||
cd backend
|
||||
|
||||
# Create virtual environment
|
||||
python -m venv venv
|
||||
source venv/bin/activate # On Windows: venv\Scripts\activate
|
||||
|
||||
# Install dependencies
|
||||
pip install -r requirements.txt
|
||||
|
||||
# Seed database with demo users
|
||||
python seed_db.py
|
||||
|
||||
# Run development server
|
||||
uvicorn app.main:app --reload --host 0.0.0.0 --port 8000
|
||||
```
|
||||
|
||||
Backend will be available at: http://localhost:8000
|
||||
|
||||
API documentation: http://localhost:8000/docs
|
||||
|
||||
### Frontend Setup
|
||||
|
||||
```bash
|
||||
cd frontend
|
||||
|
||||
# Install dependencies
|
||||
npm install
|
||||
|
||||
# Run development server
|
||||
npm run dev
|
||||
```
|
||||
|
||||
Frontend will be available at: http://localhost:5173
|
||||
|
||||
## Demo Accounts
|
||||
|
||||
After seeding the database:
|
||||
|
||||
- **Admin:** admin@example.com / adminpassword
|
||||
- **User:** user@example.com / userpassword
|
||||
|
||||
## Development Commands
|
||||
|
||||
### Backend
|
||||
|
||||
```bash
|
||||
cd backend
|
||||
|
||||
# Type checking
|
||||
mypy app/
|
||||
|
||||
# Linting
|
||||
ruff check .
|
||||
|
||||
# Format code
|
||||
ruff format .
|
||||
|
||||
# Run tests
|
||||
pytest
|
||||
|
||||
# Run with auto-reload
|
||||
uvicorn app.main:app --reload
|
||||
```
|
||||
|
||||
### Frontend
|
||||
|
||||
```bash
|
||||
cd frontend
|
||||
|
||||
# Type checking
|
||||
npm run typecheck
|
||||
|
||||
# Linting
|
||||
npm run lint
|
||||
|
||||
# Build for production
|
||||
npm run build
|
||||
|
||||
# Preview production build
|
||||
npm run preview
|
||||
```
|
||||
|
||||
## Project Structure
|
||||
|
||||
```
|
||||
space-booking/
|
||||
├── backend/
|
||||
│ ├── app/
|
||||
│ │ ├── api/ # API endpoints
|
||||
│ │ ├── core/ # Core utilities (config, security)
|
||||
│ │ ├── db/ # Database session
|
||||
│ │ ├── models/ # SQLAlchemy models
|
||||
│ │ ├── schemas/ # Pydantic schemas
|
||||
│ │ └── main.py # FastAPI application
|
||||
│ ├── tests/ # Backend tests
|
||||
│ ├── requirements.txt
|
||||
│ └── seed_db.py # Database seeding script
|
||||
├── frontend/
|
||||
│ ├── src/
|
||||
│ │ ├── assets/ # CSS and static assets
|
||||
│ │ ├── components/ # Vue components
|
||||
│ │ ├── router/ # Vue Router configuration
|
||||
│ │ ├── services/ # API services
|
||||
│ │ ├── stores/ # Pinia stores
|
||||
│ │ ├── types/ # TypeScript types
|
||||
│ │ ├── views/ # Page components
|
||||
│ │ ├── App.vue # Root component
|
||||
│ │ └── main.ts # Application entry
|
||||
│ └── package.json
|
||||
└── README.md
|
||||
```
|
||||
|
||||
## Features
|
||||
|
||||
### Implemented (US-001)
|
||||
|
||||
- [x] User authentication with JWT
|
||||
- [x] Login page with email/password
|
||||
- [x] Protected routes
|
||||
- [x] Token storage and validation
|
||||
- [x] Redirect to dashboard on successful login
|
||||
- [x] Role-based access (admin/user)
|
||||
|
||||
### Coming Soon
|
||||
|
||||
- Space management (CRUD)
|
||||
- Booking calendar view
|
||||
- Booking request system
|
||||
- Admin approval workflow
|
||||
- Notifications
|
||||
- Audit log
|
||||
|
||||
## API Endpoints
|
||||
|
||||
### Authentication
|
||||
|
||||
- `POST /api/auth/login` - Login with email and password
|
||||
|
||||
### Health
|
||||
|
||||
- `GET /` - API info
|
||||
- `GET /health` - Health check
|
||||
|
||||
## License
|
||||
|
||||
MIT
|
||||
19
backend/.env.example
Normal file
19
backend/.env.example
Normal file
@@ -0,0 +1,19 @@
|
||||
# Application settings
|
||||
APP_NAME="Space Booking API"
|
||||
DEBUG=true
|
||||
|
||||
# Database
|
||||
DATABASE_URL="sqlite:///./space_booking.db"
|
||||
|
||||
# JWT
|
||||
SECRET_KEY="your-secret-key-change-in-production"
|
||||
ALGORITHM="HS256"
|
||||
ACCESS_TOKEN_EXPIRE_MINUTES=1440
|
||||
|
||||
# SMTP
|
||||
SMTP_HOST=localhost
|
||||
SMTP_PORT=1025
|
||||
SMTP_USER=
|
||||
SMTP_PASSWORD=
|
||||
SMTP_FROM_ADDRESS=noreply@space-booking.local
|
||||
SMTP_ENABLED=false
|
||||
56
backend/.gitignore
vendored
Normal file
56
backend/.gitignore
vendored
Normal file
@@ -0,0 +1,56 @@
|
||||
# Python
|
||||
__pycache__/
|
||||
*.py[cod]
|
||||
*$py.class
|
||||
*.so
|
||||
.Python
|
||||
build/
|
||||
develop-eggs/
|
||||
dist/
|
||||
downloads/
|
||||
eggs/
|
||||
.eggs/
|
||||
lib/
|
||||
lib64/
|
||||
parts/
|
||||
sdist/
|
||||
var/
|
||||
wheels/
|
||||
*.egg-info/
|
||||
.installed.cfg
|
||||
*.egg
|
||||
|
||||
# Virtual environments
|
||||
venv/
|
||||
ENV/
|
||||
env/
|
||||
.venv
|
||||
|
||||
# Database
|
||||
*.db
|
||||
*.sqlite
|
||||
*.sqlite3
|
||||
|
||||
# Environment variables
|
||||
.env
|
||||
|
||||
# IDE
|
||||
.vscode/
|
||||
.idea/
|
||||
*.swp
|
||||
*.swo
|
||||
*~
|
||||
|
||||
# Testing
|
||||
.pytest_cache/
|
||||
.coverage
|
||||
htmlcov/
|
||||
.mypy_cache/
|
||||
.ruff_cache/
|
||||
|
||||
# Logs
|
||||
*.log
|
||||
|
||||
# Uploads
|
||||
uploads/
|
||||
!uploads/.gitkeep
|
||||
1
backend/app/__init__.py
Normal file
1
backend/app/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
# Space Booking Backend
|
||||
1
backend/app/api/__init__.py
Normal file
1
backend/app/api/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
# API module
|
||||
192
backend/app/api/attachments.py
Normal file
192
backend/app/api/attachments.py
Normal file
@@ -0,0 +1,192 @@
|
||||
"""Attachments API endpoints."""
|
||||
import os
|
||||
import uuid
|
||||
from pathlib import Path
|
||||
from typing import Annotated
|
||||
|
||||
from fastapi import APIRouter, Depends, File, HTTPException, UploadFile
|
||||
from fastapi.responses import FileResponse
|
||||
from sqlalchemy.orm import Session, joinedload
|
||||
|
||||
from app.core.deps import get_current_user, get_db
|
||||
from app.models.attachment import Attachment
|
||||
from app.models.booking import Booking
|
||||
from app.models.user import User
|
||||
from app.schemas.attachment import AttachmentRead
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
UPLOAD_DIR = Path(__file__).parent.parent.parent / "uploads"
|
||||
UPLOAD_DIR.mkdir(exist_ok=True)
|
||||
|
||||
MAX_FILE_SIZE = 10 * 1024 * 1024 # 10MB
|
||||
MAX_FILES_PER_BOOKING = 5
|
||||
ALLOWED_EXTENSIONS = {".pdf", ".docx", ".pptx", ".xlsx", ".xls", ".png", ".jpg", ".jpeg"}
|
||||
|
||||
|
||||
@router.post("/bookings/{booking_id}/attachments", response_model=AttachmentRead, status_code=201)
|
||||
async def upload_attachment(
|
||||
booking_id: int,
|
||||
file: Annotated[UploadFile, File()],
|
||||
db: Annotated[Session, Depends(get_db)],
|
||||
current_user: Annotated[User, Depends(get_current_user)],
|
||||
) -> AttachmentRead:
|
||||
"""Upload file attachment to booking."""
|
||||
# Check booking exists and user is owner
|
||||
booking = db.query(Booking).filter(Booking.id == booking_id).first()
|
||||
if not booking:
|
||||
raise HTTPException(status_code=404, detail="Booking not found")
|
||||
|
||||
if booking.user_id != current_user.id and current_user.role != "admin":
|
||||
raise HTTPException(status_code=403, detail="Can only attach files to your own bookings")
|
||||
|
||||
# Check max files limit
|
||||
existing_count = db.query(Attachment).filter(Attachment.booking_id == booking_id).count()
|
||||
if existing_count >= MAX_FILES_PER_BOOKING:
|
||||
raise HTTPException(
|
||||
status_code=400, detail=f"Maximum {MAX_FILES_PER_BOOKING} files per booking"
|
||||
)
|
||||
|
||||
# Validate file extension
|
||||
if not file.filename:
|
||||
raise HTTPException(status_code=400, detail="Filename is required")
|
||||
|
||||
file_ext = Path(file.filename).suffix.lower()
|
||||
if file_ext not in ALLOWED_EXTENSIONS:
|
||||
raise HTTPException(
|
||||
status_code=400, detail=f"File type not allowed. Allowed: {', '.join(ALLOWED_EXTENSIONS)}"
|
||||
)
|
||||
|
||||
# Read file
|
||||
content = await file.read()
|
||||
file_size = len(content)
|
||||
|
||||
# Check file size
|
||||
if file_size > MAX_FILE_SIZE:
|
||||
raise HTTPException(
|
||||
status_code=400, detail=f"File too large. Max size: {MAX_FILE_SIZE // (1024*1024)}MB"
|
||||
)
|
||||
|
||||
# Generate unique filename
|
||||
unique_filename = f"{uuid.uuid4()}{file_ext}"
|
||||
filepath = UPLOAD_DIR / unique_filename
|
||||
|
||||
# Save file
|
||||
with open(filepath, "wb") as f:
|
||||
f.write(content)
|
||||
|
||||
# Create attachment record
|
||||
attachment = Attachment(
|
||||
booking_id=booking_id,
|
||||
filename=file.filename,
|
||||
stored_filename=unique_filename,
|
||||
filepath=str(filepath),
|
||||
size=file_size,
|
||||
content_type=file.content_type or "application/octet-stream",
|
||||
uploaded_by=current_user.id,
|
||||
)
|
||||
|
||||
db.add(attachment)
|
||||
db.commit()
|
||||
db.refresh(attachment)
|
||||
|
||||
return AttachmentRead(
|
||||
id=attachment.id,
|
||||
booking_id=attachment.booking_id,
|
||||
filename=attachment.filename,
|
||||
size=attachment.size,
|
||||
content_type=attachment.content_type,
|
||||
uploaded_by=attachment.uploaded_by,
|
||||
uploader_name=current_user.full_name,
|
||||
created_at=attachment.created_at,
|
||||
)
|
||||
|
||||
|
||||
@router.get("/bookings/{booking_id}/attachments", response_model=list[AttachmentRead])
|
||||
def list_attachments(
|
||||
booking_id: int,
|
||||
db: Annotated[Session, Depends(get_db)],
|
||||
current_user: Annotated[User, Depends(get_current_user)],
|
||||
) -> list[AttachmentRead]:
|
||||
"""List all attachments for a booking."""
|
||||
booking = db.query(Booking).filter(Booking.id == booking_id).first()
|
||||
if not booking:
|
||||
raise HTTPException(status_code=404, detail="Booking not found")
|
||||
|
||||
attachments = (
|
||||
db.query(Attachment)
|
||||
.options(joinedload(Attachment.uploader))
|
||||
.filter(Attachment.booking_id == booking_id)
|
||||
.all()
|
||||
)
|
||||
|
||||
return [
|
||||
AttachmentRead(
|
||||
id=a.id,
|
||||
booking_id=a.booking_id,
|
||||
filename=a.filename,
|
||||
size=a.size,
|
||||
content_type=a.content_type,
|
||||
uploaded_by=a.uploaded_by,
|
||||
uploader_name=a.uploader.full_name,
|
||||
created_at=a.created_at,
|
||||
)
|
||||
for a in attachments
|
||||
]
|
||||
|
||||
|
||||
@router.get("/attachments/{attachment_id}/download")
|
||||
def download_attachment(
|
||||
attachment_id: int,
|
||||
db: Annotated[Session, Depends(get_db)],
|
||||
current_user: Annotated[User, Depends(get_current_user)],
|
||||
) -> FileResponse:
|
||||
"""Download attachment file."""
|
||||
attachment = (
|
||||
db.query(Attachment)
|
||||
.options(joinedload(Attachment.booking))
|
||||
.filter(Attachment.id == attachment_id)
|
||||
.first()
|
||||
)
|
||||
|
||||
if not attachment:
|
||||
raise HTTPException(status_code=404, detail="Attachment not found")
|
||||
|
||||
# Check if user can access (owner or admin)
|
||||
if attachment.booking.user_id != current_user.id and current_user.role != "admin":
|
||||
raise HTTPException(status_code=403, detail="Cannot access this attachment")
|
||||
|
||||
# Return file
|
||||
return FileResponse(
|
||||
path=attachment.filepath, filename=attachment.filename, media_type=attachment.content_type
|
||||
)
|
||||
|
||||
|
||||
@router.delete("/attachments/{attachment_id}", status_code=204)
|
||||
def delete_attachment(
|
||||
attachment_id: int,
|
||||
db: Annotated[Session, Depends(get_db)],
|
||||
current_user: Annotated[User, Depends(get_current_user)],
|
||||
) -> None:
|
||||
"""Delete attachment."""
|
||||
attachment = (
|
||||
db.query(Attachment)
|
||||
.options(joinedload(Attachment.booking))
|
||||
.filter(Attachment.id == attachment_id)
|
||||
.first()
|
||||
)
|
||||
|
||||
if not attachment:
|
||||
raise HTTPException(status_code=404, detail="Attachment not found")
|
||||
|
||||
# Check permission
|
||||
if attachment.uploaded_by != current_user.id and current_user.role != "admin":
|
||||
raise HTTPException(status_code=403, detail="Can only delete your own attachments")
|
||||
|
||||
# Delete file from disk
|
||||
if os.path.exists(attachment.filepath):
|
||||
os.remove(attachment.filepath)
|
||||
|
||||
# Delete record
|
||||
db.delete(attachment)
|
||||
db.commit()
|
||||
59
backend/app/api/audit_log.py
Normal file
59
backend/app/api/audit_log.py
Normal file
@@ -0,0 +1,59 @@
|
||||
"""Audit log API endpoints."""
|
||||
from datetime import datetime
|
||||
from typing import Annotated, Optional
|
||||
|
||||
from fastapi import APIRouter, Depends, Query
|
||||
from sqlalchemy.orm import Session, joinedload
|
||||
|
||||
from app.core.deps import get_current_admin, get_db
|
||||
from app.models.audit_log import AuditLog
|
||||
from app.models.user import User
|
||||
from app.schemas.audit_log import AuditLogRead
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
@router.get("/admin/audit-log", response_model=list[AuditLogRead])
|
||||
def get_audit_logs(
|
||||
action: Annotated[Optional[str], Query()] = None,
|
||||
start_date: Annotated[Optional[datetime], Query()] = None,
|
||||
end_date: Annotated[Optional[datetime], Query()] = None,
|
||||
page: Annotated[int, Query(ge=1)] = 1,
|
||||
limit: Annotated[int, Query(ge=1, le=100)] = 50,
|
||||
db: Session = Depends(get_db),
|
||||
current_admin: User = Depends(get_current_admin),
|
||||
) -> list[AuditLogRead]:
|
||||
"""
|
||||
Get audit logs with filtering and pagination.
|
||||
|
||||
Admin only endpoint to view audit trail of administrative actions.
|
||||
"""
|
||||
query = db.query(AuditLog).options(joinedload(AuditLog.user))
|
||||
|
||||
# Apply filters
|
||||
if action:
|
||||
query = query.filter(AuditLog.action == action)
|
||||
if start_date:
|
||||
query = query.filter(AuditLog.created_at >= start_date)
|
||||
if end_date:
|
||||
query = query.filter(AuditLog.created_at <= end_date)
|
||||
|
||||
# Pagination
|
||||
offset = (page - 1) * limit
|
||||
logs = query.order_by(AuditLog.created_at.desc()).offset(offset).limit(limit).all()
|
||||
|
||||
# Map to response schema with user details
|
||||
return [
|
||||
AuditLogRead(
|
||||
id=log.id,
|
||||
action=log.action,
|
||||
user_id=log.user_id,
|
||||
user_name=log.user.full_name,
|
||||
user_email=log.user.email,
|
||||
target_type=log.target_type,
|
||||
target_id=log.target_id,
|
||||
details=log.details,
|
||||
created_at=log.created_at,
|
||||
)
|
||||
for log in logs
|
||||
]
|
||||
217
backend/app/api/auth.py
Normal file
217
backend/app/api/auth.py
Normal file
@@ -0,0 +1,217 @@
|
||||
"""Authentication endpoints."""
|
||||
from datetime import datetime, timedelta
|
||||
from typing import Annotated
|
||||
|
||||
from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException, status
|
||||
from jose import JWTError, jwt
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.config import settings
|
||||
from app.core.deps import get_db
|
||||
from app.core.security import create_access_token, get_password_hash, verify_password
|
||||
from app.models.user import User
|
||||
from app.schemas.auth import EmailVerificationRequest, LoginRequest, UserRegister
|
||||
from app.schemas.user import Token
|
||||
from app.services.email_service import send_email
|
||||
|
||||
router = APIRouter(prefix="/auth", tags=["auth"])
|
||||
|
||||
|
||||
@router.post("/login", response_model=Token)
|
||||
def login(
|
||||
login_data: LoginRequest,
|
||||
db: Annotated[Session, Depends(get_db)],
|
||||
) -> Token:
|
||||
"""
|
||||
Login with email and password.
|
||||
|
||||
Returns JWT token for authenticated requests.
|
||||
"""
|
||||
user = db.query(User).filter(User.email == login_data.email).first()
|
||||
|
||||
if not user or not verify_password(login_data.password, str(user.hashed_password)):
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||
detail="Incorrect email or password",
|
||||
headers={"WWW-Authenticate": "Bearer"},
|
||||
)
|
||||
|
||||
if not user.is_active:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_403_FORBIDDEN,
|
||||
detail="User account is disabled",
|
||||
)
|
||||
|
||||
access_token = create_access_token(subject=int(user.id))
|
||||
|
||||
return Token(access_token=access_token, token_type="bearer")
|
||||
|
||||
|
||||
@router.post("/register", status_code=201)
|
||||
async def register(
|
||||
data: UserRegister,
|
||||
background_tasks: BackgroundTasks,
|
||||
db: Annotated[Session, Depends(get_db)],
|
||||
) -> dict:
|
||||
"""
|
||||
Register new user with email verification.
|
||||
|
||||
Creates an inactive user account and sends verification email.
|
||||
"""
|
||||
# Check if email already exists
|
||||
existing = db.query(User).filter(User.email == data.email).first()
|
||||
if existing:
|
||||
raise HTTPException(status_code=400, detail="Email already registered")
|
||||
|
||||
# Create user (inactive until verified)
|
||||
user = User(
|
||||
email=data.email,
|
||||
hashed_password=get_password_hash(data.password),
|
||||
full_name=data.full_name,
|
||||
organization=data.organization,
|
||||
role="user", # Default role
|
||||
is_active=False, # Inactive until email verified
|
||||
)
|
||||
|
||||
db.add(user)
|
||||
db.commit()
|
||||
db.refresh(user)
|
||||
|
||||
# Generate verification token (JWT, expires in 24h)
|
||||
verification_token = jwt.encode(
|
||||
{
|
||||
"sub": str(user.id),
|
||||
"type": "email_verification",
|
||||
"exp": datetime.utcnow() + timedelta(hours=24),
|
||||
},
|
||||
settings.secret_key,
|
||||
algorithm="HS256",
|
||||
)
|
||||
|
||||
# Send verification email (background task)
|
||||
verification_link = f"{settings.frontend_url}/verify?token={verification_token}"
|
||||
|
||||
subject = "Verifică contul tău - Space Booking"
|
||||
body = f"""Bună ziua {user.full_name},
|
||||
|
||||
Bine ai venit pe platforma Space Booking!
|
||||
|
||||
Pentru a-ți activa contul, te rugăm să accesezi link-ul de mai jos:
|
||||
|
||||
{verification_link}
|
||||
|
||||
Link-ul va expira în 24 de ore.
|
||||
|
||||
Dacă nu ai creat acest cont, te rugăm să ignori acest email.
|
||||
|
||||
Cu stimă,
|
||||
Echipa Space Booking
|
||||
"""
|
||||
|
||||
background_tasks.add_task(send_email, user.email, subject, body)
|
||||
|
||||
return {
|
||||
"message": "Registration successful. Please check your email to verify your account.",
|
||||
"email": user.email,
|
||||
}
|
||||
|
||||
|
||||
@router.post("/verify")
|
||||
def verify_email(
|
||||
data: EmailVerificationRequest,
|
||||
db: Annotated[Session, Depends(get_db)],
|
||||
) -> dict:
|
||||
"""
|
||||
Verify email address with token.
|
||||
|
||||
Activates the user account if token is valid.
|
||||
"""
|
||||
try:
|
||||
# Decode token
|
||||
payload = jwt.decode(
|
||||
data.token,
|
||||
settings.secret_key,
|
||||
algorithms=["HS256"],
|
||||
)
|
||||
|
||||
# Check token type
|
||||
if payload.get("type") != "email_verification":
|
||||
raise HTTPException(status_code=400, detail="Invalid verification token")
|
||||
|
||||
user_id = int(payload.get("sub"))
|
||||
|
||||
# Get user
|
||||
user = db.query(User).filter(User.id == user_id).first()
|
||||
if not user:
|
||||
raise HTTPException(status_code=404, detail="User not found")
|
||||
|
||||
# Check if already verified
|
||||
if user.is_active:
|
||||
return {"message": "Email already verified"}
|
||||
|
||||
# Activate user
|
||||
user.is_active = True
|
||||
db.commit()
|
||||
|
||||
return {"message": "Email verified successfully. You can now log in."}
|
||||
|
||||
except jwt.ExpiredSignatureError:
|
||||
raise HTTPException(
|
||||
status_code=400,
|
||||
detail="Verification link expired. Please request a new one.",
|
||||
)
|
||||
except JWTError:
|
||||
raise HTTPException(status_code=400, detail="Invalid verification token")
|
||||
|
||||
|
||||
@router.post("/resend-verification")
|
||||
async def resend_verification(
|
||||
email: str,
|
||||
background_tasks: BackgroundTasks,
|
||||
db: Annotated[Session, Depends(get_db)],
|
||||
) -> dict:
|
||||
"""
|
||||
Resend verification email.
|
||||
|
||||
For security, always returns success even if email doesn't exist.
|
||||
"""
|
||||
user = db.query(User).filter(User.email == email).first()
|
||||
if not user:
|
||||
# Don't reveal if email exists
|
||||
return {"message": "If the email exists, a verification link has been sent."}
|
||||
|
||||
if user.is_active:
|
||||
raise HTTPException(status_code=400, detail="Account already verified")
|
||||
|
||||
# Generate new token
|
||||
verification_token = jwt.encode(
|
||||
{
|
||||
"sub": str(user.id),
|
||||
"type": "email_verification",
|
||||
"exp": datetime.utcnow() + timedelta(hours=24),
|
||||
},
|
||||
settings.secret_key,
|
||||
algorithm="HS256",
|
||||
)
|
||||
|
||||
# Send email
|
||||
verification_link = f"{settings.frontend_url}/verify?token={verification_token}"
|
||||
|
||||
subject = "Verifică contul tău - Space Booking"
|
||||
body = f"""Bună ziua {user.full_name},
|
||||
|
||||
Ai solicitat un nou link de verificare pentru contul tău pe Space Booking.
|
||||
|
||||
Pentru a-ți activa contul, te rugăm să accesezi link-ul de mai jos:
|
||||
|
||||
{verification_link}
|
||||
|
||||
Link-ul va expira în 24 de ore.
|
||||
|
||||
Cu stimă,
|
||||
Echipa Space Booking
|
||||
"""
|
||||
|
||||
background_tasks.add_task(send_email, user.email, subject, body)
|
||||
|
||||
return {"message": "If the email exists, a verification link has been sent."}
|
||||
229
backend/app/api/booking_templates.py
Normal file
229
backend/app/api/booking_templates.py
Normal file
@@ -0,0 +1,229 @@
|
||||
"""Booking template endpoints."""
|
||||
from datetime import datetime, timedelta
|
||||
from typing import Annotated
|
||||
|
||||
from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException, status
|
||||
from sqlalchemy.orm import Session, joinedload
|
||||
|
||||
from app.core.deps import get_current_user, get_db
|
||||
from app.models.booking import Booking
|
||||
from app.models.booking_template import BookingTemplate
|
||||
from app.models.user import User
|
||||
from app.schemas.booking import BookingResponse
|
||||
from app.schemas.booking_template import BookingTemplateCreate, BookingTemplateRead
|
||||
from app.services.booking_service import validate_booking_rules
|
||||
from app.services.email_service import send_booking_notification
|
||||
from app.services.notification_service import create_notification
|
||||
|
||||
router = APIRouter(prefix="/booking-templates", tags=["booking-templates"])
|
||||
|
||||
|
||||
@router.post("", response_model=BookingTemplateRead, status_code=status.HTTP_201_CREATED)
|
||||
def create_template(
|
||||
data: BookingTemplateCreate,
|
||||
db: Annotated[Session, Depends(get_db)],
|
||||
current_user: Annotated[User, Depends(get_current_user)],
|
||||
) -> BookingTemplateRead:
|
||||
"""
|
||||
Create a new booking template.
|
||||
|
||||
- **name**: Template name (e.g., "Weekly Team Sync")
|
||||
- **space_id**: Optional default space ID
|
||||
- **duration_minutes**: Default duration in minutes
|
||||
- **title**: Default booking title
|
||||
- **description**: Optional default description
|
||||
|
||||
Returns the created template.
|
||||
"""
|
||||
template = BookingTemplate(
|
||||
user_id=current_user.id, # type: ignore[arg-type]
|
||||
name=data.name,
|
||||
space_id=data.space_id,
|
||||
duration_minutes=data.duration_minutes,
|
||||
title=data.title,
|
||||
description=data.description,
|
||||
)
|
||||
db.add(template)
|
||||
db.commit()
|
||||
db.refresh(template)
|
||||
|
||||
return BookingTemplateRead(
|
||||
id=template.id, # type: ignore[arg-type]
|
||||
user_id=template.user_id, # type: ignore[arg-type]
|
||||
name=template.name, # type: ignore[arg-type]
|
||||
space_id=template.space_id, # type: ignore[arg-type]
|
||||
space_name=template.space.name if template.space else None, # type: ignore[union-attr]
|
||||
duration_minutes=template.duration_minutes, # type: ignore[arg-type]
|
||||
title=template.title, # type: ignore[arg-type]
|
||||
description=template.description, # type: ignore[arg-type]
|
||||
usage_count=template.usage_count, # type: ignore[arg-type]
|
||||
)
|
||||
|
||||
|
||||
@router.get("", response_model=list[BookingTemplateRead])
|
||||
def list_templates(
|
||||
db: Annotated[Session, Depends(get_db)],
|
||||
current_user: Annotated[User, Depends(get_current_user)],
|
||||
) -> list[BookingTemplateRead]:
|
||||
"""
|
||||
List all booking templates for the current user.
|
||||
|
||||
Returns templates sorted by name.
|
||||
"""
|
||||
templates = (
|
||||
db.query(BookingTemplate)
|
||||
.options(joinedload(BookingTemplate.space))
|
||||
.filter(BookingTemplate.user_id == current_user.id)
|
||||
.order_by(BookingTemplate.name)
|
||||
.all()
|
||||
)
|
||||
|
||||
return [
|
||||
BookingTemplateRead(
|
||||
id=t.id, # type: ignore[arg-type]
|
||||
user_id=t.user_id, # type: ignore[arg-type]
|
||||
name=t.name, # type: ignore[arg-type]
|
||||
space_id=t.space_id, # type: ignore[arg-type]
|
||||
space_name=t.space.name if t.space else None, # type: ignore[union-attr]
|
||||
duration_minutes=t.duration_minutes, # type: ignore[arg-type]
|
||||
title=t.title, # type: ignore[arg-type]
|
||||
description=t.description, # type: ignore[arg-type]
|
||||
usage_count=t.usage_count, # type: ignore[arg-type]
|
||||
)
|
||||
for t in templates
|
||||
]
|
||||
|
||||
|
||||
@router.delete("/{id}", status_code=status.HTTP_204_NO_CONTENT)
|
||||
def delete_template(
|
||||
id: int,
|
||||
db: Annotated[Session, Depends(get_db)],
|
||||
current_user: Annotated[User, Depends(get_current_user)],
|
||||
) -> None:
|
||||
"""
|
||||
Delete a booking template.
|
||||
|
||||
Users can only delete their own templates.
|
||||
"""
|
||||
template = (
|
||||
db.query(BookingTemplate)
|
||||
.filter(
|
||||
BookingTemplate.id == id,
|
||||
BookingTemplate.user_id == current_user.id,
|
||||
)
|
||||
.first()
|
||||
)
|
||||
|
||||
if not template:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail="Template not found",
|
||||
)
|
||||
|
||||
db.delete(template)
|
||||
db.commit()
|
||||
return None
|
||||
|
||||
|
||||
@router.post("/from-template/{template_id}", response_model=BookingResponse, status_code=status.HTTP_201_CREATED)
|
||||
def create_booking_from_template(
|
||||
template_id: int,
|
||||
start_datetime: datetime,
|
||||
background_tasks: BackgroundTasks,
|
||||
db: Annotated[Session, Depends(get_db)],
|
||||
current_user: Annotated[User, Depends(get_current_user)],
|
||||
) -> Booking:
|
||||
"""
|
||||
Create a booking from a template.
|
||||
|
||||
- **template_id**: ID of the template to use
|
||||
- **start_datetime**: When the booking should start (ISO format)
|
||||
|
||||
The booking will use the template's space, title, description, and duration.
|
||||
The end time is calculated automatically based on the template's duration.
|
||||
|
||||
Returns the created booking with status "pending" (requires admin approval).
|
||||
"""
|
||||
# Find template
|
||||
template = (
|
||||
db.query(BookingTemplate)
|
||||
.filter(
|
||||
BookingTemplate.id == template_id,
|
||||
BookingTemplate.user_id == current_user.id,
|
||||
)
|
||||
.first()
|
||||
)
|
||||
|
||||
if not template:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail="Template not found",
|
||||
)
|
||||
|
||||
if not template.space_id:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail="Template does not have a default space",
|
||||
)
|
||||
|
||||
# Calculate end time
|
||||
end_datetime = start_datetime + timedelta(minutes=template.duration_minutes) # type: ignore[arg-type]
|
||||
|
||||
# Validate booking rules
|
||||
user_id = int(current_user.id) # type: ignore[arg-type]
|
||||
errors = validate_booking_rules(
|
||||
db=db,
|
||||
space_id=int(template.space_id), # type: ignore[arg-type]
|
||||
start_datetime=start_datetime,
|
||||
end_datetime=end_datetime,
|
||||
user_id=user_id,
|
||||
)
|
||||
|
||||
if errors:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail=errors[0], # Return first error
|
||||
)
|
||||
|
||||
# Create booking
|
||||
booking = Booking(
|
||||
user_id=user_id,
|
||||
space_id=template.space_id, # type: ignore[arg-type]
|
||||
title=template.title, # type: ignore[arg-type]
|
||||
description=template.description, # type: ignore[arg-type]
|
||||
start_datetime=start_datetime,
|
||||
end_datetime=end_datetime,
|
||||
status="pending",
|
||||
created_at=datetime.utcnow(),
|
||||
)
|
||||
|
||||
db.add(booking)
|
||||
|
||||
# Increment usage count
|
||||
template.usage_count = int(template.usage_count) + 1 # type: ignore[arg-type, assignment]
|
||||
|
||||
db.commit()
|
||||
db.refresh(booking)
|
||||
|
||||
# Notify all admins about the new booking request
|
||||
admins = db.query(User).filter(User.role == "admin").all()
|
||||
for admin in admins:
|
||||
create_notification(
|
||||
db=db,
|
||||
user_id=admin.id, # type: ignore[arg-type]
|
||||
type="booking_created",
|
||||
title="Noua Cerere de Rezervare",
|
||||
message=f"Utilizatorul {current_user.full_name} a solicitat rezervarea spațiului {template.space.name} pentru {booking.start_datetime.strftime('%d.%m.%Y %H:%M')}", # type: ignore[union-attr, union-attr]
|
||||
booking_id=booking.id,
|
||||
)
|
||||
# Send email notification to admin
|
||||
background_tasks.add_task(
|
||||
send_booking_notification,
|
||||
booking,
|
||||
"created",
|
||||
admin.email,
|
||||
current_user.full_name,
|
||||
None,
|
||||
)
|
||||
|
||||
return booking
|
||||
1155
backend/app/api/bookings.py
Normal file
1155
backend/app/api/bookings.py
Normal file
File diff suppressed because it is too large
Load Diff
176
backend/app/api/google_calendar.py
Normal file
176
backend/app/api/google_calendar.py
Normal file
@@ -0,0 +1,176 @@
|
||||
"""Google Calendar integration endpoints."""
|
||||
from typing import Annotated
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException, Query, status
|
||||
from google_auth_oauthlib.flow import Flow
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.config import settings
|
||||
from app.core.deps import get_current_user, get_db
|
||||
from app.models.google_calendar_token import GoogleCalendarToken
|
||||
from app.models.user import User
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
@router.get("/integrations/google/connect")
|
||||
def connect_google(
|
||||
current_user: Annotated[User, Depends(get_current_user)],
|
||||
) -> dict[str, str]:
|
||||
"""
|
||||
Start Google OAuth flow.
|
||||
|
||||
Returns authorization URL that user should visit to grant access.
|
||||
"""
|
||||
if not settings.google_client_id or not settings.google_client_secret:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_503_SERVICE_UNAVAILABLE,
|
||||
detail="Google Calendar integration not configured",
|
||||
)
|
||||
|
||||
try:
|
||||
flow = Flow.from_client_config(
|
||||
{
|
||||
"web": {
|
||||
"client_id": settings.google_client_id,
|
||||
"client_secret": settings.google_client_secret,
|
||||
"auth_uri": "https://accounts.google.com/o/oauth2/auth",
|
||||
"token_uri": "https://oauth2.googleapis.com/token",
|
||||
"redirect_uris": [settings.google_redirect_uri],
|
||||
}
|
||||
},
|
||||
scopes=[
|
||||
"https://www.googleapis.com/auth/calendar",
|
||||
"https://www.googleapis.com/auth/calendar.events",
|
||||
],
|
||||
redirect_uri=settings.google_redirect_uri,
|
||||
)
|
||||
|
||||
authorization_url, state = flow.authorization_url(
|
||||
access_type="offline", include_granted_scopes="true", prompt="consent"
|
||||
)
|
||||
|
||||
# Note: In production, store state in session/cache and validate it in callback
|
||||
return {"authorization_url": authorization_url, "state": state}
|
||||
except Exception as e:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
|
||||
detail=f"Failed to start OAuth flow: {str(e)}",
|
||||
)
|
||||
|
||||
|
||||
@router.get("/integrations/google/callback")
|
||||
def google_callback(
|
||||
code: Annotated[str, Query()],
|
||||
state: Annotated[str, Query()],
|
||||
db: Annotated[Session, Depends(get_db)],
|
||||
current_user: Annotated[User, Depends(get_current_user)],
|
||||
) -> dict[str, str]:
|
||||
"""
|
||||
Handle Google OAuth callback.
|
||||
|
||||
Exchange authorization code for tokens and store them.
|
||||
"""
|
||||
if not settings.google_client_id or not settings.google_client_secret:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_503_SERVICE_UNAVAILABLE,
|
||||
detail="Google Calendar integration not configured",
|
||||
)
|
||||
|
||||
try:
|
||||
flow = Flow.from_client_config(
|
||||
{
|
||||
"web": {
|
||||
"client_id": settings.google_client_id,
|
||||
"client_secret": settings.google_client_secret,
|
||||
"auth_uri": "https://accounts.google.com/o/oauth2/auth",
|
||||
"token_uri": "https://oauth2.googleapis.com/token",
|
||||
"redirect_uris": [settings.google_redirect_uri],
|
||||
}
|
||||
},
|
||||
scopes=[
|
||||
"https://www.googleapis.com/auth/calendar",
|
||||
"https://www.googleapis.com/auth/calendar.events",
|
||||
],
|
||||
redirect_uri=settings.google_redirect_uri,
|
||||
state=state,
|
||||
)
|
||||
|
||||
# Exchange code for tokens
|
||||
flow.fetch_token(code=code)
|
||||
|
||||
credentials = flow.credentials
|
||||
|
||||
# Store tokens
|
||||
token_record = (
|
||||
db.query(GoogleCalendarToken)
|
||||
.filter(GoogleCalendarToken.user_id == current_user.id)
|
||||
.first()
|
||||
)
|
||||
|
||||
if token_record:
|
||||
token_record.access_token = credentials.token # type: ignore[assignment]
|
||||
token_record.refresh_token = credentials.refresh_token # type: ignore[assignment]
|
||||
token_record.token_expiry = credentials.expiry # type: ignore[assignment]
|
||||
else:
|
||||
token_record = GoogleCalendarToken(
|
||||
user_id=current_user.id, # type: ignore[arg-type]
|
||||
access_token=credentials.token,
|
||||
refresh_token=credentials.refresh_token,
|
||||
token_expiry=credentials.expiry,
|
||||
)
|
||||
db.add(token_record)
|
||||
|
||||
db.commit()
|
||||
|
||||
return {"message": "Google Calendar connected successfully"}
|
||||
except Exception as e:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail=f"OAuth failed: {str(e)}",
|
||||
)
|
||||
|
||||
|
||||
@router.delete("/integrations/google/disconnect")
|
||||
def disconnect_google(
|
||||
db: Annotated[Session, Depends(get_db)],
|
||||
current_user: Annotated[User, Depends(get_current_user)],
|
||||
) -> dict[str, str]:
|
||||
"""
|
||||
Disconnect Google Calendar.
|
||||
|
||||
Removes stored tokens for the current user.
|
||||
"""
|
||||
token_record = (
|
||||
db.query(GoogleCalendarToken)
|
||||
.filter(GoogleCalendarToken.user_id == current_user.id)
|
||||
.first()
|
||||
)
|
||||
|
||||
if token_record:
|
||||
db.delete(token_record)
|
||||
db.commit()
|
||||
|
||||
return {"message": "Google Calendar disconnected"}
|
||||
|
||||
|
||||
@router.get("/integrations/google/status")
|
||||
def google_status(
|
||||
db: Annotated[Session, Depends(get_db)],
|
||||
current_user: Annotated[User, Depends(get_current_user)],
|
||||
) -> dict[str, bool | str | None]:
|
||||
"""
|
||||
Check Google Calendar connection status.
|
||||
|
||||
Returns whether user has connected their Google Calendar account.
|
||||
"""
|
||||
token_record = (
|
||||
db.query(GoogleCalendarToken)
|
||||
.filter(GoogleCalendarToken.user_id == current_user.id)
|
||||
.first()
|
||||
)
|
||||
|
||||
return {
|
||||
"connected": token_record is not None,
|
||||
"expires_at": token_record.token_expiry.isoformat() if token_record and token_record.token_expiry else None,
|
||||
}
|
||||
67
backend/app/api/notifications.py
Normal file
67
backend/app/api/notifications.py
Normal file
@@ -0,0 +1,67 @@
|
||||
"""Notifications API endpoints."""
|
||||
from typing import Annotated, Optional
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException, Query, status
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.deps import get_current_user, get_db
|
||||
from app.models.notification import Notification
|
||||
from app.models.user import User
|
||||
from app.schemas.notification import NotificationRead
|
||||
|
||||
router = APIRouter(prefix="/notifications", tags=["notifications"])
|
||||
|
||||
|
||||
@router.get("", response_model=list[NotificationRead])
|
||||
def get_notifications(
|
||||
db: Annotated[Session, Depends(get_db)],
|
||||
current_user: Annotated[User, Depends(get_current_user)],
|
||||
is_read: Optional[bool] = Query(None, description="Filter by read status"),
|
||||
) -> list[Notification]:
|
||||
"""
|
||||
Get notifications for the current user.
|
||||
|
||||
Optional filter by read status (true/false/all).
|
||||
Returns notifications ordered by created_at DESC.
|
||||
"""
|
||||
query = db.query(Notification).filter(Notification.user_id == current_user.id)
|
||||
|
||||
if is_read is not None:
|
||||
query = query.filter(Notification.is_read == is_read)
|
||||
|
||||
notifications = query.order_by(Notification.created_at.desc()).all()
|
||||
return notifications
|
||||
|
||||
|
||||
@router.put("/{notification_id}/read", response_model=NotificationRead)
|
||||
def mark_notification_as_read(
|
||||
notification_id: int,
|
||||
db: Annotated[Session, Depends(get_db)],
|
||||
current_user: Annotated[User, Depends(get_current_user)],
|
||||
) -> Notification:
|
||||
"""
|
||||
Mark a notification as read.
|
||||
|
||||
Verifies the notification belongs to the current user.
|
||||
"""
|
||||
notification = (
|
||||
db.query(Notification).filter(Notification.id == notification_id).first()
|
||||
)
|
||||
|
||||
if not notification:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail="Notification not found",
|
||||
)
|
||||
|
||||
if notification.user_id != current_user.id:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_403_FORBIDDEN,
|
||||
detail="You can only mark your own notifications as read",
|
||||
)
|
||||
|
||||
notification.is_read = True
|
||||
db.commit()
|
||||
db.refresh(notification)
|
||||
|
||||
return notification
|
||||
218
backend/app/api/reports.py
Normal file
218
backend/app/api/reports.py
Normal file
@@ -0,0 +1,218 @@
|
||||
"""Reports API endpoints."""
|
||||
from datetime import date, datetime
|
||||
from typing import Annotated
|
||||
|
||||
from fastapi import APIRouter, Depends, Query
|
||||
from sqlalchemy import and_, case, func
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.config import settings
|
||||
from app.core.deps import get_current_admin, get_db
|
||||
from app.models.booking import Booking
|
||||
from app.models.space import Space
|
||||
from app.models.user import User
|
||||
from app.schemas.reports import (
|
||||
ApprovalRateReport,
|
||||
SpaceUsageItem,
|
||||
SpaceUsageReport,
|
||||
TopUserItem,
|
||||
TopUsersReport,
|
||||
)
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
def calculate_hours_expr() -> any:
|
||||
"""Get database-specific expression for calculating hours between datetimes."""
|
||||
if "sqlite" in settings.database_url:
|
||||
# SQLite: Use julianday function
|
||||
# Returns difference in days, multiply by 24 to get hours
|
||||
return (
|
||||
func.julianday(Booking.end_datetime)
|
||||
- func.julianday(Booking.start_datetime)
|
||||
) * 24
|
||||
else:
|
||||
# PostgreSQL: Use EXTRACT(EPOCH)
|
||||
return func.extract("epoch", Booking.end_datetime - Booking.start_datetime) / 3600
|
||||
|
||||
|
||||
@router.get("/admin/reports/usage", response_model=SpaceUsageReport)
|
||||
def get_usage_report(
|
||||
start_date: date | None = Query(None),
|
||||
end_date: date | None = Query(None),
|
||||
space_id: int | None = Query(None),
|
||||
db: Annotated[Session, Depends(get_db)] = None,
|
||||
current_admin: Annotated[User, Depends(get_current_admin)] = None,
|
||||
) -> SpaceUsageReport:
|
||||
"""Get booking usage report by space."""
|
||||
query = (
|
||||
db.query(
|
||||
Booking.space_id,
|
||||
Space.name.label("space_name"),
|
||||
func.count(Booking.id).label("total_bookings"),
|
||||
func.sum(case((Booking.status == "approved", 1), else_=0)).label(
|
||||
"approved_bookings"
|
||||
),
|
||||
func.sum(case((Booking.status == "pending", 1), else_=0)).label(
|
||||
"pending_bookings"
|
||||
),
|
||||
func.sum(case((Booking.status == "rejected", 1), else_=0)).label(
|
||||
"rejected_bookings"
|
||||
),
|
||||
func.sum(case((Booking.status == "canceled", 1), else_=0)).label(
|
||||
"canceled_bookings"
|
||||
),
|
||||
func.sum(calculate_hours_expr()).label("total_hours"),
|
||||
)
|
||||
.join(Space)
|
||||
.group_by(Booking.space_id, Space.name)
|
||||
)
|
||||
|
||||
# Apply filters
|
||||
filters = []
|
||||
if start_date:
|
||||
filters.append(
|
||||
Booking.start_datetime
|
||||
>= datetime.combine(start_date, datetime.min.time())
|
||||
)
|
||||
if end_date:
|
||||
filters.append(
|
||||
Booking.start_datetime <= datetime.combine(end_date, datetime.max.time())
|
||||
)
|
||||
if space_id:
|
||||
filters.append(Booking.space_id == space_id)
|
||||
|
||||
if filters:
|
||||
query = query.filter(and_(*filters))
|
||||
|
||||
results = query.all()
|
||||
|
||||
items = [
|
||||
SpaceUsageItem(
|
||||
space_id=r.space_id,
|
||||
space_name=r.space_name,
|
||||
total_bookings=r.total_bookings,
|
||||
approved_bookings=r.approved_bookings or 0,
|
||||
pending_bookings=r.pending_bookings or 0,
|
||||
rejected_bookings=r.rejected_bookings or 0,
|
||||
canceled_bookings=r.canceled_bookings or 0,
|
||||
total_hours=round(float(r.total_hours or 0), 2),
|
||||
)
|
||||
for r in results
|
||||
]
|
||||
|
||||
return SpaceUsageReport(
|
||||
items=items,
|
||||
total_bookings=sum(item.total_bookings for item in items),
|
||||
date_range={"start": start_date, "end": end_date},
|
||||
)
|
||||
|
||||
|
||||
@router.get("/admin/reports/top-users", response_model=TopUsersReport)
|
||||
def get_top_users_report(
|
||||
start_date: date | None = Query(None),
|
||||
end_date: date | None = Query(None),
|
||||
limit: int = Query(10, ge=1, le=100),
|
||||
db: Annotated[Session, Depends(get_db)] = None,
|
||||
current_admin: Annotated[User, Depends(get_current_admin)] = None,
|
||||
) -> TopUsersReport:
|
||||
"""Get top users by booking count."""
|
||||
query = (
|
||||
db.query(
|
||||
Booking.user_id,
|
||||
User.full_name.label("user_name"),
|
||||
User.email.label("user_email"),
|
||||
func.count(Booking.id).label("total_bookings"),
|
||||
func.sum(case((Booking.status == "approved", 1), else_=0)).label(
|
||||
"approved_bookings"
|
||||
),
|
||||
func.sum(calculate_hours_expr()).label("total_hours"),
|
||||
)
|
||||
.join(User, Booking.user_id == User.id)
|
||||
.group_by(Booking.user_id, User.full_name, User.email)
|
||||
)
|
||||
|
||||
# Apply date filters
|
||||
if start_date:
|
||||
query = query.filter(
|
||||
Booking.start_datetime
|
||||
>= datetime.combine(start_date, datetime.min.time())
|
||||
)
|
||||
if end_date:
|
||||
query = query.filter(
|
||||
Booking.start_datetime <= datetime.combine(end_date, datetime.max.time())
|
||||
)
|
||||
|
||||
# Order by total bookings desc
|
||||
query = query.order_by(func.count(Booking.id).desc()).limit(limit)
|
||||
|
||||
results = query.all()
|
||||
|
||||
items = [
|
||||
TopUserItem(
|
||||
user_id=r.user_id,
|
||||
user_name=r.user_name,
|
||||
user_email=r.user_email,
|
||||
total_bookings=r.total_bookings,
|
||||
approved_bookings=r.approved_bookings or 0,
|
||||
total_hours=round(float(r.total_hours or 0), 2),
|
||||
)
|
||||
for r in results
|
||||
]
|
||||
|
||||
return TopUsersReport(
|
||||
items=items,
|
||||
date_range={"start": start_date, "end": end_date},
|
||||
)
|
||||
|
||||
|
||||
@router.get("/admin/reports/approval-rate", response_model=ApprovalRateReport)
|
||||
def get_approval_rate_report(
|
||||
start_date: date | None = Query(None),
|
||||
end_date: date | None = Query(None),
|
||||
db: Annotated[Session, Depends(get_db)] = None,
|
||||
current_admin: Annotated[User, Depends(get_current_admin)] = None,
|
||||
) -> ApprovalRateReport:
|
||||
"""Get approval/rejection rate report."""
|
||||
query = db.query(
|
||||
func.count(Booking.id).label("total"),
|
||||
func.sum(case((Booking.status == "approved", 1), else_=0)).label("approved"),
|
||||
func.sum(case((Booking.status == "rejected", 1), else_=0)).label("rejected"),
|
||||
func.sum(case((Booking.status == "pending", 1), else_=0)).label("pending"),
|
||||
func.sum(case((Booking.status == "canceled", 1), else_=0)).label("canceled"),
|
||||
)
|
||||
|
||||
# Apply date filters
|
||||
if start_date:
|
||||
query = query.filter(
|
||||
Booking.start_datetime
|
||||
>= datetime.combine(start_date, datetime.min.time())
|
||||
)
|
||||
if end_date:
|
||||
query = query.filter(
|
||||
Booking.start_datetime <= datetime.combine(end_date, datetime.max.time())
|
||||
)
|
||||
|
||||
result = query.first()
|
||||
|
||||
total = result.total or 0
|
||||
approved = result.approved or 0
|
||||
rejected = result.rejected or 0
|
||||
pending = result.pending or 0
|
||||
canceled = result.canceled or 0
|
||||
|
||||
# Calculate rates (exclude pending from denominator)
|
||||
decided = approved + rejected
|
||||
approval_rate = (approved / decided * 100) if decided > 0 else 0
|
||||
rejection_rate = (rejected / decided * 100) if decided > 0 else 0
|
||||
|
||||
return ApprovalRateReport(
|
||||
total_requests=total,
|
||||
approved=approved,
|
||||
rejected=rejected,
|
||||
pending=pending,
|
||||
canceled=canceled,
|
||||
approval_rate=round(approval_rate, 2),
|
||||
rejection_rate=round(rejection_rate, 2),
|
||||
date_range={"start": start_date, "end": end_date},
|
||||
)
|
||||
131
backend/app/api/settings.py
Normal file
131
backend/app/api/settings.py
Normal file
@@ -0,0 +1,131 @@
|
||||
"""Settings management endpoints."""
|
||||
from typing import Annotated
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException, status
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.deps import get_current_admin, get_db
|
||||
from app.models.settings import Settings
|
||||
from app.models.user import User
|
||||
from app.schemas.settings import SettingsResponse, SettingsUpdate
|
||||
from app.services.audit_service import log_action
|
||||
|
||||
router = APIRouter(prefix="/admin/settings", tags=["admin"])
|
||||
|
||||
|
||||
@router.get("", response_model=SettingsResponse)
|
||||
def get_settings(
|
||||
db: Annotated[Session, Depends(get_db)],
|
||||
_: Annotated[User, Depends(get_current_admin)],
|
||||
) -> Settings:
|
||||
"""
|
||||
Get global settings (admin only).
|
||||
|
||||
Returns the current global booking rules.
|
||||
"""
|
||||
settings = db.query(Settings).filter(Settings.id == 1).first()
|
||||
if not settings:
|
||||
# Create default settings if not exist
|
||||
settings = Settings(
|
||||
id=1,
|
||||
min_duration_minutes=30,
|
||||
max_duration_minutes=480,
|
||||
working_hours_start=8,
|
||||
working_hours_end=20,
|
||||
max_bookings_per_day_per_user=3,
|
||||
min_hours_before_cancel=2,
|
||||
)
|
||||
db.add(settings)
|
||||
db.commit()
|
||||
db.refresh(settings)
|
||||
|
||||
return settings
|
||||
|
||||
|
||||
@router.put("", response_model=SettingsResponse)
|
||||
def update_settings(
|
||||
settings_data: SettingsUpdate,
|
||||
db: Annotated[Session, Depends(get_db)],
|
||||
current_admin: Annotated[User, Depends(get_current_admin)],
|
||||
) -> Settings:
|
||||
"""
|
||||
Update global settings (admin only).
|
||||
|
||||
All booking rules are validated on the client side and applied
|
||||
to all new booking requests.
|
||||
"""
|
||||
settings = db.query(Settings).filter(Settings.id == 1).first()
|
||||
if not settings:
|
||||
# Create if not exist
|
||||
settings = Settings(id=1)
|
||||
db.add(settings)
|
||||
|
||||
# Validate: min_duration <= max_duration
|
||||
if settings_data.min_duration_minutes > settings_data.max_duration_minutes:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail="Minimum duration cannot be greater than maximum duration",
|
||||
)
|
||||
|
||||
# Validate: working_hours_start < working_hours_end
|
||||
if settings_data.working_hours_start >= settings_data.working_hours_end:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail="Working hours start must be before working hours end",
|
||||
)
|
||||
|
||||
# Track which fields changed
|
||||
changed_fields = {}
|
||||
if settings.min_duration_minutes != settings_data.min_duration_minutes:
|
||||
changed_fields["min_duration_minutes"] = {
|
||||
"old": settings.min_duration_minutes,
|
||||
"new": settings_data.min_duration_minutes
|
||||
}
|
||||
if settings.max_duration_minutes != settings_data.max_duration_minutes:
|
||||
changed_fields["max_duration_minutes"] = {
|
||||
"old": settings.max_duration_minutes,
|
||||
"new": settings_data.max_duration_minutes
|
||||
}
|
||||
if settings.working_hours_start != settings_data.working_hours_start:
|
||||
changed_fields["working_hours_start"] = {
|
||||
"old": settings.working_hours_start,
|
||||
"new": settings_data.working_hours_start
|
||||
}
|
||||
if settings.working_hours_end != settings_data.working_hours_end:
|
||||
changed_fields["working_hours_end"] = {
|
||||
"old": settings.working_hours_end,
|
||||
"new": settings_data.working_hours_end
|
||||
}
|
||||
if settings.max_bookings_per_day_per_user != settings_data.max_bookings_per_day_per_user:
|
||||
changed_fields["max_bookings_per_day_per_user"] = {
|
||||
"old": settings.max_bookings_per_day_per_user,
|
||||
"new": settings_data.max_bookings_per_day_per_user
|
||||
}
|
||||
if settings.min_hours_before_cancel != settings_data.min_hours_before_cancel:
|
||||
changed_fields["min_hours_before_cancel"] = {
|
||||
"old": settings.min_hours_before_cancel,
|
||||
"new": settings_data.min_hours_before_cancel
|
||||
}
|
||||
|
||||
# Update all fields
|
||||
setattr(settings, "min_duration_minutes", settings_data.min_duration_minutes)
|
||||
setattr(settings, "max_duration_minutes", settings_data.max_duration_minutes)
|
||||
setattr(settings, "working_hours_start", settings_data.working_hours_start)
|
||||
setattr(settings, "working_hours_end", settings_data.working_hours_end)
|
||||
setattr(settings, "max_bookings_per_day_per_user", settings_data.max_bookings_per_day_per_user)
|
||||
setattr(settings, "min_hours_before_cancel", settings_data.min_hours_before_cancel)
|
||||
|
||||
db.commit()
|
||||
db.refresh(settings)
|
||||
|
||||
# Log the action
|
||||
log_action(
|
||||
db=db,
|
||||
action="settings_updated",
|
||||
user_id=current_admin.id,
|
||||
target_type="settings",
|
||||
target_id=1, # Settings ID is always 1 (singleton)
|
||||
details={"changed_fields": changed_fields}
|
||||
)
|
||||
|
||||
return settings
|
||||
169
backend/app/api/spaces.py
Normal file
169
backend/app/api/spaces.py
Normal file
@@ -0,0 +1,169 @@
|
||||
"""Space management endpoints."""
|
||||
from typing import Annotated
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException, status
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.deps import get_current_admin, get_current_user, get_db
|
||||
from app.models.space import Space
|
||||
from app.models.user import User
|
||||
from app.schemas.space import SpaceCreate, SpaceResponse, SpaceStatusUpdate, SpaceUpdate
|
||||
from app.services.audit_service import log_action
|
||||
|
||||
router = APIRouter(prefix="/spaces", tags=["spaces"])
|
||||
admin_router = APIRouter(prefix="/admin/spaces", tags=["admin"])
|
||||
|
||||
|
||||
@router.get("", response_model=list[SpaceResponse])
|
||||
def list_spaces(
|
||||
db: Annotated[Session, Depends(get_db)],
|
||||
current_user: Annotated[User, Depends(get_current_user)],
|
||||
) -> list[Space]:
|
||||
"""
|
||||
Get list of spaces.
|
||||
|
||||
- Users see only active spaces
|
||||
- Admins see all spaces (active + inactive)
|
||||
"""
|
||||
query = db.query(Space)
|
||||
|
||||
# Filter by active status for non-admin users
|
||||
if current_user.role != "admin":
|
||||
query = query.filter(Space.is_active == True) # noqa: E712
|
||||
|
||||
spaces = query.order_by(Space.name).all()
|
||||
return spaces
|
||||
|
||||
|
||||
@admin_router.post("", response_model=SpaceResponse, status_code=status.HTTP_201_CREATED)
|
||||
def create_space(
|
||||
space_data: SpaceCreate,
|
||||
db: Annotated[Session, Depends(get_db)],
|
||||
current_admin: Annotated[User, Depends(get_current_admin)],
|
||||
) -> Space:
|
||||
"""
|
||||
Create a new space (admin only).
|
||||
|
||||
- name: required, non-empty
|
||||
- type: "sala" or "birou"
|
||||
- capacity: must be > 0
|
||||
- description: optional
|
||||
"""
|
||||
# Check if space with same name exists
|
||||
existing = db.query(Space).filter(Space.name == space_data.name).first()
|
||||
if existing:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail=f"Space with name '{space_data.name}' already exists",
|
||||
)
|
||||
|
||||
space = Space(
|
||||
name=space_data.name,
|
||||
type=space_data.type,
|
||||
capacity=space_data.capacity,
|
||||
description=space_data.description,
|
||||
is_active=True,
|
||||
)
|
||||
|
||||
db.add(space)
|
||||
db.commit()
|
||||
db.refresh(space)
|
||||
|
||||
# Log the action
|
||||
log_action(
|
||||
db=db,
|
||||
action="space_created",
|
||||
user_id=current_admin.id,
|
||||
target_type="space",
|
||||
target_id=space.id,
|
||||
details={"name": space.name, "type": space.type, "capacity": space.capacity}
|
||||
)
|
||||
|
||||
return space
|
||||
|
||||
|
||||
@admin_router.put("/{space_id}", response_model=SpaceResponse)
|
||||
def update_space(
|
||||
space_id: int,
|
||||
space_data: SpaceUpdate,
|
||||
db: Annotated[Session, Depends(get_db)],
|
||||
current_admin: Annotated[User, Depends(get_current_admin)],
|
||||
) -> Space:
|
||||
"""
|
||||
Update an existing space (admin only).
|
||||
|
||||
All fields are required (full update).
|
||||
"""
|
||||
space = db.query(Space).filter(Space.id == space_id).first()
|
||||
if not space:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail="Space not found",
|
||||
)
|
||||
|
||||
# Check if new name conflicts with another space
|
||||
if space_data.name != space.name:
|
||||
existing = db.query(Space).filter(Space.name == space_data.name).first()
|
||||
if existing:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail=f"Space with name '{space_data.name}' already exists",
|
||||
)
|
||||
|
||||
# Track what changed
|
||||
updated_fields = []
|
||||
if space.name != space_data.name:
|
||||
updated_fields.append("name")
|
||||
if space.type != space_data.type:
|
||||
updated_fields.append("type")
|
||||
if space.capacity != space_data.capacity:
|
||||
updated_fields.append("capacity")
|
||||
if space.description != space_data.description:
|
||||
updated_fields.append("description")
|
||||
|
||||
setattr(space, "name", space_data.name)
|
||||
setattr(space, "type", space_data.type)
|
||||
setattr(space, "capacity", space_data.capacity)
|
||||
setattr(space, "description", space_data.description)
|
||||
|
||||
db.commit()
|
||||
db.refresh(space)
|
||||
|
||||
# Log the action
|
||||
log_action(
|
||||
db=db,
|
||||
action="space_updated",
|
||||
user_id=current_admin.id,
|
||||
target_type="space",
|
||||
target_id=space.id,
|
||||
details={"updated_fields": updated_fields}
|
||||
)
|
||||
|
||||
return space
|
||||
|
||||
|
||||
@admin_router.patch("/{space_id}/status", response_model=SpaceResponse)
|
||||
def update_space_status(
|
||||
space_id: int,
|
||||
status_data: SpaceStatusUpdate,
|
||||
db: Annotated[Session, Depends(get_db)],
|
||||
_: Annotated[User, Depends(get_current_admin)],
|
||||
) -> Space:
|
||||
"""
|
||||
Activate or deactivate a space (admin only).
|
||||
|
||||
Deactivated spaces will not appear in booking lists for users.
|
||||
"""
|
||||
space = db.query(Space).filter(Space.id == space_id).first()
|
||||
if not space:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail="Space not found",
|
||||
)
|
||||
|
||||
setattr(space, "is_active", status_data.is_active)
|
||||
|
||||
db.commit()
|
||||
db.refresh(space)
|
||||
|
||||
return space
|
||||
267
backend/app/api/users.py
Normal file
267
backend/app/api/users.py
Normal file
@@ -0,0 +1,267 @@
|
||||
"""User endpoints."""
|
||||
from typing import Annotated
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException, status
|
||||
from pydantic import BaseModel
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.deps import get_current_admin, get_current_user, get_db
|
||||
from app.core.security import get_password_hash
|
||||
from app.models.user import User
|
||||
from app.schemas.user import (
|
||||
ResetPasswordRequest,
|
||||
UserCreate,
|
||||
UserResponse,
|
||||
UserStatusUpdate,
|
||||
UserUpdate,
|
||||
)
|
||||
from app.services.audit_service import log_action
|
||||
from app.utils.timezone import get_available_timezones
|
||||
|
||||
router = APIRouter(prefix="/users", tags=["users"])
|
||||
admin_router = APIRouter(prefix="/admin/users", tags=["admin"])
|
||||
|
||||
|
||||
class TimezoneUpdate(BaseModel):
|
||||
"""Schema for updating user timezone."""
|
||||
|
||||
timezone: str
|
||||
|
||||
|
||||
@router.get("/me", response_model=UserResponse)
|
||||
def get_current_user_info(
|
||||
current_user: Annotated[User, Depends(get_current_user)],
|
||||
) -> User:
|
||||
"""Get current user information."""
|
||||
return current_user
|
||||
|
||||
|
||||
@router.get("/timezones", response_model=list[str])
|
||||
def list_timezones() -> list[str]:
|
||||
"""Get list of available timezones."""
|
||||
return get_available_timezones()
|
||||
|
||||
|
||||
@router.put("/me/timezone")
|
||||
def update_timezone(
|
||||
data: TimezoneUpdate,
|
||||
db: Annotated[Session, Depends(get_db)],
|
||||
current_user: Annotated[User, Depends(get_current_user)],
|
||||
):
|
||||
"""Update user timezone preference."""
|
||||
# Validate timezone
|
||||
import pytz
|
||||
try:
|
||||
pytz.timezone(data.timezone)
|
||||
except pytz.exceptions.UnknownTimeZoneError:
|
||||
raise HTTPException(status_code=400, detail="Invalid timezone")
|
||||
|
||||
current_user.timezone = data.timezone # type: ignore[assignment]
|
||||
db.commit()
|
||||
|
||||
return {"message": "Timezone updated", "timezone": data.timezone}
|
||||
|
||||
|
||||
@admin_router.get("", response_model=list[UserResponse])
|
||||
def list_users(
|
||||
db: Annotated[Session, Depends(get_db)],
|
||||
_: Annotated[User, Depends(get_current_admin)],
|
||||
role: str | None = None,
|
||||
organization: str | None = None,
|
||||
) -> list[User]:
|
||||
"""
|
||||
Get list of users (admin only).
|
||||
|
||||
Supports filtering by role and organization.
|
||||
"""
|
||||
query = db.query(User)
|
||||
|
||||
if role:
|
||||
query = query.filter(User.role == role)
|
||||
|
||||
if organization:
|
||||
query = query.filter(User.organization == organization)
|
||||
|
||||
users = query.order_by(User.full_name).all()
|
||||
return users
|
||||
|
||||
|
||||
@admin_router.post("", response_model=UserResponse, status_code=status.HTTP_201_CREATED)
|
||||
def create_user(
|
||||
user_data: UserCreate,
|
||||
db: Annotated[Session, Depends(get_db)],
|
||||
current_admin: Annotated[User, Depends(get_current_admin)],
|
||||
) -> User:
|
||||
"""
|
||||
Create a new user (admin only).
|
||||
|
||||
- email: must be unique
|
||||
- password: will be hashed
|
||||
- role: "admin" or "user"
|
||||
- organization: optional
|
||||
"""
|
||||
# Check if user with same email exists
|
||||
existing = db.query(User).filter(User.email == user_data.email).first()
|
||||
if existing:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail=f"User with email '{user_data.email}' already exists",
|
||||
)
|
||||
|
||||
# Validate role
|
||||
if user_data.role not in ["admin", "user"]:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail="Role must be 'admin' or 'user'",
|
||||
)
|
||||
|
||||
user = User(
|
||||
email=user_data.email,
|
||||
full_name=user_data.full_name,
|
||||
hashed_password=get_password_hash(user_data.password),
|
||||
role=user_data.role,
|
||||
organization=user_data.organization,
|
||||
is_active=True,
|
||||
)
|
||||
|
||||
db.add(user)
|
||||
db.commit()
|
||||
db.refresh(user)
|
||||
|
||||
# Log the action
|
||||
log_action(
|
||||
db=db,
|
||||
action="user_created",
|
||||
user_id=current_admin.id,
|
||||
target_type="user",
|
||||
target_id=user.id,
|
||||
details={"email": user.email, "role": user.role}
|
||||
)
|
||||
|
||||
return user
|
||||
|
||||
|
||||
@admin_router.put("/{user_id}", response_model=UserResponse)
|
||||
def update_user(
|
||||
user_id: int,
|
||||
user_data: UserUpdate,
|
||||
db: Annotated[Session, Depends(get_db)],
|
||||
current_admin: Annotated[User, Depends(get_current_admin)],
|
||||
) -> User:
|
||||
"""
|
||||
Update an existing user (admin only).
|
||||
|
||||
Only fields provided in request will be updated (partial update).
|
||||
"""
|
||||
user = db.query(User).filter(User.id == user_id).first()
|
||||
if not user:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail="User not found",
|
||||
)
|
||||
|
||||
# Check if new email conflicts with another user
|
||||
if user_data.email and user_data.email != user.email:
|
||||
existing = db.query(User).filter(User.email == user_data.email).first()
|
||||
if existing:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail=f"User with email '{user_data.email}' already exists",
|
||||
)
|
||||
|
||||
# Validate role
|
||||
if user_data.role and user_data.role not in ["admin", "user"]:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_400_BAD_REQUEST,
|
||||
detail="Role must be 'admin' or 'user'",
|
||||
)
|
||||
|
||||
# Track what changed
|
||||
updated_fields = []
|
||||
if user_data.email is not None and user_data.email != user.email:
|
||||
updated_fields.append("email")
|
||||
if user_data.full_name is not None and user_data.full_name != user.full_name:
|
||||
updated_fields.append("full_name")
|
||||
if user_data.role is not None and user_data.role != user.role:
|
||||
updated_fields.append("role")
|
||||
if user_data.organization is not None and user_data.organization != user.organization:
|
||||
updated_fields.append("organization")
|
||||
|
||||
# Update only provided fields
|
||||
if user_data.email is not None:
|
||||
setattr(user, "email", user_data.email)
|
||||
if user_data.full_name is not None:
|
||||
setattr(user, "full_name", user_data.full_name)
|
||||
if user_data.role is not None:
|
||||
setattr(user, "role", user_data.role)
|
||||
if user_data.organization is not None:
|
||||
setattr(user, "organization", user_data.organization)
|
||||
|
||||
db.commit()
|
||||
db.refresh(user)
|
||||
|
||||
# Log the action
|
||||
log_action(
|
||||
db=db,
|
||||
action="user_updated",
|
||||
user_id=current_admin.id,
|
||||
target_type="user",
|
||||
target_id=user.id,
|
||||
details={"updated_fields": updated_fields}
|
||||
)
|
||||
|
||||
return user
|
||||
|
||||
|
||||
@admin_router.patch("/{user_id}/status", response_model=UserResponse)
|
||||
def update_user_status(
|
||||
user_id: int,
|
||||
status_data: UserStatusUpdate,
|
||||
db: Annotated[Session, Depends(get_db)],
|
||||
_: Annotated[User, Depends(get_current_admin)],
|
||||
) -> User:
|
||||
"""
|
||||
Activate or deactivate a user (admin only).
|
||||
|
||||
Deactivated users cannot log in.
|
||||
"""
|
||||
user = db.query(User).filter(User.id == user_id).first()
|
||||
if not user:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail="User not found",
|
||||
)
|
||||
|
||||
setattr(user, "is_active", status_data.is_active)
|
||||
|
||||
db.commit()
|
||||
db.refresh(user)
|
||||
|
||||
return user
|
||||
|
||||
|
||||
@admin_router.post("/{user_id}/reset-password", response_model=UserResponse)
|
||||
def reset_user_password(
|
||||
user_id: int,
|
||||
reset_data: ResetPasswordRequest,
|
||||
db: Annotated[Session, Depends(get_db)],
|
||||
_: Annotated[User, Depends(get_current_admin)],
|
||||
) -> User:
|
||||
"""
|
||||
Reset a user's password (admin only).
|
||||
|
||||
Password will be hashed before storing.
|
||||
"""
|
||||
user = db.query(User).filter(User.id == user_id).first()
|
||||
if not user:
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_404_NOT_FOUND,
|
||||
detail="User not found",
|
||||
)
|
||||
|
||||
setattr(user, "hashed_password", get_password_hash(reset_data.new_password))
|
||||
|
||||
db.commit()
|
||||
db.refresh(user)
|
||||
|
||||
return user
|
||||
1
backend/app/core/__init__.py
Normal file
1
backend/app/core/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
# Core module
|
||||
48
backend/app/core/config.py
Normal file
48
backend/app/core/config.py
Normal file
@@ -0,0 +1,48 @@
|
||||
"""Application configuration."""
|
||||
from typing import List
|
||||
from pydantic_settings import BaseSettings, SettingsConfigDict
|
||||
|
||||
|
||||
class Settings(BaseSettings):
|
||||
"""Application settings."""
|
||||
|
||||
model_config = SettingsConfigDict(
|
||||
env_file=".env",
|
||||
env_file_encoding="utf-8",
|
||||
case_sensitive=False
|
||||
)
|
||||
|
||||
# App
|
||||
app_name: str = "Space Booking API"
|
||||
debug: bool = False
|
||||
|
||||
# Database
|
||||
database_url: str = "sqlite:///./space_booking.db"
|
||||
|
||||
# JWT
|
||||
secret_key: str = "your-secret-key-change-in-production"
|
||||
algorithm: str = "HS256"
|
||||
access_token_expire_minutes: int = 1440 # 24 hours
|
||||
|
||||
# SMTP
|
||||
smtp_host: str = "localhost"
|
||||
smtp_port: int = 1025 # MailHog default
|
||||
smtp_user: str = ""
|
||||
smtp_password: str = ""
|
||||
smtp_from_address: str = "noreply@space-booking.local"
|
||||
smtp_enabled: bool = False # Disable by default for dev
|
||||
|
||||
# Frontend
|
||||
frontend_url: str = "http://localhost:5173"
|
||||
|
||||
# Google Calendar OAuth
|
||||
google_client_id: str = ""
|
||||
google_client_secret: str = ""
|
||||
google_redirect_uri: str = "http://localhost:8000/api/integrations/google/callback"
|
||||
google_scopes: List[str] = [
|
||||
"https://www.googleapis.com/auth/calendar",
|
||||
"https://www.googleapis.com/auth/calendar.events"
|
||||
]
|
||||
|
||||
|
||||
settings = Settings()
|
||||
52
backend/app/core/deps.py
Normal file
52
backend/app/core/deps.py
Normal file
@@ -0,0 +1,52 @@
|
||||
"""Dependencies for FastAPI routes."""
|
||||
from typing import Annotated
|
||||
|
||||
from fastapi import Depends, HTTPException, status
|
||||
from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
|
||||
from jose import JWTError, jwt
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.config import settings
|
||||
from app.db.session import get_db
|
||||
from app.models.user import User
|
||||
|
||||
security = HTTPBearer()
|
||||
|
||||
|
||||
def get_current_user(
|
||||
credentials: Annotated[HTTPAuthorizationCredentials, Depends(security)],
|
||||
db: Annotated[Session, Depends(get_db)],
|
||||
) -> User:
|
||||
"""Get current authenticated user from JWT token."""
|
||||
credentials_exception = HTTPException(
|
||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||
detail="Could not validate credentials",
|
||||
headers={"WWW-Authenticate": "Bearer"},
|
||||
)
|
||||
|
||||
try:
|
||||
token = credentials.credentials
|
||||
payload = jwt.decode(token, settings.secret_key, algorithms=[settings.algorithm])
|
||||
user_id: str | None = payload.get("sub")
|
||||
if user_id is None:
|
||||
raise credentials_exception
|
||||
except JWTError:
|
||||
raise credentials_exception
|
||||
|
||||
user = db.query(User).filter(User.id == int(user_id)).first()
|
||||
if user is None or not user.is_active:
|
||||
raise credentials_exception
|
||||
|
||||
return user
|
||||
|
||||
|
||||
def get_current_admin(
|
||||
current_user: Annotated[User, Depends(get_current_user)],
|
||||
) -> User:
|
||||
"""Verify current user is admin."""
|
||||
if current_user.role != "admin":
|
||||
raise HTTPException(
|
||||
status_code=status.HTTP_403_FORBIDDEN,
|
||||
detail="Not enough permissions",
|
||||
)
|
||||
return current_user
|
||||
36
backend/app/core/security.py
Normal file
36
backend/app/core/security.py
Normal file
@@ -0,0 +1,36 @@
|
||||
"""Security utilities for authentication and authorization."""
|
||||
from datetime import datetime, timedelta
|
||||
from typing import Any
|
||||
|
||||
from jose import jwt
|
||||
from passlib.context import CryptContext
|
||||
|
||||
from app.core.config import settings
|
||||
|
||||
pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
|
||||
|
||||
|
||||
def verify_password(plain_password: str, hashed_password: str) -> bool:
|
||||
"""Verify a password against a hash."""
|
||||
result: bool = pwd_context.verify(plain_password, hashed_password)
|
||||
return result
|
||||
|
||||
|
||||
def get_password_hash(password: str) -> str:
|
||||
"""Generate password hash."""
|
||||
hashed: str = pwd_context.hash(password)
|
||||
return hashed
|
||||
|
||||
|
||||
def create_access_token(subject: str | int, expires_delta: timedelta | None = None) -> str:
|
||||
"""Create JWT access token."""
|
||||
if expires_delta:
|
||||
expire = datetime.utcnow() + expires_delta
|
||||
else:
|
||||
expire = datetime.utcnow() + timedelta(
|
||||
minutes=settings.access_token_expire_minutes
|
||||
)
|
||||
|
||||
to_encode: dict[str, Any] = {"exp": expire, "sub": str(subject)}
|
||||
encoded_jwt: str = jwt.encode(to_encode, settings.secret_key, algorithm=settings.algorithm)
|
||||
return encoded_jwt
|
||||
1
backend/app/db/__init__.py
Normal file
1
backend/app/db/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
# Database module
|
||||
25
backend/app/db/session.py
Normal file
25
backend/app/db/session.py
Normal file
@@ -0,0 +1,25 @@
|
||||
"""Database session management."""
|
||||
from collections.abc import Generator
|
||||
|
||||
from sqlalchemy import create_engine
|
||||
from sqlalchemy.orm import Session, declarative_base, sessionmaker
|
||||
|
||||
from app.core.config import settings
|
||||
|
||||
engine = create_engine(
|
||||
settings.database_url,
|
||||
connect_args={"check_same_thread": False} if "sqlite" in settings.database_url else {},
|
||||
)
|
||||
|
||||
SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
|
||||
|
||||
Base = declarative_base()
|
||||
|
||||
|
||||
def get_db() -> Generator[Session, None, None]:
|
||||
"""Get database session."""
|
||||
db = SessionLocal()
|
||||
try:
|
||||
yield db
|
||||
finally:
|
||||
db.close()
|
||||
64
backend/app/main.py
Normal file
64
backend/app/main.py
Normal file
@@ -0,0 +1,64 @@
|
||||
"""FastAPI application entry point."""
|
||||
from fastapi import FastAPI
|
||||
from fastapi.middleware.cors import CORSMiddleware
|
||||
|
||||
from app.api.attachments import router as attachments_router
|
||||
from app.api.audit_log import router as audit_log_router
|
||||
from app.api.auth import router as auth_router
|
||||
from app.api.booking_templates import router as booking_templates_router
|
||||
from app.api.bookings import admin_router as bookings_admin_router
|
||||
from app.api.bookings import bookings_router
|
||||
from app.api.bookings import router as spaces_bookings_router
|
||||
from app.api.google_calendar import router as google_calendar_router
|
||||
from app.api.notifications import router as notifications_router
|
||||
from app.api.reports import router as reports_router
|
||||
from app.api.settings import router as settings_router
|
||||
from app.api.spaces import admin_router as spaces_admin_router
|
||||
from app.api.spaces import router as spaces_router
|
||||
from app.api.users import admin_router as users_admin_router
|
||||
from app.api.users import router as users_router
|
||||
from app.core.config import settings
|
||||
from app.db.session import Base, engine
|
||||
|
||||
# Create database tables
|
||||
Base.metadata.create_all(bind=engine)
|
||||
|
||||
app = FastAPI(title=settings.app_name)
|
||||
|
||||
# CORS middleware
|
||||
app.add_middleware(
|
||||
CORSMiddleware,
|
||||
allow_origins=["http://localhost:5173"], # Frontend dev server
|
||||
allow_credentials=True,
|
||||
allow_methods=["*"],
|
||||
allow_headers=["*"],
|
||||
)
|
||||
|
||||
# Include routers
|
||||
app.include_router(auth_router, prefix="/api")
|
||||
app.include_router(users_router, prefix="/api")
|
||||
app.include_router(users_admin_router, prefix="/api")
|
||||
app.include_router(spaces_router, prefix="/api")
|
||||
app.include_router(spaces_admin_router, prefix="/api")
|
||||
app.include_router(spaces_bookings_router, prefix="/api")
|
||||
app.include_router(bookings_router, prefix="/api")
|
||||
app.include_router(bookings_admin_router, prefix="/api")
|
||||
app.include_router(booking_templates_router, prefix="/api")
|
||||
app.include_router(settings_router, prefix="/api")
|
||||
app.include_router(notifications_router, prefix="/api")
|
||||
app.include_router(audit_log_router, prefix="/api", tags=["audit-log"])
|
||||
app.include_router(attachments_router, prefix="/api", tags=["attachments"])
|
||||
app.include_router(reports_router, prefix="/api", tags=["reports"])
|
||||
app.include_router(google_calendar_router, prefix="/api", tags=["google-calendar"])
|
||||
|
||||
|
||||
@app.get("/")
|
||||
def root() -> dict[str, str]:
|
||||
"""Root endpoint."""
|
||||
return {"message": "Space Booking API"}
|
||||
|
||||
|
||||
@app.get("/health")
|
||||
def health() -> dict[str, str]:
|
||||
"""Health check endpoint."""
|
||||
return {"status": "ok"}
|
||||
11
backend/app/models/__init__.py
Normal file
11
backend/app/models/__init__.py
Normal file
@@ -0,0 +1,11 @@
|
||||
"""Models package."""
|
||||
from app.models.attachment import Attachment
|
||||
from app.models.audit_log import AuditLog
|
||||
from app.models.booking import Booking
|
||||
from app.models.booking_template import BookingTemplate
|
||||
from app.models.notification import Notification
|
||||
from app.models.settings import Settings
|
||||
from app.models.space import Space
|
||||
from app.models.user import User
|
||||
|
||||
__all__ = ["User", "Space", "Settings", "Booking", "BookingTemplate", "Notification", "AuditLog", "Attachment"]
|
||||
27
backend/app/models/attachment.py
Normal file
27
backend/app/models/attachment.py
Normal file
@@ -0,0 +1,27 @@
|
||||
"""Attachment model."""
|
||||
from datetime import datetime
|
||||
|
||||
from sqlalchemy import BigInteger, Column, DateTime, ForeignKey, Integer, String
|
||||
from sqlalchemy.orm import relationship
|
||||
|
||||
from app.db.session import Base
|
||||
|
||||
|
||||
class Attachment(Base):
|
||||
"""Attachment model for booking files."""
|
||||
|
||||
__tablename__ = "attachments"
|
||||
|
||||
id = Column(Integer, primary_key=True, index=True)
|
||||
booking_id = Column(Integer, ForeignKey("bookings.id"), nullable=False, index=True)
|
||||
filename = Column(String(255), nullable=False) # Original filename
|
||||
stored_filename = Column(String(255), nullable=False) # UUID-based filename
|
||||
filepath = Column(String(500), nullable=False) # Full path
|
||||
size = Column(BigInteger, nullable=False) # File size in bytes
|
||||
content_type = Column(String(100), nullable=False)
|
||||
uploaded_by = Column(Integer, ForeignKey("users.id"), nullable=False, index=True)
|
||||
created_at = Column(DateTime, nullable=False, default=datetime.utcnow)
|
||||
|
||||
# Relationships
|
||||
booking = relationship("Booking", back_populates="attachments")
|
||||
uploader = relationship("User")
|
||||
24
backend/app/models/audit_log.py
Normal file
24
backend/app/models/audit_log.py
Normal file
@@ -0,0 +1,24 @@
|
||||
"""AuditLog model for tracking admin actions."""
|
||||
from datetime import datetime
|
||||
|
||||
from sqlalchemy import Column, DateTime, ForeignKey, Integer, JSON, String
|
||||
from sqlalchemy.orm import relationship
|
||||
|
||||
from app.db.session import Base
|
||||
|
||||
|
||||
class AuditLog(Base):
|
||||
"""Audit log for tracking admin actions."""
|
||||
|
||||
__tablename__ = "audit_logs"
|
||||
|
||||
id = Column(Integer, primary_key=True, index=True)
|
||||
action = Column(String(100), nullable=False, index=True) # booking_approved, space_created, etc
|
||||
user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
|
||||
target_type = Column(String(50), nullable=False, index=True) # booking, space, user, settings
|
||||
target_id = Column(Integer, nullable=False)
|
||||
details = Column(JSON, nullable=True) # Additional info (reasons, changed fields, etc)
|
||||
created_at = Column(DateTime, default=datetime.utcnow, nullable=False, index=True)
|
||||
|
||||
# Relationships
|
||||
user = relationship("User", back_populates="audit_logs")
|
||||
36
backend/app/models/booking.py
Normal file
36
backend/app/models/booking.py
Normal file
@@ -0,0 +1,36 @@
|
||||
"""Booking model."""
|
||||
from datetime import datetime
|
||||
|
||||
from sqlalchemy import Column, DateTime, ForeignKey, Integer, String
|
||||
from sqlalchemy.orm import relationship
|
||||
|
||||
from app.db.session import Base
|
||||
|
||||
|
||||
class Booking(Base):
|
||||
"""Booking model for space reservations."""
|
||||
|
||||
__tablename__ = "bookings"
|
||||
|
||||
id = Column(Integer, primary_key=True, index=True)
|
||||
user_id = Column(Integer, ForeignKey("users.id"), nullable=False, index=True)
|
||||
space_id = Column(Integer, ForeignKey("spaces.id"), nullable=False, index=True)
|
||||
title = Column(String, nullable=False)
|
||||
description = Column(String, nullable=True)
|
||||
start_datetime = Column(DateTime, nullable=False, index=True)
|
||||
end_datetime = Column(DateTime, nullable=False, index=True)
|
||||
status = Column(
|
||||
String, nullable=False, default="pending", index=True
|
||||
) # pending/approved/rejected/canceled
|
||||
rejection_reason = Column(String, nullable=True)
|
||||
cancellation_reason = Column(String, nullable=True)
|
||||
approved_by = Column(Integer, ForeignKey("users.id"), nullable=True)
|
||||
google_calendar_event_id = Column(String, nullable=True) # Store Google Calendar event ID
|
||||
created_at = Column(DateTime, nullable=False, default=datetime.utcnow)
|
||||
|
||||
# Relationships
|
||||
user = relationship("User", foreign_keys=[user_id], backref="bookings")
|
||||
space = relationship("Space", foreign_keys=[space_id], backref="bookings")
|
||||
approver = relationship("User", foreign_keys=[approved_by], backref="approved_bookings")
|
||||
notifications = relationship("Notification", back_populates="booking")
|
||||
attachments = relationship("Attachment", back_populates="booking", cascade="all, delete-orphan")
|
||||
24
backend/app/models/booking_template.py
Normal file
24
backend/app/models/booking_template.py
Normal file
@@ -0,0 +1,24 @@
|
||||
"""Booking template model."""
|
||||
from sqlalchemy import Column, ForeignKey, Integer, String, Text
|
||||
from sqlalchemy.orm import relationship
|
||||
|
||||
from app.db.session import Base
|
||||
|
||||
|
||||
class BookingTemplate(Base):
|
||||
"""Booking template model for reusable booking configurations."""
|
||||
|
||||
__tablename__ = "booking_templates"
|
||||
|
||||
id = Column(Integer, primary_key=True, index=True)
|
||||
user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
|
||||
name = Column(String(200), nullable=False) # Template name
|
||||
space_id = Column(Integer, ForeignKey("spaces.id"), nullable=True) # Optional default space
|
||||
duration_minutes = Column(Integer, nullable=False) # Default duration
|
||||
title = Column(String(200), nullable=False) # Default title
|
||||
description = Column(Text, nullable=True) # Default description
|
||||
usage_count = Column(Integer, default=0) # Track usage
|
||||
|
||||
# Relationships
|
||||
user = relationship("User", back_populates="booking_templates")
|
||||
space = relationship("Space")
|
||||
26
backend/app/models/google_calendar_token.py
Normal file
26
backend/app/models/google_calendar_token.py
Normal file
@@ -0,0 +1,26 @@
|
||||
"""Google Calendar Token model."""
|
||||
from datetime import datetime
|
||||
|
||||
from sqlalchemy import Column, DateTime, ForeignKey, Integer, Text
|
||||
from sqlalchemy.orm import relationship
|
||||
|
||||
from app.db.session import Base
|
||||
|
||||
|
||||
class GoogleCalendarToken(Base):
|
||||
"""Google Calendar OAuth token storage."""
|
||||
|
||||
__tablename__ = "google_calendar_tokens"
|
||||
|
||||
id = Column(Integer, primary_key=True, index=True)
|
||||
user_id = Column(Integer, ForeignKey("users.id"), unique=True, nullable=False)
|
||||
access_token = Column(Text, nullable=False)
|
||||
refresh_token = Column(Text, nullable=False)
|
||||
token_expiry = Column(DateTime, nullable=True)
|
||||
created_at = Column(DateTime, default=datetime.utcnow, nullable=False)
|
||||
updated_at = Column(
|
||||
DateTime, default=datetime.utcnow, onupdate=datetime.utcnow, nullable=False
|
||||
)
|
||||
|
||||
# Relationships
|
||||
user = relationship("User", back_populates="google_calendar_token")
|
||||
26
backend/app/models/notification.py
Normal file
26
backend/app/models/notification.py
Normal file
@@ -0,0 +1,26 @@
|
||||
"""Notification model."""
|
||||
from datetime import datetime
|
||||
|
||||
from sqlalchemy import Boolean, Column, DateTime, ForeignKey, Integer, String, Text
|
||||
from sqlalchemy.orm import relationship
|
||||
|
||||
from app.db.session import Base
|
||||
|
||||
|
||||
class Notification(Base):
|
||||
"""Notification model for in-app notifications."""
|
||||
|
||||
__tablename__ = "notifications"
|
||||
|
||||
id = Column(Integer, primary_key=True, index=True)
|
||||
user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
|
||||
type = Column(String(50), nullable=False) # booking_created, booking_approved, etc
|
||||
title = Column(String(200), nullable=False)
|
||||
message = Column(Text, nullable=False)
|
||||
booking_id = Column(Integer, ForeignKey("bookings.id"), nullable=True)
|
||||
is_read = Column(Boolean, default=False, nullable=False)
|
||||
created_at = Column(DateTime, default=datetime.utcnow, nullable=False)
|
||||
|
||||
# Relationships
|
||||
user = relationship("User", back_populates="notifications")
|
||||
booking = relationship("Booking", back_populates="notifications")
|
||||
18
backend/app/models/settings.py
Normal file
18
backend/app/models/settings.py
Normal file
@@ -0,0 +1,18 @@
|
||||
"""Settings model."""
|
||||
from sqlalchemy import Column, Integer
|
||||
|
||||
from app.db.session import Base
|
||||
|
||||
|
||||
class Settings(Base):
|
||||
"""Global settings model (singleton - only one row with id=1)."""
|
||||
|
||||
__tablename__ = "settings"
|
||||
|
||||
id = Column(Integer, primary_key=True, default=1)
|
||||
min_duration_minutes = Column(Integer, nullable=False, default=30)
|
||||
max_duration_minutes = Column(Integer, nullable=False, default=480) # 8 hours
|
||||
working_hours_start = Column(Integer, nullable=False, default=8) # 8 AM
|
||||
working_hours_end = Column(Integer, nullable=False, default=20) # 8 PM
|
||||
max_bookings_per_day_per_user = Column(Integer, nullable=False, default=3)
|
||||
min_hours_before_cancel = Column(Integer, nullable=False, default=2)
|
||||
17
backend/app/models/space.py
Normal file
17
backend/app/models/space.py
Normal file
@@ -0,0 +1,17 @@
|
||||
"""Space model."""
|
||||
from sqlalchemy import Boolean, Column, Integer, String
|
||||
|
||||
from app.db.session import Base
|
||||
|
||||
|
||||
class Space(Base):
|
||||
"""Space model for offices and meeting rooms."""
|
||||
|
||||
__tablename__ = "spaces"
|
||||
|
||||
id = Column(Integer, primary_key=True, index=True)
|
||||
name = Column(String, nullable=False, index=True)
|
||||
type = Column(String, nullable=False) # "sala" or "birou"
|
||||
capacity = Column(Integer, nullable=False)
|
||||
description = Column(String, nullable=True)
|
||||
is_active = Column(Boolean, default=True, nullable=False)
|
||||
28
backend/app/models/user.py
Normal file
28
backend/app/models/user.py
Normal file
@@ -0,0 +1,28 @@
|
||||
"""User model."""
|
||||
from sqlalchemy import Boolean, Column, Integer, String
|
||||
from sqlalchemy.orm import relationship
|
||||
|
||||
from app.db.session import Base
|
||||
|
||||
|
||||
class User(Base):
|
||||
"""User model."""
|
||||
|
||||
__tablename__ = "users"
|
||||
|
||||
id = Column(Integer, primary_key=True, index=True)
|
||||
email = Column(String, unique=True, index=True, nullable=False)
|
||||
full_name = Column(String, nullable=False)
|
||||
hashed_password = Column(String, nullable=False)
|
||||
role = Column(String, nullable=False, default="user") # "admin" or "user"
|
||||
organization = Column(String, nullable=True)
|
||||
is_active = Column(Boolean, default=True, nullable=False)
|
||||
timezone = Column(String(50), default="UTC", nullable=False) # IANA timezone
|
||||
|
||||
# Relationships
|
||||
notifications = relationship("Notification", back_populates="user")
|
||||
audit_logs = relationship("AuditLog", back_populates="user")
|
||||
booking_templates = relationship("BookingTemplate", back_populates="user")
|
||||
google_calendar_token = relationship(
|
||||
"GoogleCalendarToken", back_populates="user", uselist=False
|
||||
)
|
||||
1
backend/app/schemas/__init__.py
Normal file
1
backend/app/schemas/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
# Schemas module
|
||||
22
backend/app/schemas/attachment.py
Normal file
22
backend/app/schemas/attachment.py
Normal file
@@ -0,0 +1,22 @@
|
||||
"""Attachment schemas."""
|
||||
from datetime import datetime
|
||||
|
||||
from pydantic import BaseModel
|
||||
|
||||
|
||||
class AttachmentRead(BaseModel):
|
||||
"""Attachment read schema."""
|
||||
|
||||
id: int
|
||||
booking_id: int
|
||||
filename: str
|
||||
size: int
|
||||
content_type: str
|
||||
uploaded_by: int
|
||||
uploader_name: str
|
||||
created_at: datetime
|
||||
|
||||
class Config:
|
||||
"""Pydantic config."""
|
||||
|
||||
from_attributes = True
|
||||
21
backend/app/schemas/audit_log.py
Normal file
21
backend/app/schemas/audit_log.py
Normal file
@@ -0,0 +1,21 @@
|
||||
"""Audit log schemas."""
|
||||
from datetime import datetime
|
||||
from typing import Any, Optional
|
||||
|
||||
from pydantic import BaseModel, ConfigDict
|
||||
|
||||
|
||||
class AuditLogRead(BaseModel):
|
||||
"""Schema for reading audit log entries."""
|
||||
|
||||
id: int
|
||||
action: str
|
||||
user_id: int
|
||||
user_name: str # From relationship
|
||||
user_email: str # From relationship
|
||||
target_type: str
|
||||
target_id: int
|
||||
details: Optional[dict[str, Any]] = None
|
||||
created_at: datetime
|
||||
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
49
backend/app/schemas/auth.py
Normal file
49
backend/app/schemas/auth.py
Normal file
@@ -0,0 +1,49 @@
|
||||
"""Authentication schemas."""
|
||||
import re
|
||||
|
||||
from pydantic import BaseModel, EmailStr, Field, field_validator
|
||||
|
||||
|
||||
class LoginRequest(BaseModel):
|
||||
"""Login request schema."""
|
||||
|
||||
email: EmailStr
|
||||
password: str
|
||||
|
||||
|
||||
class UserRegister(BaseModel):
|
||||
"""User registration schema."""
|
||||
|
||||
email: EmailStr
|
||||
password: str = Field(..., min_length=8)
|
||||
confirm_password: str
|
||||
full_name: str = Field(..., min_length=2, max_length=200)
|
||||
organization: str = Field(..., min_length=2, max_length=200)
|
||||
|
||||
@field_validator("password")
|
||||
@classmethod
|
||||
def validate_password(cls, v: str) -> str:
|
||||
"""Validate password strength."""
|
||||
if len(v) < 8:
|
||||
raise ValueError("Password must be at least 8 characters")
|
||||
if not re.search(r"[A-Z]", v):
|
||||
raise ValueError("Password must contain at least one uppercase letter")
|
||||
if not re.search(r"[a-z]", v):
|
||||
raise ValueError("Password must contain at least one lowercase letter")
|
||||
if not re.search(r"[0-9]", v):
|
||||
raise ValueError("Password must contain at least one digit")
|
||||
return v
|
||||
|
||||
@field_validator("confirm_password")
|
||||
@classmethod
|
||||
def passwords_match(cls, v: str, info) -> str:
|
||||
"""Ensure passwords match."""
|
||||
if "password" in info.data and v != info.data["password"]:
|
||||
raise ValueError("Passwords do not match")
|
||||
return v
|
||||
|
||||
|
||||
class EmailVerificationRequest(BaseModel):
|
||||
"""Email verification request schema."""
|
||||
|
||||
token: str
|
||||
244
backend/app/schemas/booking.py
Normal file
244
backend/app/schemas/booking.py
Normal file
@@ -0,0 +1,244 @@
|
||||
"""Booking schemas for request/response."""
|
||||
from datetime import datetime, date
|
||||
from typing import Optional
|
||||
|
||||
from pydantic import BaseModel, Field, field_validator
|
||||
|
||||
|
||||
class BookingCalendarPublic(BaseModel):
|
||||
"""Public booking data for regular users (calendar view)."""
|
||||
|
||||
id: int
|
||||
start_datetime: datetime
|
||||
end_datetime: datetime
|
||||
status: str
|
||||
title: str
|
||||
|
||||
model_config = {"from_attributes": True}
|
||||
|
||||
|
||||
class BookingCalendarAdmin(BaseModel):
|
||||
"""Full booking data for admins (calendar view)."""
|
||||
|
||||
id: int
|
||||
user_id: int
|
||||
space_id: int
|
||||
start_datetime: datetime
|
||||
end_datetime: datetime
|
||||
status: str
|
||||
title: str
|
||||
description: str | None
|
||||
rejection_reason: str | None
|
||||
cancellation_reason: str | None
|
||||
approved_by: int | None
|
||||
created_at: datetime
|
||||
|
||||
model_config = {"from_attributes": True}
|
||||
|
||||
|
||||
class BookingCreate(BaseModel):
|
||||
"""Schema for creating a new booking."""
|
||||
|
||||
space_id: int
|
||||
start_datetime: datetime
|
||||
end_datetime: datetime
|
||||
title: str = Field(..., min_length=1, max_length=200)
|
||||
description: str | None = None
|
||||
|
||||
|
||||
class BookingResponse(BaseModel):
|
||||
"""Schema for booking response after creation."""
|
||||
|
||||
id: int
|
||||
user_id: int
|
||||
space_id: int
|
||||
start_datetime: datetime
|
||||
end_datetime: datetime
|
||||
status: str
|
||||
title: str
|
||||
description: str | None
|
||||
created_at: datetime
|
||||
# Timezone-aware formatted strings (optional, set by endpoint)
|
||||
start_datetime_tz: Optional[str] = None
|
||||
end_datetime_tz: Optional[str] = None
|
||||
|
||||
model_config = {"from_attributes": True}
|
||||
|
||||
@classmethod
|
||||
def from_booking_with_timezone(cls, booking, user_timezone: str = "UTC"):
|
||||
"""Create response with timezone conversion."""
|
||||
from app.utils.timezone import format_datetime_tz
|
||||
|
||||
return cls(
|
||||
id=booking.id,
|
||||
user_id=booking.user_id,
|
||||
space_id=booking.space_id,
|
||||
start_datetime=booking.start_datetime,
|
||||
end_datetime=booking.end_datetime,
|
||||
status=booking.status,
|
||||
title=booking.title,
|
||||
description=booking.description,
|
||||
created_at=booking.created_at,
|
||||
start_datetime_tz=format_datetime_tz(booking.start_datetime, user_timezone),
|
||||
end_datetime_tz=format_datetime_tz(booking.end_datetime, user_timezone)
|
||||
)
|
||||
|
||||
|
||||
class SpaceInBooking(BaseModel):
|
||||
"""Space details embedded in booking response."""
|
||||
|
||||
id: int
|
||||
name: str
|
||||
type: str
|
||||
|
||||
model_config = {"from_attributes": True}
|
||||
|
||||
|
||||
class BookingWithSpace(BaseModel):
|
||||
"""Booking with associated space details for user's booking list."""
|
||||
|
||||
id: int
|
||||
space_id: int
|
||||
space: SpaceInBooking
|
||||
start_datetime: datetime
|
||||
end_datetime: datetime
|
||||
status: str
|
||||
title: str
|
||||
description: str | None
|
||||
created_at: datetime
|
||||
|
||||
model_config = {"from_attributes": True}
|
||||
|
||||
|
||||
class UserInBooking(BaseModel):
|
||||
"""User details embedded in booking response."""
|
||||
|
||||
id: int
|
||||
full_name: str
|
||||
email: str
|
||||
organization: str | None
|
||||
|
||||
model_config = {"from_attributes": True}
|
||||
|
||||
|
||||
class BookingPendingDetail(BaseModel):
|
||||
"""Detailed booking information for admin pending list."""
|
||||
|
||||
id: int
|
||||
space_id: int
|
||||
space: SpaceInBooking
|
||||
user_id: int
|
||||
user: UserInBooking
|
||||
start_datetime: datetime
|
||||
end_datetime: datetime
|
||||
status: str
|
||||
title: str
|
||||
description: str | None
|
||||
created_at: datetime
|
||||
|
||||
model_config = {"from_attributes": True}
|
||||
|
||||
|
||||
class RejectRequest(BaseModel):
|
||||
"""Schema for rejecting a booking."""
|
||||
|
||||
reason: str | None = None
|
||||
|
||||
|
||||
class BookingAdminCreate(BaseModel):
|
||||
"""Schema for admin to create a booking directly (bypass approval)."""
|
||||
|
||||
space_id: int
|
||||
user_id: int | None = None
|
||||
start_datetime: datetime
|
||||
end_datetime: datetime
|
||||
title: str = Field(..., min_length=1, max_length=200)
|
||||
description: str | None = None
|
||||
|
||||
|
||||
class AdminCancelRequest(BaseModel):
|
||||
"""Schema for admin cancelling a booking."""
|
||||
|
||||
cancellation_reason: str | None = None
|
||||
|
||||
|
||||
class BookingUpdate(BaseModel):
|
||||
"""Schema for updating a booking."""
|
||||
|
||||
title: str | None = None
|
||||
description: str | None = None
|
||||
start_datetime: datetime | None = None
|
||||
end_datetime: datetime | None = None
|
||||
|
||||
|
||||
class ConflictingBooking(BaseModel):
|
||||
"""Schema for a conflicting booking in availability check."""
|
||||
|
||||
id: int
|
||||
user_name: str
|
||||
title: str
|
||||
status: str
|
||||
start_datetime: datetime
|
||||
end_datetime: datetime
|
||||
|
||||
model_config = {"from_attributes": True}
|
||||
|
||||
|
||||
class AvailabilityCheck(BaseModel):
|
||||
"""Schema for availability check response."""
|
||||
|
||||
available: bool
|
||||
conflicts: list[ConflictingBooking]
|
||||
message: str
|
||||
|
||||
|
||||
class BookingRecurringCreate(BaseModel):
|
||||
"""Schema for creating recurring weekly bookings."""
|
||||
|
||||
space_id: int
|
||||
start_time: str # Time only (e.g., "10:00")
|
||||
duration_minutes: int
|
||||
title: str = Field(..., min_length=1, max_length=200)
|
||||
description: str | None = None
|
||||
recurrence_days: list[int] = Field(..., min_length=1, max_length=7) # 0=Monday, 6=Sunday
|
||||
start_date: date # First occurrence date
|
||||
end_date: date # Last occurrence date
|
||||
skip_conflicts: bool = True # Skip conflicted dates or stop
|
||||
|
||||
@field_validator('recurrence_days')
|
||||
@classmethod
|
||||
def validate_days(cls, v: list[int]) -> list[int]:
|
||||
"""Validate recurrence days are valid weekdays."""
|
||||
if not all(0 <= day <= 6 for day in v):
|
||||
raise ValueError('Days must be 0-6 (0=Monday, 6=Sunday)')
|
||||
return sorted(list(set(v))) # Remove duplicates and sort
|
||||
|
||||
@field_validator('end_date')
|
||||
@classmethod
|
||||
def validate_date_range(cls, v: date, info) -> date:
|
||||
"""Validate end date is after start date and within 1 year."""
|
||||
if 'start_date' in info.data and v < info.data['start_date']:
|
||||
raise ValueError('end_date must be after start_date')
|
||||
|
||||
# Max 1 year
|
||||
if 'start_date' in info.data and (v - info.data['start_date']).days > 365:
|
||||
raise ValueError('Recurrence period cannot exceed 1 year')
|
||||
|
||||
return v
|
||||
|
||||
|
||||
class RecurringBookingResult(BaseModel):
|
||||
"""Schema for recurring booking creation result."""
|
||||
|
||||
total_requested: int
|
||||
total_created: int
|
||||
total_skipped: int
|
||||
created_bookings: list[BookingResponse]
|
||||
skipped_dates: list[dict] # [{"date": "2024-01-01", "reason": "..."}, ...]
|
||||
|
||||
|
||||
class BookingReschedule(BaseModel):
|
||||
"""Schema for rescheduling a booking (drag-and-drop)."""
|
||||
|
||||
start_datetime: datetime
|
||||
end_datetime: datetime
|
||||
28
backend/app/schemas/booking_template.py
Normal file
28
backend/app/schemas/booking_template.py
Normal file
@@ -0,0 +1,28 @@
|
||||
"""Booking template schemas for request/response."""
|
||||
from pydantic import BaseModel, Field
|
||||
|
||||
|
||||
class BookingTemplateCreate(BaseModel):
|
||||
"""Schema for creating a new booking template."""
|
||||
|
||||
name: str = Field(..., min_length=1, max_length=200)
|
||||
space_id: int | None = None
|
||||
duration_minutes: int = Field(..., gt=0)
|
||||
title: str = Field(..., min_length=1, max_length=200)
|
||||
description: str | None = None
|
||||
|
||||
|
||||
class BookingTemplateRead(BaseModel):
|
||||
"""Schema for reading booking template data."""
|
||||
|
||||
id: int
|
||||
user_id: int
|
||||
name: str
|
||||
space_id: int | None
|
||||
space_name: str | None # From relationship
|
||||
duration_minutes: int
|
||||
title: str
|
||||
description: str | None
|
||||
usage_count: int
|
||||
|
||||
model_config = {"from_attributes": True}
|
||||
23
backend/app/schemas/notification.py
Normal file
23
backend/app/schemas/notification.py
Normal file
@@ -0,0 +1,23 @@
|
||||
"""Notification schemas."""
|
||||
from datetime import datetime
|
||||
from typing import Optional
|
||||
|
||||
from pydantic import BaseModel
|
||||
|
||||
|
||||
class NotificationRead(BaseModel):
|
||||
"""Schema for reading notifications."""
|
||||
|
||||
id: int
|
||||
user_id: int
|
||||
type: str
|
||||
title: str
|
||||
message: str
|
||||
booking_id: Optional[int]
|
||||
is_read: bool
|
||||
created_at: datetime
|
||||
|
||||
class Config:
|
||||
"""Pydantic config."""
|
||||
|
||||
from_attributes = True
|
||||
64
backend/app/schemas/reports.py
Normal file
64
backend/app/schemas/reports.py
Normal file
@@ -0,0 +1,64 @@
|
||||
"""Report schemas."""
|
||||
from datetime import date
|
||||
from typing import Any
|
||||
|
||||
from pydantic import BaseModel
|
||||
|
||||
|
||||
class DateRangeFilter(BaseModel):
|
||||
"""Date range filter for reports."""
|
||||
|
||||
start_date: date | None = None
|
||||
end_date: date | None = None
|
||||
|
||||
|
||||
class SpaceUsageItem(BaseModel):
|
||||
"""Space usage report item."""
|
||||
|
||||
space_id: int
|
||||
space_name: str
|
||||
total_bookings: int
|
||||
approved_bookings: int
|
||||
pending_bookings: int
|
||||
rejected_bookings: int
|
||||
canceled_bookings: int
|
||||
total_hours: float
|
||||
|
||||
|
||||
class SpaceUsageReport(BaseModel):
|
||||
"""Space usage report."""
|
||||
|
||||
items: list[SpaceUsageItem]
|
||||
total_bookings: int
|
||||
date_range: dict[str, Any]
|
||||
|
||||
|
||||
class TopUserItem(BaseModel):
|
||||
"""Top user report item."""
|
||||
|
||||
user_id: int
|
||||
user_name: str
|
||||
user_email: str
|
||||
total_bookings: int
|
||||
approved_bookings: int
|
||||
total_hours: float
|
||||
|
||||
|
||||
class TopUsersReport(BaseModel):
|
||||
"""Top users report."""
|
||||
|
||||
items: list[TopUserItem]
|
||||
date_range: dict[str, Any]
|
||||
|
||||
|
||||
class ApprovalRateReport(BaseModel):
|
||||
"""Approval rate report."""
|
||||
|
||||
total_requests: int
|
||||
approved: int
|
||||
rejected: int
|
||||
pending: int
|
||||
canceled: int
|
||||
approval_rate: float
|
||||
rejection_rate: float
|
||||
date_range: dict[str, Any]
|
||||
30
backend/app/schemas/settings.py
Normal file
30
backend/app/schemas/settings.py
Normal file
@@ -0,0 +1,30 @@
|
||||
"""Settings schemas."""
|
||||
from pydantic import BaseModel, Field
|
||||
|
||||
|
||||
class SettingsBase(BaseModel):
|
||||
"""Base settings schema."""
|
||||
|
||||
min_duration_minutes: int = Field(ge=15, le=480, default=30)
|
||||
max_duration_minutes: int = Field(ge=30, le=1440, default=480)
|
||||
working_hours_start: int = Field(ge=0, le=23, default=8)
|
||||
working_hours_end: int = Field(ge=1, le=24, default=20)
|
||||
max_bookings_per_day_per_user: int = Field(ge=1, le=20, default=3)
|
||||
min_hours_before_cancel: int = Field(ge=0, le=72, default=2)
|
||||
|
||||
|
||||
class SettingsUpdate(SettingsBase):
|
||||
"""Settings update schema."""
|
||||
|
||||
pass
|
||||
|
||||
|
||||
class SettingsResponse(SettingsBase):
|
||||
"""Settings response schema."""
|
||||
|
||||
id: int
|
||||
|
||||
class Config:
|
||||
"""Pydantic config."""
|
||||
|
||||
from_attributes = True
|
||||
38
backend/app/schemas/space.py
Normal file
38
backend/app/schemas/space.py
Normal file
@@ -0,0 +1,38 @@
|
||||
"""Space schemas for request/response."""
|
||||
from pydantic import BaseModel, Field
|
||||
|
||||
|
||||
class SpaceBase(BaseModel):
|
||||
"""Base space schema."""
|
||||
|
||||
name: str = Field(..., min_length=1)
|
||||
type: str = Field(..., pattern="^(sala|birou)$")
|
||||
capacity: int = Field(..., gt=0)
|
||||
description: str | None = None
|
||||
|
||||
|
||||
class SpaceCreate(SpaceBase):
|
||||
"""Space creation schema."""
|
||||
|
||||
pass
|
||||
|
||||
|
||||
class SpaceUpdate(SpaceBase):
|
||||
"""Space update schema."""
|
||||
|
||||
pass
|
||||
|
||||
|
||||
class SpaceStatusUpdate(BaseModel):
|
||||
"""Space status update schema."""
|
||||
|
||||
is_active: bool
|
||||
|
||||
|
||||
class SpaceResponse(SpaceBase):
|
||||
"""Space response schema."""
|
||||
|
||||
id: int
|
||||
is_active: bool
|
||||
|
||||
model_config = {"from_attributes": True}
|
||||
62
backend/app/schemas/user.py
Normal file
62
backend/app/schemas/user.py
Normal file
@@ -0,0 +1,62 @@
|
||||
"""User schemas for request/response."""
|
||||
from pydantic import BaseModel, EmailStr
|
||||
|
||||
|
||||
class UserBase(BaseModel):
|
||||
"""Base user schema."""
|
||||
|
||||
email: EmailStr
|
||||
full_name: str
|
||||
organization: str | None = None
|
||||
|
||||
|
||||
class UserCreate(UserBase):
|
||||
"""User creation schema."""
|
||||
|
||||
password: str
|
||||
role: str = "user"
|
||||
|
||||
|
||||
class UserResponse(UserBase):
|
||||
"""User response schema."""
|
||||
|
||||
id: int
|
||||
role: str
|
||||
is_active: bool
|
||||
timezone: str = "UTC"
|
||||
|
||||
model_config = {"from_attributes": True}
|
||||
|
||||
|
||||
class Token(BaseModel):
|
||||
"""Token response schema."""
|
||||
|
||||
access_token: str
|
||||
token_type: str
|
||||
|
||||
|
||||
class UserUpdate(BaseModel):
|
||||
"""User update schema."""
|
||||
|
||||
email: EmailStr | None = None
|
||||
full_name: str | None = None
|
||||
role: str | None = None
|
||||
organization: str | None = None
|
||||
|
||||
|
||||
class UserStatusUpdate(BaseModel):
|
||||
"""User status update schema."""
|
||||
|
||||
is_active: bool
|
||||
|
||||
|
||||
class ResetPasswordRequest(BaseModel):
|
||||
"""Reset password request schema."""
|
||||
|
||||
new_password: str
|
||||
|
||||
|
||||
class TokenData(BaseModel):
|
||||
"""Token data schema."""
|
||||
|
||||
user_id: int | None = None
|
||||
41
backend/app/services/audit_service.py
Normal file
41
backend/app/services/audit_service.py
Normal file
@@ -0,0 +1,41 @@
|
||||
"""Audit service for logging admin actions."""
|
||||
from typing import Any, Dict, Optional
|
||||
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.models.audit_log import AuditLog
|
||||
|
||||
|
||||
def log_action(
|
||||
db: Session,
|
||||
action: str,
|
||||
user_id: int,
|
||||
target_type: str,
|
||||
target_id: int,
|
||||
details: Optional[Dict[str, Any]] = None
|
||||
) -> AuditLog:
|
||||
"""
|
||||
Log an admin action to the audit log.
|
||||
|
||||
Args:
|
||||
db: Database session
|
||||
action: Action performed (e.g., 'booking_approved', 'space_created')
|
||||
user_id: ID of the admin user who performed the action
|
||||
target_type: Type of target entity ('booking', 'space', 'user', 'settings')
|
||||
target_id: ID of the target entity
|
||||
details: Optional dictionary with additional information
|
||||
|
||||
Returns:
|
||||
Created AuditLog instance
|
||||
"""
|
||||
audit_log = AuditLog(
|
||||
action=action,
|
||||
user_id=user_id,
|
||||
target_type=target_type,
|
||||
target_id=target_id,
|
||||
details=details or {}
|
||||
)
|
||||
db.add(audit_log)
|
||||
db.commit()
|
||||
db.refresh(audit_log)
|
||||
return audit_log
|
||||
112
backend/app/services/booking_service.py
Normal file
112
backend/app/services/booking_service.py
Normal file
@@ -0,0 +1,112 @@
|
||||
"""Booking validation service."""
|
||||
from datetime import datetime
|
||||
|
||||
from sqlalchemy import and_
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.models.booking import Booking
|
||||
from app.models.settings import Settings
|
||||
|
||||
|
||||
def validate_booking_rules(
|
||||
db: Session,
|
||||
space_id: int,
|
||||
user_id: int,
|
||||
start_datetime: datetime,
|
||||
end_datetime: datetime,
|
||||
exclude_booking_id: int | None = None,
|
||||
) -> list[str]:
|
||||
"""
|
||||
Validate booking against global settings rules.
|
||||
|
||||
Args:
|
||||
db: Database session
|
||||
space_id: ID of the space to book
|
||||
user_id: ID of the user making the booking
|
||||
start_datetime: Booking start time
|
||||
end_datetime: Booking end time
|
||||
exclude_booking_id: Optional booking ID to exclude from overlap check
|
||||
(used when re-validating an existing booking)
|
||||
|
||||
Returns:
|
||||
List of validation error messages (empty list = validation OK)
|
||||
"""
|
||||
errors = []
|
||||
|
||||
# Fetch settings (create default if not exists)
|
||||
settings = db.query(Settings).filter(Settings.id == 1).first()
|
||||
if not settings:
|
||||
settings = Settings(
|
||||
id=1,
|
||||
min_duration_minutes=30,
|
||||
max_duration_minutes=480,
|
||||
working_hours_start=8,
|
||||
working_hours_end=20,
|
||||
max_bookings_per_day_per_user=3,
|
||||
min_hours_before_cancel=2,
|
||||
)
|
||||
db.add(settings)
|
||||
db.commit()
|
||||
db.refresh(settings)
|
||||
|
||||
# a) Validate duration in range
|
||||
duration_minutes = (end_datetime - start_datetime).total_seconds() / 60
|
||||
if (
|
||||
duration_minutes < settings.min_duration_minutes
|
||||
or duration_minutes > settings.max_duration_minutes
|
||||
):
|
||||
errors.append(
|
||||
f"Durata rezervării trebuie să fie între {settings.min_duration_minutes} "
|
||||
f"și {settings.max_duration_minutes} minute"
|
||||
)
|
||||
|
||||
# b) Validate working hours
|
||||
if (
|
||||
start_datetime.hour < settings.working_hours_start
|
||||
or end_datetime.hour > settings.working_hours_end
|
||||
):
|
||||
errors.append(
|
||||
f"Rezervările sunt permise doar între {settings.working_hours_start}:00 "
|
||||
f"și {settings.working_hours_end}:00"
|
||||
)
|
||||
|
||||
# c) Check for overlapping bookings
|
||||
query = db.query(Booking).filter(
|
||||
Booking.space_id == space_id,
|
||||
Booking.status.in_(["approved", "pending"]),
|
||||
and_(
|
||||
Booking.start_datetime < end_datetime,
|
||||
Booking.end_datetime > start_datetime,
|
||||
),
|
||||
)
|
||||
|
||||
# Exclude current booking if re-validating
|
||||
if exclude_booking_id is not None:
|
||||
query = query.filter(Booking.id != exclude_booking_id)
|
||||
|
||||
overlapping_bookings = query.first()
|
||||
if overlapping_bookings:
|
||||
errors.append("Spațiul este deja rezervat în acest interval")
|
||||
|
||||
# d) Check max bookings per day per user
|
||||
booking_date = start_datetime.date()
|
||||
start_of_day = datetime.combine(booking_date, datetime.min.time())
|
||||
end_of_day = datetime.combine(booking_date, datetime.max.time())
|
||||
|
||||
user_bookings_count = (
|
||||
db.query(Booking)
|
||||
.filter(
|
||||
Booking.user_id == user_id,
|
||||
Booking.status.in_(["approved", "pending"]),
|
||||
Booking.start_datetime >= start_of_day,
|
||||
Booking.start_datetime <= end_of_day,
|
||||
)
|
||||
.count()
|
||||
)
|
||||
|
||||
if user_bookings_count >= settings.max_bookings_per_day_per_user:
|
||||
errors.append(
|
||||
f"Ai atins limita de {settings.max_bookings_per_day_per_user} rezervări pe zi"
|
||||
)
|
||||
|
||||
return errors
|
||||
153
backend/app/services/email_service.py
Normal file
153
backend/app/services/email_service.py
Normal file
@@ -0,0 +1,153 @@
|
||||
"""Email service for sending booking notifications."""
|
||||
import logging
|
||||
from email.mime.multipart import MIMEMultipart
|
||||
from email.mime.text import MIMEText
|
||||
from typing import Optional
|
||||
|
||||
import aiosmtplib
|
||||
|
||||
from app.core.config import settings
|
||||
from app.models.booking import Booking
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
async def send_email(to: str, subject: str, body: str) -> bool:
|
||||
"""Send email via SMTP. Returns True if successful."""
|
||||
if not settings.smtp_enabled:
|
||||
# Development mode: just log the email
|
||||
logger.info(f"[EMAIL] To: {to}")
|
||||
logger.info(f"[EMAIL] Subject: {subject}")
|
||||
logger.info(f"[EMAIL] Body:\n{body}")
|
||||
print(f"\n--- EMAIL ---")
|
||||
print(f"To: {to}")
|
||||
print(f"Subject: {subject}")
|
||||
print(f"Body:\n{body}")
|
||||
print(f"--- END EMAIL ---\n")
|
||||
return True
|
||||
|
||||
try:
|
||||
message = MIMEMultipart()
|
||||
message["From"] = settings.smtp_from_address
|
||||
message["To"] = to
|
||||
message["Subject"] = subject
|
||||
message.attach(MIMEText(body, "plain", "utf-8"))
|
||||
|
||||
await aiosmtplib.send(
|
||||
message,
|
||||
hostname=settings.smtp_host,
|
||||
port=settings.smtp_port,
|
||||
username=settings.smtp_user if settings.smtp_user else None,
|
||||
password=settings.smtp_password if settings.smtp_password else None,
|
||||
)
|
||||
return True
|
||||
except Exception as e:
|
||||
logger.error(f"Failed to send email to {to}: {e}")
|
||||
return False
|
||||
|
||||
|
||||
def generate_booking_email(
|
||||
booking: Booking,
|
||||
event_type: str,
|
||||
user_email: str,
|
||||
user_name: str,
|
||||
extra_data: Optional[dict] = None,
|
||||
) -> tuple[str, str]:
|
||||
"""Generate email subject and body for booking events.
|
||||
|
||||
Returns: (subject, body)
|
||||
"""
|
||||
extra_data = extra_data or {}
|
||||
space_name = booking.space.name if booking.space else "Unknown Space"
|
||||
start_str = booking.start_datetime.strftime("%d.%m.%Y %H:%M")
|
||||
end_str = booking.end_datetime.strftime("%H:%M")
|
||||
|
||||
if event_type == "created":
|
||||
subject = "Cerere Nouă de Rezervare"
|
||||
body = f"""Bună ziua,
|
||||
|
||||
O nouă cerere de rezervare necesită aprobarea dumneavoastră:
|
||||
|
||||
Utilizator: {user_name}
|
||||
Spațiu: {space_name}
|
||||
Data și ora: {start_str} - {end_str}
|
||||
Titlu: {booking.title}
|
||||
Descriere: {booking.description or 'N/A'}
|
||||
|
||||
Vă rugăm să accesați panoul de administrare pentru a aproba sau respinge această cerere.
|
||||
|
||||
Cu stimă,
|
||||
Sistemul de Rezervări
|
||||
"""
|
||||
|
||||
elif event_type == "approved":
|
||||
subject = "Rezervare Aprobată"
|
||||
body = f"""Bună ziua {user_name},
|
||||
|
||||
Rezervarea dumneavoastră a fost aprobată:
|
||||
|
||||
Spațiu: {space_name}
|
||||
Data și ora: {start_str} - {end_str}
|
||||
Titlu: {booking.title}
|
||||
|
||||
Vă așteptăm!
|
||||
|
||||
Cu stimă,
|
||||
Sistemul de Rezervări
|
||||
"""
|
||||
|
||||
elif event_type == "rejected":
|
||||
reason = extra_data.get("rejection_reason", "Nu a fost specificat")
|
||||
subject = "Rezervare Respinsă"
|
||||
body = f"""Bună ziua {user_name},
|
||||
|
||||
Rezervarea dumneavoastră a fost respinsă:
|
||||
|
||||
Spațiu: {space_name}
|
||||
Data și ora: {start_str} - {end_str}
|
||||
Titlu: {booking.title}
|
||||
Motiv: {reason}
|
||||
|
||||
Vă rugăm să contactați administratorul pentru detalii.
|
||||
|
||||
Cu stimă,
|
||||
Sistemul de Rezervări
|
||||
"""
|
||||
|
||||
elif event_type == "canceled":
|
||||
reason = extra_data.get("cancellation_reason", "Nu a fost specificat")
|
||||
subject = "Rezervare Anulată"
|
||||
body = f"""Bună ziua {user_name},
|
||||
|
||||
Rezervarea dumneavoastră a fost anulată de către administrator:
|
||||
|
||||
Spațiu: {space_name}
|
||||
Data și ora: {start_str} - {end_str}
|
||||
Titlu: {booking.title}
|
||||
Motiv: {reason}
|
||||
|
||||
Vă rugăm să contactați administratorul pentru detalii.
|
||||
|
||||
Cu stimă,
|
||||
Sistemul de Rezervări
|
||||
"""
|
||||
|
||||
else:
|
||||
subject = "Notificare Rezervare"
|
||||
body = f"Notificare despre rezervarea pentru {space_name} din {start_str}"
|
||||
|
||||
return subject, body
|
||||
|
||||
|
||||
async def send_booking_notification(
|
||||
booking: Booking,
|
||||
event_type: str,
|
||||
user_email: str,
|
||||
user_name: str,
|
||||
extra_data: Optional[dict] = None,
|
||||
) -> bool:
|
||||
"""Send booking notification email."""
|
||||
subject, body = generate_booking_email(
|
||||
booking, event_type, user_email, user_name, extra_data
|
||||
)
|
||||
return await send_email(user_email, subject, body)
|
||||
173
backend/app/services/google_calendar_service.py
Normal file
173
backend/app/services/google_calendar_service.py
Normal file
@@ -0,0 +1,173 @@
|
||||
"""Google Calendar integration service."""
|
||||
from datetime import datetime
|
||||
from typing import Optional
|
||||
|
||||
from google.auth.transport.requests import Request
|
||||
from google.oauth2.credentials import Credentials
|
||||
from googleapiclient.discovery import build
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.core.config import settings
|
||||
from app.models.booking import Booking
|
||||
from app.models.google_calendar_token import GoogleCalendarToken
|
||||
|
||||
|
||||
def get_google_calendar_service(db: Session, user_id: int):
|
||||
"""
|
||||
Get authenticated Google Calendar service for user.
|
||||
|
||||
Args:
|
||||
db: Database session
|
||||
user_id: User ID
|
||||
|
||||
Returns:
|
||||
Google Calendar service object or None if not connected
|
||||
"""
|
||||
token_record = (
|
||||
db.query(GoogleCalendarToken)
|
||||
.filter(GoogleCalendarToken.user_id == user_id)
|
||||
.first()
|
||||
)
|
||||
|
||||
if not token_record:
|
||||
return None
|
||||
|
||||
# Create credentials
|
||||
creds = Credentials(
|
||||
token=token_record.access_token,
|
||||
refresh_token=token_record.refresh_token,
|
||||
token_uri="https://oauth2.googleapis.com/token",
|
||||
client_id=settings.google_client_id,
|
||||
client_secret=settings.google_client_secret,
|
||||
)
|
||||
|
||||
# Refresh if expired
|
||||
if creds.expired and creds.refresh_token:
|
||||
try:
|
||||
creds.refresh(Request())
|
||||
|
||||
# Update tokens in DB
|
||||
token_record.access_token = creds.token # type: ignore[assignment]
|
||||
if creds.expiry:
|
||||
token_record.token_expiry = creds.expiry # type: ignore[assignment]
|
||||
db.commit()
|
||||
except Exception as e:
|
||||
print(f"Failed to refresh Google token: {e}")
|
||||
return None
|
||||
|
||||
# Build service
|
||||
try:
|
||||
service = build("calendar", "v3", credentials=creds)
|
||||
return service
|
||||
except Exception as e:
|
||||
print(f"Failed to build Google Calendar service: {e}")
|
||||
return None
|
||||
|
||||
|
||||
def create_calendar_event(
|
||||
db: Session, booking: Booking, user_id: int
|
||||
) -> Optional[str]:
|
||||
"""
|
||||
Create Google Calendar event for booking.
|
||||
|
||||
Args:
|
||||
db: Database session
|
||||
booking: Booking object
|
||||
user_id: User ID
|
||||
|
||||
Returns:
|
||||
Google Calendar event ID or None if failed
|
||||
"""
|
||||
try:
|
||||
service = get_google_calendar_service(db, user_id)
|
||||
if not service:
|
||||
return None
|
||||
|
||||
# Create event
|
||||
event = {
|
||||
"summary": f"{booking.space.name}: {booking.title}",
|
||||
"description": booking.description or "",
|
||||
"start": {
|
||||
"dateTime": booking.start_datetime.isoformat(), # type: ignore[union-attr]
|
||||
"timeZone": "UTC",
|
||||
},
|
||||
"end": {
|
||||
"dateTime": booking.end_datetime.isoformat(), # type: ignore[union-attr]
|
||||
"timeZone": "UTC",
|
||||
},
|
||||
}
|
||||
|
||||
created_event = service.events().insert(calendarId="primary", body=event).execute()
|
||||
|
||||
return created_event.get("id")
|
||||
except Exception as e:
|
||||
print(f"Failed to create Google Calendar event: {e}")
|
||||
return None
|
||||
|
||||
|
||||
def update_calendar_event(
|
||||
db: Session, booking: Booking, user_id: int, event_id: str
|
||||
) -> bool:
|
||||
"""
|
||||
Update Google Calendar event for booking.
|
||||
|
||||
Args:
|
||||
db: Database session
|
||||
booking: Booking object
|
||||
user_id: User ID
|
||||
event_id: Google Calendar event ID
|
||||
|
||||
Returns:
|
||||
True if successful, False otherwise
|
||||
"""
|
||||
try:
|
||||
service = get_google_calendar_service(db, user_id)
|
||||
if not service:
|
||||
return False
|
||||
|
||||
# Update event
|
||||
event = {
|
||||
"summary": f"{booking.space.name}: {booking.title}",
|
||||
"description": booking.description or "",
|
||||
"start": {
|
||||
"dateTime": booking.start_datetime.isoformat(), # type: ignore[union-attr]
|
||||
"timeZone": "UTC",
|
||||
},
|
||||
"end": {
|
||||
"dateTime": booking.end_datetime.isoformat(), # type: ignore[union-attr]
|
||||
"timeZone": "UTC",
|
||||
},
|
||||
}
|
||||
|
||||
service.events().update(
|
||||
calendarId="primary", eventId=event_id, body=event
|
||||
).execute()
|
||||
|
||||
return True
|
||||
except Exception as e:
|
||||
print(f"Failed to update Google Calendar event: {e}")
|
||||
return False
|
||||
|
||||
|
||||
def delete_calendar_event(db: Session, event_id: str, user_id: int) -> bool:
|
||||
"""
|
||||
Delete Google Calendar event.
|
||||
|
||||
Args:
|
||||
db: Database session
|
||||
event_id: Google Calendar event ID
|
||||
user_id: User ID
|
||||
|
||||
Returns:
|
||||
True if successful, False otherwise
|
||||
"""
|
||||
try:
|
||||
service = get_google_calendar_service(db, user_id)
|
||||
if not service:
|
||||
return False
|
||||
|
||||
service.events().delete(calendarId="primary", eventId=event_id).execute()
|
||||
return True
|
||||
except Exception as e:
|
||||
print(f"Failed to delete Google Calendar event: {e}")
|
||||
return False
|
||||
41
backend/app/services/notification_service.py
Normal file
41
backend/app/services/notification_service.py
Normal file
@@ -0,0 +1,41 @@
|
||||
"""Notification service."""
|
||||
from typing import Optional
|
||||
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.models.notification import Notification
|
||||
|
||||
|
||||
def create_notification(
|
||||
db: Session,
|
||||
user_id: int,
|
||||
type: str,
|
||||
title: str,
|
||||
message: str,
|
||||
booking_id: Optional[int] = None,
|
||||
) -> Notification:
|
||||
"""
|
||||
Create a new notification.
|
||||
|
||||
Args:
|
||||
db: Database session
|
||||
user_id: ID of the user to notify
|
||||
type: Notification type (e.g., 'booking_created', 'booking_approved')
|
||||
title: Notification title
|
||||
message: Notification message
|
||||
booking_id: Optional booking ID this notification relates to
|
||||
|
||||
Returns:
|
||||
Created notification object
|
||||
"""
|
||||
notification = Notification(
|
||||
user_id=user_id,
|
||||
type=type,
|
||||
title=title,
|
||||
message=message,
|
||||
booking_id=booking_id,
|
||||
)
|
||||
db.add(notification)
|
||||
db.commit()
|
||||
db.refresh(notification)
|
||||
return notification
|
||||
1
backend/app/utils/__init__.py
Normal file
1
backend/app/utils/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
"""Utilities module."""
|
||||
79
backend/app/utils/timezone.py
Normal file
79
backend/app/utils/timezone.py
Normal file
@@ -0,0 +1,79 @@
|
||||
"""Timezone utilities for converting between UTC and user timezones."""
|
||||
from datetime import datetime
|
||||
from typing import Optional
|
||||
import pytz
|
||||
from dateutil import parser
|
||||
|
||||
|
||||
def convert_to_utc(dt: datetime, from_timezone: str = "UTC") -> datetime:
|
||||
"""Convert datetime from user timezone to UTC.
|
||||
|
||||
Args:
|
||||
dt: Datetime to convert (naive or aware)
|
||||
from_timezone: IANA timezone name (e.g., "Europe/Bucharest")
|
||||
|
||||
Returns:
|
||||
Naive datetime in UTC
|
||||
"""
|
||||
if dt.tzinfo is None:
|
||||
# Naive datetime, assume it's in user timezone
|
||||
tz = pytz.timezone(from_timezone)
|
||||
dt = tz.localize(dt)
|
||||
|
||||
# Convert to UTC
|
||||
return dt.astimezone(pytz.UTC).replace(tzinfo=None)
|
||||
|
||||
|
||||
def convert_from_utc(dt: datetime, to_timezone: str = "UTC") -> datetime:
|
||||
"""Convert datetime from UTC to user timezone.
|
||||
|
||||
Args:
|
||||
dt: Datetime in UTC (naive or aware)
|
||||
to_timezone: IANA timezone name (e.g., "Europe/Bucharest")
|
||||
|
||||
Returns:
|
||||
Timezone-aware datetime in target timezone
|
||||
"""
|
||||
if dt.tzinfo is None:
|
||||
# Add UTC timezone if naive
|
||||
dt = pytz.UTC.localize(dt)
|
||||
|
||||
# Convert to target timezone
|
||||
tz = pytz.timezone(to_timezone)
|
||||
return dt.astimezone(tz)
|
||||
|
||||
|
||||
def format_datetime_tz(dt: datetime, timezone: str = "UTC", format_str: str = "%Y-%m-%d %H:%M %Z") -> str:
|
||||
"""Format datetime with timezone abbreviation.
|
||||
|
||||
Args:
|
||||
dt: Datetime in UTC (naive or aware)
|
||||
timezone: IANA timezone name for display
|
||||
format_str: Format string (default includes timezone abbreviation)
|
||||
|
||||
Returns:
|
||||
Formatted datetime string with timezone
|
||||
"""
|
||||
dt_tz = convert_from_utc(dt, timezone)
|
||||
return dt_tz.strftime(format_str)
|
||||
|
||||
|
||||
def get_available_timezones():
|
||||
"""Get list of common timezones for user selection."""
|
||||
common_timezones = [
|
||||
"UTC",
|
||||
"Europe/Bucharest",
|
||||
"Europe/London",
|
||||
"Europe/Paris",
|
||||
"Europe/Berlin",
|
||||
"Europe/Amsterdam",
|
||||
"America/New_York",
|
||||
"America/Los_Angeles",
|
||||
"America/Chicago",
|
||||
"America/Denver",
|
||||
"Asia/Tokyo",
|
||||
"Asia/Shanghai",
|
||||
"Asia/Dubai",
|
||||
"Australia/Sydney",
|
||||
]
|
||||
return common_timezones
|
||||
21
backend/migrations/002_add_google_calendar.sql
Normal file
21
backend/migrations/002_add_google_calendar.sql
Normal file
@@ -0,0 +1,21 @@
|
||||
-- Migration: Add Google Calendar Integration
|
||||
-- Date: 2026-02-09
|
||||
|
||||
-- Create google_calendar_tokens table
|
||||
CREATE TABLE IF NOT EXISTS google_calendar_tokens (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
user_id INTEGER NOT NULL UNIQUE,
|
||||
access_token TEXT NOT NULL,
|
||||
refresh_token TEXT NOT NULL,
|
||||
token_expiry DATETIME,
|
||||
created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE
|
||||
);
|
||||
|
||||
-- Add google_calendar_event_id column to bookings table
|
||||
ALTER TABLE bookings ADD COLUMN google_calendar_event_id VARCHAR(255);
|
||||
|
||||
-- Create index for faster lookups
|
||||
CREATE INDEX IF NOT EXISTS idx_google_calendar_tokens_user_id ON google_calendar_tokens(user_id);
|
||||
CREATE INDEX IF NOT EXISTS idx_bookings_google_calendar_event_id ON bookings(google_calendar_event_id);
|
||||
11
backend/migrations/003_add_user_timezone.sql
Normal file
11
backend/migrations/003_add_user_timezone.sql
Normal file
@@ -0,0 +1,11 @@
|
||||
-- Migration: Add timezone column to users table
|
||||
-- Date: 2026-02-09
|
||||
|
||||
-- Add timezone column with default UTC
|
||||
ALTER TABLE users ADD COLUMN IF NOT EXISTS timezone VARCHAR(50) DEFAULT 'UTC' NOT NULL;
|
||||
|
||||
-- Set existing users to UTC timezone
|
||||
UPDATE users SET timezone = 'UTC' WHERE timezone IS NULL;
|
||||
|
||||
-- Add comment
|
||||
COMMENT ON COLUMN users.timezone IS 'User timezone preference (IANA format, e.g., Europe/Bucharest)';
|
||||
24
backend/pyproject.toml
Normal file
24
backend/pyproject.toml
Normal file
@@ -0,0 +1,24 @@
|
||||
[project]
|
||||
name = "space-booking-backend"
|
||||
version = "0.1.0"
|
||||
description = "Space booking backend API"
|
||||
requires-python = ">=3.12"
|
||||
|
||||
[tool.mypy]
|
||||
python_version = "3.12"
|
||||
warn_return_any = true
|
||||
warn_unused_configs = true
|
||||
disallow_untyped_defs = true
|
||||
ignore_missing_imports = true
|
||||
|
||||
[tool.ruff]
|
||||
line-length = 100
|
||||
target-version = "py312"
|
||||
|
||||
[tool.ruff.lint]
|
||||
select = ["E", "F", "I", "N", "W"]
|
||||
ignore = []
|
||||
|
||||
[tool.pytest.ini_options]
|
||||
asyncio_mode = "auto"
|
||||
testpaths = ["tests"]
|
||||
23
backend/requirements.txt
Normal file
23
backend/requirements.txt
Normal file
@@ -0,0 +1,23 @@
|
||||
fastapi==0.115.0
|
||||
uvicorn[standard]==0.30.0
|
||||
sqlalchemy==2.0.31
|
||||
alembic==1.13.2
|
||||
pydantic==2.8.2
|
||||
pydantic-settings==2.4.0
|
||||
python-jose[cryptography]==3.3.0
|
||||
passlib[bcrypt]==1.7.4
|
||||
bcrypt==4.0.1
|
||||
python-multipart==0.0.9
|
||||
email-validator==2.2.0
|
||||
pytest==8.3.2
|
||||
pytest-asyncio==0.23.8
|
||||
httpx==0.27.0
|
||||
mypy==1.11.0
|
||||
ruff==0.5.5
|
||||
aiosmtplib==3.0.1
|
||||
google-auth==2.28.0
|
||||
google-auth-oauthlib==1.2.0
|
||||
google-auth-httplib2==0.2.0
|
||||
google-api-python-client==2.119.0
|
||||
python-dateutil==2.9.0
|
||||
pytz==2024.1
|
||||
69
backend/seed_db.py
Normal file
69
backend/seed_db.py
Normal file
@@ -0,0 +1,69 @@
|
||||
"""Seed database with initial data."""
|
||||
from app.core.security import get_password_hash
|
||||
from app.db.session import Base, SessionLocal, engine
|
||||
from app.models.settings import Settings
|
||||
from app.models.user import User
|
||||
|
||||
|
||||
def seed_database() -> None:
|
||||
"""Create initial users for testing."""
|
||||
# Create tables
|
||||
Base.metadata.create_all(bind=engine)
|
||||
|
||||
db = SessionLocal()
|
||||
try:
|
||||
# Check if users already exist
|
||||
existing_admin = db.query(User).filter(User.email == "admin@example.com").first()
|
||||
if existing_admin:
|
||||
print("Database already seeded. Skipping...")
|
||||
return
|
||||
|
||||
# Create admin user
|
||||
admin = User(
|
||||
email="admin@example.com",
|
||||
full_name="Admin User",
|
||||
hashed_password=get_password_hash("adminpassword"),
|
||||
role="admin",
|
||||
organization="Management",
|
||||
is_active=True,
|
||||
)
|
||||
db.add(admin)
|
||||
|
||||
# Create regular user
|
||||
user = User(
|
||||
email="user@example.com",
|
||||
full_name="Regular User",
|
||||
hashed_password=get_password_hash("userpassword"),
|
||||
role="user",
|
||||
organization="Engineering",
|
||||
is_active=True,
|
||||
)
|
||||
db.add(user)
|
||||
|
||||
# Create default settings if not exist
|
||||
existing_settings = db.query(Settings).filter(Settings.id == 1).first()
|
||||
if not existing_settings:
|
||||
default_settings = Settings(
|
||||
id=1,
|
||||
min_duration_minutes=30,
|
||||
max_duration_minutes=480, # 8 hours
|
||||
working_hours_start=8, # 8 AM
|
||||
working_hours_end=20, # 8 PM
|
||||
max_bookings_per_day_per_user=3,
|
||||
min_hours_before_cancel=2,
|
||||
)
|
||||
db.add(default_settings)
|
||||
|
||||
db.commit()
|
||||
print("✓ Database seeded successfully!")
|
||||
print("Admin: admin@example.com / adminpassword")
|
||||
print("User: user@example.com / userpassword")
|
||||
except Exception as e:
|
||||
print(f"Error seeding database: {e}")
|
||||
db.rollback()
|
||||
finally:
|
||||
db.close()
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
seed_database()
|
||||
1
backend/tests/__init__.py
Normal file
1
backend/tests/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
# Tests module
|
||||
165
backend/tests/conftest.py
Normal file
165
backend/tests/conftest.py
Normal file
@@ -0,0 +1,165 @@
|
||||
"""Pytest configuration and fixtures."""
|
||||
from collections.abc import Generator
|
||||
|
||||
import pytest
|
||||
from fastapi.testclient import TestClient
|
||||
from sqlalchemy import create_engine
|
||||
from sqlalchemy.orm import Session, sessionmaker
|
||||
|
||||
from app.core.security import get_password_hash
|
||||
from app.db.session import Base, get_db
|
||||
from app.main import app
|
||||
from app.models.booking import Booking
|
||||
from app.models.space import Space
|
||||
from app.models.user import User
|
||||
|
||||
# Test database
|
||||
SQLALCHEMY_DATABASE_URL = "sqlite:///./test.db"
|
||||
engine = create_engine(
|
||||
SQLALCHEMY_DATABASE_URL,
|
||||
connect_args={"check_same_thread": False}
|
||||
)
|
||||
TestingSessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def db() -> Generator[Session, None, None]:
|
||||
"""Create test database."""
|
||||
Base.metadata.create_all(bind=engine)
|
||||
db = TestingSessionLocal()
|
||||
try:
|
||||
yield db
|
||||
finally:
|
||||
db.close()
|
||||
Base.metadata.drop_all(bind=engine)
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def db_session(db: Session) -> Session:
|
||||
"""Alias for db fixture."""
|
||||
return db
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def client(db: Session) -> Generator[TestClient, None, None]:
|
||||
"""Create test client."""
|
||||
def override_get_db() -> Generator[Session, None, None]:
|
||||
try:
|
||||
yield db
|
||||
finally:
|
||||
pass
|
||||
|
||||
app.dependency_overrides[get_db] = override_get_db
|
||||
with TestClient(app) as test_client:
|
||||
yield test_client
|
||||
app.dependency_overrides.clear()
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def test_user(db: Session) -> User:
|
||||
"""Create test user."""
|
||||
user = User(
|
||||
email="test@example.com",
|
||||
full_name="Test User",
|
||||
hashed_password=get_password_hash("testpassword"),
|
||||
role="user",
|
||||
is_active=True,
|
||||
)
|
||||
db.add(user)
|
||||
db.commit()
|
||||
db.refresh(user)
|
||||
return user
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def test_admin(db: Session) -> User:
|
||||
"""Create test admin user."""
|
||||
admin = User(
|
||||
email="admin@example.com",
|
||||
full_name="Admin User",
|
||||
hashed_password=get_password_hash("adminpassword"),
|
||||
role="admin",
|
||||
is_active=True,
|
||||
)
|
||||
db.add(admin)
|
||||
db.commit()
|
||||
db.refresh(admin)
|
||||
return admin
|
||||
|
||||
|
||||
def get_user_token() -> str:
|
||||
"""Get JWT token for test user."""
|
||||
from app.core.security import create_access_token
|
||||
|
||||
return create_access_token(subject=1)
|
||||
|
||||
|
||||
def get_admin_token() -> str:
|
||||
"""Get JWT token for test admin."""
|
||||
from app.core.security import create_access_token
|
||||
|
||||
return create_access_token(subject=2)
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def user_token(test_user: User) -> str:
|
||||
"""Get token for test user."""
|
||||
from app.core.security import create_access_token
|
||||
|
||||
return create_access_token(subject=int(test_user.id))
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def admin_token(test_admin: User) -> str:
|
||||
"""Get token for test admin."""
|
||||
from app.core.security import create_access_token
|
||||
|
||||
return create_access_token(subject=int(test_admin.id))
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def auth_headers(user_token: str) -> dict[str, str]:
|
||||
"""Get authorization headers for test user."""
|
||||
return {"Authorization": f"Bearer {user_token}"}
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def admin_headers(admin_token: str) -> dict[str, str]:
|
||||
"""Get authorization headers for test admin."""
|
||||
return {"Authorization": f"Bearer {admin_token}"}
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def test_space(db: Session) -> Space:
|
||||
"""Create test space."""
|
||||
space = Space(
|
||||
name="Test Conference Room",
|
||||
type="sala",
|
||||
capacity=10,
|
||||
description="Test room for bookings",
|
||||
is_active=True,
|
||||
)
|
||||
db.add(space)
|
||||
db.commit()
|
||||
db.refresh(space)
|
||||
return space
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def test_booking(db: Session, test_user: User, test_space: Space) -> Booking:
|
||||
"""Create test booking."""
|
||||
from datetime import datetime
|
||||
|
||||
booking = Booking(
|
||||
user_id=test_user.id,
|
||||
space_id=test_space.id,
|
||||
title="Test Meeting",
|
||||
description="Confidential meeting details",
|
||||
start_datetime=datetime(2024, 3, 15, 10, 0, 0),
|
||||
end_datetime=datetime(2024, 3, 15, 12, 0, 0),
|
||||
status="approved",
|
||||
)
|
||||
db.add(booking)
|
||||
db.commit()
|
||||
db.refresh(booking)
|
||||
return booking
|
||||
272
backend/tests/test_attachments.py
Normal file
272
backend/tests/test_attachments.py
Normal file
@@ -0,0 +1,272 @@
|
||||
"""Tests for attachments API."""
|
||||
from io import BytesIO
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
from fastapi.testclient import TestClient
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.models.attachment import Attachment
|
||||
from app.models.booking import Booking
|
||||
from app.models.user import User
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def test_attachment(db: Session, test_booking: Booking, test_user: User) -> Attachment:
|
||||
"""Create test attachment."""
|
||||
attachment = Attachment(
|
||||
booking_id=test_booking.id,
|
||||
filename="test.pdf",
|
||||
stored_filename="uuid-test.pdf",
|
||||
filepath="/tmp/uuid-test.pdf",
|
||||
size=1024,
|
||||
content_type="application/pdf",
|
||||
uploaded_by=test_user.id,
|
||||
)
|
||||
db.add(attachment)
|
||||
db.commit()
|
||||
db.refresh(attachment)
|
||||
return attachment
|
||||
|
||||
|
||||
def test_upload_attachment(
|
||||
client: TestClient, auth_headers: dict[str, str], test_booking: Booking
|
||||
) -> None:
|
||||
"""Test uploading file attachment."""
|
||||
# Create a test PDF file
|
||||
file_content = b"PDF file content here"
|
||||
files = {"file": ("test.pdf", BytesIO(file_content), "application/pdf")}
|
||||
|
||||
response = client.post(
|
||||
f"/api/bookings/{test_booking.id}/attachments", files=files, headers=auth_headers
|
||||
)
|
||||
|
||||
assert response.status_code == 201
|
||||
data = response.json()
|
||||
assert data["booking_id"] == test_booking.id
|
||||
assert data["filename"] == "test.pdf"
|
||||
assert data["size"] == len(file_content)
|
||||
assert data["content_type"] == "application/pdf"
|
||||
|
||||
|
||||
def test_upload_attachment_invalid_type(
|
||||
client: TestClient, auth_headers: dict[str, str], test_booking: Booking
|
||||
) -> None:
|
||||
"""Test uploading file with invalid type."""
|
||||
file_content = b"Invalid file content"
|
||||
files = {"file": ("test.exe", BytesIO(file_content), "application/exe")}
|
||||
|
||||
response = client.post(
|
||||
f"/api/bookings/{test_booking.id}/attachments", files=files, headers=auth_headers
|
||||
)
|
||||
|
||||
assert response.status_code == 400
|
||||
assert "not allowed" in response.json()["detail"]
|
||||
|
||||
|
||||
def test_upload_attachment_too_large(
|
||||
client: TestClient, auth_headers: dict[str, str], test_booking: Booking
|
||||
) -> None:
|
||||
"""Test uploading file that exceeds size limit."""
|
||||
# Create file larger than 10MB
|
||||
file_content = b"x" * (11 * 1024 * 1024)
|
||||
files = {"file": ("large.pdf", BytesIO(file_content), "application/pdf")}
|
||||
|
||||
response = client.post(
|
||||
f"/api/bookings/{test_booking.id}/attachments", files=files, headers=auth_headers
|
||||
)
|
||||
|
||||
assert response.status_code == 400
|
||||
assert "too large" in response.json()["detail"]
|
||||
|
||||
|
||||
def test_upload_exceeds_limit(
|
||||
client: TestClient, auth_headers: dict[str, str], test_booking: Booking
|
||||
) -> None:
|
||||
"""Test uploading more than 5 files."""
|
||||
# Upload 5 files
|
||||
for i in range(5):
|
||||
file_content = b"PDF file content"
|
||||
files = {"file": (f"test{i}.pdf", BytesIO(file_content), "application/pdf")}
|
||||
response = client.post(
|
||||
f"/api/bookings/{test_booking.id}/attachments", files=files, headers=auth_headers
|
||||
)
|
||||
assert response.status_code == 201
|
||||
|
||||
# Try to upload 6th file
|
||||
file_content = b"PDF file content"
|
||||
files = {"file": ("test6.pdf", BytesIO(file_content), "application/pdf")}
|
||||
response = client.post(
|
||||
f"/api/bookings/{test_booking.id}/attachments", files=files, headers=auth_headers
|
||||
)
|
||||
|
||||
assert response.status_code == 400
|
||||
assert "Maximum 5 files" in response.json()["detail"]
|
||||
|
||||
|
||||
def test_upload_to_others_booking(
|
||||
client: TestClient, test_user: User, test_admin: User, db: Session
|
||||
) -> None:
|
||||
"""Test user cannot upload to another user's booking."""
|
||||
from datetime import datetime
|
||||
|
||||
from app.core.security import create_access_token
|
||||
from app.models.space import Space
|
||||
|
||||
# Create space
|
||||
space = Space(name="Test Room", type="sala", capacity=10, is_active=True)
|
||||
db.add(space)
|
||||
db.commit()
|
||||
|
||||
# Create booking for admin
|
||||
booking = Booking(
|
||||
user_id=test_admin.id,
|
||||
space_id=space.id,
|
||||
title="Admin Meeting",
|
||||
start_datetime=datetime(2024, 3, 15, 10, 0, 0),
|
||||
end_datetime=datetime(2024, 3, 15, 12, 0, 0),
|
||||
status="approved",
|
||||
)
|
||||
db.add(booking)
|
||||
db.commit()
|
||||
|
||||
# Try to upload as regular user
|
||||
user_token = create_access_token(subject=int(test_user.id))
|
||||
headers = {"Authorization": f"Bearer {user_token}"}
|
||||
|
||||
file_content = b"PDF file content"
|
||||
files = {"file": ("test.pdf", BytesIO(file_content), "application/pdf")}
|
||||
|
||||
response = client.post(f"/api/bookings/{booking.id}/attachments", files=files, headers=headers)
|
||||
|
||||
assert response.status_code == 403
|
||||
|
||||
|
||||
def test_list_attachments(
|
||||
client: TestClient, auth_headers: dict[str, str], test_booking: Booking, test_attachment: Attachment
|
||||
) -> None:
|
||||
"""Test listing attachments for a booking."""
|
||||
response = client.get(f"/api/bookings/{test_booking.id}/attachments", headers=auth_headers)
|
||||
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert len(data) == 1
|
||||
assert data[0]["id"] == test_attachment.id
|
||||
assert data[0]["filename"] == test_attachment.filename
|
||||
|
||||
|
||||
def test_download_attachment(
|
||||
client: TestClient, auth_headers: dict[str, str], test_attachment: Attachment
|
||||
) -> None:
|
||||
"""Test downloading attachment file."""
|
||||
# Create actual file
|
||||
Path(test_attachment.filepath).parent.mkdir(parents=True, exist_ok=True)
|
||||
Path(test_attachment.filepath).write_bytes(b"Test file content")
|
||||
|
||||
response = client.get(f"/api/attachments/{test_attachment.id}/download", headers=auth_headers)
|
||||
|
||||
assert response.status_code == 200
|
||||
assert response.content == b"Test file content"
|
||||
|
||||
# Cleanup
|
||||
Path(test_attachment.filepath).unlink()
|
||||
|
||||
|
||||
def test_download_attachment_not_found(client: TestClient, auth_headers: dict[str, str]) -> None:
|
||||
"""Test downloading non-existent attachment."""
|
||||
response = client.get("/api/attachments/999/download", headers=auth_headers)
|
||||
|
||||
assert response.status_code == 404
|
||||
|
||||
|
||||
def test_delete_attachment(
|
||||
client: TestClient, auth_headers: dict[str, str], test_attachment: Attachment, db: Session
|
||||
) -> None:
|
||||
"""Test deleting attachment."""
|
||||
# Create actual file
|
||||
Path(test_attachment.filepath).parent.mkdir(parents=True, exist_ok=True)
|
||||
Path(test_attachment.filepath).write_bytes(b"Test file content")
|
||||
|
||||
response = client.delete(f"/api/attachments/{test_attachment.id}", headers=auth_headers)
|
||||
|
||||
assert response.status_code == 204
|
||||
|
||||
# Verify deleted from database
|
||||
attachment = db.query(Attachment).filter(Attachment.id == test_attachment.id).first()
|
||||
assert attachment is None
|
||||
|
||||
# Verify file deleted
|
||||
assert not Path(test_attachment.filepath).exists()
|
||||
|
||||
|
||||
def test_delete_attachment_not_owner(
|
||||
client: TestClient, auth_headers: dict[str, str], test_user: User, db: Session
|
||||
) -> None:
|
||||
"""Test user cannot delete another user's attachment."""
|
||||
from datetime import datetime
|
||||
|
||||
from app.core.security import get_password_hash
|
||||
from app.models.space import Space
|
||||
|
||||
# Create another user
|
||||
other_user = User(
|
||||
email="other@example.com",
|
||||
full_name="Other User",
|
||||
hashed_password=get_password_hash("password"),
|
||||
role="user",
|
||||
is_active=True,
|
||||
)
|
||||
db.add(other_user)
|
||||
db.commit()
|
||||
|
||||
# Create space
|
||||
space = Space(name="Test Room", type="sala", capacity=10, is_active=True)
|
||||
db.add(space)
|
||||
db.commit()
|
||||
|
||||
# Create booking for other user
|
||||
booking = Booking(
|
||||
user_id=other_user.id,
|
||||
space_id=space.id,
|
||||
title="Other User Meeting",
|
||||
start_datetime=datetime(2024, 3, 15, 10, 0, 0),
|
||||
end_datetime=datetime(2024, 3, 15, 12, 0, 0),
|
||||
status="approved",
|
||||
)
|
||||
db.add(booking)
|
||||
db.commit()
|
||||
|
||||
# Create attachment uploaded by other user
|
||||
attachment = Attachment(
|
||||
booking_id=booking.id,
|
||||
filename="other.pdf",
|
||||
stored_filename="uuid-other.pdf",
|
||||
filepath="/tmp/uuid-other.pdf",
|
||||
size=1024,
|
||||
content_type="application/pdf",
|
||||
uploaded_by=other_user.id,
|
||||
)
|
||||
db.add(attachment)
|
||||
db.commit()
|
||||
|
||||
# Try to delete as test_user
|
||||
response = client.delete(f"/api/attachments/{attachment.id}", headers=auth_headers)
|
||||
|
||||
assert response.status_code == 403
|
||||
|
||||
|
||||
def test_admin_can_delete_any_attachment(
|
||||
client: TestClient, admin_headers: dict[str, str], test_attachment: Attachment
|
||||
) -> None:
|
||||
"""Test admin can delete any attachment."""
|
||||
# Create actual file
|
||||
Path(test_attachment.filepath).parent.mkdir(parents=True, exist_ok=True)
|
||||
Path(test_attachment.filepath).write_bytes(b"Test file content")
|
||||
|
||||
response = client.delete(f"/api/attachments/{test_attachment.id}", headers=admin_headers)
|
||||
|
||||
assert response.status_code == 204
|
||||
|
||||
# Cleanup
|
||||
if Path(test_attachment.filepath).exists():
|
||||
Path(test_attachment.filepath).unlink()
|
||||
165
backend/tests/test_audit_log.py
Normal file
165
backend/tests/test_audit_log.py
Normal file
@@ -0,0 +1,165 @@
|
||||
"""Tests for audit log API."""
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
import pytest
|
||||
from fastapi.testclient import TestClient
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.models.user import User
|
||||
from app.services.audit_service import log_action
|
||||
|
||||
|
||||
def test_get_audit_logs(client: TestClient, admin_token: str, db_session: Session, test_admin: User) -> None:
|
||||
"""Test getting audit logs."""
|
||||
# Create some audit logs
|
||||
log_action(db_session, "booking_approved", test_admin.id, "booking", 1)
|
||||
log_action(db_session, "space_created", test_admin.id, "space", 2)
|
||||
|
||||
response = client.get(
|
||||
"/api/admin/audit-log",
|
||||
headers={"Authorization": f"Bearer {admin_token}"}
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert len(data) >= 2
|
||||
assert data[0]["user_name"] == test_admin.full_name
|
||||
assert data[0]["user_email"] == test_admin.email
|
||||
|
||||
|
||||
def test_filter_audit_logs_by_action(
|
||||
client: TestClient,
|
||||
admin_token: str,
|
||||
db_session: Session,
|
||||
test_admin: User
|
||||
) -> None:
|
||||
"""Test filtering by action."""
|
||||
log_action(db_session, "booking_approved", test_admin.id, "booking", 1)
|
||||
log_action(db_session, "space_created", test_admin.id, "space", 2)
|
||||
|
||||
response = client.get(
|
||||
"/api/admin/audit-log?action=booking_approved",
|
||||
headers={"Authorization": f"Bearer {admin_token}"}
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert all(log["action"] == "booking_approved" for log in data)
|
||||
|
||||
|
||||
def test_filter_audit_logs_by_date(
|
||||
client: TestClient,
|
||||
admin_token: str,
|
||||
db_session: Session,
|
||||
test_admin: User
|
||||
) -> None:
|
||||
"""Test filtering by date range."""
|
||||
log_action(db_session, "booking_approved", test_admin.id, "booking", 1)
|
||||
|
||||
# Test with date filters
|
||||
yesterday = (datetime.utcnow() - timedelta(days=1)).isoformat()
|
||||
tomorrow = (datetime.utcnow() + timedelta(days=1)).isoformat()
|
||||
|
||||
response = client.get(
|
||||
f"/api/admin/audit-log?start_date={yesterday}&end_date={tomorrow}",
|
||||
headers={"Authorization": f"Bearer {admin_token}"}
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert len(data) >= 1
|
||||
|
||||
|
||||
def test_audit_logs_require_admin(client: TestClient, user_token: str) -> None:
|
||||
"""Test that regular users cannot access audit logs."""
|
||||
response = client.get(
|
||||
"/api/admin/audit-log",
|
||||
headers={"Authorization": f"Bearer {user_token}"}
|
||||
)
|
||||
|
||||
assert response.status_code == 403
|
||||
|
||||
|
||||
def test_pagination_audit_logs(
|
||||
client: TestClient,
|
||||
admin_token: str,
|
||||
db_session: Session,
|
||||
test_admin: User
|
||||
) -> None:
|
||||
"""Test pagination."""
|
||||
# Create multiple logs
|
||||
for i in range(10):
|
||||
log_action(db_session, f"action_{i}", test_admin.id, "booking", i)
|
||||
|
||||
# Get page 1
|
||||
response = client.get(
|
||||
"/api/admin/audit-log?page=1&limit=5",
|
||||
headers={"Authorization": f"Bearer {admin_token}"}
|
||||
)
|
||||
assert response.status_code == 200
|
||||
assert len(response.json()) == 5
|
||||
|
||||
# Get page 2
|
||||
response = client.get(
|
||||
"/api/admin/audit-log?page=2&limit=5",
|
||||
headers={"Authorization": f"Bearer {admin_token}"}
|
||||
)
|
||||
assert response.status_code == 200
|
||||
assert len(response.json()) == 5
|
||||
|
||||
|
||||
def test_audit_logs_with_details(
|
||||
client: TestClient,
|
||||
admin_token: str,
|
||||
db_session: Session,
|
||||
test_admin: User
|
||||
) -> None:
|
||||
"""Test audit logs with additional details."""
|
||||
log_action(
|
||||
db_session,
|
||||
"booking_rejected",
|
||||
test_admin.id,
|
||||
"booking",
|
||||
1,
|
||||
details={"reason": "Room not available", "original_status": "pending"}
|
||||
)
|
||||
|
||||
response = client.get(
|
||||
"/api/admin/audit-log",
|
||||
headers={"Authorization": f"Bearer {admin_token}"}
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert len(data) >= 1
|
||||
log_entry = next((log for log in data if log["action"] == "booking_rejected"), None)
|
||||
assert log_entry is not None
|
||||
assert log_entry["details"]["reason"] == "Room not available"
|
||||
assert log_entry["details"]["original_status"] == "pending"
|
||||
|
||||
|
||||
def test_audit_logs_ordered_by_date_desc(
|
||||
client: TestClient,
|
||||
admin_token: str,
|
||||
db_session: Session,
|
||||
test_admin: User
|
||||
) -> None:
|
||||
"""Test that audit logs are ordered by date descending (newest first)."""
|
||||
# Create logs with different actions to identify them
|
||||
log_action(db_session, "first_action", test_admin.id, "booking", 1)
|
||||
log_action(db_session, "second_action", test_admin.id, "booking", 2)
|
||||
log_action(db_session, "third_action", test_admin.id, "booking", 3)
|
||||
|
||||
response = client.get(
|
||||
"/api/admin/audit-log",
|
||||
headers={"Authorization": f"Bearer {admin_token}"}
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert len(data) >= 3
|
||||
|
||||
# Most recent should be first
|
||||
assert data[0]["action"] == "third_action"
|
||||
assert data[1]["action"] == "second_action"
|
||||
assert data[2]["action"] == "first_action"
|
||||
86
backend/tests/test_audit_service.py
Normal file
86
backend/tests/test_audit_service.py
Normal file
@@ -0,0 +1,86 @@
|
||||
"""Tests for audit service."""
|
||||
import pytest
|
||||
|
||||
from app.models.audit_log import AuditLog
|
||||
from app.services.audit_service import log_action
|
||||
|
||||
|
||||
def test_log_action_basic(db_session, test_admin):
|
||||
"""Test basic audit log creation."""
|
||||
audit = log_action(
|
||||
db=db_session,
|
||||
action="booking_approved",
|
||||
user_id=test_admin.id,
|
||||
target_type="booking",
|
||||
target_id=123,
|
||||
details=None
|
||||
)
|
||||
|
||||
assert audit.id is not None
|
||||
assert audit.action == "booking_approved"
|
||||
assert audit.user_id == test_admin.id
|
||||
assert audit.target_type == "booking"
|
||||
assert audit.target_id == 123
|
||||
assert audit.details == {}
|
||||
assert audit.created_at is not None
|
||||
|
||||
|
||||
def test_log_action_with_details(db_session, test_admin):
|
||||
"""Test audit log with details."""
|
||||
details = {
|
||||
"rejection_reason": "Spațiul este în mentenanță",
|
||||
"old_value": "pending",
|
||||
"new_value": "rejected"
|
||||
}
|
||||
|
||||
audit = log_action(
|
||||
db=db_session,
|
||||
action="booking_rejected",
|
||||
user_id=test_admin.id,
|
||||
target_type="booking",
|
||||
target_id=456,
|
||||
details=details
|
||||
)
|
||||
|
||||
assert audit.details == details
|
||||
assert audit.details["rejection_reason"] == "Spațiul este în mentenanță"
|
||||
|
||||
|
||||
def test_log_action_settings_update(db_session, test_admin):
|
||||
"""Test audit log for settings update."""
|
||||
changed_fields = {
|
||||
"min_duration_minutes": {"old": 30, "new": 60},
|
||||
"max_duration_minutes": {"old": 480, "new": 720}
|
||||
}
|
||||
|
||||
audit = log_action(
|
||||
db=db_session,
|
||||
action="settings_updated",
|
||||
user_id=test_admin.id,
|
||||
target_type="settings",
|
||||
target_id=1,
|
||||
details={"changed_fields": changed_fields}
|
||||
)
|
||||
|
||||
assert audit.target_type == "settings"
|
||||
assert "changed_fields" in audit.details
|
||||
assert audit.details["changed_fields"]["min_duration_minutes"]["new"] == 60
|
||||
|
||||
|
||||
def test_multiple_audit_logs(db_session, test_admin):
|
||||
"""Test creating multiple audit logs."""
|
||||
actions = [
|
||||
("space_created", "space", 1),
|
||||
("space_updated", "space", 1),
|
||||
("user_created", "user", 10),
|
||||
("booking_approved", "booking", 5)
|
||||
]
|
||||
|
||||
for action, target_type, target_id in actions:
|
||||
log_action(db_session, action, test_admin.id, target_type, target_id)
|
||||
|
||||
# Verify all logs were created
|
||||
logs = db_session.query(AuditLog).filter(AuditLog.user_id == test_admin.id).all()
|
||||
assert len(logs) == 4
|
||||
assert logs[0].action == "space_created"
|
||||
assert logs[3].action == "booking_approved"
|
||||
56
backend/tests/test_auth.py
Normal file
56
backend/tests/test_auth.py
Normal file
@@ -0,0 +1,56 @@
|
||||
"""Tests for authentication endpoints."""
|
||||
from fastapi.testclient import TestClient
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.models.user import User
|
||||
|
||||
|
||||
def test_login_success(client: TestClient, test_user: User) -> None:
|
||||
"""Test successful login."""
|
||||
response = client.post(
|
||||
"/api/auth/login",
|
||||
json={"email": "test@example.com", "password": "testpassword"},
|
||||
)
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert "access_token" in data
|
||||
assert data["token_type"] == "bearer"
|
||||
|
||||
|
||||
def test_login_wrong_password(client: TestClient, test_user: User) -> None:
|
||||
"""Test login with wrong password."""
|
||||
response = client.post(
|
||||
"/api/auth/login",
|
||||
json={"email": "test@example.com", "password": "wrongpassword"},
|
||||
)
|
||||
assert response.status_code == 401
|
||||
assert "Incorrect email or password" in response.json()["detail"]
|
||||
|
||||
|
||||
def test_login_nonexistent_user(client: TestClient) -> None:
|
||||
"""Test login with non-existent user."""
|
||||
response = client.post(
|
||||
"/api/auth/login",
|
||||
json={"email": "nonexistent@example.com", "password": "password"},
|
||||
)
|
||||
assert response.status_code == 401
|
||||
|
||||
|
||||
def test_login_inactive_user(client: TestClient, test_user: User, db: Session) -> None:
|
||||
"""Test login with inactive user."""
|
||||
test_user.is_active = False
|
||||
db.commit()
|
||||
|
||||
response = client.post(
|
||||
"/api/auth/login",
|
||||
json={"email": "test@example.com", "password": "testpassword"},
|
||||
)
|
||||
assert response.status_code == 403
|
||||
assert "disabled" in response.json()["detail"].lower()
|
||||
|
||||
|
||||
def test_protected_endpoint_without_token(client: TestClient) -> None:
|
||||
"""Test accessing protected endpoint without token."""
|
||||
# HTTPBearer returns 403 when no Authorization header is provided
|
||||
response = client.get("/api/bookings/my")
|
||||
assert response.status_code == 403
|
||||
305
backend/tests/test_booking_emails.py
Normal file
305
backend/tests/test_booking_emails.py
Normal file
@@ -0,0 +1,305 @@
|
||||
"""Tests for booking email notifications."""
|
||||
from datetime import datetime
|
||||
from unittest.mock import AsyncMock, patch
|
||||
|
||||
from fastapi.testclient import TestClient
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.models.booking import Booking
|
||||
from app.models.space import Space
|
||||
from app.models.user import User
|
||||
|
||||
|
||||
@patch("app.api.bookings.send_booking_notification", new_callable=AsyncMock)
|
||||
def test_booking_creation_sends_email_to_admins(
|
||||
mock_email: AsyncMock,
|
||||
client: TestClient,
|
||||
user_token: str,
|
||||
test_space: Space,
|
||||
test_user: User,
|
||||
test_admin: User,
|
||||
db: Session,
|
||||
) -> None:
|
||||
"""Test that creating a booking sends email notifications to all admins."""
|
||||
from app.core.security import get_password_hash
|
||||
|
||||
# Create another admin user
|
||||
admin2 = User(
|
||||
email="admin2@example.com",
|
||||
full_name="Second Admin",
|
||||
hashed_password=get_password_hash("password"),
|
||||
role="admin",
|
||||
is_active=True,
|
||||
)
|
||||
db.add(admin2)
|
||||
db.commit()
|
||||
db.refresh(admin2)
|
||||
|
||||
# Create a booking
|
||||
booking_data = {
|
||||
"space_id": test_space.id,
|
||||
"start_datetime": "2024-06-15T10:00:00",
|
||||
"end_datetime": "2024-06-15T12:00:00",
|
||||
"title": "Team Planning Session",
|
||||
"description": "Q3 planning and retrospective",
|
||||
}
|
||||
|
||||
response = client.post(
|
||||
"/api/bookings",
|
||||
json=booking_data,
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
)
|
||||
|
||||
assert response.status_code == 201
|
||||
|
||||
# Verify email was sent to both admins (2 calls)
|
||||
assert mock_email.call_count == 2
|
||||
|
||||
# Verify the calls contain the correct parameters
|
||||
calls = mock_email.call_args_list
|
||||
admin_emails = {test_admin.email, admin2.email}
|
||||
called_emails = {call[0][2] for call in calls} # Third argument is user_email
|
||||
|
||||
assert called_emails == admin_emails
|
||||
|
||||
# Verify all calls have event_type "created"
|
||||
for call in calls:
|
||||
assert call[0][1] == "created" # Second argument is event_type
|
||||
assert call[0][3] == test_user.full_name # Fourth argument is user_name
|
||||
|
||||
|
||||
@patch("app.api.bookings.send_booking_notification", new_callable=AsyncMock)
|
||||
def test_booking_approval_sends_email_to_user(
|
||||
mock_email: AsyncMock,
|
||||
client: TestClient,
|
||||
admin_token: str,
|
||||
test_admin: User,
|
||||
test_space: Space,
|
||||
test_user: User,
|
||||
db: Session,
|
||||
) -> None:
|
||||
"""Test that approving a booking sends email notification to the user."""
|
||||
# Create a pending booking
|
||||
booking = Booking(
|
||||
user_id=test_user.id,
|
||||
space_id=test_space.id,
|
||||
title="Team Meeting",
|
||||
description="Q3 Planning",
|
||||
start_datetime=datetime(2024, 6, 15, 10, 0, 0),
|
||||
end_datetime=datetime(2024, 6, 15, 12, 0, 0),
|
||||
status="pending",
|
||||
created_at=datetime.utcnow(),
|
||||
)
|
||||
db.add(booking)
|
||||
db.commit()
|
||||
db.refresh(booking)
|
||||
|
||||
# Approve the booking
|
||||
response = client.put(
|
||||
f"/api/admin/bookings/{booking.id}/approve",
|
||||
headers={"Authorization": f"Bearer {admin_token}"},
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
|
||||
# Verify email was sent
|
||||
mock_email.assert_called_once()
|
||||
|
||||
# Verify call parameters
|
||||
call_args = mock_email.call_args[0]
|
||||
assert call_args[1] == "approved" # event_type
|
||||
assert call_args[2] == test_user.email # user_email
|
||||
assert call_args[3] == test_user.full_name # user_name
|
||||
assert call_args[4] is None # extra_data
|
||||
|
||||
|
||||
@patch("app.api.bookings.send_booking_notification", new_callable=AsyncMock)
|
||||
def test_booking_rejection_sends_email_with_reason(
|
||||
mock_email: AsyncMock,
|
||||
client: TestClient,
|
||||
admin_token: str,
|
||||
test_space: Space,
|
||||
test_user: User,
|
||||
db: Session,
|
||||
) -> None:
|
||||
"""Test that rejecting a booking sends email notification with rejection reason."""
|
||||
# Create a pending booking
|
||||
booking = Booking(
|
||||
user_id=test_user.id,
|
||||
space_id=test_space.id,
|
||||
title="Team Meeting",
|
||||
description="Q3 Planning",
|
||||
start_datetime=datetime(2024, 6, 15, 10, 0, 0),
|
||||
end_datetime=datetime(2024, 6, 15, 12, 0, 0),
|
||||
status="pending",
|
||||
created_at=datetime.utcnow(),
|
||||
)
|
||||
db.add(booking)
|
||||
db.commit()
|
||||
db.refresh(booking)
|
||||
|
||||
# Reject the booking with reason
|
||||
rejection_reason = "Space maintenance scheduled"
|
||||
response = client.put(
|
||||
f"/api/admin/bookings/{booking.id}/reject",
|
||||
json={"reason": rejection_reason},
|
||||
headers={"Authorization": f"Bearer {admin_token}"},
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
|
||||
# Verify email was sent
|
||||
mock_email.assert_called_once()
|
||||
|
||||
# Verify call parameters
|
||||
call_args = mock_email.call_args[0]
|
||||
assert call_args[1] == "rejected" # event_type
|
||||
assert call_args[2] == test_user.email # user_email
|
||||
assert call_args[3] == test_user.full_name # user_name
|
||||
|
||||
# Verify extra_data contains rejection_reason
|
||||
extra_data = call_args[4]
|
||||
assert extra_data is not None
|
||||
assert extra_data["rejection_reason"] == rejection_reason
|
||||
|
||||
|
||||
@patch("app.api.bookings.send_booking_notification", new_callable=AsyncMock)
|
||||
def test_admin_cancel_sends_email_with_reason(
|
||||
mock_email: AsyncMock,
|
||||
client: TestClient,
|
||||
admin_token: str,
|
||||
test_space: Space,
|
||||
test_user: User,
|
||||
db: Session,
|
||||
) -> None:
|
||||
"""Test that admin canceling a booking sends email notification with cancellation reason."""
|
||||
# Create an approved booking
|
||||
booking = Booking(
|
||||
user_id=test_user.id,
|
||||
space_id=test_space.id,
|
||||
title="Team Meeting",
|
||||
description="Q3 Planning",
|
||||
start_datetime=datetime(2024, 6, 15, 10, 0, 0),
|
||||
end_datetime=datetime(2024, 6, 15, 12, 0, 0),
|
||||
status="approved",
|
||||
created_at=datetime.utcnow(),
|
||||
)
|
||||
db.add(booking)
|
||||
db.commit()
|
||||
db.refresh(booking)
|
||||
|
||||
# Cancel the booking with reason
|
||||
cancellation_reason = "Emergency maintenance required"
|
||||
response = client.put(
|
||||
f"/api/admin/bookings/{booking.id}/cancel",
|
||||
json={"cancellation_reason": cancellation_reason},
|
||||
headers={"Authorization": f"Bearer {admin_token}"},
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
|
||||
# Verify email was sent
|
||||
mock_email.assert_called_once()
|
||||
|
||||
# Verify call parameters
|
||||
call_args = mock_email.call_args[0]
|
||||
assert call_args[1] == "canceled" # event_type
|
||||
assert call_args[2] == test_user.email # user_email
|
||||
assert call_args[3] == test_user.full_name # user_name
|
||||
|
||||
# Verify extra_data contains cancellation_reason
|
||||
extra_data = call_args[4]
|
||||
assert extra_data is not None
|
||||
assert extra_data["cancellation_reason"] == cancellation_reason
|
||||
|
||||
|
||||
@patch("app.api.bookings.send_booking_notification", new_callable=AsyncMock)
|
||||
def test_booking_rejection_without_reason(
|
||||
mock_email: AsyncMock,
|
||||
client: TestClient,
|
||||
admin_token: str,
|
||||
test_space: Space,
|
||||
test_user: User,
|
||||
db: Session,
|
||||
) -> None:
|
||||
"""Test that rejecting a booking without reason sends email with None reason."""
|
||||
# Create a pending booking
|
||||
booking = Booking(
|
||||
user_id=test_user.id,
|
||||
space_id=test_space.id,
|
||||
title="Team Meeting",
|
||||
start_datetime=datetime(2024, 6, 15, 10, 0, 0),
|
||||
end_datetime=datetime(2024, 6, 15, 12, 0, 0),
|
||||
status="pending",
|
||||
created_at=datetime.utcnow(),
|
||||
)
|
||||
db.add(booking)
|
||||
db.commit()
|
||||
db.refresh(booking)
|
||||
|
||||
# Reject the booking without reason
|
||||
response = client.put(
|
||||
f"/api/admin/bookings/{booking.id}/reject",
|
||||
json={},
|
||||
headers={"Authorization": f"Bearer {admin_token}"},
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
|
||||
# Verify email was sent
|
||||
mock_email.assert_called_once()
|
||||
|
||||
# Verify call parameters
|
||||
call_args = mock_email.call_args[0]
|
||||
assert call_args[1] == "rejected" # event_type
|
||||
|
||||
# Verify extra_data contains rejection_reason as None
|
||||
extra_data = call_args[4]
|
||||
assert extra_data is not None
|
||||
assert extra_data["rejection_reason"] is None
|
||||
|
||||
|
||||
@patch("app.api.bookings.send_booking_notification", new_callable=AsyncMock)
|
||||
def test_admin_cancel_without_reason(
|
||||
mock_email: AsyncMock,
|
||||
client: TestClient,
|
||||
admin_token: str,
|
||||
test_space: Space,
|
||||
test_user: User,
|
||||
db: Session,
|
||||
) -> None:
|
||||
"""Test that admin canceling without reason sends email with None reason."""
|
||||
# Create a pending booking
|
||||
booking = Booking(
|
||||
user_id=test_user.id,
|
||||
space_id=test_space.id,
|
||||
title="Client Meeting",
|
||||
start_datetime=datetime(2024, 6, 16, 14, 0, 0),
|
||||
end_datetime=datetime(2024, 6, 16, 16, 0, 0),
|
||||
status="pending",
|
||||
created_at=datetime.utcnow(),
|
||||
)
|
||||
db.add(booking)
|
||||
db.commit()
|
||||
db.refresh(booking)
|
||||
|
||||
# Cancel the booking without reason
|
||||
response = client.put(
|
||||
f"/api/admin/bookings/{booking.id}/cancel",
|
||||
json={},
|
||||
headers={"Authorization": f"Bearer {admin_token}"},
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
|
||||
# Verify email was sent
|
||||
mock_email.assert_called_once()
|
||||
|
||||
# Verify call parameters
|
||||
call_args = mock_email.call_args[0]
|
||||
assert call_args[1] == "canceled" # event_type
|
||||
|
||||
# Verify extra_data contains cancellation_reason as None
|
||||
extra_data = call_args[4]
|
||||
assert extra_data is not None
|
||||
assert extra_data["cancellation_reason"] is None
|
||||
338
backend/tests/test_booking_service.py
Normal file
338
backend/tests/test_booking_service.py
Normal file
@@ -0,0 +1,338 @@
|
||||
"""Tests for booking validation service."""
|
||||
from datetime import datetime
|
||||
|
||||
import pytest
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.models.booking import Booking
|
||||
from app.models.settings import Settings
|
||||
from app.models.space import Space
|
||||
from app.models.user import User
|
||||
from app.services.booking_service import validate_booking_rules
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def test_settings(db: Session) -> Settings:
|
||||
"""Create test settings."""
|
||||
settings = Settings(
|
||||
id=1,
|
||||
min_duration_minutes=30,
|
||||
max_duration_minutes=480, # 8 hours
|
||||
working_hours_start=8,
|
||||
working_hours_end=20,
|
||||
max_bookings_per_day_per_user=3,
|
||||
min_hours_before_cancel=2,
|
||||
)
|
||||
db.add(settings)
|
||||
db.commit()
|
||||
db.refresh(settings)
|
||||
return settings
|
||||
|
||||
|
||||
def test_validate_duration_too_short(
|
||||
db: Session, test_user: User, test_space: Space, test_settings: Settings
|
||||
):
|
||||
"""Test validation fails for booking duration too short."""
|
||||
start = datetime(2024, 3, 15, 10, 0, 0)
|
||||
end = datetime(2024, 3, 15, 10, 15, 0) # Only 15 minutes (min is 30)
|
||||
|
||||
errors = validate_booking_rules(
|
||||
db=db,
|
||||
space_id=test_space.id,
|
||||
user_id=test_user.id,
|
||||
start_datetime=start,
|
||||
end_datetime=end,
|
||||
)
|
||||
|
||||
assert len(errors) == 1
|
||||
assert "Durata rezervării trebuie să fie între 30 și 480 minute" in errors[0]
|
||||
|
||||
|
||||
def test_validate_duration_too_long(
|
||||
db: Session, test_user: User, test_space: Space, test_settings: Settings
|
||||
):
|
||||
"""Test validation fails for booking duration too long."""
|
||||
start = datetime(2024, 3, 15, 8, 0, 0)
|
||||
end = datetime(2024, 3, 15, 20, 0, 0) # 12 hours = 720 minutes (max is 480)
|
||||
|
||||
errors = validate_booking_rules(
|
||||
db=db,
|
||||
space_id=test_space.id,
|
||||
user_id=test_user.id,
|
||||
start_datetime=start,
|
||||
end_datetime=end,
|
||||
)
|
||||
|
||||
assert len(errors) == 1
|
||||
assert "Durata rezervării trebuie să fie între 30 și 480 minute" in errors[0]
|
||||
|
||||
|
||||
def test_validate_outside_working_hours_start(
|
||||
db: Session, test_user: User, test_space: Space, test_settings: Settings
|
||||
):
|
||||
"""Test validation fails for booking starting before working hours."""
|
||||
start = datetime(2024, 3, 15, 7, 0, 0) # Before 8 AM
|
||||
end = datetime(2024, 3, 15, 9, 0, 0)
|
||||
|
||||
errors = validate_booking_rules(
|
||||
db=db,
|
||||
space_id=test_space.id,
|
||||
user_id=test_user.id,
|
||||
start_datetime=start,
|
||||
end_datetime=end,
|
||||
)
|
||||
|
||||
assert len(errors) == 1
|
||||
assert "Rezervările sunt permise doar între 8:00 și 20:00" in errors[0]
|
||||
|
||||
|
||||
def test_validate_outside_working_hours_end(
|
||||
db: Session, test_user: User, test_space: Space, test_settings: Settings
|
||||
):
|
||||
"""Test validation fails for booking ending after working hours."""
|
||||
start = datetime(2024, 3, 15, 19, 0, 0)
|
||||
end = datetime(2024, 3, 15, 21, 0, 0) # After 8 PM
|
||||
|
||||
errors = validate_booking_rules(
|
||||
db=db,
|
||||
space_id=test_space.id,
|
||||
user_id=test_user.id,
|
||||
start_datetime=start,
|
||||
end_datetime=end,
|
||||
)
|
||||
|
||||
assert len(errors) == 1
|
||||
assert "Rezervările sunt permise doar între 8:00 și 20:00" in errors[0]
|
||||
|
||||
|
||||
def test_validate_overlap_detected_pending(
|
||||
db: Session, test_user: User, test_space: Space, test_settings: Settings
|
||||
):
|
||||
"""Test validation fails when space is already booked (pending status)."""
|
||||
# Create existing booking
|
||||
existing = Booking(
|
||||
user_id=test_user.id,
|
||||
space_id=test_space.id,
|
||||
title="Existing Meeting",
|
||||
start_datetime=datetime(2024, 3, 15, 10, 0, 0),
|
||||
end_datetime=datetime(2024, 3, 15, 12, 0, 0),
|
||||
status="pending",
|
||||
)
|
||||
db.add(existing)
|
||||
db.commit()
|
||||
|
||||
# Try to create overlapping booking
|
||||
start = datetime(2024, 3, 15, 11, 0, 0)
|
||||
end = datetime(2024, 3, 15, 13, 0, 0)
|
||||
|
||||
errors = validate_booking_rules(
|
||||
db=db,
|
||||
space_id=test_space.id,
|
||||
user_id=test_user.id,
|
||||
start_datetime=start,
|
||||
end_datetime=end,
|
||||
)
|
||||
|
||||
assert len(errors) == 1
|
||||
assert "Spațiul este deja rezervat în acest interval" in errors[0]
|
||||
|
||||
|
||||
def test_validate_overlap_detected_approved(
|
||||
db: Session, test_user: User, test_space: Space, test_settings: Settings
|
||||
):
|
||||
"""Test validation fails when space is already booked (approved status)."""
|
||||
# Create existing booking
|
||||
existing = Booking(
|
||||
user_id=test_user.id,
|
||||
space_id=test_space.id,
|
||||
title="Existing Meeting",
|
||||
start_datetime=datetime(2024, 3, 15, 10, 0, 0),
|
||||
end_datetime=datetime(2024, 3, 15, 12, 0, 0),
|
||||
status="approved",
|
||||
)
|
||||
db.add(existing)
|
||||
db.commit()
|
||||
|
||||
# Try to create overlapping booking
|
||||
start = datetime(2024, 3, 15, 11, 0, 0)
|
||||
end = datetime(2024, 3, 15, 13, 0, 0)
|
||||
|
||||
errors = validate_booking_rules(
|
||||
db=db,
|
||||
space_id=test_space.id,
|
||||
user_id=test_user.id,
|
||||
start_datetime=start,
|
||||
end_datetime=end,
|
||||
)
|
||||
|
||||
assert len(errors) == 1
|
||||
assert "Spațiul este deja rezervat în acest interval" in errors[0]
|
||||
|
||||
|
||||
def test_validate_no_overlap_rejected(
|
||||
db: Session, test_user: User, test_space: Space, test_settings: Settings
|
||||
):
|
||||
"""Test validation passes when existing booking is rejected."""
|
||||
# Create rejected booking
|
||||
existing = Booking(
|
||||
user_id=test_user.id,
|
||||
space_id=test_space.id,
|
||||
title="Rejected Meeting",
|
||||
start_datetime=datetime(2024, 3, 15, 10, 0, 0),
|
||||
end_datetime=datetime(2024, 3, 15, 12, 0, 0),
|
||||
status="rejected",
|
||||
)
|
||||
db.add(existing)
|
||||
db.commit()
|
||||
|
||||
# Try to create booking in same time slot
|
||||
start = datetime(2024, 3, 15, 11, 0, 0)
|
||||
end = datetime(2024, 3, 15, 12, 0, 0)
|
||||
|
||||
errors = validate_booking_rules(
|
||||
db=db,
|
||||
space_id=test_space.id,
|
||||
user_id=test_user.id,
|
||||
start_datetime=start,
|
||||
end_datetime=end,
|
||||
)
|
||||
|
||||
# Should have no overlap error (rejected bookings don't count)
|
||||
assert "Spațiul este deja rezervat în acest interval" not in errors
|
||||
|
||||
|
||||
def test_validate_max_bookings_exceeded(
|
||||
db: Session, test_user: User, test_space: Space, test_settings: Settings
|
||||
):
|
||||
"""Test validation fails when user exceeds max bookings per day."""
|
||||
# Create 3 bookings for the same day (max is 3)
|
||||
base_date = datetime(2024, 3, 15)
|
||||
for i in range(3):
|
||||
booking = Booking(
|
||||
user_id=test_user.id,
|
||||
space_id=test_space.id,
|
||||
title=f"Meeting {i+1}",
|
||||
start_datetime=base_date.replace(hour=9 + i * 2),
|
||||
end_datetime=base_date.replace(hour=10 + i * 2),
|
||||
status="approved",
|
||||
)
|
||||
db.add(booking)
|
||||
db.commit()
|
||||
|
||||
# Try to create 4th booking on same day
|
||||
start = datetime(2024, 3, 15, 16, 0, 0)
|
||||
end = datetime(2024, 3, 15, 17, 0, 0)
|
||||
|
||||
errors = validate_booking_rules(
|
||||
db=db,
|
||||
space_id=test_space.id,
|
||||
user_id=test_user.id,
|
||||
start_datetime=start,
|
||||
end_datetime=end,
|
||||
)
|
||||
|
||||
assert len(errors) == 1
|
||||
assert "Ai atins limita de 3 rezervări pe zi" in errors[0]
|
||||
|
||||
|
||||
def test_validate_max_bookings_different_day_ok(
|
||||
db: Session, test_user: User, test_space: Space, test_settings: Settings
|
||||
):
|
||||
"""Test validation passes when max bookings reached on different day."""
|
||||
# Create 3 bookings for previous day
|
||||
previous_date = datetime(2024, 3, 14)
|
||||
for i in range(3):
|
||||
booking = Booking(
|
||||
user_id=test_user.id,
|
||||
space_id=test_space.id,
|
||||
title=f"Meeting {i+1}",
|
||||
start_datetime=previous_date.replace(hour=9 + i * 2),
|
||||
end_datetime=previous_date.replace(hour=10 + i * 2),
|
||||
status="approved",
|
||||
)
|
||||
db.add(booking)
|
||||
db.commit()
|
||||
|
||||
# Try to create booking on different day
|
||||
start = datetime(2024, 3, 15, 10, 0, 0)
|
||||
end = datetime(2024, 3, 15, 11, 0, 0)
|
||||
|
||||
errors = validate_booking_rules(
|
||||
db=db,
|
||||
space_id=test_space.id,
|
||||
user_id=test_user.id,
|
||||
start_datetime=start,
|
||||
end_datetime=end,
|
||||
)
|
||||
|
||||
# Should have no max bookings error (different day)
|
||||
assert "Ai atins limita de 3 rezervări pe zi" not in errors
|
||||
|
||||
|
||||
def test_validate_all_rules_pass(
|
||||
db: Session, test_user: User, test_space: Space, test_settings: Settings
|
||||
):
|
||||
"""Test validation passes when all rules are satisfied (happy path)."""
|
||||
start = datetime(2024, 3, 15, 10, 0, 0)
|
||||
end = datetime(2024, 3, 15, 11, 0, 0) # 1 hour duration
|
||||
|
||||
errors = validate_booking_rules(
|
||||
db=db,
|
||||
space_id=test_space.id,
|
||||
user_id=test_user.id,
|
||||
start_datetime=start,
|
||||
end_datetime=end,
|
||||
)
|
||||
|
||||
assert len(errors) == 0
|
||||
|
||||
|
||||
def test_validate_multiple_errors(
|
||||
db: Session, test_user: User, test_space: Space, test_settings: Settings
|
||||
):
|
||||
"""Test validation returns multiple errors when multiple rules fail."""
|
||||
# Duration too short AND outside working hours
|
||||
start = datetime(2024, 3, 15, 6, 0, 0) # Before 8 AM
|
||||
end = datetime(2024, 3, 15, 6, 10, 0) # Only 10 minutes
|
||||
|
||||
errors = validate_booking_rules(
|
||||
db=db,
|
||||
space_id=test_space.id,
|
||||
user_id=test_user.id,
|
||||
start_datetime=start,
|
||||
end_datetime=end,
|
||||
)
|
||||
|
||||
assert len(errors) == 2
|
||||
assert any("Durata rezervării" in error for error in errors)
|
||||
assert any("Rezervările sunt permise doar" in error for error in errors)
|
||||
|
||||
|
||||
def test_validate_creates_default_settings(db: Session, test_user: User, test_space: Space):
|
||||
"""Test validation creates default settings if they don't exist."""
|
||||
# Ensure no settings exist
|
||||
db.query(Settings).delete()
|
||||
db.commit()
|
||||
|
||||
start = datetime(2024, 3, 15, 10, 0, 0)
|
||||
end = datetime(2024, 3, 15, 11, 0, 0)
|
||||
|
||||
errors = validate_booking_rules(
|
||||
db=db,
|
||||
space_id=test_space.id,
|
||||
user_id=test_user.id,
|
||||
start_datetime=start,
|
||||
end_datetime=end,
|
||||
)
|
||||
|
||||
# Verify settings were created
|
||||
settings = db.query(Settings).filter(Settings.id == 1).first()
|
||||
assert settings is not None
|
||||
assert settings.min_duration_minutes == 30
|
||||
assert settings.max_duration_minutes == 480
|
||||
assert settings.working_hours_start == 8
|
||||
assert settings.working_hours_end == 20
|
||||
assert settings.max_bookings_per_day_per_user == 3
|
||||
|
||||
# Should pass validation with default settings
|
||||
assert len(errors) == 0
|
||||
323
backend/tests/test_booking_templates.py
Normal file
323
backend/tests/test_booking_templates.py
Normal file
@@ -0,0 +1,323 @@
|
||||
"""Tests for booking templates API."""
|
||||
import pytest
|
||||
from datetime import datetime, timedelta
|
||||
from fastapi.testclient import TestClient
|
||||
|
||||
|
||||
def test_create_template(client: TestClient, user_token: str, test_space):
|
||||
"""Test creating a booking template."""
|
||||
response = client.post(
|
||||
"/api/booking-templates",
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
json={
|
||||
"name": "Weekly Team Sync",
|
||||
"space_id": test_space.id,
|
||||
"duration_minutes": 60,
|
||||
"title": "Team Sync Meeting",
|
||||
"description": "Weekly team synchronization meeting",
|
||||
},
|
||||
)
|
||||
|
||||
assert response.status_code == 201
|
||||
data = response.json()
|
||||
assert data["name"] == "Weekly Team Sync"
|
||||
assert data["space_id"] == test_space.id
|
||||
assert data["space_name"] == test_space.name
|
||||
assert data["duration_minutes"] == 60
|
||||
assert data["title"] == "Team Sync Meeting"
|
||||
assert data["description"] == "Weekly team synchronization meeting"
|
||||
assert data["usage_count"] == 0
|
||||
|
||||
|
||||
def test_create_template_without_space(client: TestClient, user_token: str):
|
||||
"""Test creating a template without a default space."""
|
||||
response = client.post(
|
||||
"/api/booking-templates",
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
json={
|
||||
"name": "Generic Meeting",
|
||||
"duration_minutes": 30,
|
||||
"title": "Meeting",
|
||||
"description": "Generic meeting template",
|
||||
},
|
||||
)
|
||||
|
||||
assert response.status_code == 201
|
||||
data = response.json()
|
||||
assert data["name"] == "Generic Meeting"
|
||||
assert data["space_id"] is None
|
||||
assert data["space_name"] is None
|
||||
|
||||
|
||||
def test_list_templates(client: TestClient, user_token: str, test_space):
|
||||
"""Test listing user's templates."""
|
||||
# Create two templates
|
||||
client.post(
|
||||
"/api/booking-templates",
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
json={
|
||||
"name": "Template 1",
|
||||
"space_id": test_space.id,
|
||||
"duration_minutes": 30,
|
||||
"title": "Meeting 1",
|
||||
},
|
||||
)
|
||||
client.post(
|
||||
"/api/booking-templates",
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
json={
|
||||
"name": "Template 2",
|
||||
"space_id": test_space.id,
|
||||
"duration_minutes": 60,
|
||||
"title": "Meeting 2",
|
||||
},
|
||||
)
|
||||
|
||||
# List templates
|
||||
response = client.get(
|
||||
"/api/booking-templates",
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert len(data) >= 2
|
||||
assert any(t["name"] == "Template 1" for t in data)
|
||||
assert any(t["name"] == "Template 2" for t in data)
|
||||
|
||||
|
||||
def test_list_templates_isolated(client: TestClient, user_token: str, admin_token: str, test_space):
|
||||
"""Test that users only see their own templates."""
|
||||
# User creates a template
|
||||
client.post(
|
||||
"/api/booking-templates",
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
json={
|
||||
"name": "User Template",
|
||||
"space_id": test_space.id,
|
||||
"duration_minutes": 30,
|
||||
"title": "User Meeting",
|
||||
},
|
||||
)
|
||||
|
||||
# Admin creates a template
|
||||
client.post(
|
||||
"/api/booking-templates",
|
||||
headers={"Authorization": f"Bearer {admin_token}"},
|
||||
json={
|
||||
"name": "Admin Template",
|
||||
"space_id": test_space.id,
|
||||
"duration_minutes": 60,
|
||||
"title": "Admin Meeting",
|
||||
},
|
||||
)
|
||||
|
||||
# User lists templates
|
||||
user_response = client.get(
|
||||
"/api/booking-templates",
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
)
|
||||
user_data = user_response.json()
|
||||
|
||||
# Admin lists templates
|
||||
admin_response = client.get(
|
||||
"/api/booking-templates",
|
||||
headers={"Authorization": f"Bearer {admin_token}"},
|
||||
)
|
||||
admin_data = admin_response.json()
|
||||
|
||||
# User should only see their template
|
||||
user_template_names = [t["name"] for t in user_data]
|
||||
assert "User Template" in user_template_names
|
||||
assert "Admin Template" not in user_template_names
|
||||
|
||||
# Admin should only see their template
|
||||
admin_template_names = [t["name"] for t in admin_data]
|
||||
assert "Admin Template" in admin_template_names
|
||||
assert "User Template" not in admin_template_names
|
||||
|
||||
|
||||
def test_delete_template(client: TestClient, user_token: str, test_space):
|
||||
"""Test deleting a template."""
|
||||
# Create template
|
||||
create_response = client.post(
|
||||
"/api/booking-templates",
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
json={
|
||||
"name": "To Delete",
|
||||
"space_id": test_space.id,
|
||||
"duration_minutes": 30,
|
||||
"title": "Meeting",
|
||||
},
|
||||
)
|
||||
template_id = create_response.json()["id"]
|
||||
|
||||
# Delete template
|
||||
delete_response = client.delete(
|
||||
f"/api/booking-templates/{template_id}",
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
)
|
||||
|
||||
assert delete_response.status_code == 204
|
||||
|
||||
# Verify it's gone
|
||||
list_response = client.get(
|
||||
"/api/booking-templates",
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
)
|
||||
templates = list_response.json()
|
||||
assert not any(t["id"] == template_id for t in templates)
|
||||
|
||||
|
||||
def test_delete_template_not_found(client: TestClient, user_token: str):
|
||||
"""Test deleting a non-existent template."""
|
||||
response = client.delete(
|
||||
"/api/booking-templates/99999",
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
)
|
||||
|
||||
assert response.status_code == 404
|
||||
|
||||
|
||||
def test_delete_template_other_user(client: TestClient, user_token: str, admin_token: str, test_space):
|
||||
"""Test that users cannot delete other users' templates."""
|
||||
# Admin creates a template
|
||||
create_response = client.post(
|
||||
"/api/booking-templates",
|
||||
headers={"Authorization": f"Bearer {admin_token}"},
|
||||
json={
|
||||
"name": "Admin Template",
|
||||
"space_id": test_space.id,
|
||||
"duration_minutes": 30,
|
||||
"title": "Meeting",
|
||||
},
|
||||
)
|
||||
template_id = create_response.json()["id"]
|
||||
|
||||
# User tries to delete admin's template
|
||||
delete_response = client.delete(
|
||||
f"/api/booking-templates/{template_id}",
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
)
|
||||
|
||||
assert delete_response.status_code == 404
|
||||
|
||||
|
||||
def test_create_booking_from_template(client: TestClient, user_token: str, test_space):
|
||||
"""Test creating a booking from a template."""
|
||||
# Create template
|
||||
template_response = client.post(
|
||||
"/api/booking-templates",
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
json={
|
||||
"name": "Client Meeting",
|
||||
"space_id": test_space.id,
|
||||
"duration_minutes": 90,
|
||||
"title": "Client Presentation",
|
||||
"description": "Quarterly review with client",
|
||||
},
|
||||
)
|
||||
template_id = template_response.json()["id"]
|
||||
|
||||
# Create booking from template
|
||||
tomorrow = datetime.now() + timedelta(days=1)
|
||||
start_time = tomorrow.replace(hour=10, minute=0, second=0, microsecond=0)
|
||||
|
||||
response = client.post(
|
||||
f"/api/booking-templates/from-template/{template_id}",
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
params={"start_datetime": start_time.isoformat()},
|
||||
)
|
||||
|
||||
assert response.status_code == 201
|
||||
data = response.json()
|
||||
assert data["space_id"] == test_space.id
|
||||
assert data["title"] == "Client Presentation"
|
||||
assert data["description"] == "Quarterly review with client"
|
||||
assert data["status"] == "pending"
|
||||
|
||||
# Verify duration
|
||||
start_dt = datetime.fromisoformat(data["start_datetime"])
|
||||
end_dt = datetime.fromisoformat(data["end_datetime"])
|
||||
duration = (end_dt - start_dt).total_seconds() / 60
|
||||
assert duration == 90
|
||||
|
||||
# Verify usage count incremented
|
||||
list_response = client.get(
|
||||
"/api/booking-templates",
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
)
|
||||
templates = list_response.json()
|
||||
template = next(t for t in templates if t["id"] == template_id)
|
||||
assert template["usage_count"] == 1
|
||||
|
||||
|
||||
def test_create_booking_from_template_no_space(client: TestClient, user_token: str):
|
||||
"""Test creating a booking from a template without a default space."""
|
||||
# Create template without space
|
||||
template_response = client.post(
|
||||
"/api/booking-templates",
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
json={
|
||||
"name": "Generic Meeting",
|
||||
"duration_minutes": 60,
|
||||
"title": "Meeting",
|
||||
},
|
||||
)
|
||||
template_id = template_response.json()["id"]
|
||||
|
||||
# Try to create booking
|
||||
tomorrow = datetime.now() + timedelta(days=1)
|
||||
start_time = tomorrow.replace(hour=10, minute=0, second=0, microsecond=0)
|
||||
|
||||
response = client.post(
|
||||
f"/api/booking-templates/from-template/{template_id}",
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
params={"start_datetime": start_time.isoformat()},
|
||||
)
|
||||
|
||||
assert response.status_code == 400
|
||||
assert "does not have a default space" in response.json()["detail"]
|
||||
|
||||
|
||||
def test_create_booking_from_template_not_found(client: TestClient, user_token: str):
|
||||
"""Test creating a booking from a non-existent template."""
|
||||
tomorrow = datetime.now() + timedelta(days=1)
|
||||
start_time = tomorrow.replace(hour=10, minute=0, second=0, microsecond=0)
|
||||
|
||||
response = client.post(
|
||||
"/api/booking-templates/from-template/99999",
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
params={"start_datetime": start_time.isoformat()},
|
||||
)
|
||||
|
||||
assert response.status_code == 404
|
||||
|
||||
|
||||
def test_create_booking_from_template_validation_error(client: TestClient, user_token: str, test_space):
|
||||
"""Test that booking from template validates booking rules."""
|
||||
# Create template
|
||||
template_response = client.post(
|
||||
"/api/booking-templates",
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
json={
|
||||
"name": "Long Meeting",
|
||||
"space_id": test_space.id,
|
||||
"duration_minutes": 600, # 10 hours - exceeds max
|
||||
"title": "Marathon Meeting",
|
||||
},
|
||||
)
|
||||
template_id = template_response.json()["id"]
|
||||
|
||||
# Try to create booking
|
||||
tomorrow = datetime.now() + timedelta(days=1)
|
||||
start_time = tomorrow.replace(hour=10, minute=0, second=0, microsecond=0)
|
||||
|
||||
response = client.post(
|
||||
f"/api/booking-templates/from-template/{template_id}",
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
params={"start_datetime": start_time.isoformat()},
|
||||
)
|
||||
|
||||
assert response.status_code == 400
|
||||
# Should fail validation (duration exceeds max)
|
||||
2627
backend/tests/test_bookings.py
Normal file
2627
backend/tests/test_bookings.py
Normal file
File diff suppressed because it is too large
Load Diff
93
backend/tests/test_email_service.py
Normal file
93
backend/tests/test_email_service.py
Normal file
@@ -0,0 +1,93 @@
|
||||
"""Tests for email service."""
|
||||
from datetime import datetime, timedelta
|
||||
from unittest.mock import AsyncMock, patch
|
||||
|
||||
import pytest
|
||||
|
||||
from app.services.email_service import (
|
||||
generate_booking_email,
|
||||
send_booking_notification,
|
||||
send_email,
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_send_email_disabled():
|
||||
"""Test email sending when SMTP is disabled (default)."""
|
||||
result = await send_email("test@example.com", "Test Subject", "Test Body")
|
||||
assert result is True # Should succeed but only log
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_send_email_with_smtp_mock():
|
||||
"""Test email sending with mocked SMTP."""
|
||||
with patch("app.services.email_service.settings.smtp_enabled", True):
|
||||
with patch(
|
||||
"app.services.email_service.aiosmtplib.send", new_callable=AsyncMock
|
||||
) as mock_send:
|
||||
result = await send_email("test@example.com", "Test", "Body")
|
||||
assert result is True
|
||||
mock_send.assert_called_once()
|
||||
|
||||
|
||||
def test_generate_booking_email_approved(test_booking, test_space):
|
||||
"""Test email generation for approved booking."""
|
||||
test_booking.space = test_space
|
||||
subject, body = generate_booking_email(
|
||||
test_booking, "approved", "user@example.com", "John Doe"
|
||||
)
|
||||
assert subject == "Rezervare Aprobată"
|
||||
assert "John Doe" in body
|
||||
assert test_space.name in body
|
||||
assert "aprobată" in body
|
||||
|
||||
|
||||
def test_generate_booking_email_rejected(test_booking, test_space):
|
||||
"""Test email generation for rejected booking with reason."""
|
||||
test_booking.space = test_space
|
||||
subject, body = generate_booking_email(
|
||||
test_booking,
|
||||
"rejected",
|
||||
"user@example.com",
|
||||
"John Doe",
|
||||
extra_data={"rejection_reason": "Spațiul este în mentenanță"},
|
||||
)
|
||||
assert subject == "Rezervare Respinsă"
|
||||
assert "respinsă" in body
|
||||
assert "Spațiul este în mentenanță" in body
|
||||
|
||||
|
||||
def test_generate_booking_email_canceled(test_booking, test_space):
|
||||
"""Test email generation for canceled booking."""
|
||||
test_booking.space = test_space
|
||||
subject, body = generate_booking_email(
|
||||
test_booking,
|
||||
"canceled",
|
||||
"user@example.com",
|
||||
"John Doe",
|
||||
extra_data={"cancellation_reason": "Eveniment anulat"},
|
||||
)
|
||||
assert subject == "Rezervare Anulată"
|
||||
assert "anulată" in body
|
||||
assert "Eveniment anulat" in body
|
||||
|
||||
|
||||
def test_generate_booking_email_created(test_booking, test_space):
|
||||
"""Test email generation for created booking (admin notification)."""
|
||||
test_booking.space = test_space
|
||||
subject, body = generate_booking_email(
|
||||
test_booking, "created", "admin@example.com", "Admin User"
|
||||
)
|
||||
assert subject == "Cerere Nouă de Rezervare"
|
||||
assert "cerere de rezervare" in body
|
||||
assert test_space.name in body
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_send_booking_notification(test_booking, test_space):
|
||||
"""Test sending booking notification."""
|
||||
test_booking.space = test_space
|
||||
result = await send_booking_notification(
|
||||
test_booking, "approved", "user@example.com", "John Doe"
|
||||
)
|
||||
assert result is True
|
||||
410
backend/tests/test_google_calendar.py
Normal file
410
backend/tests/test_google_calendar.py
Normal file
@@ -0,0 +1,410 @@
|
||||
"""Tests for Google Calendar integration."""
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
import pytest
|
||||
from fastapi.testclient import TestClient
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.models.booking import Booking
|
||||
from app.models.google_calendar_token import GoogleCalendarToken
|
||||
from app.models.space import Space
|
||||
from app.models.user import User
|
||||
from app.services.google_calendar_service import (
|
||||
create_calendar_event,
|
||||
delete_calendar_event,
|
||||
get_google_calendar_service,
|
||||
)
|
||||
|
||||
|
||||
class TestGoogleCalendarAPI:
|
||||
"""Test Google Calendar API endpoints."""
|
||||
|
||||
def test_status_not_connected(
|
||||
self, client: TestClient, test_user: User, auth_headers: dict
|
||||
):
|
||||
"""Test status endpoint when not connected."""
|
||||
response = client.get("/api/integrations/google/status", headers=auth_headers)
|
||||
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert data["connected"] is False
|
||||
assert data["expires_at"] is None
|
||||
|
||||
def test_connect_missing_credentials(
|
||||
self, client: TestClient, test_user: User, auth_headers: dict
|
||||
):
|
||||
"""Test connect endpoint with missing Google credentials."""
|
||||
# Note: In conftest, google_client_id and google_client_secret are empty by default
|
||||
response = client.get("/api/integrations/google/connect", headers=auth_headers)
|
||||
|
||||
assert response.status_code == 503
|
||||
assert "not configured" in response.json()["detail"].lower()
|
||||
|
||||
@patch("app.api.google_calendar.Flow")
|
||||
def test_connect_success(
|
||||
self, mock_flow, client: TestClient, test_user: User, auth_headers: dict
|
||||
):
|
||||
"""Test successful OAuth flow initiation."""
|
||||
# Mock the Flow object
|
||||
mock_flow_instance = MagicMock()
|
||||
mock_flow_instance.authorization_url.return_value = (
|
||||
"https://accounts.google.com/o/oauth2/auth?...",
|
||||
"test_state",
|
||||
)
|
||||
mock_flow.from_client_config.return_value = mock_flow_instance
|
||||
|
||||
# Temporarily set credentials in settings
|
||||
from app.core.config import settings
|
||||
|
||||
original_client_id = settings.google_client_id
|
||||
original_client_secret = settings.google_client_secret
|
||||
|
||||
settings.google_client_id = "test_client_id"
|
||||
settings.google_client_secret = "test_client_secret"
|
||||
|
||||
try:
|
||||
response = client.get(
|
||||
"/api/integrations/google/connect", headers=auth_headers
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert "authorization_url" in data
|
||||
assert "state" in data
|
||||
assert data["state"] == "test_state"
|
||||
finally:
|
||||
# Restore original settings
|
||||
settings.google_client_id = original_client_id
|
||||
settings.google_client_secret = original_client_secret
|
||||
|
||||
def test_disconnect_no_token(
|
||||
self, client: TestClient, test_user: User, auth_headers: dict
|
||||
):
|
||||
"""Test disconnect when no token exists."""
|
||||
response = client.delete(
|
||||
"/api/integrations/google/disconnect", headers=auth_headers
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
assert "disconnected" in response.json()["message"].lower()
|
||||
|
||||
def test_disconnect_with_token(
|
||||
self, client: TestClient, test_user: User, auth_headers: dict, db: Session
|
||||
):
|
||||
"""Test disconnect when token exists."""
|
||||
# Create a token for the user
|
||||
token = GoogleCalendarToken(
|
||||
user_id=test_user.id,
|
||||
access_token="test_access_token",
|
||||
refresh_token="test_refresh_token",
|
||||
token_expiry=None,
|
||||
)
|
||||
db.add(token)
|
||||
db.commit()
|
||||
|
||||
response = client.delete(
|
||||
"/api/integrations/google/disconnect", headers=auth_headers
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
assert "disconnected" in response.json()["message"].lower()
|
||||
|
||||
# Verify token was deleted
|
||||
deleted_token = (
|
||||
db.query(GoogleCalendarToken)
|
||||
.filter(GoogleCalendarToken.user_id == test_user.id)
|
||||
.first()
|
||||
)
|
||||
assert deleted_token is None
|
||||
|
||||
def test_status_connected(
|
||||
self, client: TestClient, test_user: User, auth_headers: dict, db: Session
|
||||
):
|
||||
"""Test status endpoint when connected."""
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
expiry = datetime.utcnow() + timedelta(hours=1)
|
||||
|
||||
# Create a token for the user
|
||||
token = GoogleCalendarToken(
|
||||
user_id=test_user.id,
|
||||
access_token="test_access_token",
|
||||
refresh_token="test_refresh_token",
|
||||
token_expiry=expiry,
|
||||
)
|
||||
db.add(token)
|
||||
db.commit()
|
||||
|
||||
response = client.get("/api/integrations/google/status", headers=auth_headers)
|
||||
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert data["connected"] is True
|
||||
assert data["expires_at"] is not None
|
||||
|
||||
|
||||
class TestGoogleCalendarService:
|
||||
"""Test Google Calendar service functions."""
|
||||
|
||||
def test_get_service_no_token(self, db: Session, test_user: User):
|
||||
"""Test getting service when no token exists."""
|
||||
service = get_google_calendar_service(db, test_user.id) # type: ignore[arg-type]
|
||||
assert service is None
|
||||
|
||||
@patch("app.services.google_calendar_service.build")
|
||||
@patch("app.services.google_calendar_service.Credentials")
|
||||
def test_create_calendar_event_success(
|
||||
self, mock_credentials, mock_build, db: Session, test_user: User
|
||||
):
|
||||
"""Test successful calendar event creation."""
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
# Create token
|
||||
token = GoogleCalendarToken(
|
||||
user_id=test_user.id,
|
||||
access_token="test_access_token",
|
||||
refresh_token="test_refresh_token",
|
||||
)
|
||||
db.add(token)
|
||||
|
||||
# Create space
|
||||
space = Space(
|
||||
name="Test Conference Room",
|
||||
type="sala",
|
||||
description="A test room",
|
||||
capacity=10,
|
||||
)
|
||||
db.add(space)
|
||||
|
||||
# Create booking
|
||||
now = datetime.utcnow()
|
||||
booking = Booking(
|
||||
user_id=test_user.id,
|
||||
space_id=1,
|
||||
title="Test Meeting",
|
||||
description="Test description",
|
||||
start_datetime=now,
|
||||
end_datetime=now + timedelta(hours=1),
|
||||
status="approved",
|
||||
)
|
||||
db.add(booking)
|
||||
db.commit()
|
||||
db.refresh(booking)
|
||||
|
||||
# Mock Google API
|
||||
mock_service = MagicMock()
|
||||
mock_service.events().insert().execute.return_value = {"id": "google_event_123"}
|
||||
mock_build.return_value = mock_service
|
||||
|
||||
# Mock credentials
|
||||
mock_creds_instance = MagicMock()
|
||||
mock_creds_instance.expired = False
|
||||
mock_creds_instance.refresh_token = "test_refresh_token"
|
||||
mock_credentials.return_value = mock_creds_instance
|
||||
|
||||
# Create event
|
||||
event_id = create_calendar_event(db, booking, test_user.id) # type: ignore[arg-type]
|
||||
|
||||
assert event_id == "google_event_123"
|
||||
# Check that insert was called (not assert_called_once due to mock chaining)
|
||||
assert mock_service.events().insert.call_count >= 1
|
||||
|
||||
@patch("app.services.google_calendar_service.build")
|
||||
@patch("app.services.google_calendar_service.Credentials")
|
||||
def test_delete_calendar_event_success(
|
||||
self, mock_credentials, mock_build, db: Session, test_user: User
|
||||
):
|
||||
"""Test successful calendar event deletion."""
|
||||
# Create token
|
||||
token = GoogleCalendarToken(
|
||||
user_id=test_user.id,
|
||||
access_token="test_access_token",
|
||||
refresh_token="test_refresh_token",
|
||||
)
|
||||
db.add(token)
|
||||
db.commit()
|
||||
|
||||
# Mock Google API
|
||||
mock_service = MagicMock()
|
||||
mock_build.return_value = mock_service
|
||||
|
||||
# Mock credentials
|
||||
mock_creds_instance = MagicMock()
|
||||
mock_creds_instance.expired = False
|
||||
mock_creds_instance.refresh_token = "test_refresh_token"
|
||||
mock_credentials.return_value = mock_creds_instance
|
||||
|
||||
# Delete event
|
||||
result = delete_calendar_event(db, "google_event_123", test_user.id) # type: ignore[arg-type]
|
||||
|
||||
assert result is True
|
||||
mock_service.events().delete.assert_called_once_with(
|
||||
calendarId="primary", eventId="google_event_123"
|
||||
)
|
||||
|
||||
def test_create_event_no_token(self, db: Session, test_user: User):
|
||||
"""Test creating event when user has no token."""
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
# Create space and booking without token
|
||||
space = Space(
|
||||
name="Test Room",
|
||||
type="sala",
|
||||
description="Test",
|
||||
capacity=10,
|
||||
)
|
||||
db.add(space)
|
||||
|
||||
now = datetime.utcnow()
|
||||
booking = Booking(
|
||||
user_id=test_user.id,
|
||||
space_id=1,
|
||||
title="Test",
|
||||
start_datetime=now,
|
||||
end_datetime=now + timedelta(hours=1),
|
||||
status="approved",
|
||||
)
|
||||
db.add(booking)
|
||||
db.commit()
|
||||
db.refresh(booking)
|
||||
|
||||
event_id = create_calendar_event(db, booking, test_user.id) # type: ignore[arg-type]
|
||||
assert event_id is None
|
||||
|
||||
|
||||
class TestBookingGoogleCalendarIntegration:
|
||||
"""Test integration of Google Calendar with booking approval/cancellation."""
|
||||
|
||||
@patch("app.services.google_calendar_service.create_calendar_event")
|
||||
def test_booking_approval_creates_event(
|
||||
self,
|
||||
mock_create_event,
|
||||
client: TestClient,
|
||||
test_admin: User,
|
||||
admin_headers: dict,
|
||||
db: Session,
|
||||
):
|
||||
"""Test that approving a booking creates a Google Calendar event."""
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
# Create test user and token
|
||||
user = User(
|
||||
email="user@test.com",
|
||||
full_name="Test User",
|
||||
hashed_password="hashed",
|
||||
role="user",
|
||||
)
|
||||
db.add(user)
|
||||
db.commit()
|
||||
db.refresh(user)
|
||||
|
||||
token = GoogleCalendarToken(
|
||||
user_id=user.id,
|
||||
access_token="test_access_token",
|
||||
refresh_token="test_refresh_token",
|
||||
)
|
||||
db.add(token)
|
||||
|
||||
# Create space
|
||||
space = Space(
|
||||
name="Test Room",
|
||||
type="sala",
|
||||
description="Test",
|
||||
capacity=10,
|
||||
)
|
||||
db.add(space)
|
||||
db.commit()
|
||||
db.refresh(space)
|
||||
|
||||
# Create pending booking
|
||||
now = datetime.utcnow()
|
||||
booking = Booking(
|
||||
user_id=user.id,
|
||||
space_id=space.id,
|
||||
title="Test Meeting",
|
||||
start_datetime=now + timedelta(hours=2),
|
||||
end_datetime=now + timedelta(hours=3),
|
||||
status="pending",
|
||||
)
|
||||
db.add(booking)
|
||||
db.commit()
|
||||
db.refresh(booking)
|
||||
|
||||
# Mock Google Calendar event creation
|
||||
mock_create_event.return_value = "google_event_123"
|
||||
|
||||
# Approve booking
|
||||
response = client.put(
|
||||
f"/api/admin/bookings/{booking.id}/approve", headers=admin_headers
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert data["status"] == "approved"
|
||||
assert data["google_calendar_event_id"] == "google_event_123"
|
||||
|
||||
# Verify event creation was called
|
||||
mock_create_event.assert_called_once()
|
||||
|
||||
@patch("app.services.google_calendar_service.delete_calendar_event")
|
||||
def test_booking_cancellation_deletes_event(
|
||||
self,
|
||||
mock_delete_event,
|
||||
client: TestClient,
|
||||
test_user: User,
|
||||
auth_headers: dict,
|
||||
db: Session,
|
||||
):
|
||||
"""Test that canceling a booking deletes the Google Calendar event."""
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
# Create token
|
||||
token = GoogleCalendarToken(
|
||||
user_id=test_user.id,
|
||||
access_token="test_access_token",
|
||||
refresh_token="test_refresh_token",
|
||||
)
|
||||
db.add(token)
|
||||
|
||||
# Create space
|
||||
space = Space(
|
||||
name="Test Room",
|
||||
type="sala",
|
||||
description="Test",
|
||||
capacity=10,
|
||||
)
|
||||
db.add(space)
|
||||
db.commit()
|
||||
db.refresh(space)
|
||||
|
||||
# Create approved booking with Google Calendar event
|
||||
now = datetime.utcnow()
|
||||
booking = Booking(
|
||||
user_id=test_user.id,
|
||||
space_id=space.id,
|
||||
title="Test Meeting",
|
||||
start_datetime=now + timedelta(hours=3),
|
||||
end_datetime=now + timedelta(hours=4),
|
||||
status="approved",
|
||||
google_calendar_event_id="google_event_123",
|
||||
)
|
||||
db.add(booking)
|
||||
db.commit()
|
||||
|
||||
# Mock Google Calendar event deletion
|
||||
mock_delete_event.return_value = True
|
||||
|
||||
# Cancel booking
|
||||
response = client.put(
|
||||
f"/api/bookings/{booking.id}/cancel", headers=auth_headers
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert data["status"] == "canceled"
|
||||
assert data["google_calendar_event_id"] is None
|
||||
|
||||
# Verify event deletion was called
|
||||
mock_delete_event.assert_called_once_with(
|
||||
db=db, event_id="google_event_123", user_id=test_user.id
|
||||
)
|
||||
127
backend/tests/test_google_calendar_api.py
Normal file
127
backend/tests/test_google_calendar_api.py
Normal file
@@ -0,0 +1,127 @@
|
||||
"""Tests for Google Calendar API endpoints."""
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
import pytest
|
||||
from fastapi.testclient import TestClient
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.main import app
|
||||
from app.models.google_calendar_token import GoogleCalendarToken
|
||||
from app.models.user import User
|
||||
|
||||
client = TestClient(app)
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def auth_headers(db: Session, test_user: User) -> dict[str, str]:
|
||||
"""Get auth headers for test user."""
|
||||
# Login to get token
|
||||
response = client.post(
|
||||
"/api/auth/login",
|
||||
json={"email": test_user.email, "password": "testpassword"},
|
||||
)
|
||||
token = response.json()["access_token"]
|
||||
return {"Authorization": f"Bearer {token}"}
|
||||
|
||||
|
||||
def test_google_status_not_connected(auth_headers: dict[str, str]):
|
||||
"""Test Google Calendar status when not connected."""
|
||||
response = client.get("/api/integrations/google/status", headers=auth_headers)
|
||||
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert data["connected"] is False
|
||||
assert data["expires_at"] is None
|
||||
|
||||
|
||||
def test_google_status_connected(
|
||||
db: Session, test_user: User, auth_headers: dict[str, str]
|
||||
):
|
||||
"""Test Google Calendar status when connected."""
|
||||
# Create token for user
|
||||
token = GoogleCalendarToken(
|
||||
user_id=test_user.id, # type: ignore[arg-type]
|
||||
access_token="test_token",
|
||||
refresh_token="test_refresh",
|
||||
token_expiry=None,
|
||||
)
|
||||
db.add(token)
|
||||
db.commit()
|
||||
|
||||
response = client.get("/api/integrations/google/status", headers=auth_headers)
|
||||
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert data["connected"] is True
|
||||
|
||||
|
||||
@patch("app.api.google_calendar.Flow")
|
||||
def test_connect_google(mock_flow: MagicMock, auth_headers: dict[str, str]):
|
||||
"""Test starting Google OAuth flow."""
|
||||
# Setup mock
|
||||
mock_flow_instance = MagicMock()
|
||||
mock_flow_instance.authorization_url.return_value = (
|
||||
"https://accounts.google.com/o/oauth2/auth?...",
|
||||
"test_state",
|
||||
)
|
||||
mock_flow.from_client_config.return_value = mock_flow_instance
|
||||
|
||||
response = client.get("/api/integrations/google/connect", headers=auth_headers)
|
||||
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert "authorization_url" in data
|
||||
assert "state" in data
|
||||
assert data["state"] == "test_state"
|
||||
|
||||
|
||||
def test_disconnect_google_not_connected(auth_headers: dict[str, str]):
|
||||
"""Test disconnecting when not connected."""
|
||||
response = client.delete(
|
||||
"/api/integrations/google/disconnect", headers=auth_headers
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
assert response.json()["message"] == "Google Calendar disconnected"
|
||||
|
||||
|
||||
def test_disconnect_google_success(
|
||||
db: Session, test_user: User, auth_headers: dict[str, str]
|
||||
):
|
||||
"""Test successful Google Calendar disconnect."""
|
||||
# Create token for user
|
||||
token = GoogleCalendarToken(
|
||||
user_id=test_user.id, # type: ignore[arg-type]
|
||||
access_token="test_token",
|
||||
refresh_token="test_refresh",
|
||||
token_expiry=None,
|
||||
)
|
||||
db.add(token)
|
||||
db.commit()
|
||||
|
||||
response = client.delete(
|
||||
"/api/integrations/google/disconnect", headers=auth_headers
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
assert response.json()["message"] == "Google Calendar disconnected"
|
||||
|
||||
# Verify token was deleted
|
||||
token_in_db = (
|
||||
db.query(GoogleCalendarToken)
|
||||
.filter(GoogleCalendarToken.user_id == test_user.id)
|
||||
.first()
|
||||
)
|
||||
assert token_in_db is None
|
||||
|
||||
|
||||
def test_google_connect_requires_auth():
|
||||
"""Test that Google Calendar endpoints require authentication."""
|
||||
response = client.get("/api/integrations/google/connect")
|
||||
assert response.status_code == 401
|
||||
|
||||
response = client.get("/api/integrations/google/status")
|
||||
assert response.status_code == 401
|
||||
|
||||
response = client.delete("/api/integrations/google/disconnect")
|
||||
assert response.status_code == 401
|
||||
153
backend/tests/test_google_calendar_service.py
Normal file
153
backend/tests/test_google_calendar_service.py
Normal file
@@ -0,0 +1,153 @@
|
||||
"""Tests for Google Calendar service."""
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
import pytest
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.models.booking import Booking
|
||||
from app.models.google_calendar_token import GoogleCalendarToken
|
||||
from app.models.space import Space
|
||||
from app.services.google_calendar_service import (
|
||||
create_calendar_event,
|
||||
delete_calendar_event,
|
||||
get_google_calendar_service,
|
||||
)
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def mock_google_calendar_token(db: Session) -> GoogleCalendarToken:
|
||||
"""Create a mock Google Calendar token."""
|
||||
token = GoogleCalendarToken(
|
||||
user_id=1,
|
||||
access_token="mock_access_token",
|
||||
refresh_token="mock_refresh_token",
|
||||
token_expiry=None,
|
||||
)
|
||||
db.add(token)
|
||||
db.commit()
|
||||
db.refresh(token)
|
||||
return token
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def mock_booking(db: Session) -> Booking:
|
||||
"""Create a mock booking with space."""
|
||||
space = Space(
|
||||
name="Test Space",
|
||||
description="Test Description",
|
||||
capacity=10,
|
||||
floor_level=1,
|
||||
building="Test Building",
|
||||
)
|
||||
db.add(space)
|
||||
db.commit()
|
||||
|
||||
booking = Booking(
|
||||
user_id=1,
|
||||
space_id=space.id,
|
||||
title="Test Booking",
|
||||
description="Test Description",
|
||||
start_datetime="2024-06-15T10:00:00",
|
||||
end_datetime="2024-06-15T12:00:00",
|
||||
status="approved",
|
||||
)
|
||||
db.add(booking)
|
||||
db.commit()
|
||||
db.refresh(booking)
|
||||
return booking
|
||||
|
||||
|
||||
def test_get_google_calendar_service_no_token(db: Session):
|
||||
"""Test get_google_calendar_service with no token."""
|
||||
service = get_google_calendar_service(db, 999)
|
||||
assert service is None
|
||||
|
||||
|
||||
@patch("app.services.google_calendar_service.build")
|
||||
@patch("app.services.google_calendar_service.Credentials")
|
||||
def test_get_google_calendar_service_success(
|
||||
mock_credentials: MagicMock,
|
||||
mock_build: MagicMock,
|
||||
db: Session,
|
||||
mock_google_calendar_token: GoogleCalendarToken,
|
||||
):
|
||||
"""Test successful Google Calendar service creation."""
|
||||
# Setup mocks
|
||||
mock_creds = MagicMock()
|
||||
mock_creds.expired = False
|
||||
mock_credentials.return_value = mock_creds
|
||||
|
||||
mock_service = MagicMock()
|
||||
mock_build.return_value = mock_service
|
||||
|
||||
service = get_google_calendar_service(db, 1)
|
||||
|
||||
# Verify service was created
|
||||
assert service is not None
|
||||
mock_build.assert_called_once_with("calendar", "v3", credentials=mock_creds)
|
||||
|
||||
|
||||
@patch("app.services.google_calendar_service.get_google_calendar_service")
|
||||
def test_create_calendar_event_no_service(
|
||||
mock_get_service: MagicMock, db: Session, mock_booking: Booking
|
||||
):
|
||||
"""Test create_calendar_event with no service."""
|
||||
mock_get_service.return_value = None
|
||||
|
||||
event_id = create_calendar_event(db, mock_booking, 1)
|
||||
|
||||
assert event_id is None
|
||||
|
||||
|
||||
@patch("app.services.google_calendar_service.get_google_calendar_service")
|
||||
def test_create_calendar_event_success(
|
||||
mock_get_service: MagicMock, db: Session, mock_booking: Booking
|
||||
):
|
||||
"""Test successful calendar event creation."""
|
||||
# Setup mock service
|
||||
mock_service = MagicMock()
|
||||
mock_events = MagicMock()
|
||||
mock_insert = MagicMock()
|
||||
mock_execute = MagicMock()
|
||||
|
||||
mock_service.events.return_value = mock_events
|
||||
mock_events.insert.return_value = mock_insert
|
||||
mock_insert.execute.return_value = {"id": "test_event_id"}
|
||||
|
||||
mock_get_service.return_value = mock_service
|
||||
|
||||
event_id = create_calendar_event(db, mock_booking, 1)
|
||||
|
||||
assert event_id == "test_event_id"
|
||||
mock_events.insert.assert_called_once()
|
||||
|
||||
|
||||
@patch("app.services.google_calendar_service.get_google_calendar_service")
|
||||
def test_delete_calendar_event_success(mock_get_service: MagicMock, db: Session):
|
||||
"""Test successful calendar event deletion."""
|
||||
# Setup mock service
|
||||
mock_service = MagicMock()
|
||||
mock_events = MagicMock()
|
||||
mock_delete = MagicMock()
|
||||
|
||||
mock_service.events.return_value = mock_events
|
||||
mock_events.delete.return_value = mock_delete
|
||||
|
||||
mock_get_service.return_value = mock_service
|
||||
|
||||
result = delete_calendar_event(db, "test_event_id", 1)
|
||||
|
||||
assert result is True
|
||||
mock_events.delete.assert_called_once_with(
|
||||
calendarId="primary", eventId="test_event_id"
|
||||
)
|
||||
|
||||
|
||||
@patch("app.services.google_calendar_service.get_google_calendar_service")
|
||||
def test_delete_calendar_event_no_service(mock_get_service: MagicMock, db: Session):
|
||||
"""Test delete_calendar_event with no service."""
|
||||
mock_get_service.return_value = None
|
||||
|
||||
result = delete_calendar_event(db, "test_event_id", 1)
|
||||
|
||||
assert result is False
|
||||
97
backend/tests/test_notification_service.py
Normal file
97
backend/tests/test_notification_service.py
Normal file
@@ -0,0 +1,97 @@
|
||||
"""Tests for notification service."""
|
||||
import pytest
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.models.booking import Booking
|
||||
from app.models.notification import Notification
|
||||
from app.models.user import User
|
||||
from app.services.notification_service import create_notification
|
||||
|
||||
|
||||
def test_create_notification(db: Session, test_user: User, test_booking: Booking):
|
||||
"""Test creating a notification."""
|
||||
notification = create_notification(
|
||||
db=db,
|
||||
user_id=test_user.id,
|
||||
type="booking_approved",
|
||||
title="Booking Approved",
|
||||
message="Your booking has been approved",
|
||||
booking_id=test_booking.id,
|
||||
)
|
||||
|
||||
assert notification.id is not None
|
||||
assert notification.user_id == test_user.id
|
||||
assert notification.type == "booking_approved"
|
||||
assert notification.title == "Booking Approved"
|
||||
assert notification.message == "Your booking has been approved"
|
||||
assert notification.is_read is False
|
||||
assert notification.booking_id == test_booking.id
|
||||
assert notification.created_at is not None
|
||||
|
||||
|
||||
def test_create_notification_without_booking(db: Session, test_user: User):
|
||||
"""Test creating a notification without a booking reference."""
|
||||
notification = create_notification(
|
||||
db=db,
|
||||
user_id=test_user.id,
|
||||
type="system_message",
|
||||
title="System Update",
|
||||
message="The system will undergo maintenance tonight",
|
||||
)
|
||||
|
||||
assert notification.id is not None
|
||||
assert notification.user_id == test_user.id
|
||||
assert notification.type == "system_message"
|
||||
assert notification.booking_id is None
|
||||
assert notification.is_read is False
|
||||
|
||||
|
||||
def test_notification_relationships(db: Session, test_user: User, test_booking: Booking):
|
||||
"""Test notification relationships with user and booking."""
|
||||
notification = create_notification(
|
||||
db=db,
|
||||
user_id=test_user.id,
|
||||
type="booking_created",
|
||||
title="Booking Created",
|
||||
message="Your booking has been created",
|
||||
booking_id=test_booking.id,
|
||||
)
|
||||
|
||||
# Test user relationship
|
||||
assert notification.user is not None
|
||||
assert notification.user.id == test_user.id
|
||||
assert notification.user.email == test_user.email
|
||||
|
||||
# Test booking relationship
|
||||
assert notification.booking is not None
|
||||
assert notification.booking.id == test_booking.id
|
||||
assert notification.booking.title == test_booking.title
|
||||
|
||||
|
||||
def test_multiple_notifications_for_user(db: Session, test_user: User):
|
||||
"""Test creating multiple notifications for the same user."""
|
||||
notification1 = create_notification(
|
||||
db=db,
|
||||
user_id=test_user.id,
|
||||
type="booking_created",
|
||||
title="First Booking",
|
||||
message="Your first booking has been created",
|
||||
)
|
||||
|
||||
notification2 = create_notification(
|
||||
db=db,
|
||||
user_id=test_user.id,
|
||||
type="booking_approved",
|
||||
title="Second Booking",
|
||||
message="Your second booking has been approved",
|
||||
)
|
||||
|
||||
assert notification1.id != notification2.id
|
||||
assert notification1.user_id == notification2.user_id == test_user.id
|
||||
|
||||
# Check user has access to all notifications
|
||||
db.refresh(test_user)
|
||||
user_notifications = test_user.notifications
|
||||
assert len(user_notifications) == 2
|
||||
assert notification1 in user_notifications
|
||||
assert notification2 in user_notifications
|
||||
179
backend/tests/test_notifications.py
Normal file
179
backend/tests/test_notifications.py
Normal file
@@ -0,0 +1,179 @@
|
||||
"""Tests for notifications API endpoints."""
|
||||
from datetime import datetime
|
||||
|
||||
import pytest
|
||||
from fastapi.testclient import TestClient
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.models.notification import Notification
|
||||
from app.models.user import User
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def test_notification(db: Session, test_user: User) -> Notification:
|
||||
"""Create test notification."""
|
||||
notification = Notification(
|
||||
user_id=test_user.id,
|
||||
type="booking_created",
|
||||
title="Test Notification",
|
||||
message="This is a test notification",
|
||||
is_read=False,
|
||||
created_at=datetime.utcnow(),
|
||||
)
|
||||
db.add(notification)
|
||||
db.commit()
|
||||
db.refresh(notification)
|
||||
return notification
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def test_read_notification(db: Session, test_user: User) -> Notification:
|
||||
"""Create read test notification."""
|
||||
notification = Notification(
|
||||
user_id=test_user.id,
|
||||
type="booking_approved",
|
||||
title="Read Notification",
|
||||
message="This notification has been read",
|
||||
is_read=True,
|
||||
created_at=datetime.utcnow(),
|
||||
)
|
||||
db.add(notification)
|
||||
db.commit()
|
||||
db.refresh(notification)
|
||||
return notification
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def other_user_notification(db: Session, test_admin: User) -> Notification:
|
||||
"""Create notification for another user."""
|
||||
notification = Notification(
|
||||
user_id=test_admin.id,
|
||||
type="booking_created",
|
||||
title="Admin Notification",
|
||||
message="This belongs to admin",
|
||||
is_read=False,
|
||||
created_at=datetime.utcnow(),
|
||||
)
|
||||
db.add(notification)
|
||||
db.commit()
|
||||
db.refresh(notification)
|
||||
return notification
|
||||
|
||||
|
||||
def test_get_notifications_for_user(
|
||||
client: TestClient,
|
||||
auth_headers: dict[str, str],
|
||||
test_notification: Notification,
|
||||
test_read_notification: Notification,
|
||||
other_user_notification: Notification,
|
||||
) -> None:
|
||||
"""Test getting all notifications for current user."""
|
||||
response = client.get("/api/notifications", headers=auth_headers)
|
||||
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
|
||||
# Should only return notifications for current user
|
||||
assert len(data) == 2
|
||||
|
||||
# Should be ordered by created_at DESC (most recent first)
|
||||
notification_ids = [n["id"] for n in data]
|
||||
assert test_notification.id in notification_ids
|
||||
assert test_read_notification.id in notification_ids
|
||||
assert other_user_notification.id not in notification_ids
|
||||
|
||||
|
||||
def test_filter_unread_notifications(
|
||||
client: TestClient,
|
||||
auth_headers: dict[str, str],
|
||||
test_notification: Notification,
|
||||
test_read_notification: Notification,
|
||||
) -> None:
|
||||
"""Test filtering notifications by is_read status."""
|
||||
# Get only unread notifications
|
||||
response = client.get(
|
||||
"/api/notifications",
|
||||
headers=auth_headers,
|
||||
params={"is_read": False},
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
|
||||
assert len(data) == 1
|
||||
assert data[0]["id"] == test_notification.id
|
||||
assert data[0]["is_read"] is False
|
||||
|
||||
# Get only read notifications
|
||||
response = client.get(
|
||||
"/api/notifications",
|
||||
headers=auth_headers,
|
||||
params={"is_read": True},
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
|
||||
assert len(data) == 1
|
||||
assert data[0]["id"] == test_read_notification.id
|
||||
assert data[0]["is_read"] is True
|
||||
|
||||
|
||||
def test_mark_notification_as_read(
|
||||
client: TestClient,
|
||||
auth_headers: dict[str, str],
|
||||
test_notification: Notification,
|
||||
) -> None:
|
||||
"""Test marking a notification as read."""
|
||||
response = client.put(
|
||||
f"/api/notifications/{test_notification.id}/read",
|
||||
headers=auth_headers,
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
|
||||
assert data["id"] == test_notification.id
|
||||
assert data["is_read"] is True
|
||||
assert data["title"] == "Test Notification"
|
||||
assert data["message"] == "This is a test notification"
|
||||
|
||||
|
||||
def test_cannot_mark_others_notification(
|
||||
client: TestClient,
|
||||
auth_headers: dict[str, str],
|
||||
other_user_notification: Notification,
|
||||
) -> None:
|
||||
"""Test that users cannot mark other users' notifications as read."""
|
||||
response = client.put(
|
||||
f"/api/notifications/{other_user_notification.id}/read",
|
||||
headers=auth_headers,
|
||||
)
|
||||
|
||||
assert response.status_code == 403
|
||||
data = response.json()
|
||||
assert "own notifications" in data["detail"].lower()
|
||||
|
||||
|
||||
def test_mark_nonexistent_notification(
|
||||
client: TestClient,
|
||||
auth_headers: dict[str, str],
|
||||
) -> None:
|
||||
"""Test marking a non-existent notification as read."""
|
||||
response = client.put(
|
||||
"/api/notifications/99999/read",
|
||||
headers=auth_headers,
|
||||
)
|
||||
|
||||
assert response.status_code == 404
|
||||
data = response.json()
|
||||
assert "not found" in data["detail"].lower()
|
||||
|
||||
|
||||
def test_get_notifications_without_auth(client: TestClient) -> None:
|
||||
"""Test that authentication is required for notifications endpoints."""
|
||||
response = client.get("/api/notifications")
|
||||
assert response.status_code == 403
|
||||
|
||||
response = client.put("/api/notifications/1/read")
|
||||
assert response.status_code == 403
|
||||
328
backend/tests/test_recurring_bookings.py
Normal file
328
backend/tests/test_recurring_bookings.py
Normal file
@@ -0,0 +1,328 @@
|
||||
"""Tests for recurring booking endpoints."""
|
||||
from datetime import date, timedelta
|
||||
|
||||
import pytest
|
||||
from fastapi.testclient import TestClient
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.models.booking import Booking
|
||||
|
||||
|
||||
def test_create_recurring_booking_success(
|
||||
client: TestClient, user_token: str, test_space, db: Session
|
||||
):
|
||||
"""Test successful creation of recurring bookings."""
|
||||
# Create 4 Monday bookings (4 weeks)
|
||||
start_date = date.today() + timedelta(days=7) # Next week
|
||||
# Find the next Monday
|
||||
while start_date.weekday() != 0: # 0 = Monday
|
||||
start_date += timedelta(days=1)
|
||||
|
||||
end_date = start_date + timedelta(days=21) # 3 weeks later
|
||||
|
||||
response = client.post(
|
||||
"/api/bookings/recurring",
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
json={
|
||||
"space_id": test_space.id,
|
||||
"start_time": "10:00",
|
||||
"duration_minutes": 60,
|
||||
"title": "Weekly Team Sync",
|
||||
"description": "Regular team meeting",
|
||||
"recurrence_days": [0], # Monday only
|
||||
"start_date": start_date.isoformat(),
|
||||
"end_date": end_date.isoformat(),
|
||||
"skip_conflicts": True,
|
||||
},
|
||||
)
|
||||
|
||||
assert response.status_code == 201
|
||||
data = response.json()
|
||||
assert data["total_requested"] == 4
|
||||
assert data["total_created"] == 4
|
||||
assert data["total_skipped"] == 0
|
||||
assert len(data["created_bookings"]) == 4
|
||||
assert len(data["skipped_dates"]) == 0
|
||||
|
||||
# Verify all bookings were created
|
||||
bookings = db.query(Booking).filter(Booking.title == "Weekly Team Sync").all()
|
||||
assert len(bookings) == 4
|
||||
|
||||
|
||||
def test_create_recurring_booking_multiple_days(
|
||||
client: TestClient, user_token: str, test_space, db: Session
|
||||
):
|
||||
"""Test recurring booking on multiple days (Mon, Wed, Fri)."""
|
||||
start_date = date.today() + timedelta(days=7)
|
||||
# Find the next Monday
|
||||
while start_date.weekday() != 0:
|
||||
start_date += timedelta(days=1)
|
||||
|
||||
end_date = start_date + timedelta(days=14) # 2 weeks
|
||||
|
||||
response = client.post(
|
||||
"/api/bookings/recurring",
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
json={
|
||||
"space_id": test_space.id,
|
||||
"start_time": "14:00",
|
||||
"duration_minutes": 90,
|
||||
"title": "MWF Sessions",
|
||||
"recurrence_days": [0, 2, 4], # Mon, Wed, Fri
|
||||
"start_date": start_date.isoformat(),
|
||||
"end_date": end_date.isoformat(),
|
||||
"skip_conflicts": True,
|
||||
},
|
||||
)
|
||||
|
||||
assert response.status_code == 201
|
||||
data = response.json()
|
||||
# Could be 6 or 7 depending on whether start_date itself is included
|
||||
assert data["total_created"] >= 6
|
||||
assert data["total_created"] <= 7
|
||||
assert data["total_skipped"] == 0
|
||||
|
||||
|
||||
def test_create_recurring_booking_skip_conflicts(
|
||||
client: TestClient, user_token: str, test_space, admin_token: str, db: Session
|
||||
):
|
||||
"""Test skipping conflicted dates."""
|
||||
start_date = date.today() + timedelta(days=7)
|
||||
# Find the next Monday
|
||||
while start_date.weekday() != 0:
|
||||
start_date += timedelta(days=1)
|
||||
|
||||
# Create a conflicting booking on the 2nd Monday
|
||||
conflict_date = start_date + timedelta(days=7)
|
||||
|
||||
client.post(
|
||||
"/api/bookings",
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
json={
|
||||
"space_id": test_space.id,
|
||||
"start_datetime": f"{conflict_date.isoformat()}T10:00:00",
|
||||
"end_datetime": f"{conflict_date.isoformat()}T11:00:00",
|
||||
"title": "Conflicting Booking",
|
||||
},
|
||||
)
|
||||
|
||||
# Now create recurring booking that will hit the conflict
|
||||
end_date = start_date + timedelta(days=21)
|
||||
|
||||
response = client.post(
|
||||
"/api/bookings/recurring",
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
json={
|
||||
"space_id": test_space.id,
|
||||
"start_time": "10:00",
|
||||
"duration_minutes": 60,
|
||||
"title": "Weekly Recurring",
|
||||
"recurrence_days": [0], # Monday
|
||||
"start_date": start_date.isoformat(),
|
||||
"end_date": end_date.isoformat(),
|
||||
"skip_conflicts": True,
|
||||
},
|
||||
)
|
||||
|
||||
assert response.status_code == 201
|
||||
data = response.json()
|
||||
assert data["total_requested"] == 4
|
||||
assert data["total_created"] == 3 # One skipped
|
||||
assert data["total_skipped"] == 1
|
||||
assert len(data["skipped_dates"]) == 1
|
||||
assert data["skipped_dates"][0]["date"] == conflict_date.isoformat()
|
||||
assert "deja rezervat" in data["skipped_dates"][0]["reason"].lower()
|
||||
|
||||
|
||||
def test_create_recurring_booking_stop_on_conflict(
|
||||
client: TestClient, user_token: str, test_space, db: Session
|
||||
):
|
||||
"""Test stopping on first conflict."""
|
||||
start_date = date.today() + timedelta(days=7)
|
||||
# Find the next Monday
|
||||
while start_date.weekday() != 0:
|
||||
start_date += timedelta(days=1)
|
||||
|
||||
# Create a conflicting booking on the 2nd Monday
|
||||
conflict_date = start_date + timedelta(days=7)
|
||||
|
||||
client.post(
|
||||
"/api/bookings",
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
json={
|
||||
"space_id": test_space.id,
|
||||
"start_datetime": f"{conflict_date.isoformat()}T10:00:00",
|
||||
"end_datetime": f"{conflict_date.isoformat()}T11:00:00",
|
||||
"title": "Conflicting Booking",
|
||||
},
|
||||
)
|
||||
|
||||
# Now create recurring booking with skip_conflicts=False
|
||||
end_date = start_date + timedelta(days=21)
|
||||
|
||||
response = client.post(
|
||||
"/api/bookings/recurring",
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
json={
|
||||
"space_id": test_space.id,
|
||||
"start_time": "10:00",
|
||||
"duration_minutes": 60,
|
||||
"title": "Weekly Recurring",
|
||||
"recurrence_days": [0],
|
||||
"start_date": start_date.isoformat(),
|
||||
"end_date": end_date.isoformat(),
|
||||
"skip_conflicts": False, # Stop on conflict
|
||||
},
|
||||
)
|
||||
|
||||
assert response.status_code == 201
|
||||
data = response.json()
|
||||
assert data["total_requested"] == 4
|
||||
assert data["total_created"] == 1 # Only first one before conflict
|
||||
assert data["total_skipped"] == 1
|
||||
|
||||
|
||||
def test_create_recurring_booking_max_occurrences(
|
||||
client: TestClient, user_token: str, test_space
|
||||
):
|
||||
"""Test limiting to 52 occurrences."""
|
||||
start_date = date.today() + timedelta(days=1)
|
||||
# Request 52+ weeks but within 1 year limit (365 days)
|
||||
end_date = start_date + timedelta(days=364) # Within 1 year
|
||||
|
||||
response = client.post(
|
||||
"/api/bookings/recurring",
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
json={
|
||||
"space_id": test_space.id,
|
||||
"start_time": "10:00",
|
||||
"duration_minutes": 60,
|
||||
"title": "Long Recurring",
|
||||
"recurrence_days": [0], # Monday
|
||||
"start_date": start_date.isoformat(),
|
||||
"end_date": end_date.isoformat(),
|
||||
"skip_conflicts": True,
|
||||
},
|
||||
)
|
||||
|
||||
assert response.status_code == 201
|
||||
data = response.json()
|
||||
# Should be capped at 52 occurrences
|
||||
assert data["total_requested"] <= 52
|
||||
assert data["total_created"] <= 52
|
||||
|
||||
|
||||
def test_create_recurring_booking_validation(client: TestClient, user_token: str):
|
||||
"""Test validation (invalid days, date range, etc.)."""
|
||||
start_date = date.today() + timedelta(days=7)
|
||||
end_date = start_date + timedelta(days=14)
|
||||
|
||||
# Invalid recurrence day (> 6)
|
||||
response = client.post(
|
||||
"/api/bookings/recurring",
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
json={
|
||||
"space_id": 1,
|
||||
"start_time": "10:00",
|
||||
"duration_minutes": 60,
|
||||
"title": "Invalid Day",
|
||||
"recurrence_days": [0, 7], # 7 is invalid
|
||||
"start_date": start_date.isoformat(),
|
||||
"end_date": end_date.isoformat(),
|
||||
"skip_conflicts": True,
|
||||
},
|
||||
)
|
||||
|
||||
assert response.status_code == 422
|
||||
assert "Days must be 0-6" in response.json()["detail"][0]["msg"]
|
||||
|
||||
# End date before start date
|
||||
response = client.post(
|
||||
"/api/bookings/recurring",
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
json={
|
||||
"space_id": 1,
|
||||
"start_time": "10:00",
|
||||
"duration_minutes": 60,
|
||||
"title": "Invalid Range",
|
||||
"recurrence_days": [0],
|
||||
"start_date": end_date.isoformat(),
|
||||
"end_date": start_date.isoformat(),
|
||||
"skip_conflicts": True,
|
||||
},
|
||||
)
|
||||
|
||||
assert response.status_code == 422
|
||||
assert "end_date must be after start_date" in response.json()["detail"][0]["msg"]
|
||||
|
||||
# Date range > 1 year
|
||||
response = client.post(
|
||||
"/api/bookings/recurring",
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
json={
|
||||
"space_id": 1,
|
||||
"start_time": "10:00",
|
||||
"duration_minutes": 60,
|
||||
"title": "Too Long",
|
||||
"recurrence_days": [0],
|
||||
"start_date": start_date.isoformat(),
|
||||
"end_date": (start_date + timedelta(days=400)).isoformat(),
|
||||
"skip_conflicts": True,
|
||||
},
|
||||
)
|
||||
|
||||
assert response.status_code == 422
|
||||
assert "cannot exceed 1 year" in response.json()["detail"][0]["msg"]
|
||||
|
||||
|
||||
def test_create_recurring_booking_invalid_time_format(
|
||||
client: TestClient, user_token: str, test_space
|
||||
):
|
||||
"""Test invalid time format."""
|
||||
start_date = date.today() + timedelta(days=7)
|
||||
end_date = start_date + timedelta(days=14)
|
||||
|
||||
# Test with malformed time string
|
||||
response = client.post(
|
||||
"/api/bookings/recurring",
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
json={
|
||||
"space_id": test_space.id,
|
||||
"start_time": "abc", # Invalid format
|
||||
"duration_minutes": 60,
|
||||
"title": "Invalid Time",
|
||||
"recurrence_days": [0],
|
||||
"start_date": start_date.isoformat(),
|
||||
"end_date": end_date.isoformat(),
|
||||
"skip_conflicts": True,
|
||||
},
|
||||
)
|
||||
|
||||
assert response.status_code == 400
|
||||
assert "Invalid start_time format" in response.json()["detail"]
|
||||
|
||||
|
||||
def test_create_recurring_booking_space_not_found(
|
||||
client: TestClient, user_token: str
|
||||
):
|
||||
"""Test recurring booking with non-existent space."""
|
||||
start_date = date.today() + timedelta(days=7)
|
||||
end_date = start_date + timedelta(days=14)
|
||||
|
||||
response = client.post(
|
||||
"/api/bookings/recurring",
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
json={
|
||||
"space_id": 99999, # Non-existent
|
||||
"start_time": "10:00",
|
||||
"duration_minutes": 60,
|
||||
"title": "Test",
|
||||
"recurrence_days": [0],
|
||||
"start_date": start_date.isoformat(),
|
||||
"end_date": end_date.isoformat(),
|
||||
"skip_conflicts": True,
|
||||
},
|
||||
)
|
||||
|
||||
assert response.status_code == 404
|
||||
assert "Space not found" in response.json()["detail"]
|
||||
333
backend/tests/test_registration.py
Normal file
333
backend/tests/test_registration.py
Normal file
@@ -0,0 +1,333 @@
|
||||
"""Tests for user registration and email verification."""
|
||||
from datetime import datetime, timedelta
|
||||
from unittest.mock import patch
|
||||
|
||||
import pytest
|
||||
from jose import jwt
|
||||
|
||||
from app.core.config import settings
|
||||
from app.models.user import User
|
||||
|
||||
|
||||
def test_register_success(client):
|
||||
"""Test successful registration."""
|
||||
response = client.post(
|
||||
"/api/auth/register",
|
||||
json={
|
||||
"email": "newuser@example.com",
|
||||
"password": "Test1234",
|
||||
"confirm_password": "Test1234",
|
||||
"full_name": "New User",
|
||||
"organization": "Test Org",
|
||||
},
|
||||
)
|
||||
|
||||
assert response.status_code == 201
|
||||
data = response.json()
|
||||
assert data["email"] == "newuser@example.com"
|
||||
assert "verify" in data["message"].lower()
|
||||
|
||||
|
||||
def test_register_duplicate_email(client, test_user):
|
||||
"""Test registering with existing email."""
|
||||
response = client.post(
|
||||
"/api/auth/register",
|
||||
json={
|
||||
"email": test_user.email,
|
||||
"password": "Test1234",
|
||||
"confirm_password": "Test1234",
|
||||
"full_name": "Duplicate User",
|
||||
"organization": "Test Org",
|
||||
},
|
||||
)
|
||||
|
||||
assert response.status_code == 400
|
||||
assert "already registered" in response.json()["detail"].lower()
|
||||
|
||||
|
||||
def test_register_weak_password(client):
|
||||
"""Test password validation."""
|
||||
# No uppercase
|
||||
response = client.post(
|
||||
"/api/auth/register",
|
||||
json={
|
||||
"email": "test@example.com",
|
||||
"password": "test1234",
|
||||
"confirm_password": "test1234",
|
||||
"full_name": "Test User",
|
||||
"organization": "Test Org",
|
||||
},
|
||||
)
|
||||
assert response.status_code == 422
|
||||
|
||||
# No digit
|
||||
response = client.post(
|
||||
"/api/auth/register",
|
||||
json={
|
||||
"email": "test@example.com",
|
||||
"password": "Testtest",
|
||||
"confirm_password": "Testtest",
|
||||
"full_name": "Test User",
|
||||
"organization": "Test Org",
|
||||
},
|
||||
)
|
||||
assert response.status_code == 422
|
||||
|
||||
# Too short
|
||||
response = client.post(
|
||||
"/api/auth/register",
|
||||
json={
|
||||
"email": "test@example.com",
|
||||
"password": "Test12",
|
||||
"confirm_password": "Test12",
|
||||
"full_name": "Test User",
|
||||
"organization": "Test Org",
|
||||
},
|
||||
)
|
||||
assert response.status_code == 422
|
||||
|
||||
|
||||
def test_register_passwords_mismatch(client):
|
||||
"""Test password confirmation."""
|
||||
response = client.post(
|
||||
"/api/auth/register",
|
||||
json={
|
||||
"email": "test@example.com",
|
||||
"password": "Test1234",
|
||||
"confirm_password": "Different1234",
|
||||
"full_name": "Test User",
|
||||
"organization": "Test Org",
|
||||
},
|
||||
)
|
||||
|
||||
assert response.status_code == 422
|
||||
assert "password" in response.json()["detail"][0]["msg"].lower()
|
||||
|
||||
|
||||
def test_verify_email_success(client, db_session):
|
||||
"""Test email verification."""
|
||||
# Create unverified user
|
||||
user = User(
|
||||
email="verify@example.com",
|
||||
hashed_password="hashed",
|
||||
full_name="Test User",
|
||||
organization="Test Org",
|
||||
role="user",
|
||||
is_active=False,
|
||||
)
|
||||
db_session.add(user)
|
||||
db_session.commit()
|
||||
db_session.refresh(user)
|
||||
|
||||
# Generate token
|
||||
token = jwt.encode(
|
||||
{
|
||||
"sub": str(user.id),
|
||||
"type": "email_verification",
|
||||
"exp": datetime.utcnow() + timedelta(hours=24),
|
||||
},
|
||||
settings.secret_key,
|
||||
algorithm="HS256",
|
||||
)
|
||||
|
||||
# Verify
|
||||
response = client.post("/api/auth/verify", json={"token": token})
|
||||
|
||||
assert response.status_code == 200
|
||||
assert "successfully" in response.json()["message"].lower()
|
||||
|
||||
# Check user is now active
|
||||
db_session.refresh(user)
|
||||
assert user.is_active is True
|
||||
|
||||
|
||||
def test_verify_email_expired_token(client, db_session):
|
||||
"""Test expired verification token."""
|
||||
# Create unverified user
|
||||
user = User(
|
||||
email="verify@example.com",
|
||||
hashed_password="hashed",
|
||||
full_name="Test User",
|
||||
organization="Test Org",
|
||||
role="user",
|
||||
is_active=False,
|
||||
)
|
||||
db_session.add(user)
|
||||
db_session.commit()
|
||||
db_session.refresh(user)
|
||||
|
||||
# Generate expired token
|
||||
token = jwt.encode(
|
||||
{
|
||||
"sub": str(user.id),
|
||||
"type": "email_verification",
|
||||
"exp": datetime.utcnow() - timedelta(hours=1), # Expired
|
||||
},
|
||||
settings.secret_key,
|
||||
algorithm="HS256",
|
||||
)
|
||||
|
||||
# Try to verify
|
||||
response = client.post("/api/auth/verify", json={"token": token})
|
||||
|
||||
assert response.status_code == 400
|
||||
assert "expired" in response.json()["detail"].lower()
|
||||
|
||||
|
||||
def test_verify_email_invalid_token(client):
|
||||
"""Test invalid verification token."""
|
||||
response = client.post("/api/auth/verify", json={"token": "invalid-token"})
|
||||
|
||||
assert response.status_code == 400
|
||||
assert "invalid" in response.json()["detail"].lower()
|
||||
|
||||
|
||||
def test_verify_email_wrong_token_type(client, db_session):
|
||||
"""Test token with wrong type."""
|
||||
# Create unverified user
|
||||
user = User(
|
||||
email="verify@example.com",
|
||||
hashed_password="hashed",
|
||||
full_name="Test User",
|
||||
organization="Test Org",
|
||||
role="user",
|
||||
is_active=False,
|
||||
)
|
||||
db_session.add(user)
|
||||
db_session.commit()
|
||||
db_session.refresh(user)
|
||||
|
||||
# Generate token with wrong type
|
||||
token = jwt.encode(
|
||||
{
|
||||
"sub": str(user.id),
|
||||
"type": "access_token", # Wrong type
|
||||
"exp": datetime.utcnow() + timedelta(hours=24),
|
||||
},
|
||||
settings.secret_key,
|
||||
algorithm="HS256",
|
||||
)
|
||||
|
||||
# Try to verify
|
||||
response = client.post("/api/auth/verify", json={"token": token})
|
||||
|
||||
assert response.status_code == 400
|
||||
assert "invalid" in response.json()["detail"].lower()
|
||||
|
||||
|
||||
def test_verify_email_already_verified(client, db_session):
|
||||
"""Test verifying already verified account."""
|
||||
# Create verified user
|
||||
user = User(
|
||||
email="verify@example.com",
|
||||
hashed_password="hashed",
|
||||
full_name="Test User",
|
||||
organization="Test Org",
|
||||
role="user",
|
||||
is_active=True, # Already active
|
||||
)
|
||||
db_session.add(user)
|
||||
db_session.commit()
|
||||
db_session.refresh(user)
|
||||
|
||||
# Generate token
|
||||
token = jwt.encode(
|
||||
{
|
||||
"sub": str(user.id),
|
||||
"type": "email_verification",
|
||||
"exp": datetime.utcnow() + timedelta(hours=24),
|
||||
},
|
||||
settings.secret_key,
|
||||
algorithm="HS256",
|
||||
)
|
||||
|
||||
# Try to verify
|
||||
response = client.post("/api/auth/verify", json={"token": token})
|
||||
|
||||
assert response.status_code == 200
|
||||
assert "already verified" in response.json()["message"].lower()
|
||||
|
||||
|
||||
def test_resend_verification(client, db_session):
|
||||
"""Test resending verification email."""
|
||||
# Create unverified user
|
||||
user = User(
|
||||
email="resend@example.com",
|
||||
hashed_password="hashed",
|
||||
full_name="Test User",
|
||||
organization="Test Org",
|
||||
role="user",
|
||||
is_active=False,
|
||||
)
|
||||
db_session.add(user)
|
||||
db_session.commit()
|
||||
|
||||
# Request resend
|
||||
response = client.post(
|
||||
"/api/auth/resend-verification", params={"email": user.email}
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
assert "verification link" in response.json()["message"].lower()
|
||||
|
||||
|
||||
def test_resend_verification_nonexistent_email(client):
|
||||
"""Test resending to non-existent email."""
|
||||
response = client.post(
|
||||
"/api/auth/resend-verification",
|
||||
params={"email": "nonexistent@example.com"},
|
||||
)
|
||||
|
||||
# Should not reveal if email exists
|
||||
assert response.status_code == 200
|
||||
assert "if the email exists" in response.json()["message"].lower()
|
||||
|
||||
|
||||
def test_resend_verification_already_verified(client, db_session):
|
||||
"""Test resending for already verified account."""
|
||||
# Create verified user
|
||||
user = User(
|
||||
email="verified@example.com",
|
||||
hashed_password="hashed",
|
||||
full_name="Test User",
|
||||
organization="Test Org",
|
||||
role="user",
|
||||
is_active=True,
|
||||
)
|
||||
db_session.add(user)
|
||||
db_session.commit()
|
||||
|
||||
# Try to resend
|
||||
response = client.post(
|
||||
"/api/auth/resend-verification", params={"email": user.email}
|
||||
)
|
||||
|
||||
assert response.status_code == 400
|
||||
assert "already verified" in response.json()["detail"].lower()
|
||||
|
||||
|
||||
def test_login_before_verification(client, db_session):
|
||||
"""Test that unverified users cannot log in."""
|
||||
# Create unverified user
|
||||
from app.core.security import get_password_hash
|
||||
|
||||
password = "Test1234"
|
||||
user = User(
|
||||
email="unverified@example.com",
|
||||
hashed_password=get_password_hash(password),
|
||||
full_name="Test User",
|
||||
organization="Test Org",
|
||||
role="user",
|
||||
is_active=False, # Not verified
|
||||
)
|
||||
db_session.add(user)
|
||||
db_session.commit()
|
||||
|
||||
# Try to login
|
||||
response = client.post(
|
||||
"/api/auth/login",
|
||||
json={"email": user.email, "password": password},
|
||||
)
|
||||
|
||||
assert response.status_code == 403
|
||||
assert "disabled" in response.json()["detail"].lower()
|
||||
296
backend/tests/test_reports.py
Normal file
296
backend/tests/test_reports.py
Normal file
@@ -0,0 +1,296 @@
|
||||
"""Test report endpoints."""
|
||||
from datetime import datetime
|
||||
|
||||
import pytest
|
||||
from fastapi.testclient import TestClient
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.models.booking import Booking
|
||||
from app.models.space import Space
|
||||
from app.models.user import User
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def test_spaces(db: Session) -> list[Space]:
|
||||
"""Create multiple test spaces."""
|
||||
spaces = [
|
||||
Space(
|
||||
name="Conference Room A",
|
||||
type="sala",
|
||||
capacity=10,
|
||||
description="Test room A",
|
||||
is_active=True,
|
||||
),
|
||||
Space(
|
||||
name="Office B",
|
||||
type="birou",
|
||||
capacity=2,
|
||||
description="Test office B",
|
||||
is_active=True,
|
||||
),
|
||||
]
|
||||
for space in spaces:
|
||||
db.add(space)
|
||||
db.commit()
|
||||
for space in spaces:
|
||||
db.refresh(space)
|
||||
return spaces
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def test_users(db: Session, test_user: User) -> list[User]:
|
||||
"""Create multiple test users."""
|
||||
from app.core.security import get_password_hash
|
||||
|
||||
user2 = User(
|
||||
email="user2@example.com",
|
||||
full_name="User Two",
|
||||
hashed_password=get_password_hash("password"),
|
||||
role="user",
|
||||
is_active=True,
|
||||
)
|
||||
db.add(user2)
|
||||
db.commit()
|
||||
db.refresh(user2)
|
||||
return [test_user, user2]
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def test_bookings(
|
||||
db: Session, test_users: list[User], test_spaces: list[Space]
|
||||
) -> list[Booking]:
|
||||
"""Create multiple test bookings with various statuses."""
|
||||
bookings = [
|
||||
# User 1, Space 1, approved
|
||||
Booking(
|
||||
user_id=test_users[0].id,
|
||||
space_id=test_spaces[0].id,
|
||||
title="Meeting 1",
|
||||
description="Test",
|
||||
start_datetime=datetime(2024, 3, 15, 10, 0),
|
||||
end_datetime=datetime(2024, 3, 15, 12, 0), # 2 hours
|
||||
status="approved",
|
||||
),
|
||||
# User 1, Space 1, pending
|
||||
Booking(
|
||||
user_id=test_users[0].id,
|
||||
space_id=test_spaces[0].id,
|
||||
title="Meeting 2",
|
||||
description="Test",
|
||||
start_datetime=datetime(2024, 3, 16, 10, 0),
|
||||
end_datetime=datetime(2024, 3, 16, 11, 0), # 1 hour
|
||||
status="pending",
|
||||
),
|
||||
# User 1, Space 2, rejected
|
||||
Booking(
|
||||
user_id=test_users[0].id,
|
||||
space_id=test_spaces[1].id,
|
||||
title="Meeting 3",
|
||||
description="Test",
|
||||
start_datetime=datetime(2024, 3, 17, 10, 0),
|
||||
end_datetime=datetime(2024, 3, 17, 13, 0), # 3 hours
|
||||
status="rejected",
|
||||
rejection_reason="Conflict",
|
||||
),
|
||||
# User 2, Space 1, approved
|
||||
Booking(
|
||||
user_id=test_users[1].id,
|
||||
space_id=test_spaces[0].id,
|
||||
title="Meeting 4",
|
||||
description="Test",
|
||||
start_datetime=datetime(2024, 3, 18, 10, 0),
|
||||
end_datetime=datetime(2024, 3, 18, 14, 0), # 4 hours
|
||||
status="approved",
|
||||
),
|
||||
# User 2, Space 1, canceled
|
||||
Booking(
|
||||
user_id=test_users[1].id,
|
||||
space_id=test_spaces[0].id,
|
||||
title="Meeting 5",
|
||||
description="Test",
|
||||
start_datetime=datetime(2024, 3, 19, 10, 0),
|
||||
end_datetime=datetime(2024, 3, 19, 11, 30), # 1.5 hours
|
||||
status="canceled",
|
||||
cancellation_reason="Not needed",
|
||||
),
|
||||
]
|
||||
for booking in bookings:
|
||||
db.add(booking)
|
||||
db.commit()
|
||||
for booking in bookings:
|
||||
db.refresh(booking)
|
||||
return bookings
|
||||
|
||||
|
||||
def test_usage_report(
|
||||
client: TestClient,
|
||||
admin_headers: dict[str, str],
|
||||
test_bookings: list[Booking],
|
||||
) -> None:
|
||||
"""Test usage report generation."""
|
||||
response = client.get("/api/admin/reports/usage", headers=admin_headers)
|
||||
assert response.status_code == 200
|
||||
|
||||
data = response.json()
|
||||
assert "items" in data
|
||||
assert "total_bookings" in data
|
||||
assert "date_range" in data
|
||||
|
||||
# Should have 2 spaces
|
||||
assert len(data["items"]) == 2
|
||||
|
||||
# Check Conference Room A
|
||||
conf_room = next((i for i in data["items"] if i["space_name"] == "Conference Room A"), None)
|
||||
assert conf_room is not None
|
||||
assert conf_room["total_bookings"] == 4 # 4 bookings in this space
|
||||
assert conf_room["approved_bookings"] == 2
|
||||
assert conf_room["pending_bookings"] == 1
|
||||
assert conf_room["rejected_bookings"] == 0
|
||||
assert conf_room["canceled_bookings"] == 1
|
||||
assert conf_room["total_hours"] == 8.5 # 2 + 1 + 4 + 1.5
|
||||
|
||||
# Check Office B
|
||||
office = next((i for i in data["items"] if i["space_name"] == "Office B"), None)
|
||||
assert office is not None
|
||||
assert office["total_bookings"] == 1
|
||||
assert office["rejected_bookings"] == 1
|
||||
assert office["total_hours"] == 3.0
|
||||
|
||||
# Total bookings across all spaces
|
||||
assert data["total_bookings"] == 5
|
||||
|
||||
|
||||
def test_usage_report_with_date_filter(
|
||||
client: TestClient,
|
||||
admin_headers: dict[str, str],
|
||||
test_bookings: list[Booking],
|
||||
) -> None:
|
||||
"""Test usage report with date range filter."""
|
||||
# Filter for March 15-16 only
|
||||
response = client.get(
|
||||
"/api/admin/reports/usage",
|
||||
headers=admin_headers,
|
||||
params={"start_date": "2024-03-15", "end_date": "2024-03-16"},
|
||||
)
|
||||
assert response.status_code == 200
|
||||
|
||||
data = response.json()
|
||||
assert len(data["items"]) == 1 # Only Conference Room A
|
||||
assert data["total_bookings"] == 2 # Meeting 1 and 2
|
||||
|
||||
|
||||
def test_usage_report_with_space_filter(
|
||||
client: TestClient,
|
||||
admin_headers: dict[str, str],
|
||||
test_bookings: list[Booking],
|
||||
test_spaces: list[Space],
|
||||
) -> None:
|
||||
"""Test usage report with space filter."""
|
||||
response = client.get(
|
||||
"/api/admin/reports/usage",
|
||||
headers=admin_headers,
|
||||
params={"space_id": test_spaces[0].id},
|
||||
)
|
||||
assert response.status_code == 200
|
||||
|
||||
data = response.json()
|
||||
assert len(data["items"]) == 1
|
||||
assert data["items"][0]["space_name"] == "Conference Room A"
|
||||
|
||||
|
||||
def test_top_users_report(
|
||||
client: TestClient,
|
||||
admin_headers: dict[str, str],
|
||||
test_bookings: list[Booking],
|
||||
test_users: list[User],
|
||||
) -> None:
|
||||
"""Test top users report."""
|
||||
response = client.get("/api/admin/reports/top-users", headers=admin_headers)
|
||||
assert response.status_code == 200
|
||||
|
||||
data = response.json()
|
||||
assert "items" in data
|
||||
assert "date_range" in data
|
||||
|
||||
# Should have 2 users
|
||||
assert len(data["items"]) == 2
|
||||
|
||||
# Top user should be test_user with 3 bookings
|
||||
assert data["items"][0]["user_email"] == test_users[0].email
|
||||
assert data["items"][0]["total_bookings"] == 3
|
||||
assert data["items"][0]["approved_bookings"] == 1
|
||||
assert data["items"][0]["total_hours"] == 6.0 # 2 + 1 + 3
|
||||
|
||||
# Second user with 2 bookings
|
||||
assert data["items"][1]["user_email"] == test_users[1].email
|
||||
assert data["items"][1]["total_bookings"] == 2
|
||||
assert data["items"][1]["approved_bookings"] == 1
|
||||
assert data["items"][1]["total_hours"] == 5.5 # 4 + 1.5
|
||||
|
||||
|
||||
def test_top_users_report_with_limit(
|
||||
client: TestClient,
|
||||
admin_headers: dict[str, str],
|
||||
test_bookings: list[Booking],
|
||||
) -> None:
|
||||
"""Test top users report with limit."""
|
||||
response = client.get(
|
||||
"/api/admin/reports/top-users",
|
||||
headers=admin_headers,
|
||||
params={"limit": 1},
|
||||
)
|
||||
assert response.status_code == 200
|
||||
|
||||
data = response.json()
|
||||
assert len(data["items"]) == 1 # Only top user
|
||||
|
||||
|
||||
def test_approval_rate_report(
|
||||
client: TestClient,
|
||||
admin_headers: dict[str, str],
|
||||
test_bookings: list[Booking],
|
||||
) -> None:
|
||||
"""Test approval rate report."""
|
||||
response = client.get("/api/admin/reports/approval-rate", headers=admin_headers)
|
||||
assert response.status_code == 200
|
||||
|
||||
data = response.json()
|
||||
assert data["total_requests"] == 5
|
||||
assert data["approved"] == 2
|
||||
assert data["rejected"] == 1
|
||||
assert data["pending"] == 1
|
||||
assert data["canceled"] == 1
|
||||
|
||||
# Approval rate = 2 / (2 + 1) = 66.67%
|
||||
assert data["approval_rate"] == 66.67
|
||||
# Rejection rate = 1 / (2 + 1) = 33.33%
|
||||
assert data["rejection_rate"] == 33.33
|
||||
|
||||
|
||||
def test_reports_require_admin(
|
||||
client: TestClient, auth_headers: dict[str, str]
|
||||
) -> None:
|
||||
"""Test that regular users cannot access reports."""
|
||||
endpoints = [
|
||||
"/api/admin/reports/usage",
|
||||
"/api/admin/reports/top-users",
|
||||
"/api/admin/reports/approval-rate",
|
||||
]
|
||||
|
||||
for endpoint in endpoints:
|
||||
response = client.get(endpoint, headers=auth_headers)
|
||||
assert response.status_code == 403
|
||||
assert response.json()["detail"] == "Not enough permissions"
|
||||
|
||||
|
||||
def test_reports_require_auth(client: TestClient) -> None:
|
||||
"""Test that reports require authentication."""
|
||||
endpoints = [
|
||||
"/api/admin/reports/usage",
|
||||
"/api/admin/reports/top-users",
|
||||
"/api/admin/reports/approval-rate",
|
||||
]
|
||||
|
||||
for endpoint in endpoints:
|
||||
response = client.get(endpoint)
|
||||
assert response.status_code == 403
|
||||
241
backend/tests/test_settings.py
Normal file
241
backend/tests/test_settings.py
Normal file
@@ -0,0 +1,241 @@
|
||||
"""Tests for settings endpoints."""
|
||||
from fastapi.testclient import TestClient
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.models.settings import Settings
|
||||
from app.models.user import User
|
||||
|
||||
|
||||
def test_get_settings_admin(
|
||||
client: TestClient,
|
||||
db: Session,
|
||||
admin_headers: dict[str, str],
|
||||
) -> None:
|
||||
"""Test GET /api/admin/settings returns settings for admin."""
|
||||
# Create default settings
|
||||
settings = Settings(
|
||||
id=1,
|
||||
min_duration_minutes=30,
|
||||
max_duration_minutes=480,
|
||||
working_hours_start=8,
|
||||
working_hours_end=20,
|
||||
max_bookings_per_day_per_user=3,
|
||||
min_hours_before_cancel=2,
|
||||
)
|
||||
db.add(settings)
|
||||
db.commit()
|
||||
|
||||
response = client.get("/api/admin/settings", headers=admin_headers)
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert data["min_duration_minutes"] == 30
|
||||
assert data["max_duration_minutes"] == 480
|
||||
assert data["working_hours_start"] == 8
|
||||
assert data["working_hours_end"] == 20
|
||||
assert data["max_bookings_per_day_per_user"] == 3
|
||||
assert data["min_hours_before_cancel"] == 2
|
||||
|
||||
|
||||
def test_get_settings_creates_default_if_not_exist(
|
||||
client: TestClient,
|
||||
db: Session,
|
||||
admin_headers: dict[str, str],
|
||||
) -> None:
|
||||
"""Test GET /api/admin/settings creates default settings if not exist."""
|
||||
response = client.get("/api/admin/settings", headers=admin_headers)
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert data["min_duration_minutes"] == 30
|
||||
assert data["max_duration_minutes"] == 480
|
||||
|
||||
# Verify it was created in DB
|
||||
settings = db.query(Settings).filter(Settings.id == 1).first()
|
||||
assert settings is not None
|
||||
assert settings.min_duration_minutes == 30
|
||||
|
||||
|
||||
def test_get_settings_non_admin_forbidden(
|
||||
client: TestClient,
|
||||
auth_headers: dict[str, str],
|
||||
) -> None:
|
||||
"""Test GET /api/admin/settings forbidden for non-admin."""
|
||||
response = client.get("/api/admin/settings", headers=auth_headers)
|
||||
assert response.status_code == 403
|
||||
|
||||
|
||||
def test_update_settings_admin(
|
||||
client: TestClient,
|
||||
db: Session,
|
||||
admin_headers: dict[str, str],
|
||||
) -> None:
|
||||
"""Test PUT /api/admin/settings updates settings for admin."""
|
||||
# Create default settings
|
||||
settings = Settings(
|
||||
id=1,
|
||||
min_duration_minutes=30,
|
||||
max_duration_minutes=480,
|
||||
working_hours_start=8,
|
||||
working_hours_end=20,
|
||||
max_bookings_per_day_per_user=3,
|
||||
min_hours_before_cancel=2,
|
||||
)
|
||||
db.add(settings)
|
||||
db.commit()
|
||||
|
||||
# Update settings
|
||||
update_data = {
|
||||
"min_duration_minutes": 60,
|
||||
"max_duration_minutes": 600,
|
||||
"working_hours_start": 9,
|
||||
"working_hours_end": 18,
|
||||
"max_bookings_per_day_per_user": 5,
|
||||
"min_hours_before_cancel": 4,
|
||||
}
|
||||
response = client.put("/api/admin/settings", headers=admin_headers, json=update_data)
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert data["min_duration_minutes"] == 60
|
||||
assert data["max_duration_minutes"] == 600
|
||||
assert data["working_hours_start"] == 9
|
||||
assert data["working_hours_end"] == 18
|
||||
assert data["max_bookings_per_day_per_user"] == 5
|
||||
assert data["min_hours_before_cancel"] == 4
|
||||
|
||||
# Verify update in DB
|
||||
db.refresh(settings)
|
||||
assert settings.min_duration_minutes == 60
|
||||
assert settings.max_bookings_per_day_per_user == 5
|
||||
|
||||
|
||||
def test_update_settings_validation_min_max_duration(
|
||||
client: TestClient,
|
||||
db: Session,
|
||||
admin_headers: dict[str, str],
|
||||
) -> None:
|
||||
"""Test PUT /api/admin/settings validates min <= max duration."""
|
||||
# Create default settings
|
||||
settings = Settings(id=1)
|
||||
db.add(settings)
|
||||
db.commit()
|
||||
|
||||
# Try to set min > max (but within Pydantic range)
|
||||
update_data = {
|
||||
"min_duration_minutes": 400,
|
||||
"max_duration_minutes": 100,
|
||||
"working_hours_start": 8,
|
||||
"working_hours_end": 20,
|
||||
"max_bookings_per_day_per_user": 3,
|
||||
"min_hours_before_cancel": 2,
|
||||
}
|
||||
response = client.put("/api/admin/settings", headers=admin_headers, json=update_data)
|
||||
assert response.status_code == 400
|
||||
assert "duration" in response.json()["detail"].lower()
|
||||
|
||||
|
||||
def test_update_settings_validation_working_hours(
|
||||
client: TestClient,
|
||||
db: Session,
|
||||
admin_headers: dict[str, str],
|
||||
) -> None:
|
||||
"""Test PUT /api/admin/settings validates start < end hours."""
|
||||
# Create default settings
|
||||
settings = Settings(id=1)
|
||||
db.add(settings)
|
||||
db.commit()
|
||||
|
||||
# Try to set start >= end
|
||||
update_data = {
|
||||
"min_duration_minutes": 30,
|
||||
"max_duration_minutes": 480,
|
||||
"working_hours_start": 20,
|
||||
"working_hours_end": 8,
|
||||
"max_bookings_per_day_per_user": 3,
|
||||
"min_hours_before_cancel": 2,
|
||||
}
|
||||
response = client.put("/api/admin/settings", headers=admin_headers, json=update_data)
|
||||
assert response.status_code == 400
|
||||
assert "working hours" in response.json()["detail"].lower()
|
||||
|
||||
|
||||
def test_update_settings_non_admin_forbidden(
|
||||
client: TestClient,
|
||||
auth_headers: dict[str, str],
|
||||
) -> None:
|
||||
"""Test PUT /api/admin/settings forbidden for non-admin."""
|
||||
update_data = {
|
||||
"min_duration_minutes": 60,
|
||||
"max_duration_minutes": 600,
|
||||
"working_hours_start": 9,
|
||||
"working_hours_end": 18,
|
||||
"max_bookings_per_day_per_user": 5,
|
||||
"min_hours_before_cancel": 4,
|
||||
}
|
||||
response = client.put("/api/admin/settings", headers=auth_headers, json=update_data)
|
||||
assert response.status_code == 403
|
||||
|
||||
|
||||
# ===== Audit Log Integration Tests =====
|
||||
|
||||
|
||||
def test_settings_update_creates_audit_log(
|
||||
client: TestClient,
|
||||
admin_token: str,
|
||||
test_admin: User,
|
||||
db: Session,
|
||||
) -> None:
|
||||
"""Test that updating settings creates an audit log entry with changed fields."""
|
||||
from app.models.audit_log import AuditLog
|
||||
|
||||
# Create default settings
|
||||
settings = Settings(
|
||||
id=1,
|
||||
min_duration_minutes=30,
|
||||
max_duration_minutes=480,
|
||||
working_hours_start=8,
|
||||
working_hours_end=20,
|
||||
max_bookings_per_day_per_user=3,
|
||||
min_hours_before_cancel=2,
|
||||
)
|
||||
db.add(settings)
|
||||
db.commit()
|
||||
|
||||
# Update settings
|
||||
update_data = {
|
||||
"min_duration_minutes": 60,
|
||||
"max_duration_minutes": 600,
|
||||
"working_hours_start": 9,
|
||||
"working_hours_end": 18,
|
||||
"max_bookings_per_day_per_user": 5,
|
||||
"min_hours_before_cancel": 4,
|
||||
}
|
||||
response = client.put(
|
||||
"/api/admin/settings",
|
||||
headers={"Authorization": f"Bearer {admin_token}"},
|
||||
json=update_data
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
|
||||
# Check audit log was created
|
||||
audit = db.query(AuditLog).filter(
|
||||
AuditLog.action == "settings_updated",
|
||||
AuditLog.target_id == 1
|
||||
).first()
|
||||
|
||||
assert audit is not None
|
||||
assert audit.target_type == "settings"
|
||||
assert audit.user_id == test_admin.id
|
||||
|
||||
# Check that changed fields are tracked with old and new values
|
||||
changed_fields = audit.details["changed_fields"]
|
||||
assert "min_duration_minutes" in changed_fields
|
||||
assert changed_fields["min_duration_minutes"]["old"] == 30
|
||||
assert changed_fields["min_duration_minutes"]["new"] == 60
|
||||
assert "max_duration_minutes" in changed_fields
|
||||
assert changed_fields["max_duration_minutes"]["old"] == 480
|
||||
assert changed_fields["max_duration_minutes"]["new"] == 600
|
||||
assert "working_hours_start" in changed_fields
|
||||
assert "working_hours_end" in changed_fields
|
||||
assert "max_bookings_per_day_per_user" in changed_fields
|
||||
assert "min_hours_before_cancel" in changed_fields
|
||||
assert len(changed_fields) == 6 # All 6 fields changed
|
||||
328
backend/tests/test_spaces.py
Normal file
328
backend/tests/test_spaces.py
Normal file
@@ -0,0 +1,328 @@
|
||||
"""Tests for space management endpoints."""
|
||||
from fastapi.testclient import TestClient
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.models.user import User
|
||||
|
||||
|
||||
def test_create_space_as_admin(client: TestClient, admin_token: str) -> None:
|
||||
"""Test creating a space as admin."""
|
||||
response = client.post(
|
||||
"/api/admin/spaces",
|
||||
json={
|
||||
"name": "Conference Room A",
|
||||
"type": "sala",
|
||||
"capacity": 10,
|
||||
"description": "Main conference room",
|
||||
},
|
||||
headers={"Authorization": f"Bearer {admin_token}"},
|
||||
)
|
||||
assert response.status_code == 201
|
||||
data = response.json()
|
||||
assert data["name"] == "Conference Room A"
|
||||
assert data["type"] == "sala"
|
||||
assert data["capacity"] == 10
|
||||
assert data["is_active"] is True
|
||||
|
||||
|
||||
def test_create_space_as_user_forbidden(client: TestClient, user_token: str) -> None:
|
||||
"""Test that regular users cannot create spaces."""
|
||||
response = client.post(
|
||||
"/api/admin/spaces",
|
||||
json={
|
||||
"name": "Test Space",
|
||||
"type": "birou",
|
||||
"capacity": 1,
|
||||
},
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
)
|
||||
assert response.status_code == 403
|
||||
|
||||
|
||||
def test_create_space_duplicate_name(client: TestClient, admin_token: str) -> None:
|
||||
"""Test that duplicate space names are rejected."""
|
||||
space_data = {
|
||||
"name": "Duplicate Room",
|
||||
"type": "sala",
|
||||
"capacity": 5,
|
||||
}
|
||||
|
||||
# Create first space
|
||||
response = client.post(
|
||||
"/api/admin/spaces",
|
||||
json=space_data,
|
||||
headers={"Authorization": f"Bearer {admin_token}"},
|
||||
)
|
||||
assert response.status_code == 201
|
||||
|
||||
# Try to create duplicate
|
||||
response = client.post(
|
||||
"/api/admin/spaces",
|
||||
json=space_data,
|
||||
headers={"Authorization": f"Bearer {admin_token}"},
|
||||
)
|
||||
assert response.status_code == 400
|
||||
assert "already exists" in response.json()["detail"]
|
||||
|
||||
|
||||
def test_create_space_invalid_capacity(client: TestClient, admin_token: str) -> None:
|
||||
"""Test that invalid capacity is rejected."""
|
||||
response = client.post(
|
||||
"/api/admin/spaces",
|
||||
json={
|
||||
"name": "Invalid Space",
|
||||
"type": "sala",
|
||||
"capacity": 0,
|
||||
},
|
||||
headers={"Authorization": f"Bearer {admin_token}"},
|
||||
)
|
||||
assert response.status_code == 422 # Validation error
|
||||
|
||||
|
||||
def test_create_space_invalid_type(client: TestClient, admin_token: str) -> None:
|
||||
"""Test that invalid type is rejected."""
|
||||
response = client.post(
|
||||
"/api/admin/spaces",
|
||||
json={
|
||||
"name": "Invalid Type Space",
|
||||
"type": "invalid",
|
||||
"capacity": 5,
|
||||
},
|
||||
headers={"Authorization": f"Bearer {admin_token}"},
|
||||
)
|
||||
assert response.status_code == 422 # Validation error
|
||||
|
||||
|
||||
def test_list_spaces_as_user(client: TestClient, user_token: str, admin_token: str) -> None:
|
||||
"""Test that users see only active spaces."""
|
||||
# Create active space
|
||||
client.post(
|
||||
"/api/admin/spaces",
|
||||
json={"name": "Active Space", "type": "sala", "capacity": 5},
|
||||
headers={"Authorization": f"Bearer {admin_token}"},
|
||||
)
|
||||
|
||||
# Create inactive space
|
||||
response = client.post(
|
||||
"/api/admin/spaces",
|
||||
json={"name": "Inactive Space", "type": "birou", "capacity": 1},
|
||||
headers={"Authorization": f"Bearer {admin_token}"},
|
||||
)
|
||||
space_id = response.json()["id"]
|
||||
|
||||
# Deactivate the second space
|
||||
client.patch(
|
||||
f"/api/admin/spaces/{space_id}/status",
|
||||
json={"is_active": False},
|
||||
headers={"Authorization": f"Bearer {admin_token}"},
|
||||
)
|
||||
|
||||
# List as user - should see only active
|
||||
response = client.get(
|
||||
"/api/spaces",
|
||||
headers={"Authorization": f"Bearer {user_token}"},
|
||||
)
|
||||
assert response.status_code == 200
|
||||
spaces = response.json()
|
||||
names = [s["name"] for s in spaces]
|
||||
assert "Active Space" in names
|
||||
assert "Inactive Space" not in names
|
||||
|
||||
|
||||
def test_list_spaces_as_admin(client: TestClient, admin_token: str) -> None:
|
||||
"""Test that admins see all spaces."""
|
||||
# Create active space
|
||||
client.post(
|
||||
"/api/admin/spaces",
|
||||
json={"name": "Admin View Active", "type": "sala", "capacity": 5},
|
||||
headers={"Authorization": f"Bearer {admin_token}"},
|
||||
)
|
||||
|
||||
# Create inactive space
|
||||
response = client.post(
|
||||
"/api/admin/spaces",
|
||||
json={"name": "Admin View Inactive", "type": "birou", "capacity": 1},
|
||||
headers={"Authorization": f"Bearer {admin_token}"},
|
||||
)
|
||||
space_id = response.json()["id"]
|
||||
|
||||
# Deactivate
|
||||
client.patch(
|
||||
f"/api/admin/spaces/{space_id}/status",
|
||||
json={"is_active": False},
|
||||
headers={"Authorization": f"Bearer {admin_token}"},
|
||||
)
|
||||
|
||||
# List as admin - should see both
|
||||
response = client.get(
|
||||
"/api/spaces",
|
||||
headers={"Authorization": f"Bearer {admin_token}"},
|
||||
)
|
||||
assert response.status_code == 200
|
||||
spaces = response.json()
|
||||
names = [s["name"] for s in spaces]
|
||||
assert "Admin View Active" in names
|
||||
assert "Admin View Inactive" in names
|
||||
|
||||
|
||||
def test_update_space(client: TestClient, admin_token: str) -> None:
|
||||
"""Test updating a space."""
|
||||
# Create space
|
||||
response = client.post(
|
||||
"/api/admin/spaces",
|
||||
json={"name": "Original Name", "type": "sala", "capacity": 5},
|
||||
headers={"Authorization": f"Bearer {admin_token}"},
|
||||
)
|
||||
space_id = response.json()["id"]
|
||||
|
||||
# Update space
|
||||
response = client.put(
|
||||
f"/api/admin/spaces/{space_id}",
|
||||
json={
|
||||
"name": "Updated Name",
|
||||
"type": "birou",
|
||||
"capacity": 2,
|
||||
"description": "Updated description",
|
||||
},
|
||||
headers={"Authorization": f"Bearer {admin_token}"},
|
||||
)
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert data["name"] == "Updated Name"
|
||||
assert data["type"] == "birou"
|
||||
assert data["capacity"] == 2
|
||||
assert data["description"] == "Updated description"
|
||||
|
||||
|
||||
def test_update_space_not_found(client: TestClient, admin_token: str) -> None:
|
||||
"""Test updating non-existent space."""
|
||||
response = client.put(
|
||||
"/api/admin/spaces/99999",
|
||||
json={"name": "Test", "type": "sala", "capacity": 5},
|
||||
headers={"Authorization": f"Bearer {admin_token}"},
|
||||
)
|
||||
assert response.status_code == 404
|
||||
|
||||
|
||||
def test_update_space_status(client: TestClient, admin_token: str) -> None:
|
||||
"""Test activating/deactivating a space."""
|
||||
# Create space
|
||||
response = client.post(
|
||||
"/api/admin/spaces",
|
||||
json={"name": "Toggle Space", "type": "sala", "capacity": 5},
|
||||
headers={"Authorization": f"Bearer {admin_token}"},
|
||||
)
|
||||
space_id = response.json()["id"]
|
||||
|
||||
# Deactivate
|
||||
response = client.patch(
|
||||
f"/api/admin/spaces/{space_id}/status",
|
||||
json={"is_active": False},
|
||||
headers={"Authorization": f"Bearer {admin_token}"},
|
||||
)
|
||||
assert response.status_code == 200
|
||||
assert response.json()["is_active"] is False
|
||||
|
||||
# Reactivate
|
||||
response = client.patch(
|
||||
f"/api/admin/spaces/{space_id}/status",
|
||||
json={"is_active": True},
|
||||
headers={"Authorization": f"Bearer {admin_token}"},
|
||||
)
|
||||
assert response.status_code == 200
|
||||
assert response.json()["is_active"] is True
|
||||
|
||||
|
||||
def test_update_space_status_not_found(client: TestClient, admin_token: str) -> None:
|
||||
"""Test updating status of non-existent space."""
|
||||
response = client.patch(
|
||||
"/api/admin/spaces/99999/status",
|
||||
json={"is_active": False},
|
||||
headers={"Authorization": f"Bearer {admin_token}"},
|
||||
)
|
||||
assert response.status_code == 404
|
||||
|
||||
|
||||
# ===== Audit Log Integration Tests =====
|
||||
|
||||
|
||||
def test_space_creation_creates_audit_log(
|
||||
client: TestClient,
|
||||
admin_token: str,
|
||||
test_admin: User,
|
||||
db: Session,
|
||||
) -> None:
|
||||
"""Test that creating a space creates an audit log entry."""
|
||||
from app.models.audit_log import AuditLog
|
||||
|
||||
response = client.post(
|
||||
"/api/admin/spaces",
|
||||
json={
|
||||
"name": "Conference Room A",
|
||||
"type": "sala",
|
||||
"capacity": 10,
|
||||
"description": "Main conference room",
|
||||
},
|
||||
headers={"Authorization": f"Bearer {admin_token}"},
|
||||
)
|
||||
|
||||
assert response.status_code == 201
|
||||
space_id = response.json()["id"]
|
||||
|
||||
# Check audit log was created
|
||||
audit = db.query(AuditLog).filter(
|
||||
AuditLog.action == "space_created",
|
||||
AuditLog.target_id == space_id
|
||||
).first()
|
||||
|
||||
assert audit is not None
|
||||
assert audit.target_type == "space"
|
||||
assert audit.user_id == test_admin.id
|
||||
assert audit.details == {"name": "Conference Room A", "type": "sala", "capacity": 10}
|
||||
|
||||
|
||||
def test_space_update_creates_audit_log(
|
||||
client: TestClient,
|
||||
admin_token: str,
|
||||
test_admin: User,
|
||||
db: Session,
|
||||
) -> None:
|
||||
"""Test that updating a space creates an audit log entry."""
|
||||
from app.models.audit_log import AuditLog
|
||||
|
||||
# Create space
|
||||
response = client.post(
|
||||
"/api/admin/spaces",
|
||||
json={"name": "Original Name", "type": "sala", "capacity": 5},
|
||||
headers={"Authorization": f"Bearer {admin_token}"},
|
||||
)
|
||||
space_id = response.json()["id"]
|
||||
|
||||
# Update space
|
||||
response = client.put(
|
||||
f"/api/admin/spaces/{space_id}",
|
||||
json={
|
||||
"name": "Updated Name",
|
||||
"type": "birou",
|
||||
"capacity": 2,
|
||||
"description": "Updated description",
|
||||
},
|
||||
headers={"Authorization": f"Bearer {admin_token}"},
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
|
||||
# Check audit log was created
|
||||
audit = db.query(AuditLog).filter(
|
||||
AuditLog.action == "space_updated",
|
||||
AuditLog.target_id == space_id
|
||||
).first()
|
||||
|
||||
assert audit is not None
|
||||
assert audit.target_type == "space"
|
||||
assert audit.user_id == test_admin.id
|
||||
# Should track all changed fields
|
||||
assert "name" in audit.details["updated_fields"]
|
||||
assert "type" in audit.details["updated_fields"]
|
||||
assert "capacity" in audit.details["updated_fields"]
|
||||
assert len(audit.details["updated_fields"]) == 4 # name, type, capacity, description
|
||||
172
backend/tests/test_timezone.py
Normal file
172
backend/tests/test_timezone.py
Normal file
@@ -0,0 +1,172 @@
|
||||
"""Tests for timezone utilities and timezone-aware booking endpoints."""
|
||||
from datetime import datetime
|
||||
import pytz
|
||||
import pytest
|
||||
|
||||
from app.utils.timezone import (
|
||||
convert_to_utc,
|
||||
convert_from_utc,
|
||||
format_datetime_tz,
|
||||
get_available_timezones,
|
||||
)
|
||||
|
||||
|
||||
def test_convert_to_utc():
|
||||
"""Test timezone conversion to UTC."""
|
||||
# Create datetime in EET (Europe/Bucharest, UTC+2 in winter, UTC+3 in summer)
|
||||
# Using June (summer) - should be UTC+3 (EEST)
|
||||
local_dt = datetime(2024, 6, 15, 10, 0) # 10:00 local time
|
||||
utc_dt = convert_to_utc(local_dt, "Europe/Bucharest")
|
||||
|
||||
# Should be 7:00 UTC (10:00 EEST - 3 hours)
|
||||
assert utc_dt.hour == 7
|
||||
assert utc_dt.tzinfo is None # Should be naive
|
||||
|
||||
|
||||
def test_convert_from_utc():
|
||||
"""Test timezone conversion from UTC."""
|
||||
utc_dt = datetime(2024, 6, 15, 7, 0) # 7:00 UTC
|
||||
local_dt = convert_from_utc(utc_dt, "Europe/Bucharest")
|
||||
|
||||
# Should be 10:00 EEST (UTC+3 in summer)
|
||||
assert local_dt.hour == 10
|
||||
assert local_dt.tzinfo is not None # Should be aware
|
||||
|
||||
|
||||
def test_format_datetime_tz():
|
||||
"""Test datetime formatting with timezone."""
|
||||
utc_dt = datetime(2024, 6, 15, 7, 0)
|
||||
formatted = format_datetime_tz(utc_dt, "Europe/Bucharest")
|
||||
|
||||
# Should contain timezone abbreviation (EEST for summer)
|
||||
assert "EEST" in formatted or "EET" in formatted
|
||||
assert "2024-06-15" in formatted
|
||||
|
||||
|
||||
def test_get_available_timezones():
|
||||
"""Test getting list of common timezones."""
|
||||
timezones = get_available_timezones()
|
||||
|
||||
assert len(timezones) > 0
|
||||
assert "UTC" in timezones
|
||||
assert "Europe/Bucharest" in timezones
|
||||
assert "America/New_York" in timezones
|
||||
|
||||
|
||||
def test_timezone_endpoints(client, user_token, db_session, test_user):
|
||||
"""Test timezone management endpoints."""
|
||||
# Get list of timezones
|
||||
response = client.get("/api/users/timezones")
|
||||
assert response.status_code == 200
|
||||
timezones = response.json()
|
||||
assert isinstance(timezones, list)
|
||||
assert "UTC" in timezones
|
||||
|
||||
# Update user timezone
|
||||
response = client.put(
|
||||
"/api/users/me/timezone",
|
||||
json={"timezone": "Europe/Bucharest"},
|
||||
headers={"Authorization": f"Bearer {user_token}"}
|
||||
)
|
||||
assert response.status_code == 200
|
||||
assert response.json()["timezone"] == "Europe/Bucharest"
|
||||
|
||||
# Verify timezone was updated
|
||||
db_session.refresh(test_user)
|
||||
assert test_user.timezone == "Europe/Bucharest"
|
||||
|
||||
|
||||
def test_timezone_invalid(client, user_token):
|
||||
"""Test setting invalid timezone."""
|
||||
response = client.put(
|
||||
"/api/users/me/timezone",
|
||||
json={"timezone": "Invalid/Timezone"},
|
||||
headers={"Authorization": f"Bearer {user_token}"}
|
||||
)
|
||||
assert response.status_code == 400
|
||||
assert "Invalid timezone" in response.json()["detail"]
|
||||
|
||||
|
||||
def test_booking_with_timezone(client, user_token, test_space, db_session, test_user):
|
||||
"""Test creating booking with user timezone."""
|
||||
# Set user timezone to Europe/Bucharest (UTC+3 in summer)
|
||||
test_user.timezone = "Europe/Bucharest"
|
||||
db_session.commit()
|
||||
|
||||
# Create booking at 14:00 local time (should be stored as 11:00 UTC)
|
||||
# Using afternoon time to ensure it's within working hours (8:00-20:00 UTC)
|
||||
response = client.post(
|
||||
"/api/bookings",
|
||||
json={
|
||||
"space_id": test_space.id,
|
||||
"start_datetime": "2024-06-15T14:00:00", # Local time (11:00 UTC)
|
||||
"end_datetime": "2024-06-15T16:00:00", # Local time (13:00 UTC)
|
||||
"title": "Test Meeting"
|
||||
},
|
||||
headers={"Authorization": f"Bearer {user_token}"}
|
||||
)
|
||||
|
||||
if response.status_code != 201:
|
||||
print(f"Error: {response.json()}")
|
||||
assert response.status_code == 201
|
||||
data = response.json()
|
||||
|
||||
# Response should include timezone-aware formatted strings
|
||||
assert "start_datetime_tz" in data
|
||||
assert "end_datetime_tz" in data
|
||||
assert "EEST" in data["start_datetime_tz"] or "EET" in data["start_datetime_tz"]
|
||||
|
||||
# Stored datetime should be in UTC (11:00)
|
||||
stored_dt = datetime.fromisoformat(data["start_datetime"])
|
||||
assert stored_dt.hour == 11 # UTC time
|
||||
|
||||
|
||||
def test_booking_default_timezone(client, user_token, test_space, db_session, test_user):
|
||||
"""Test creating booking with default UTC timezone."""
|
||||
# User has default UTC timezone
|
||||
assert test_user.timezone == "UTC"
|
||||
|
||||
# Create booking at 10:00 UTC
|
||||
response = client.post(
|
||||
"/api/bookings",
|
||||
json={
|
||||
"space_id": test_space.id,
|
||||
"start_datetime": "2024-06-15T10:00:00",
|
||||
"end_datetime": "2024-06-15T12:00:00",
|
||||
"title": "UTC Meeting"
|
||||
},
|
||||
headers={"Authorization": f"Bearer {user_token}"}
|
||||
)
|
||||
|
||||
assert response.status_code == 201
|
||||
data = response.json()
|
||||
|
||||
# Should remain 10:00 UTC
|
||||
stored_dt = datetime.fromisoformat(data["start_datetime"])
|
||||
assert stored_dt.hour == 10
|
||||
|
||||
|
||||
def test_booking_timezone_conversion_validation(client, user_token, test_space, db_session, test_user):
|
||||
"""Test that booking validation works correctly with timezone conversion."""
|
||||
# Set user timezone to Europe/Bucharest (UTC+3 in summer)
|
||||
test_user.timezone = "Europe/Bucharest"
|
||||
db_session.commit()
|
||||
|
||||
# Create booking at 09:00 local time (6:00 UTC) - before working hours
|
||||
# Working hours are 8:00-20:00 UTC
|
||||
response = client.post(
|
||||
"/api/bookings",
|
||||
json={
|
||||
"space_id": test_space.id,
|
||||
"start_datetime": "2024-06-15T09:00:00", # 09:00 EEST = 06:00 UTC
|
||||
"end_datetime": "2024-06-15T10:00:00",
|
||||
"title": "Early Meeting"
|
||||
},
|
||||
headers={"Authorization": f"Bearer {user_token}"}
|
||||
)
|
||||
|
||||
# Should fail validation (before working hours in UTC)
|
||||
# Note: This depends on settings, may need adjustment
|
||||
# If working hours validation is timezone-aware, this might pass
|
||||
# For now, we just check the booking was processed
|
||||
assert response.status_code in [201, 400]
|
||||
251
backend/tests/test_users.py
Normal file
251
backend/tests/test_users.py
Normal file
@@ -0,0 +1,251 @@
|
||||
"""Tests for user management endpoints."""
|
||||
from fastapi.testclient import TestClient
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.models.user import User
|
||||
|
||||
|
||||
def test_get_current_user(client: TestClient, test_user: User, auth_headers: dict) -> None:
|
||||
"""Test getting current user info."""
|
||||
response = client.get("/api/users/me", headers=auth_headers)
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert data["email"] == "test@example.com"
|
||||
assert data["role"] == "user"
|
||||
|
||||
|
||||
def test_list_users_admin(
|
||||
client: TestClient, test_user: User, admin_headers: dict
|
||||
) -> None:
|
||||
"""Test listing all users as admin."""
|
||||
response = client.get("/api/admin/users", headers=admin_headers)
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert isinstance(data, list)
|
||||
assert len(data) >= 2 # test_user + admin_user
|
||||
|
||||
|
||||
def test_list_users_unauthorized(client: TestClient, auth_headers: dict) -> None:
|
||||
"""Test listing users as non-admin (should fail)."""
|
||||
response = client.get("/api/admin/users", headers=auth_headers)
|
||||
assert response.status_code == 403
|
||||
|
||||
|
||||
def test_list_users_filter_by_role(client: TestClient, admin_headers: dict) -> None:
|
||||
"""Test filtering users by role."""
|
||||
response = client.get("/api/admin/users?role=admin", headers=admin_headers)
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert all(user["role"] == "admin" for user in data)
|
||||
|
||||
|
||||
def test_create_user_admin(client: TestClient, admin_headers: dict) -> None:
|
||||
"""Test creating a new user as admin."""
|
||||
response = client.post(
|
||||
"/api/admin/users",
|
||||
headers=admin_headers,
|
||||
json={
|
||||
"email": "newuser@example.com",
|
||||
"full_name": "New User",
|
||||
"password": "newpassword",
|
||||
"role": "user",
|
||||
"organization": "Test Org",
|
||||
},
|
||||
)
|
||||
assert response.status_code == 201
|
||||
data = response.json()
|
||||
assert data["email"] == "newuser@example.com"
|
||||
assert data["full_name"] == "New User"
|
||||
assert data["role"] == "user"
|
||||
assert data["organization"] == "Test Org"
|
||||
assert data["is_active"] is True
|
||||
|
||||
|
||||
def test_create_user_duplicate_email(
|
||||
client: TestClient, test_user: User, admin_headers: dict
|
||||
) -> None:
|
||||
"""Test creating user with duplicate email."""
|
||||
response = client.post(
|
||||
"/api/admin/users",
|
||||
headers=admin_headers,
|
||||
json={
|
||||
"email": "test@example.com", # Already exists
|
||||
"full_name": "Duplicate User",
|
||||
"password": "password",
|
||||
"role": "user",
|
||||
},
|
||||
)
|
||||
assert response.status_code == 400
|
||||
assert "already exists" in response.json()["detail"]
|
||||
|
||||
|
||||
def test_create_user_invalid_role(client: TestClient, admin_headers: dict) -> None:
|
||||
"""Test creating user with invalid role."""
|
||||
response = client.post(
|
||||
"/api/admin/users",
|
||||
headers=admin_headers,
|
||||
json={
|
||||
"email": "invalid@example.com",
|
||||
"full_name": "Invalid User",
|
||||
"password": "password",
|
||||
"role": "superadmin", # Invalid role
|
||||
},
|
||||
)
|
||||
assert response.status_code == 400
|
||||
assert "admin" in response.json()["detail"].lower()
|
||||
|
||||
|
||||
def test_update_user_admin(client: TestClient, test_user: User, admin_headers: dict) -> None:
|
||||
"""Test updating user as admin."""
|
||||
response = client.put(
|
||||
f"/api/admin/users/{test_user.id}",
|
||||
headers=admin_headers,
|
||||
json={
|
||||
"full_name": "Updated Name",
|
||||
"organization": "Updated Org",
|
||||
},
|
||||
)
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert data["full_name"] == "Updated Name"
|
||||
assert data["organization"] == "Updated Org"
|
||||
assert data["email"] == "test@example.com" # Should remain unchanged
|
||||
|
||||
|
||||
def test_update_user_not_found(client: TestClient, admin_headers: dict) -> None:
|
||||
"""Test updating non-existent user."""
|
||||
response = client.put(
|
||||
"/api/admin/users/99999",
|
||||
headers=admin_headers,
|
||||
json={"full_name": "Updated"},
|
||||
)
|
||||
assert response.status_code == 404
|
||||
|
||||
|
||||
def test_update_user_status(client: TestClient, test_user: User, admin_headers: dict) -> None:
|
||||
"""Test deactivating user."""
|
||||
response = client.patch(
|
||||
f"/api/admin/users/{test_user.id}/status",
|
||||
headers=admin_headers,
|
||||
json={"is_active": False},
|
||||
)
|
||||
assert response.status_code == 200
|
||||
data = response.json()
|
||||
assert data["is_active"] is False
|
||||
|
||||
# Verify user cannot login
|
||||
login_response = client.post(
|
||||
"/api/auth/login",
|
||||
json={"email": "test@example.com", "password": "testpassword"},
|
||||
)
|
||||
assert login_response.status_code == 403
|
||||
|
||||
|
||||
def test_reset_password(
|
||||
client: TestClient, test_user: User, admin_headers: dict, db: Session
|
||||
) -> None:
|
||||
"""Test resetting user password."""
|
||||
response = client.post(
|
||||
f"/api/admin/users/{test_user.id}/reset-password",
|
||||
headers=admin_headers,
|
||||
json={"new_password": "newpassword123"},
|
||||
)
|
||||
assert response.status_code == 200
|
||||
|
||||
# Verify new password works
|
||||
login_response = client.post(
|
||||
"/api/auth/login",
|
||||
json={"email": "test@example.com", "password": "newpassword123"},
|
||||
)
|
||||
assert login_response.status_code == 200
|
||||
|
||||
# Verify old password doesn't work
|
||||
old_login_response = client.post(
|
||||
"/api/auth/login",
|
||||
json={"email": "test@example.com", "password": "testpassword"},
|
||||
)
|
||||
assert old_login_response.status_code == 401
|
||||
|
||||
|
||||
def test_reset_password_not_found(client: TestClient, admin_headers: dict) -> None:
|
||||
"""Test resetting password for non-existent user."""
|
||||
response = client.post(
|
||||
"/api/admin/users/99999/reset-password",
|
||||
headers=admin_headers,
|
||||
json={"new_password": "newpassword"},
|
||||
)
|
||||
assert response.status_code == 404
|
||||
|
||||
|
||||
# ===== Audit Log Integration Tests =====
|
||||
|
||||
|
||||
def test_user_creation_creates_audit_log(
|
||||
client: TestClient,
|
||||
admin_token: str,
|
||||
test_admin: User,
|
||||
db: Session,
|
||||
) -> None:
|
||||
"""Test that creating a user creates an audit log entry."""
|
||||
from app.models.audit_log import AuditLog
|
||||
|
||||
response = client.post(
|
||||
"/api/admin/users",
|
||||
headers={"Authorization": f"Bearer {admin_token}"},
|
||||
json={
|
||||
"email": "newuser@example.com",
|
||||
"full_name": "New User",
|
||||
"password": "newpassword",
|
||||
"role": "user",
|
||||
"organization": "Test Org",
|
||||
},
|
||||
)
|
||||
|
||||
assert response.status_code == 201
|
||||
user_id = response.json()["id"]
|
||||
|
||||
# Check audit log was created
|
||||
audit = db.query(AuditLog).filter(
|
||||
AuditLog.action == "user_created",
|
||||
AuditLog.target_id == user_id
|
||||
).first()
|
||||
|
||||
assert audit is not None
|
||||
assert audit.target_type == "user"
|
||||
assert audit.user_id == test_admin.id
|
||||
assert audit.details == {"email": "newuser@example.com", "role": "user"}
|
||||
|
||||
|
||||
def test_user_update_creates_audit_log(
|
||||
client: TestClient,
|
||||
admin_token: str,
|
||||
test_admin: User,
|
||||
test_user: User,
|
||||
db: Session,
|
||||
) -> None:
|
||||
"""Test that updating a user creates an audit log entry."""
|
||||
from app.models.audit_log import AuditLog
|
||||
|
||||
response = client.put(
|
||||
f"/api/admin/users/{test_user.id}",
|
||||
headers={"Authorization": f"Bearer {admin_token}"},
|
||||
json={
|
||||
"full_name": "Updated Name",
|
||||
"role": "admin",
|
||||
},
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
|
||||
# Check audit log was created
|
||||
audit = db.query(AuditLog).filter(
|
||||
AuditLog.action == "user_updated",
|
||||
AuditLog.target_id == test_user.id
|
||||
).first()
|
||||
|
||||
assert audit is not None
|
||||
assert audit.target_type == "user"
|
||||
assert audit.user_id == test_admin.id
|
||||
# Should track changed fields
|
||||
assert "full_name" in audit.details["updated_fields"]
|
||||
assert "role" in audit.details["updated_fields"]
|
||||
15
frontend/.eslintrc.cjs
Normal file
15
frontend/.eslintrc.cjs
Normal file
@@ -0,0 +1,15 @@
|
||||
/* eslint-env node */
|
||||
module.exports = {
|
||||
root: true,
|
||||
extends: [
|
||||
'plugin:vue/vue3-essential',
|
||||
'eslint:recommended',
|
||||
'@vue/eslint-config-typescript'
|
||||
],
|
||||
parserOptions: {
|
||||
ecmaVersion: 'latest'
|
||||
},
|
||||
rules: {
|
||||
'vue/multi-word-component-names': 'off'
|
||||
}
|
||||
}
|
||||
25
frontend/.gitignore
vendored
Normal file
25
frontend/.gitignore
vendored
Normal file
@@ -0,0 +1,25 @@
|
||||
# Logs
|
||||
logs
|
||||
*.log
|
||||
npm-debug.log*
|
||||
yarn-debug.log*
|
||||
yarn-error.log*
|
||||
pnpm-debug.log*
|
||||
lerna-debug.log*
|
||||
|
||||
node_modules
|
||||
.DS_Store
|
||||
dist
|
||||
dist-ssr
|
||||
coverage
|
||||
*.local
|
||||
|
||||
# Editor directories and files
|
||||
.vscode/*
|
||||
!.vscode/extensions.json
|
||||
.idea
|
||||
*.suo
|
||||
*.ntvs*
|
||||
*.njsproj
|
||||
*.sln
|
||||
*.sw?
|
||||
13
frontend/index.html
Normal file
13
frontend/index.html
Normal file
@@ -0,0 +1,13 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<link rel="icon" href="/favicon.ico">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>Space Booking</title>
|
||||
</head>
|
||||
<body>
|
||||
<div id="app"></div>
|
||||
<script type="module" src="/src/main.ts"></script>
|
||||
</body>
|
||||
</html>
|
||||
3682
frontend/package-lock.json
generated
Normal file
3682
frontend/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
34
frontend/package.json
Normal file
34
frontend/package.json
Normal file
@@ -0,0 +1,34 @@
|
||||
{
|
||||
"name": "space-booking-frontend",
|
||||
"version": "0.1.0",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"build": "vue-tsc && vite build",
|
||||
"preview": "vite preview",
|
||||
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
|
||||
"typecheck": "vue-tsc --noEmit"
|
||||
},
|
||||
"dependencies": {
|
||||
"@fullcalendar/core": "^6.1.0",
|
||||
"@fullcalendar/daygrid": "^6.1.0",
|
||||
"@fullcalendar/interaction": "^6.1.0",
|
||||
"@fullcalendar/timegrid": "^6.1.0",
|
||||
"@fullcalendar/vue3": "^6.1.0",
|
||||
"axios": "^1.6.0",
|
||||
"chart.js": "^4.5.1",
|
||||
"pinia": "^2.1.0",
|
||||
"vue": "^3.4.0",
|
||||
"vue-router": "^4.2.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@vitejs/plugin-vue": "^5.0.0",
|
||||
"@vue/eslint-config-typescript": "^12.0.0",
|
||||
"@vue/tsconfig": "^0.5.0",
|
||||
"eslint": "^8.56.0",
|
||||
"eslint-plugin-vue": "^9.19.0",
|
||||
"typescript": "^5.6.0",
|
||||
"vite": "^5.0.0",
|
||||
"vue-tsc": "^2.0.0"
|
||||
}
|
||||
}
|
||||
389
frontend/src/App.vue
Normal file
389
frontend/src/App.vue
Normal file
@@ -0,0 +1,389 @@
|
||||
<template>
|
||||
<div id="app">
|
||||
<header v-if="authStore.isAuthenticated" class="header">
|
||||
<div class="container">
|
||||
<h1>Space Booking</h1>
|
||||
<nav>
|
||||
<router-link to="/dashboard">Dashboard</router-link>
|
||||
<router-link to="/spaces">Spaces</router-link>
|
||||
<router-link to="/my-bookings">My Bookings</router-link>
|
||||
<router-link v-if="authStore.isAdmin" to="/admin">Spaces Admin</router-link>
|
||||
<router-link v-if="authStore.isAdmin" to="/users">Users Admin</router-link>
|
||||
<router-link v-if="authStore.isAdmin" to="/admin/pending">Pending Requests</router-link>
|
||||
<router-link v-if="authStore.isAdmin" to="/admin/settings">Settings</router-link>
|
||||
<router-link v-if="authStore.isAdmin" to="/admin/reports">Reports</router-link>
|
||||
<router-link v-if="authStore.isAdmin" to="/admin/audit-log">Audit Log</router-link>
|
||||
|
||||
<!-- Notification Bell -->
|
||||
<div class="notification-wrapper">
|
||||
<button @click="toggleNotifications" class="notification-bell" aria-label="Notifications">
|
||||
<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
|
||||
<path d="M18 8A6 6 0 0 0 6 8c0 7-3 9-3 9h18s-3-2-3-9"></path>
|
||||
<path d="M13.73 21a2 2 0 0 1-3.46 0"></path>
|
||||
</svg>
|
||||
<span v-if="unreadCount > 0" class="badge">{{ unreadCount }}</span>
|
||||
</button>
|
||||
|
||||
<!-- Notification Dropdown -->
|
||||
<div v-if="showNotifications" class="notification-dropdown" ref="dropdownRef">
|
||||
<div class="notification-header">
|
||||
<h3>Notifications</h3>
|
||||
<button @click="closeNotifications" class="close-btn">×</button>
|
||||
</div>
|
||||
|
||||
<div v-if="loading" class="notification-loading">Loading...</div>
|
||||
|
||||
<div v-else-if="notifications.length === 0" class="notification-empty">
|
||||
No new notifications
|
||||
</div>
|
||||
|
||||
<div v-else class="notification-list">
|
||||
<div
|
||||
v-for="notification in notifications"
|
||||
:key="notification.id"
|
||||
:class="['notification-item', { unread: !notification.is_read }]"
|
||||
@click="handleNotificationClick(notification)"
|
||||
>
|
||||
<div class="notification-title">{{ notification.title }}</div>
|
||||
<div class="notification-message">{{ notification.message }}</div>
|
||||
<div class="notification-time">{{ formatTime(notification.created_at) }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<button @click="logout" class="btn-logout">Logout ({{ authStore.user?.email }})</button>
|
||||
</nav>
|
||||
</div>
|
||||
</header>
|
||||
<main class="main">
|
||||
<router-view />
|
||||
</main>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, computed, onMounted, onUnmounted } from 'vue'
|
||||
import { useAuthStore } from '@/stores/auth'
|
||||
import { useRouter } from 'vue-router'
|
||||
import { notificationsApi } from '@/services/api'
|
||||
import type { Notification } from '@/types'
|
||||
|
||||
const authStore = useAuthStore()
|
||||
const router = useRouter()
|
||||
|
||||
const notifications = ref<Notification[]>([])
|
||||
const showNotifications = ref(false)
|
||||
const loading = ref(false)
|
||||
const dropdownRef = ref<HTMLElement | null>(null)
|
||||
|
||||
let refreshInterval: number | null = null
|
||||
|
||||
const unreadCount = computed(() => {
|
||||
return notifications.value.filter((n) => !n.is_read).length
|
||||
})
|
||||
|
||||
const logout = () => {
|
||||
authStore.logout()
|
||||
router.push('/login')
|
||||
}
|
||||
|
||||
const fetchNotifications = async () => {
|
||||
if (!authStore.isAuthenticated) return
|
||||
|
||||
try {
|
||||
loading.value = true
|
||||
// Get all notifications, sorted by created_at DESC (from API)
|
||||
notifications.value = await notificationsApi.getAll()
|
||||
} catch (error) {
|
||||
console.error('Failed to fetch notifications:', error)
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
const toggleNotifications = () => {
|
||||
showNotifications.value = !showNotifications.value
|
||||
if (showNotifications.value) {
|
||||
fetchNotifications()
|
||||
}
|
||||
}
|
||||
|
||||
const closeNotifications = () => {
|
||||
showNotifications.value = false
|
||||
}
|
||||
|
||||
const handleNotificationClick = async (notification: Notification) => {
|
||||
// Mark as read
|
||||
if (!notification.is_read) {
|
||||
try {
|
||||
await notificationsApi.markAsRead(notification.id)
|
||||
// Update local state
|
||||
notification.is_read = true
|
||||
} catch (error) {
|
||||
console.error('Failed to mark notification as read:', error)
|
||||
}
|
||||
}
|
||||
|
||||
// Navigate to booking if available
|
||||
if (notification.booking_id) {
|
||||
closeNotifications()
|
||||
router.push('/my-bookings')
|
||||
}
|
||||
}
|
||||
|
||||
const formatTime = (dateStr: string): string => {
|
||||
const date = new Date(dateStr)
|
||||
const now = new Date()
|
||||
const diffMs = now.getTime() - date.getTime()
|
||||
const diffMins = Math.floor(diffMs / 60000)
|
||||
const diffHours = Math.floor(diffMs / 3600000)
|
||||
const diffDays = Math.floor(diffMs / 86400000)
|
||||
|
||||
if (diffMins < 1) return 'Just now'
|
||||
if (diffMins < 60) return `${diffMins} minute${diffMins > 1 ? 's' : ''} ago`
|
||||
if (diffHours < 24) return `${diffHours} hour${diffHours > 1 ? 's' : ''} ago`
|
||||
if (diffDays < 7) return `${diffDays} day${diffDays > 1 ? 's' : ''} ago`
|
||||
return date.toLocaleDateString()
|
||||
}
|
||||
|
||||
// Click outside to close
|
||||
const handleClickOutside = (event: MouseEvent) => {
|
||||
if (
|
||||
dropdownRef.value &&
|
||||
!dropdownRef.value.contains(event.target as Node) &&
|
||||
!(event.target as HTMLElement).closest('.notification-bell')
|
||||
) {
|
||||
closeNotifications()
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
// Initial fetch
|
||||
fetchNotifications()
|
||||
|
||||
// Auto-refresh every 30 seconds
|
||||
refreshInterval = window.setInterval(fetchNotifications, 30000)
|
||||
|
||||
// Add click outside listener
|
||||
document.addEventListener('click', handleClickOutside)
|
||||
})
|
||||
|
||||
onUnmounted(() => {
|
||||
if (refreshInterval) {
|
||||
clearInterval(refreshInterval)
|
||||
}
|
||||
document.removeEventListener('click', handleClickOutside)
|
||||
})
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.header {
|
||||
background: #2c3e50;
|
||||
color: white;
|
||||
padding: 1rem 0;
|
||||
box-shadow: 0 2px 4px rgba(0,0,0,0.1);
|
||||
}
|
||||
|
||||
.container {
|
||||
max-width: 1200px;
|
||||
margin: 0 auto;
|
||||
padding: 0 1rem;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
h1 {
|
||||
margin: 0;
|
||||
font-size: 1.5rem;
|
||||
}
|
||||
|
||||
nav {
|
||||
display: flex;
|
||||
gap: 1.5rem;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
nav a {
|
||||
color: white;
|
||||
text-decoration: none;
|
||||
padding: 0.5rem 1rem;
|
||||
border-radius: 4px;
|
||||
transition: background 0.2s;
|
||||
}
|
||||
|
||||
nav a:hover,
|
||||
nav a.router-link-active {
|
||||
background: rgba(255,255,255,0.1);
|
||||
}
|
||||
|
||||
.btn-logout {
|
||||
background: #e74c3c;
|
||||
color: white;
|
||||
border: none;
|
||||
padding: 0.5rem 1rem;
|
||||
border-radius: 4px;
|
||||
cursor: pointer;
|
||||
font-size: 0.9rem;
|
||||
}
|
||||
|
||||
.btn-logout:hover {
|
||||
background: #c0392b;
|
||||
}
|
||||
|
||||
.main {
|
||||
max-width: 1200px;
|
||||
margin: 2rem auto;
|
||||
padding: 0 1rem;
|
||||
}
|
||||
|
||||
/* Notifications */
|
||||
.notification-wrapper {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.notification-bell {
|
||||
background: transparent;
|
||||
border: none;
|
||||
color: white;
|
||||
cursor: pointer;
|
||||
padding: 0.5rem;
|
||||
border-radius: 4px;
|
||||
position: relative;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
transition: background 0.2s;
|
||||
}
|
||||
|
||||
.notification-bell:hover {
|
||||
background: rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
|
||||
.notification-bell .badge {
|
||||
position: absolute;
|
||||
top: 2px;
|
||||
right: 2px;
|
||||
background: #e74c3c;
|
||||
color: white;
|
||||
border-radius: 10px;
|
||||
padding: 2px 6px;
|
||||
font-size: 0.7rem;
|
||||
font-weight: bold;
|
||||
min-width: 18px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.notification-dropdown {
|
||||
position: absolute;
|
||||
top: calc(100% + 10px);
|
||||
right: 0;
|
||||
background: white;
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
|
||||
width: 360px;
|
||||
max-height: 400px;
|
||||
overflow: hidden;
|
||||
z-index: 1000;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.notification-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 1rem;
|
||||
border-bottom: 1px solid #e0e0e0;
|
||||
background: #f8f9fa;
|
||||
}
|
||||
|
||||
.notification-header h3 {
|
||||
margin: 0;
|
||||
font-size: 1rem;
|
||||
color: #2c3e50;
|
||||
}
|
||||
|
||||
.close-btn {
|
||||
background: none;
|
||||
border: none;
|
||||
font-size: 1.5rem;
|
||||
color: #7f8c8d;
|
||||
cursor: pointer;
|
||||
padding: 0;
|
||||
width: 24px;
|
||||
height: 24px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
.close-btn:hover {
|
||||
background: #e0e0e0;
|
||||
color: #2c3e50;
|
||||
}
|
||||
|
||||
.notification-loading,
|
||||
.notification-empty {
|
||||
padding: 2rem;
|
||||
text-align: center;
|
||||
color: #7f8c8d;
|
||||
}
|
||||
|
||||
.notification-list {
|
||||
overflow-y: auto;
|
||||
max-height: 340px;
|
||||
}
|
||||
|
||||
.notification-item {
|
||||
padding: 1rem;
|
||||
border-bottom: 1px solid #e0e0e0;
|
||||
cursor: pointer;
|
||||
transition: background 0.2s;
|
||||
}
|
||||
|
||||
.notification-item:hover {
|
||||
background: #f8f9fa;
|
||||
}
|
||||
|
||||
.notification-item.unread {
|
||||
background: #e8f4fd;
|
||||
border-left: 3px solid #3498db;
|
||||
}
|
||||
|
||||
.notification-item.unread:hover {
|
||||
background: #d6ebfa;
|
||||
}
|
||||
|
||||
.notification-title {
|
||||
font-weight: 600;
|
||||
color: #2c3e50;
|
||||
margin-bottom: 0.25rem;
|
||||
font-size: 0.9rem;
|
||||
}
|
||||
|
||||
.notification-item.unread .notification-title {
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
.notification-message {
|
||||
color: #555;
|
||||
font-size: 0.85rem;
|
||||
margin-bottom: 0.5rem;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
.notification-time {
|
||||
color: #95a5a6;
|
||||
font-size: 0.75rem;
|
||||
}
|
||||
|
||||
/* Responsive */
|
||||
@media (max-width: 768px) {
|
||||
.notification-dropdown {
|
||||
width: 320px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
126
frontend/src/assets/main.css
Normal file
126
frontend/src/assets/main.css
Normal file
@@ -0,0 +1,126 @@
|
||||
*,
|
||||
*::before,
|
||||
*::after {
|
||||
box-sizing: border-box;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
body {
|
||||
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, sans-serif;
|
||||
line-height: 1.6;
|
||||
color: #2c3e50;
|
||||
background: #f5f5f5;
|
||||
}
|
||||
|
||||
#app {
|
||||
min-height: 100vh;
|
||||
}
|
||||
|
||||
/* Buttons */
|
||||
.btn {
|
||||
padding: 0.75rem 1.5rem;
|
||||
border: none;
|
||||
border-radius: 4px;
|
||||
cursor: pointer;
|
||||
font-size: 1rem;
|
||||
transition: all 0.2s;
|
||||
}
|
||||
|
||||
.btn-primary {
|
||||
background: #3498db;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.btn-primary:hover {
|
||||
background: #2980b9;
|
||||
}
|
||||
|
||||
.btn-success {
|
||||
background: #27ae60;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.btn-success:hover {
|
||||
background: #229954;
|
||||
}
|
||||
|
||||
.btn-danger {
|
||||
background: #e74c3c;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.btn-danger:hover {
|
||||
background: #c0392b;
|
||||
}
|
||||
|
||||
/* Forms */
|
||||
.form-group {
|
||||
margin-bottom: 1.5rem;
|
||||
}
|
||||
|
||||
.form-group label {
|
||||
display: block;
|
||||
margin-bottom: 0.5rem;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.form-group input,
|
||||
.form-group select,
|
||||
.form-group textarea {
|
||||
width: 100%;
|
||||
padding: 0.75rem;
|
||||
border: 1px solid #ddd;
|
||||
border-radius: 4px;
|
||||
font-size: 1rem;
|
||||
}
|
||||
|
||||
.form-group input:focus,
|
||||
.form-group select:focus,
|
||||
.form-group textarea:focus {
|
||||
outline: none;
|
||||
border-color: #3498db;
|
||||
}
|
||||
|
||||
.error {
|
||||
color: #e74c3c;
|
||||
font-size: 0.9rem;
|
||||
margin-top: 0.25rem;
|
||||
}
|
||||
|
||||
/* Cards */
|
||||
.card {
|
||||
background: white;
|
||||
border-radius: 8px;
|
||||
padding: 1.5rem;
|
||||
box-shadow: 0 2px 4px rgba(0,0,0,0.1);
|
||||
}
|
||||
|
||||
/* Status badges */
|
||||
.badge {
|
||||
display: inline-block;
|
||||
padding: 0.25rem 0.75rem;
|
||||
border-radius: 12px;
|
||||
font-size: 0.85rem;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.badge-pending {
|
||||
background: #fff3cd;
|
||||
color: #856404;
|
||||
}
|
||||
|
||||
.badge-approved {
|
||||
background: #d4edda;
|
||||
color: #155724;
|
||||
}
|
||||
|
||||
.badge-rejected {
|
||||
background: #f8d7da;
|
||||
color: #721c24;
|
||||
}
|
||||
|
||||
.badge-canceled {
|
||||
background: #e2e3e5;
|
||||
color: #383d41;
|
||||
}
|
||||
237
frontend/src/components/AttachmentsList.vue
Normal file
237
frontend/src/components/AttachmentsList.vue
Normal file
@@ -0,0 +1,237 @@
|
||||
<template>
|
||||
<div class="attachments-list">
|
||||
<h4 class="attachments-title">Attachments</h4>
|
||||
|
||||
<div v-if="loading" class="loading">Loading attachments...</div>
|
||||
|
||||
<div v-else-if="error" class="error">{{ error }}</div>
|
||||
|
||||
<div v-else-if="attachments.length === 0" class="no-attachments">No attachments</div>
|
||||
|
||||
<ul v-else class="attachment-items">
|
||||
<li v-for="attachment in attachments" :key="attachment.id" class="attachment-item">
|
||||
<div class="attachment-info">
|
||||
<span class="attachment-icon">📎</span>
|
||||
<div class="attachment-details">
|
||||
<a
|
||||
:href="getDownloadUrl(attachment.id)"
|
||||
class="attachment-name"
|
||||
target="_blank"
|
||||
:download="attachment.filename"
|
||||
>
|
||||
{{ attachment.filename }}
|
||||
</a>
|
||||
<span class="attachment-meta">
|
||||
{{ formatFileSize(attachment.size) }} · Uploaded by {{ attachment.uploader_name }} ·
|
||||
{{ formatDate(attachment.created_at) }}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<button
|
||||
v-if="canDelete"
|
||||
type="button"
|
||||
class="btn-delete"
|
||||
:disabled="deleting === attachment.id"
|
||||
@click="handleDelete(attachment.id)"
|
||||
>
|
||||
{{ deleting === attachment.id ? 'Deleting...' : 'Delete' }}
|
||||
</button>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, onMounted } from 'vue'
|
||||
import { attachmentsApi, handleApiError } from '@/services/api'
|
||||
import type { Attachment } from '@/types'
|
||||
|
||||
interface Props {
|
||||
bookingId: number
|
||||
canDelete?: boolean
|
||||
}
|
||||
|
||||
interface Emits {
|
||||
(e: 'deleted'): void
|
||||
}
|
||||
|
||||
const props = defineProps<Props>()
|
||||
const emit = defineEmits<Emits>()
|
||||
|
||||
const attachments = ref<Attachment[]>([])
|
||||
const loading = ref(true)
|
||||
const error = ref('')
|
||||
const deleting = ref<number | null>(null)
|
||||
|
||||
const loadAttachments = async () => {
|
||||
loading.value = true
|
||||
error.value = ''
|
||||
|
||||
try {
|
||||
attachments.value = await attachmentsApi.list(props.bookingId)
|
||||
} catch (err) {
|
||||
error.value = handleApiError(err)
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
const handleDelete = async (attachmentId: number) => {
|
||||
if (!confirm('Are you sure you want to delete this attachment?')) {
|
||||
return
|
||||
}
|
||||
|
||||
deleting.value = attachmentId
|
||||
try {
|
||||
await attachmentsApi.delete(attachmentId)
|
||||
attachments.value = attachments.value.filter(a => a.id !== attachmentId)
|
||||
emit('deleted')
|
||||
} catch (err) {
|
||||
error.value = handleApiError(err)
|
||||
} finally {
|
||||
deleting.value = null
|
||||
}
|
||||
}
|
||||
|
||||
const getDownloadUrl = (attachmentId: number): string => {
|
||||
return attachmentsApi.download(attachmentId)
|
||||
}
|
||||
|
||||
const formatFileSize = (bytes: number): string => {
|
||||
if (bytes === 0) return '0 Bytes'
|
||||
const k = 1024
|
||||
const sizes = ['Bytes', 'KB', 'MB']
|
||||
const i = Math.floor(Math.log(bytes) / Math.log(k))
|
||||
return Math.round((bytes / Math.pow(k, i)) * 100) / 100 + ' ' + sizes[i]
|
||||
}
|
||||
|
||||
const formatDate = (dateString: string): string => {
|
||||
const date = new Date(dateString)
|
||||
return date.toLocaleDateString() + ' ' + date.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
loadAttachments()
|
||||
})
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.attachments-list {
|
||||
margin-top: 24px;
|
||||
}
|
||||
|
||||
.attachments-title {
|
||||
font-size: 16px;
|
||||
font-weight: 600;
|
||||
color: #111827;
|
||||
margin: 0 0 12px 0;
|
||||
}
|
||||
|
||||
.loading,
|
||||
.error,
|
||||
.no-attachments {
|
||||
padding: 12px;
|
||||
border-radius: 6px;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.loading,
|
||||
.no-attachments {
|
||||
background: #f3f4f6;
|
||||
color: #6b7280;
|
||||
}
|
||||
|
||||
.error {
|
||||
background: #fee2e2;
|
||||
color: #991b1b;
|
||||
}
|
||||
|
||||
.attachment-items {
|
||||
list-style: none;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.attachment-item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 12px;
|
||||
background: #f9fafb;
|
||||
border: 1px solid #e5e7eb;
|
||||
border-radius: 6px;
|
||||
margin-bottom: 8px;
|
||||
gap: 12px;
|
||||
}
|
||||
|
||||
.attachment-info {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 12px;
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.attachment-icon {
|
||||
font-size: 20px;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.attachment-details {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 4px;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.attachment-name {
|
||||
font-size: 14px;
|
||||
color: #3b82f6;
|
||||
text-decoration: none;
|
||||
font-weight: 500;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.attachment-name:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.attachment-meta {
|
||||
font-size: 12px;
|
||||
color: #6b7280;
|
||||
}
|
||||
|
||||
.btn-delete {
|
||||
padding: 6px 12px;
|
||||
background: white;
|
||||
color: #ef4444;
|
||||
border: 1px solid #ef4444;
|
||||
border-radius: 4px;
|
||||
font-size: 13px;
|
||||
cursor: pointer;
|
||||
transition: all 0.2s;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.btn-delete:hover:not(:disabled) {
|
||||
background: #fef2f2;
|
||||
}
|
||||
|
||||
.btn-delete:disabled {
|
||||
opacity: 0.6;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
@media (max-width: 640px) {
|
||||
.attachment-item {
|
||||
flex-direction: column;
|
||||
align-items: stretch;
|
||||
}
|
||||
|
||||
.btn-delete {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
1308
frontend/src/components/BookingForm.vue
Normal file
1308
frontend/src/components/BookingForm.vue
Normal file
File diff suppressed because it is too large
Load Diff
43
frontend/src/components/README.md
Normal file
43
frontend/src/components/README.md
Normal file
@@ -0,0 +1,43 @@
|
||||
# SpaceCalendar Component
|
||||
|
||||
Component Vue.js 3 pentru afișarea rezervărilor unui spațiu folosind FullCalendar.
|
||||
|
||||
## Utilizare
|
||||
|
||||
```vue
|
||||
<template>
|
||||
<div>
|
||||
<h2>Rezervări pentru Sala A</h2>
|
||||
<SpaceCalendar :space-id="1" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import SpaceCalendar from '@/components/SpaceCalendar.vue'
|
||||
</script>
|
||||
```
|
||||
|
||||
## Props
|
||||
|
||||
| Prop | Type | Required | Description |
|
||||
|------|------|----------|-------------|
|
||||
| `spaceId` | `number` | Yes | ID-ul spațiului pentru care se afișează rezervările |
|
||||
|
||||
## Features
|
||||
|
||||
- **View Switcher**: Month, Week, Day views
|
||||
- **Status Colors**:
|
||||
- Pending: Orange (#FFA500)
|
||||
- Approved: Green (#4CAF50)
|
||||
- Rejected: Red (#F44336)
|
||||
- Canceled: Gray (#9E9E9E)
|
||||
- **Auto-refresh**: Se încarcă automat rezervările când se schimbă data
|
||||
- **Responsive**: Se adaptează la dimensiunea ecranului
|
||||
|
||||
## API Integration
|
||||
|
||||
Componenta folosește `bookingsApi.getForSpace(spaceId, start, end)` pentru a încărca rezervările.
|
||||
|
||||
## TypeScript Types
|
||||
|
||||
Componenta este complet type-safe și folosește interfețele din `/src/types/index.ts`.
|
||||
484
frontend/src/components/SpaceCalendar.vue
Normal file
484
frontend/src/components/SpaceCalendar.vue
Normal file
@@ -0,0 +1,484 @@
|
||||
<template>
|
||||
<div class="space-calendar">
|
||||
<div v-if="isEditable" class="admin-notice">
|
||||
Admin Mode: Drag approved bookings to reschedule
|
||||
</div>
|
||||
<div v-if="error" class="error">{{ error }}</div>
|
||||
<div v-if="loading && !confirmModal.show" class="loading">Loading calendar...</div>
|
||||
<FullCalendar v-if="!loading" :options="calendarOptions" />
|
||||
|
||||
<!-- Confirmation Modal -->
|
||||
<div v-if="confirmModal.show" class="modal-overlay" @click.self="cancelReschedule">
|
||||
<div class="modal-content">
|
||||
<h3>Confirm Reschedule</h3>
|
||||
<p>Reschedule this booking?</p>
|
||||
|
||||
<div class="time-comparison">
|
||||
<div class="old-time">
|
||||
<strong>Old Time:</strong><br />
|
||||
{{ formatDateTime(confirmModal.oldStart) }} - {{ formatDateTime(confirmModal.oldEnd) }}
|
||||
</div>
|
||||
<div class="arrow">→</div>
|
||||
<div class="new-time">
|
||||
<strong>New Time:</strong><br />
|
||||
{{ formatDateTime(confirmModal.newStart) }} - {{ formatDateTime(confirmModal.newEnd) }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="modal-actions">
|
||||
<button @click="confirmReschedule" :disabled="modalLoading" class="btn-primary">
|
||||
{{ modalLoading ? 'Saving...' : 'Confirm' }}
|
||||
</button>
|
||||
<button @click="cancelReschedule" :disabled="modalLoading" class="btn-secondary">
|
||||
Cancel
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, computed, onMounted } from 'vue'
|
||||
import FullCalendar from '@fullcalendar/vue3'
|
||||
import dayGridPlugin from '@fullcalendar/daygrid'
|
||||
import timeGridPlugin from '@fullcalendar/timegrid'
|
||||
import interactionPlugin from '@fullcalendar/interaction'
|
||||
import type { CalendarOptions, EventInput, DatesSetArg, EventDropArg, EventResizeDoneArg } from '@fullcalendar/core'
|
||||
import { bookingsApi, adminBookingsApi, handleApiError } from '@/services/api'
|
||||
import { useAuthStore } from '@/stores/auth'
|
||||
import type { Booking } from '@/types'
|
||||
|
||||
interface Props {
|
||||
spaceId: number
|
||||
}
|
||||
|
||||
const props = defineProps<Props>()
|
||||
|
||||
const authStore = useAuthStore()
|
||||
const bookings = ref<Booking[]>([])
|
||||
const loading = ref(false)
|
||||
const modalLoading = ref(false)
|
||||
const error = ref('')
|
||||
|
||||
interface ConfirmModal {
|
||||
show: boolean
|
||||
booking: any
|
||||
oldStart: Date | null
|
||||
oldEnd: Date | null
|
||||
newStart: Date | null
|
||||
newEnd: Date | null
|
||||
revertFunc: (() => void) | null
|
||||
}
|
||||
|
||||
const confirmModal = ref<ConfirmModal>({
|
||||
show: false,
|
||||
booking: null,
|
||||
oldStart: null,
|
||||
oldEnd: null,
|
||||
newStart: null,
|
||||
newEnd: null,
|
||||
revertFunc: null
|
||||
})
|
||||
|
||||
// Admin can edit, users see read-only
|
||||
const isEditable = computed(() => authStore.user?.role === 'admin')
|
||||
|
||||
// Status to color mapping
|
||||
const STATUS_COLORS: Record<string, string> = {
|
||||
pending: '#FFA500',
|
||||
approved: '#4CAF50',
|
||||
rejected: '#F44336',
|
||||
canceled: '#9E9E9E'
|
||||
}
|
||||
|
||||
// Convert bookings to FullCalendar events
|
||||
const events = computed<EventInput[]>(() => {
|
||||
return bookings.value.map((booking) => ({
|
||||
id: String(booking.id),
|
||||
title: booking.title,
|
||||
start: booking.start_datetime,
|
||||
end: booking.end_datetime,
|
||||
backgroundColor: STATUS_COLORS[booking.status] || '#9E9E9E',
|
||||
borderColor: STATUS_COLORS[booking.status] || '#9E9E9E',
|
||||
extendedProps: {
|
||||
status: booking.status,
|
||||
description: booking.description
|
||||
}
|
||||
}))
|
||||
})
|
||||
|
||||
// Handle event drop (drag)
|
||||
const handleEventDrop = (info: EventDropArg) => {
|
||||
const booking = info.event
|
||||
const oldStart = info.oldEvent.start
|
||||
const oldEnd = info.oldEvent.end
|
||||
const newStart = info.event.start
|
||||
const newEnd = info.event.end
|
||||
|
||||
// Show confirmation modal
|
||||
confirmModal.value = {
|
||||
show: true,
|
||||
booking: booking,
|
||||
oldStart: oldStart,
|
||||
oldEnd: oldEnd,
|
||||
newStart: newStart,
|
||||
newEnd: newEnd,
|
||||
revertFunc: info.revert
|
||||
}
|
||||
}
|
||||
|
||||
// Handle event resize
|
||||
const handleEventResize = (info: EventResizeDoneArg) => {
|
||||
const booking = info.event
|
||||
const oldStart = info.oldEvent.start
|
||||
const oldEnd = info.oldEvent.end
|
||||
const newStart = info.event.start
|
||||
const newEnd = info.event.end
|
||||
|
||||
// Show confirmation modal
|
||||
confirmModal.value = {
|
||||
show: true,
|
||||
booking: booking,
|
||||
oldStart: oldStart,
|
||||
oldEnd: oldEnd,
|
||||
newStart: newStart,
|
||||
newEnd: newEnd,
|
||||
revertFunc: info.revert
|
||||
}
|
||||
}
|
||||
|
||||
// Confirm reschedule
|
||||
const confirmReschedule = async () => {
|
||||
if (!confirmModal.value.newStart || !confirmModal.value.newEnd) {
|
||||
return
|
||||
}
|
||||
|
||||
try {
|
||||
modalLoading.value = true
|
||||
|
||||
// Call reschedule API
|
||||
await adminBookingsApi.reschedule(parseInt(confirmModal.value.booking.id), {
|
||||
start_datetime: confirmModal.value.newStart.toISOString(),
|
||||
end_datetime: confirmModal.value.newEnd.toISOString()
|
||||
})
|
||||
|
||||
// Success - reload events
|
||||
await loadBookings(
|
||||
confirmModal.value.newStart < confirmModal.value.oldStart!
|
||||
? confirmModal.value.newStart
|
||||
: confirmModal.value.oldStart!,
|
||||
confirmModal.value.newEnd > confirmModal.value.oldEnd!
|
||||
? confirmModal.value.newEnd
|
||||
: confirmModal.value.oldEnd!
|
||||
)
|
||||
|
||||
confirmModal.value.show = false
|
||||
} catch (err: any) {
|
||||
// Error - revert the change
|
||||
if (confirmModal.value.revertFunc) {
|
||||
confirmModal.value.revertFunc()
|
||||
}
|
||||
|
||||
const errorMsg = err.response?.data?.detail || 'Failed to reschedule booking'
|
||||
error.value = errorMsg
|
||||
|
||||
// Clear error after 5 seconds
|
||||
setTimeout(() => {
|
||||
error.value = ''
|
||||
}, 5000)
|
||||
|
||||
confirmModal.value.show = false
|
||||
} finally {
|
||||
modalLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
// Cancel reschedule
|
||||
const cancelReschedule = () => {
|
||||
// Revert the visual change
|
||||
if (confirmModal.value.revertFunc) {
|
||||
confirmModal.value.revertFunc()
|
||||
}
|
||||
confirmModal.value.show = false
|
||||
}
|
||||
|
||||
// Format datetime for display
|
||||
const formatDateTime = (date: Date | null) => {
|
||||
if (!date) return ''
|
||||
return date.toLocaleString('ro-RO', {
|
||||
year: 'numeric',
|
||||
month: '2-digit',
|
||||
day: '2-digit',
|
||||
hour: '2-digit',
|
||||
minute: '2-digit'
|
||||
})
|
||||
}
|
||||
|
||||
// Load bookings for a date range
|
||||
const loadBookings = async (start: Date, end: Date) => {
|
||||
loading.value = true
|
||||
error.value = ''
|
||||
|
||||
try {
|
||||
const startStr = start.toISOString()
|
||||
const endStr = end.toISOString()
|
||||
bookings.value = await bookingsApi.getForSpace(props.spaceId, startStr, endStr)
|
||||
} catch (err) {
|
||||
error.value = handleApiError(err)
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
// Handle date range changes
|
||||
const handleDatesSet = (arg: DatesSetArg) => {
|
||||
loadBookings(arg.start, arg.end)
|
||||
}
|
||||
|
||||
// FullCalendar options
|
||||
const calendarOptions = computed<CalendarOptions>(() => ({
|
||||
plugins: [dayGridPlugin, timeGridPlugin, interactionPlugin],
|
||||
initialView: 'dayGridMonth',
|
||||
headerToolbar: {
|
||||
left: 'prev,next today',
|
||||
center: 'title',
|
||||
right: 'dayGridMonth,timeGridWeek,timeGridDay'
|
||||
},
|
||||
events: events.value,
|
||||
datesSet: handleDatesSet,
|
||||
editable: isEditable.value, // Enable drag/resize for admins
|
||||
eventStartEditable: isEditable.value,
|
||||
eventDurationEditable: isEditable.value,
|
||||
selectable: false,
|
||||
selectMirror: true,
|
||||
dayMaxEvents: true,
|
||||
weekends: true,
|
||||
height: 'auto',
|
||||
eventTimeFormat: {
|
||||
hour: '2-digit',
|
||||
minute: '2-digit',
|
||||
hour12: false
|
||||
},
|
||||
slotLabelFormat: {
|
||||
hour: '2-digit',
|
||||
minute: '2-digit',
|
||||
hour12: false
|
||||
},
|
||||
// Drag callback
|
||||
eventDrop: handleEventDrop,
|
||||
// Resize callback
|
||||
eventResize: handleEventResize,
|
||||
// Event rendering
|
||||
eventDidMount: (info) => {
|
||||
// Only approved bookings are draggable
|
||||
if (info.event.extendedProps.status !== 'approved') {
|
||||
info.el.style.cursor = 'default'
|
||||
}
|
||||
},
|
||||
// Event allow callback
|
||||
eventAllow: (dropInfo, draggedEvent) => {
|
||||
// Only allow dragging approved bookings
|
||||
return draggedEvent.extendedProps.status === 'approved'
|
||||
}
|
||||
}))
|
||||
|
||||
// Load initial bookings on mount
|
||||
onMounted(() => {
|
||||
const now = new Date()
|
||||
const startOfMonth = new Date(now.getFullYear(), now.getMonth(), 1)
|
||||
const endOfMonth = new Date(now.getFullYear(), now.getMonth() + 1, 0)
|
||||
loadBookings(startOfMonth, endOfMonth)
|
||||
})
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.space-calendar {
|
||||
background: white;
|
||||
border-radius: 8px;
|
||||
padding: 24px;
|
||||
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
.admin-notice {
|
||||
background: #e3f2fd;
|
||||
padding: 8px 16px;
|
||||
margin-bottom: 16px;
|
||||
border-radius: 4px;
|
||||
color: #1976d2;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.error {
|
||||
padding: 12px;
|
||||
background: #fee2e2;
|
||||
color: #991b1b;
|
||||
border-radius: 4px;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
|
||||
.loading {
|
||||
text-align: center;
|
||||
color: #6b7280;
|
||||
padding: 24px;
|
||||
}
|
||||
|
||||
/* Modal styles */
|
||||
.modal-overlay {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
background: rgba(0, 0, 0, 0.5);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
z-index: 1000;
|
||||
}
|
||||
|
||||
.modal-content {
|
||||
background: white;
|
||||
padding: 24px;
|
||||
border-radius: 8px;
|
||||
max-width: 500px;
|
||||
width: 90%;
|
||||
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
|
||||
.modal-content h3 {
|
||||
margin-top: 0;
|
||||
margin-bottom: 16px;
|
||||
color: #1f2937;
|
||||
}
|
||||
|
||||
.modal-content p {
|
||||
margin-bottom: 20px;
|
||||
color: #6b7280;
|
||||
}
|
||||
|
||||
.time-comparison {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 16px;
|
||||
margin: 20px 0;
|
||||
padding: 16px;
|
||||
background: #f9fafb;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
.old-time,
|
||||
.new-time {
|
||||
flex: 1;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.old-time strong,
|
||||
.new-time strong {
|
||||
color: #374151;
|
||||
display: block;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
|
||||
.arrow {
|
||||
font-size: 24px;
|
||||
color: #9ca3af;
|
||||
}
|
||||
|
||||
.modal-actions {
|
||||
display: flex;
|
||||
gap: 12px;
|
||||
justify-content: flex-end;
|
||||
margin-top: 24px;
|
||||
}
|
||||
|
||||
.btn-primary {
|
||||
background: #3b82f6;
|
||||
color: white;
|
||||
border: none;
|
||||
padding: 10px 20px;
|
||||
border-radius: 4px;
|
||||
cursor: pointer;
|
||||
font-size: 14px;
|
||||
font-weight: 500;
|
||||
transition: background 0.2s;
|
||||
}
|
||||
|
||||
.btn-primary:hover:not(:disabled) {
|
||||
background: #2563eb;
|
||||
}
|
||||
|
||||
.btn-primary:disabled {
|
||||
background: #93c5fd;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
.btn-secondary {
|
||||
background: #f3f4f6;
|
||||
color: #374151;
|
||||
border: 1px solid #d1d5db;
|
||||
padding: 10px 20px;
|
||||
border-radius: 4px;
|
||||
cursor: pointer;
|
||||
font-size: 14px;
|
||||
font-weight: 500;
|
||||
transition: background 0.2s;
|
||||
}
|
||||
|
||||
.btn-secondary:hover:not(:disabled) {
|
||||
background: #e5e7eb;
|
||||
}
|
||||
|
||||
.btn-secondary:disabled {
|
||||
opacity: 0.5;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
/* FullCalendar custom styles */
|
||||
:deep(.fc) {
|
||||
font-family: inherit;
|
||||
}
|
||||
|
||||
:deep(.fc-button) {
|
||||
background: #3b82f6;
|
||||
border-color: #3b82f6;
|
||||
text-transform: capitalize;
|
||||
}
|
||||
|
||||
:deep(.fc-button:hover) {
|
||||
background: #2563eb;
|
||||
border-color: #2563eb;
|
||||
}
|
||||
|
||||
:deep(.fc-button-active) {
|
||||
background: #1d4ed8 !important;
|
||||
border-color: #1d4ed8 !important;
|
||||
}
|
||||
|
||||
:deep(.fc-daygrid-day-number) {
|
||||
color: #374151;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
:deep(.fc-col-header-cell-cushion) {
|
||||
color: #374151;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
:deep(.fc-event) {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
:deep(.fc-event-title) {
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
/* Draggable events styling */
|
||||
:deep(.fc-event.fc-draggable) {
|
||||
cursor: move;
|
||||
}
|
||||
|
||||
:deep(.fc-event:not(.fc-draggable)) {
|
||||
cursor: default;
|
||||
}
|
||||
</style>
|
||||
12
frontend/src/main.ts
Normal file
12
frontend/src/main.ts
Normal file
@@ -0,0 +1,12 @@
|
||||
import { createApp } from 'vue'
|
||||
import { createPinia } from 'pinia'
|
||||
import App from './App.vue'
|
||||
import router from './router'
|
||||
import './assets/main.css'
|
||||
|
||||
const app = createApp(App)
|
||||
|
||||
app.use(createPinia())
|
||||
app.use(router)
|
||||
|
||||
app.mount('#app')
|
||||
115
frontend/src/router/index.ts
Normal file
115
frontend/src/router/index.ts
Normal file
@@ -0,0 +1,115 @@
|
||||
import { createRouter, createWebHistory } from 'vue-router'
|
||||
import { useAuthStore } from '@/stores/auth'
|
||||
import Login from '@/views/Login.vue'
|
||||
import Dashboard from '@/views/Dashboard.vue'
|
||||
|
||||
const router = createRouter({
|
||||
history: createWebHistory(),
|
||||
routes: [
|
||||
{
|
||||
path: '/',
|
||||
redirect: '/dashboard'
|
||||
},
|
||||
{
|
||||
path: '/login',
|
||||
name: 'Login',
|
||||
component: Login,
|
||||
meta: { requiresAuth: false }
|
||||
},
|
||||
{
|
||||
path: '/register',
|
||||
name: 'Register',
|
||||
component: () => import('@/views/Register.vue'),
|
||||
meta: { requiresAuth: false }
|
||||
},
|
||||
{
|
||||
path: '/verify',
|
||||
name: 'VerifyEmail',
|
||||
component: () => import('@/views/VerifyEmail.vue'),
|
||||
meta: { requiresAuth: false }
|
||||
},
|
||||
{
|
||||
path: '/dashboard',
|
||||
name: 'Dashboard',
|
||||
component: Dashboard,
|
||||
meta: { requiresAuth: true }
|
||||
},
|
||||
{
|
||||
path: '/spaces',
|
||||
name: 'Spaces',
|
||||
component: () => import('@/views/Spaces.vue'),
|
||||
meta: { requiresAuth: true }
|
||||
},
|
||||
{
|
||||
path: '/spaces/:id',
|
||||
name: 'SpaceDetail',
|
||||
component: () => import('@/views/SpaceDetail.vue'),
|
||||
meta: { requiresAuth: true }
|
||||
},
|
||||
{
|
||||
path: '/my-bookings',
|
||||
name: 'MyBookings',
|
||||
component: () => import('@/views/MyBookings.vue'),
|
||||
meta: { requiresAuth: true }
|
||||
},
|
||||
{
|
||||
path: '/profile',
|
||||
name: 'UserProfile',
|
||||
component: () => import('@/views/UserProfile.vue'),
|
||||
meta: { requiresAuth: true }
|
||||
},
|
||||
{
|
||||
path: '/admin',
|
||||
name: 'Admin',
|
||||
component: () => import('@/views/Admin.vue'),
|
||||
meta: { requiresAuth: true, requiresAdmin: true }
|
||||
},
|
||||
{
|
||||
path: '/users',
|
||||
name: 'Users',
|
||||
component: () => import('@/views/Users.vue'),
|
||||
meta: { requiresAuth: true, requiresAdmin: true }
|
||||
},
|
||||
{
|
||||
path: '/admin/settings',
|
||||
name: 'AdminSettings',
|
||||
component: () => import('@/views/Settings.vue'),
|
||||
meta: { requiresAuth: true, requiresAdmin: true }
|
||||
},
|
||||
{
|
||||
path: '/admin/pending',
|
||||
name: 'AdminPending',
|
||||
component: () => import('@/views/AdminPending.vue'),
|
||||
meta: { requiresAuth: true, requiresAdmin: true }
|
||||
},
|
||||
{
|
||||
path: '/admin/audit-log',
|
||||
name: 'AuditLog',
|
||||
component: () => import('@/views/AuditLog.vue'),
|
||||
meta: { requiresAuth: true, requiresAdmin: true }
|
||||
},
|
||||
{
|
||||
path: '/admin/reports',
|
||||
name: 'AdminReports',
|
||||
component: () => import('@/views/AdminReports.vue'),
|
||||
meta: { requiresAuth: true, requiresAdmin: true }
|
||||
}
|
||||
]
|
||||
})
|
||||
|
||||
// Navigation guard
|
||||
router.beforeEach((to, _from, next) => {
|
||||
const authStore = useAuthStore()
|
||||
|
||||
if (to.meta.requiresAuth && !authStore.isAuthenticated) {
|
||||
next('/login')
|
||||
} else if (to.meta.requiresAdmin && !authStore.isAdmin) {
|
||||
next('/dashboard')
|
||||
} else if (to.path === '/login' && authStore.isAuthenticated) {
|
||||
next('/dashboard')
|
||||
} else {
|
||||
next()
|
||||
}
|
||||
})
|
||||
|
||||
export default router
|
||||
370
frontend/src/services/api.ts
Normal file
370
frontend/src/services/api.ts
Normal file
@@ -0,0 +1,370 @@
|
||||
import axios, { AxiosError } from 'axios'
|
||||
import type {
|
||||
LoginRequest,
|
||||
TokenResponse,
|
||||
UserRegister,
|
||||
RegistrationResponse,
|
||||
EmailVerificationRequest,
|
||||
VerificationResponse,
|
||||
Space,
|
||||
User,
|
||||
Settings,
|
||||
Booking,
|
||||
BookingCreate,
|
||||
BookingUpdate,
|
||||
BookingTemplate,
|
||||
BookingTemplateCreate,
|
||||
Notification,
|
||||
AuditLog,
|
||||
Attachment,
|
||||
RecurringBookingCreate,
|
||||
RecurringBookingResult,
|
||||
SpaceUsageReport,
|
||||
TopUsersReport,
|
||||
ApprovalRateReport
|
||||
} from '@/types'
|
||||
|
||||
const api = axios.create({
|
||||
baseURL: '/api',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
}
|
||||
})
|
||||
|
||||
// Add token to requests
|
||||
api.interceptors.request.use((config) => {
|
||||
const token = localStorage.getItem('token')
|
||||
if (token) {
|
||||
config.headers.Authorization = `Bearer ${token}`
|
||||
}
|
||||
return config
|
||||
})
|
||||
|
||||
// Auth API
|
||||
export const authApi = {
|
||||
login: async (credentials: LoginRequest): Promise<TokenResponse> => {
|
||||
const response = await api.post<TokenResponse>('/auth/login', credentials)
|
||||
return response.data
|
||||
},
|
||||
|
||||
register: async (data: UserRegister): Promise<RegistrationResponse> => {
|
||||
const response = await api.post<RegistrationResponse>('/auth/register', data)
|
||||
return response.data
|
||||
},
|
||||
|
||||
verifyEmail: async (data: EmailVerificationRequest): Promise<VerificationResponse> => {
|
||||
const response = await api.post<VerificationResponse>('/auth/verify', data)
|
||||
return response.data
|
||||
},
|
||||
|
||||
resendVerification: async (email: string): Promise<{ message: string }> => {
|
||||
const response = await api.post<{ message: string }>('/auth/resend-verification', null, {
|
||||
params: { email }
|
||||
})
|
||||
return response.data
|
||||
}
|
||||
}
|
||||
|
||||
// Users API
|
||||
export const usersApi = {
|
||||
me: async (): Promise<User> => {
|
||||
const response = await api.get<User>('/users/me')
|
||||
return response.data
|
||||
},
|
||||
|
||||
list: async (params?: { role?: string; organization?: string }): Promise<User[]> => {
|
||||
const response = await api.get<User[]>('/admin/users', { params })
|
||||
return response.data
|
||||
},
|
||||
|
||||
create: async (
|
||||
data: Omit<User, 'id' | 'is_active'> & { password: string }
|
||||
): Promise<User> => {
|
||||
const response = await api.post<User>('/admin/users', data)
|
||||
return response.data
|
||||
},
|
||||
|
||||
update: async (
|
||||
id: number,
|
||||
data: Partial<Omit<User, 'id' | 'is_active'>>
|
||||
): Promise<User> => {
|
||||
const response = await api.put<User>(`/admin/users/${id}`, data)
|
||||
return response.data
|
||||
},
|
||||
|
||||
updateStatus: async (id: number, is_active: boolean): Promise<User> => {
|
||||
const response = await api.patch<User>(`/admin/users/${id}/status`, { is_active })
|
||||
return response.data
|
||||
},
|
||||
|
||||
resetPassword: async (id: number, new_password: string): Promise<User> => {
|
||||
const response = await api.post<User>(`/admin/users/${id}/reset-password`, {
|
||||
new_password
|
||||
})
|
||||
return response.data
|
||||
},
|
||||
|
||||
getTimezones: async (): Promise<string[]> => {
|
||||
const response = await api.get<string[]>('/users/timezones')
|
||||
return response.data
|
||||
},
|
||||
|
||||
updateTimezone: async (timezone: string): Promise<{ message: string; timezone: string }> => {
|
||||
const response = await api.put<{ message: string; timezone: string }>('/users/me/timezone', {
|
||||
timezone
|
||||
})
|
||||
return response.data
|
||||
}
|
||||
}
|
||||
|
||||
// Spaces API
|
||||
export const spacesApi = {
|
||||
list: async (): Promise<Space[]> => {
|
||||
const response = await api.get<Space[]>('/spaces')
|
||||
return response.data
|
||||
},
|
||||
|
||||
create: async (data: Omit<Space, 'id' | 'is_active'>): Promise<Space> => {
|
||||
const response = await api.post<Space>('/admin/spaces', data)
|
||||
return response.data
|
||||
},
|
||||
|
||||
update: async (id: number, data: Omit<Space, 'id' | 'is_active'>): Promise<Space> => {
|
||||
const response = await api.put<Space>(`/admin/spaces/${id}`, data)
|
||||
return response.data
|
||||
},
|
||||
|
||||
updateStatus: async (id: number, is_active: boolean): Promise<Space> => {
|
||||
const response = await api.patch<Space>(`/admin/spaces/${id}/status`, { is_active })
|
||||
return response.data
|
||||
}
|
||||
}
|
||||
|
||||
// Settings API
|
||||
export const settingsApi = {
|
||||
get: async (): Promise<Settings> => {
|
||||
const response = await api.get<Settings>('/admin/settings')
|
||||
return response.data
|
||||
},
|
||||
|
||||
update: async (data: Omit<Settings, 'id'>): Promise<Settings> => {
|
||||
const response = await api.put<Settings>('/admin/settings', data)
|
||||
return response.data
|
||||
}
|
||||
}
|
||||
|
||||
// Bookings API
|
||||
export const bookingsApi = {
|
||||
getForSpace: async (spaceId: number, start: string, end: string): Promise<Booking[]> => {
|
||||
const response = await api.get<Booking[]>(`/spaces/${spaceId}/bookings`, {
|
||||
params: { start, end }
|
||||
})
|
||||
return response.data
|
||||
},
|
||||
|
||||
checkAvailability: async (params: {
|
||||
space_id: number
|
||||
start_datetime: string
|
||||
end_datetime: string
|
||||
}) => {
|
||||
return api.get('/bookings/check-availability', { params })
|
||||
},
|
||||
|
||||
create: async (data: BookingCreate): Promise<Booking> => {
|
||||
const response = await api.post<Booking>('/bookings', data)
|
||||
return response.data
|
||||
},
|
||||
|
||||
getMy: async (status?: string): Promise<Booking[]> => {
|
||||
const response = await api.get<Booking[]>('/bookings/my', {
|
||||
params: status ? { status } : {}
|
||||
})
|
||||
return response.data
|
||||
},
|
||||
|
||||
update: async (id: number, data: BookingUpdate): Promise<Booking> => {
|
||||
const response = await api.put<Booking>(`/bookings/${id}`, data)
|
||||
return response.data
|
||||
},
|
||||
|
||||
createRecurring: async (data: RecurringBookingCreate): Promise<RecurringBookingResult> => {
|
||||
const response = await api.post<RecurringBookingResult>('/bookings/recurring', data)
|
||||
return response.data
|
||||
}
|
||||
}
|
||||
|
||||
// Admin Bookings API
|
||||
export const adminBookingsApi = {
|
||||
getPending: async (filters?: { space_id?: number; user_id?: number }): Promise<Booking[]> => {
|
||||
const response = await api.get<Booking[]>('/admin/bookings/pending', { params: filters })
|
||||
return response.data
|
||||
},
|
||||
|
||||
approve: async (id: number): Promise<Booking> => {
|
||||
const response = await api.put<Booking>(`/admin/bookings/${id}/approve`)
|
||||
return response.data
|
||||
},
|
||||
|
||||
reject: async (id: number, reason?: string): Promise<Booking> => {
|
||||
const response = await api.put<Booking>(`/admin/bookings/${id}/reject`, { reason })
|
||||
return response.data
|
||||
},
|
||||
|
||||
update: async (id: number, data: BookingUpdate): Promise<Booking> => {
|
||||
const response = await api.put<Booking>(`/admin/bookings/${id}`, data)
|
||||
return response.data
|
||||
},
|
||||
|
||||
reschedule: async (
|
||||
id: number,
|
||||
data: { start_datetime: string; end_datetime: string }
|
||||
): Promise<Booking> => {
|
||||
const response = await api.put<Booking>(`/admin/bookings/${id}/reschedule`, data)
|
||||
return response.data
|
||||
}
|
||||
}
|
||||
|
||||
// Notifications API
|
||||
export const notificationsApi = {
|
||||
getAll: async (isRead?: boolean): Promise<Notification[]> => {
|
||||
const params = isRead !== undefined ? { is_read: isRead } : {}
|
||||
const response = await api.get<Notification[]>('/notifications', { params })
|
||||
return response.data
|
||||
},
|
||||
|
||||
markAsRead: async (id: number): Promise<Notification> => {
|
||||
const response = await api.put<Notification>(`/notifications/${id}/read`)
|
||||
return response.data
|
||||
}
|
||||
}
|
||||
|
||||
// Audit Log API
|
||||
export const auditLogApi = {
|
||||
getAll: async (params?: {
|
||||
action?: string
|
||||
start_date?: string
|
||||
end_date?: string
|
||||
page?: number
|
||||
limit?: number
|
||||
}): Promise<AuditLog[]> => {
|
||||
const response = await api.get<AuditLog[]>('/admin/audit-log', { params })
|
||||
return response.data
|
||||
}
|
||||
}
|
||||
|
||||
// Booking Templates API
|
||||
export const bookingTemplatesApi = {
|
||||
getAll: async (): Promise<BookingTemplate[]> => {
|
||||
const response = await api.get<BookingTemplate[]>('/booking-templates')
|
||||
return response.data
|
||||
},
|
||||
|
||||
create: async (data: BookingTemplateCreate): Promise<BookingTemplate> => {
|
||||
const response = await api.post<BookingTemplate>('/booking-templates', data)
|
||||
return response.data
|
||||
},
|
||||
|
||||
delete: async (id: number): Promise<void> => {
|
||||
await api.delete(`/booking-templates/${id}`)
|
||||
},
|
||||
|
||||
createBookingFromTemplate: async (
|
||||
templateId: number,
|
||||
startDatetime: string
|
||||
): Promise<Booking> => {
|
||||
const response = await api.post<Booking>(
|
||||
`/booking-templates/from-template/${templateId}`,
|
||||
null,
|
||||
{ params: { start_datetime: startDatetime } }
|
||||
)
|
||||
return response.data
|
||||
}
|
||||
}
|
||||
|
||||
// Attachments API
|
||||
export const attachmentsApi = {
|
||||
upload: async (bookingId: number, file: File): Promise<Attachment> => {
|
||||
const formData = new FormData()
|
||||
formData.append('file', file)
|
||||
const response = await api.post<Attachment>(`/bookings/${bookingId}/attachments`, formData, {
|
||||
headers: { 'Content-Type': 'multipart/form-data' }
|
||||
})
|
||||
return response.data
|
||||
},
|
||||
|
||||
list: async (bookingId: number): Promise<Attachment[]> => {
|
||||
const response = await api.get<Attachment[]>(`/bookings/${bookingId}/attachments`)
|
||||
return response.data
|
||||
},
|
||||
|
||||
download: (attachmentId: number): string => {
|
||||
return `/api/attachments/${attachmentId}/download`
|
||||
},
|
||||
|
||||
delete: async (attachmentId: number): Promise<void> => {
|
||||
await api.delete(`/attachments/${attachmentId}`)
|
||||
}
|
||||
}
|
||||
|
||||
// Reports API
|
||||
export const reportsApi = {
|
||||
getUsage: async (params?: {
|
||||
start_date?: string
|
||||
end_date?: string
|
||||
space_id?: number
|
||||
}): Promise<SpaceUsageReport> => {
|
||||
const response = await api.get<SpaceUsageReport>('/admin/reports/usage', { params })
|
||||
return response.data
|
||||
},
|
||||
|
||||
getTopUsers: async (params?: {
|
||||
start_date?: string
|
||||
end_date?: string
|
||||
limit?: number
|
||||
}): Promise<TopUsersReport> => {
|
||||
const response = await api.get<TopUsersReport>('/admin/reports/top-users', { params })
|
||||
return response.data
|
||||
},
|
||||
|
||||
getApprovalRate: async (params?: {
|
||||
start_date?: string
|
||||
end_date?: string
|
||||
}): Promise<ApprovalRateReport> => {
|
||||
const response = await api.get<ApprovalRateReport>('/admin/reports/approval-rate', {
|
||||
params
|
||||
})
|
||||
return response.data
|
||||
}
|
||||
}
|
||||
|
||||
// Google Calendar API
|
||||
export const googleCalendarApi = {
|
||||
connect: async (): Promise<{ authorization_url: string; state: string }> => {
|
||||
const response = await api.get<{ authorization_url: string; state: string }>(
|
||||
'/integrations/google/connect'
|
||||
)
|
||||
return response.data
|
||||
},
|
||||
|
||||
disconnect: async (): Promise<{ message: string }> => {
|
||||
const response = await api.delete<{ message: string }>('/integrations/google/disconnect')
|
||||
return response.data
|
||||
},
|
||||
|
||||
status: async (): Promise<{ connected: boolean; expires_at: string | null }> => {
|
||||
const response = await api.get<{ connected: boolean; expires_at: string | null }>(
|
||||
'/integrations/google/status'
|
||||
)
|
||||
return response.data
|
||||
}
|
||||
}
|
||||
|
||||
// Helper to handle API errors
|
||||
export const handleApiError = (error: unknown): string => {
|
||||
if (error instanceof AxiosError) {
|
||||
return error.response?.data?.detail || error.message
|
||||
}
|
||||
return 'An unexpected error occurred'
|
||||
}
|
||||
|
||||
export default api
|
||||
50
frontend/src/stores/auth.ts
Normal file
50
frontend/src/stores/auth.ts
Normal file
@@ -0,0 +1,50 @@
|
||||
import { defineStore } from 'pinia'
|
||||
import { ref, computed } from 'vue'
|
||||
import { authApi, usersApi } from '@/services/api'
|
||||
import type { User, LoginRequest } from '@/types'
|
||||
|
||||
export const useAuthStore = defineStore('auth', () => {
|
||||
const token = ref<string | null>(localStorage.getItem('token'))
|
||||
const user = ref<User | null>(null)
|
||||
|
||||
const isAuthenticated = computed(() => !!token.value)
|
||||
const isAdmin = computed(() => user.value?.role === 'admin')
|
||||
|
||||
const login = async (credentials: LoginRequest) => {
|
||||
const response = await authApi.login(credentials)
|
||||
token.value = response.access_token
|
||||
localStorage.setItem('token', response.access_token)
|
||||
|
||||
// Fetch user data from API
|
||||
user.value = await usersApi.me()
|
||||
}
|
||||
|
||||
const logout = () => {
|
||||
token.value = null
|
||||
user.value = null
|
||||
localStorage.removeItem('token')
|
||||
}
|
||||
|
||||
// Initialize user from token on page load
|
||||
const initFromToken = async () => {
|
||||
if (token.value) {
|
||||
try {
|
||||
user.value = await usersApi.me()
|
||||
} catch (error) {
|
||||
// Invalid token
|
||||
logout()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
initFromToken()
|
||||
|
||||
return {
|
||||
token,
|
||||
user,
|
||||
isAuthenticated,
|
||||
isAdmin,
|
||||
login,
|
||||
logout
|
||||
}
|
||||
})
|
||||
219
frontend/src/types/index.ts
Normal file
219
frontend/src/types/index.ts
Normal file
@@ -0,0 +1,219 @@
|
||||
export interface User {
|
||||
id: number
|
||||
email: string
|
||||
full_name: string
|
||||
role: string
|
||||
organization?: string
|
||||
is_active: boolean
|
||||
timezone: string
|
||||
}
|
||||
|
||||
export interface LoginRequest {
|
||||
email: string
|
||||
password: string
|
||||
}
|
||||
|
||||
export interface TokenResponse {
|
||||
access_token: string
|
||||
token_type: string
|
||||
}
|
||||
|
||||
export interface UserRegister {
|
||||
email: string
|
||||
password: string
|
||||
confirm_password: string
|
||||
full_name: string
|
||||
organization: string
|
||||
}
|
||||
|
||||
export interface RegistrationResponse {
|
||||
message: string
|
||||
email: string
|
||||
}
|
||||
|
||||
export interface EmailVerificationRequest {
|
||||
token: string
|
||||
}
|
||||
|
||||
export interface VerificationResponse {
|
||||
message: string
|
||||
}
|
||||
|
||||
export interface Space {
|
||||
id: number
|
||||
name: string
|
||||
type: string
|
||||
capacity: number
|
||||
description?: string
|
||||
is_active: boolean
|
||||
}
|
||||
|
||||
export interface Booking {
|
||||
id: number
|
||||
space_id: number
|
||||
user_id: number
|
||||
start_datetime: string
|
||||
end_datetime: string
|
||||
title: string
|
||||
description?: string
|
||||
status: 'pending' | 'approved' | 'rejected' | 'canceled'
|
||||
created_at: string
|
||||
space?: Space
|
||||
user?: User
|
||||
}
|
||||
|
||||
export interface Settings {
|
||||
id: number
|
||||
min_duration_minutes: number
|
||||
max_duration_minutes: number
|
||||
working_hours_start: number
|
||||
working_hours_end: number
|
||||
max_bookings_per_day_per_user: number
|
||||
min_hours_before_cancel: number
|
||||
}
|
||||
|
||||
export interface BookingCreate {
|
||||
space_id: number
|
||||
start_datetime: string // ISO format
|
||||
end_datetime: string // ISO format
|
||||
title: string
|
||||
description?: string
|
||||
}
|
||||
|
||||
export interface BookingUpdate {
|
||||
title?: string
|
||||
description?: string
|
||||
start_datetime?: string // ISO format
|
||||
end_datetime?: string // ISO format
|
||||
}
|
||||
|
||||
export interface Notification {
|
||||
id: number
|
||||
user_id: number
|
||||
type: string
|
||||
title: string
|
||||
message: string
|
||||
booking_id?: number
|
||||
is_read: boolean
|
||||
created_at: string
|
||||
}
|
||||
|
||||
export interface AuditLog {
|
||||
id: number
|
||||
action: string
|
||||
user_id: number
|
||||
user_name: string
|
||||
user_email: string
|
||||
target_type: string
|
||||
target_id: number
|
||||
details?: Record<string, any>
|
||||
created_at: string
|
||||
}
|
||||
|
||||
export interface ConflictingBooking {
|
||||
id: number
|
||||
user_name: string
|
||||
title: string
|
||||
status: string
|
||||
start_datetime: string
|
||||
end_datetime: string
|
||||
}
|
||||
|
||||
export interface AvailabilityCheck {
|
||||
available: boolean
|
||||
conflicts: ConflictingBooking[]
|
||||
message: string
|
||||
}
|
||||
|
||||
export interface BookingTemplate {
|
||||
id: number
|
||||
user_id: number
|
||||
name: string
|
||||
space_id?: number
|
||||
space_name?: string
|
||||
duration_minutes: number
|
||||
title: string
|
||||
description?: string
|
||||
usage_count: number
|
||||
}
|
||||
|
||||
export interface BookingTemplateCreate {
|
||||
name: string
|
||||
space_id?: number
|
||||
duration_minutes: number
|
||||
title: string
|
||||
description?: string
|
||||
}
|
||||
|
||||
export interface Attachment {
|
||||
id: number
|
||||
booking_id: number
|
||||
filename: string
|
||||
size: number
|
||||
content_type: string
|
||||
uploaded_by: number
|
||||
uploader_name: string
|
||||
created_at: string
|
||||
}
|
||||
|
||||
export interface RecurringBookingCreate {
|
||||
space_id: number
|
||||
start_time: string
|
||||
duration_minutes: number
|
||||
title: string
|
||||
description?: string
|
||||
recurrence_days: number[]
|
||||
start_date: string
|
||||
end_date: string
|
||||
skip_conflicts: boolean
|
||||
}
|
||||
|
||||
export interface RecurringBookingResult {
|
||||
total_requested: number
|
||||
total_created: number
|
||||
total_skipped: number
|
||||
created_bookings: Booking[]
|
||||
skipped_dates: Array<{ date: string; reason: string }>
|
||||
}
|
||||
|
||||
export interface SpaceUsageItem {
|
||||
space_id: number
|
||||
space_name: string
|
||||
total_bookings: number
|
||||
approved_bookings: number
|
||||
pending_bookings: number
|
||||
rejected_bookings: number
|
||||
canceled_bookings: number
|
||||
total_hours: number
|
||||
}
|
||||
|
||||
export interface SpaceUsageReport {
|
||||
items: SpaceUsageItem[]
|
||||
total_bookings: number
|
||||
date_range: { start: string | null; end: string | null }
|
||||
}
|
||||
|
||||
export interface TopUserItem {
|
||||
user_id: number
|
||||
user_name: string
|
||||
user_email: string
|
||||
total_bookings: number
|
||||
approved_bookings: number
|
||||
total_hours: number
|
||||
}
|
||||
|
||||
export interface TopUsersReport {
|
||||
items: TopUserItem[]
|
||||
date_range: { start: string | null; end: string | null }
|
||||
}
|
||||
|
||||
export interface ApprovalRateReport {
|
||||
total_requests: number
|
||||
approved: number
|
||||
rejected: number
|
||||
pending: number
|
||||
canceled: number
|
||||
approval_rate: number
|
||||
rejection_rate: number
|
||||
date_range: { start: string | null; end: string | null }
|
||||
}
|
||||
117
frontend/src/utils/datetime.ts
Normal file
117
frontend/src/utils/datetime.ts
Normal file
@@ -0,0 +1,117 @@
|
||||
/**
|
||||
* Utility functions for timezone-aware datetime formatting.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Format a datetime string in the user's timezone.
|
||||
*
|
||||
* @param datetime - ISO datetime string from API (in UTC)
|
||||
* @param timezone - IANA timezone string (e.g., "Europe/Bucharest")
|
||||
* @param options - Intl.DateTimeFormat options
|
||||
* @returns Formatted datetime string
|
||||
*/
|
||||
export const formatDateTime = (
|
||||
datetime: string,
|
||||
timezone: string = 'UTC',
|
||||
options?: Intl.DateTimeFormatOptions
|
||||
): string => {
|
||||
const date = new Date(datetime)
|
||||
|
||||
const defaultOptions: Intl.DateTimeFormatOptions = {
|
||||
timeZone: timezone,
|
||||
year: 'numeric',
|
||||
month: '2-digit',
|
||||
day: '2-digit',
|
||||
hour: '2-digit',
|
||||
minute: '2-digit',
|
||||
...options
|
||||
}
|
||||
|
||||
return new Intl.DateTimeFormat('ro-RO', defaultOptions).format(date)
|
||||
}
|
||||
|
||||
/**
|
||||
* Format date only (no time) in user's timezone.
|
||||
*/
|
||||
export const formatDate = (datetime: string, timezone: string = 'UTC'): string => {
|
||||
return formatDateTime(datetime, timezone, {
|
||||
year: 'numeric',
|
||||
month: '2-digit',
|
||||
day: '2-digit',
|
||||
hour: undefined,
|
||||
minute: undefined
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* Format time only in user's timezone.
|
||||
*/
|
||||
export const formatTime = (datetime: string, timezone: string = 'UTC'): string => {
|
||||
const date = new Date(datetime)
|
||||
return new Intl.DateTimeFormat('ro-RO', {
|
||||
timeZone: timezone,
|
||||
hour: '2-digit',
|
||||
minute: '2-digit'
|
||||
}).format(date)
|
||||
}
|
||||
|
||||
/**
|
||||
* Format datetime with timezone abbreviation.
|
||||
*/
|
||||
export const formatDateTimeWithTZ = (datetime: string, timezone: string = 'UTC'): string => {
|
||||
const date = new Date(datetime)
|
||||
|
||||
const formatted = new Intl.DateTimeFormat('ro-RO', {
|
||||
timeZone: timezone,
|
||||
year: 'numeric',
|
||||
month: '2-digit',
|
||||
day: '2-digit',
|
||||
hour: '2-digit',
|
||||
minute: '2-digit',
|
||||
timeZoneName: 'short'
|
||||
}).format(date)
|
||||
|
||||
return formatted
|
||||
}
|
||||
|
||||
/**
|
||||
* Get timezone abbreviation (e.g., "EET", "EEST").
|
||||
*/
|
||||
export const getTimezoneAbbr = (timezone: string = 'UTC'): string => {
|
||||
const date = new Date()
|
||||
const formatted = new Intl.DateTimeFormat('en-US', {
|
||||
timeZone: timezone,
|
||||
timeZoneName: 'short'
|
||||
}).format(date)
|
||||
|
||||
// Extract timezone abbreviation from formatted string
|
||||
const match = formatted.match(/,\s*(.+)/)
|
||||
return match ? match[1] : timezone.split('/').pop() || 'UTC'
|
||||
}
|
||||
|
||||
/**
|
||||
* Convert local datetime-local input to ISO string (for API).
|
||||
* The input from datetime-local is in user's local time, so we just add seconds and Z.
|
||||
*/
|
||||
export const localDateTimeToISO = (localDateTime: string): string => {
|
||||
// datetime-local format: "YYYY-MM-DDTHH:mm"
|
||||
// We need to send it as is to the API (API will handle timezone conversion)
|
||||
return localDateTime + ':00'
|
||||
}
|
||||
|
||||
/**
|
||||
* Convert ISO datetime to datetime-local format for input field.
|
||||
*/
|
||||
export const isoToLocalDateTime = (isoDateTime: string, timezone: string = 'UTC'): string => {
|
||||
const date = new Date(isoDateTime)
|
||||
|
||||
// Get the date components in the user's timezone
|
||||
const year = date.toLocaleString('en-US', { timeZone: timezone, year: 'numeric' })
|
||||
const month = date.toLocaleString('en-US', { timeZone: timezone, month: '2-digit' })
|
||||
const day = date.toLocaleString('en-US', { timeZone: timezone, day: '2-digit' })
|
||||
const hour = date.toLocaleString('en-US', { timeZone: timezone, hour: '2-digit', hour12: false })
|
||||
const minute = date.toLocaleString('en-US', { timeZone: timezone, minute: '2-digit' })
|
||||
|
||||
// Format as YYYY-MM-DDTHH:mm for datetime-local input
|
||||
return `${year}-${month}-${day}T${hour.padStart(2, '0')}:${minute}`
|
||||
}
|
||||
411
frontend/src/views/Admin.vue
Normal file
411
frontend/src/views/Admin.vue
Normal file
@@ -0,0 +1,411 @@
|
||||
<template>
|
||||
<div class="admin">
|
||||
<h2>Admin Dashboard - Space Management</h2>
|
||||
|
||||
<!-- Create/Edit Form -->
|
||||
<div class="card">
|
||||
<h3>{{ editingSpace ? 'Edit Space' : 'Create New Space' }}</h3>
|
||||
<form @submit.prevent="handleSubmit" class="space-form">
|
||||
<div class="form-group">
|
||||
<label for="name">Name *</label>
|
||||
<input
|
||||
id="name"
|
||||
v-model="formData.name"
|
||||
type="text"
|
||||
required
|
||||
placeholder="Conference Room A"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label for="type">Type *</label>
|
||||
<select id="type" v-model="formData.type" required>
|
||||
<option value="sala">Sala</option>
|
||||
<option value="birou">Birou</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label for="capacity">Capacity *</label>
|
||||
<input
|
||||
id="capacity"
|
||||
v-model.number="formData.capacity"
|
||||
type="number"
|
||||
required
|
||||
min="1"
|
||||
placeholder="10"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label for="description">Description</label>
|
||||
<textarea
|
||||
id="description"
|
||||
v-model="formData.description"
|
||||
rows="3"
|
||||
placeholder="Optional description..."
|
||||
></textarea>
|
||||
</div>
|
||||
|
||||
<div class="form-actions">
|
||||
<button type="submit" class="btn btn-primary" :disabled="loading">
|
||||
{{ editingSpace ? 'Update' : 'Create' }}
|
||||
</button>
|
||||
<button
|
||||
v-if="editingSpace"
|
||||
type="button"
|
||||
class="btn btn-secondary"
|
||||
@click="cancelEdit"
|
||||
>
|
||||
Cancel
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<div v-if="error" class="error">{{ error }}</div>
|
||||
<div v-if="success" class="success">{{ success }}</div>
|
||||
</div>
|
||||
|
||||
<!-- Spaces List -->
|
||||
<div class="card">
|
||||
<h3>All Spaces</h3>
|
||||
<div v-if="loadingSpaces" class="loading">Loading spaces...</div>
|
||||
<div v-else-if="spaces.length === 0" class="empty">
|
||||
No spaces created yet. Create one above!
|
||||
</div>
|
||||
<table v-else class="spaces-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Name</th>
|
||||
<th>Type</th>
|
||||
<th>Capacity</th>
|
||||
<th>Status</th>
|
||||
<th>Actions</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="space in spaces" :key="space.id">
|
||||
<td>{{ space.name }}</td>
|
||||
<td>{{ space.type === 'sala' ? 'Sala' : 'Birou' }}</td>
|
||||
<td>{{ space.capacity }}</td>
|
||||
<td>
|
||||
<span :class="['badge', space.is_active ? 'badge-active' : 'badge-inactive']">
|
||||
{{ space.is_active ? 'Active' : 'Inactive' }}
|
||||
</span>
|
||||
</td>
|
||||
<td class="actions">
|
||||
<button
|
||||
class="btn btn-sm btn-secondary"
|
||||
@click="startEdit(space)"
|
||||
:disabled="loading"
|
||||
>
|
||||
Edit
|
||||
</button>
|
||||
<button
|
||||
:class="['btn', 'btn-sm', space.is_active ? 'btn-warning' : 'btn-success']"
|
||||
@click="toggleStatus(space)"
|
||||
:disabled="loading"
|
||||
>
|
||||
{{ space.is_active ? 'Deactivate' : 'Activate' }}
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, onMounted } from 'vue'
|
||||
import { spacesApi, handleApiError } from '@/services/api'
|
||||
import type { Space } from '@/types'
|
||||
|
||||
const spaces = ref<Space[]>([])
|
||||
const loadingSpaces = ref(false)
|
||||
const loading = ref(false)
|
||||
const error = ref('')
|
||||
const success = ref('')
|
||||
const editingSpace = ref<Space | null>(null)
|
||||
|
||||
const formData = ref({
|
||||
name: '',
|
||||
type: 'sala',
|
||||
capacity: 1,
|
||||
description: ''
|
||||
})
|
||||
|
||||
const loadSpaces = async () => {
|
||||
loadingSpaces.value = true
|
||||
error.value = ''
|
||||
try {
|
||||
spaces.value = await spacesApi.list()
|
||||
} catch (err) {
|
||||
error.value = handleApiError(err)
|
||||
} finally {
|
||||
loadingSpaces.value = false
|
||||
}
|
||||
}
|
||||
|
||||
const handleSubmit = async () => {
|
||||
loading.value = true
|
||||
error.value = ''
|
||||
success.value = ''
|
||||
|
||||
try {
|
||||
if (editingSpace.value) {
|
||||
await spacesApi.update(editingSpace.value.id, formData.value)
|
||||
success.value = 'Space updated successfully!'
|
||||
} else {
|
||||
await spacesApi.create(formData.value)
|
||||
success.value = 'Space created successfully!'
|
||||
}
|
||||
|
||||
resetForm()
|
||||
await loadSpaces()
|
||||
|
||||
// Clear success message after 3 seconds
|
||||
setTimeout(() => {
|
||||
success.value = ''
|
||||
}, 3000)
|
||||
} catch (err) {
|
||||
error.value = handleApiError(err)
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
const startEdit = (space: Space) => {
|
||||
editingSpace.value = space
|
||||
formData.value = {
|
||||
name: space.name,
|
||||
type: space.type,
|
||||
capacity: space.capacity,
|
||||
description: space.description || ''
|
||||
}
|
||||
window.scrollTo({ top: 0, behavior: 'smooth' })
|
||||
}
|
||||
|
||||
const cancelEdit = () => {
|
||||
resetForm()
|
||||
}
|
||||
|
||||
const resetForm = () => {
|
||||
editingSpace.value = null
|
||||
formData.value = {
|
||||
name: '',
|
||||
type: 'sala',
|
||||
capacity: 1,
|
||||
description: ''
|
||||
}
|
||||
}
|
||||
|
||||
const toggleStatus = async (space: Space) => {
|
||||
loading.value = true
|
||||
error.value = ''
|
||||
success.value = ''
|
||||
|
||||
try {
|
||||
await spacesApi.updateStatus(space.id, !space.is_active)
|
||||
success.value = `Space ${space.is_active ? 'deactivated' : 'activated'} successfully!`
|
||||
await loadSpaces()
|
||||
|
||||
setTimeout(() => {
|
||||
success.value = ''
|
||||
}, 3000)
|
||||
} catch (err) {
|
||||
error.value = handleApiError(err)
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
loadSpaces()
|
||||
})
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.admin {
|
||||
max-width: 1200px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
.card {
|
||||
background: white;
|
||||
border-radius: 8px;
|
||||
padding: 24px;
|
||||
margin-bottom: 24px;
|
||||
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
.space-form {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 16px;
|
||||
}
|
||||
|
||||
.form-group {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 4px;
|
||||
}
|
||||
|
||||
.form-group label {
|
||||
font-weight: 500;
|
||||
color: #374151;
|
||||
}
|
||||
|
||||
.form-group input,
|
||||
.form-group select,
|
||||
.form-group textarea {
|
||||
padding: 8px 12px;
|
||||
border: 1px solid #d1d5db;
|
||||
border-radius: 4px;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.form-group input:focus,
|
||||
.form-group select:focus,
|
||||
.form-group textarea:focus {
|
||||
outline: none;
|
||||
border-color: #3b82f6;
|
||||
box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.1);
|
||||
}
|
||||
|
||||
.form-actions {
|
||||
display: flex;
|
||||
gap: 12px;
|
||||
margin-top: 8px;
|
||||
}
|
||||
|
||||
.btn {
|
||||
padding: 10px 20px;
|
||||
border: none;
|
||||
border-radius: 4px;
|
||||
font-size: 14px;
|
||||
font-weight: 500;
|
||||
cursor: pointer;
|
||||
transition: all 0.2s;
|
||||
}
|
||||
|
||||
.btn:disabled {
|
||||
opacity: 0.5;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
.btn-primary {
|
||||
background: #3b82f6;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.btn-primary:hover:not(:disabled) {
|
||||
background: #2563eb;
|
||||
}
|
||||
|
||||
.btn-secondary {
|
||||
background: #6b7280;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.btn-secondary:hover:not(:disabled) {
|
||||
background: #4b5563;
|
||||
}
|
||||
|
||||
.btn-success {
|
||||
background: #10b981;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.btn-success:hover:not(:disabled) {
|
||||
background: #059669;
|
||||
}
|
||||
|
||||
.btn-warning {
|
||||
background: #f59e0b;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.btn-warning:hover:not(:disabled) {
|
||||
background: #d97706;
|
||||
}
|
||||
|
||||
.btn-sm {
|
||||
padding: 6px 12px;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.error {
|
||||
padding: 12px;
|
||||
background: #fee2e2;
|
||||
color: #991b1b;
|
||||
border-radius: 4px;
|
||||
margin-top: 12px;
|
||||
}
|
||||
|
||||
.success {
|
||||
padding: 12px;
|
||||
background: #d1fae5;
|
||||
color: #065f46;
|
||||
border-radius: 4px;
|
||||
margin-top: 12px;
|
||||
}
|
||||
|
||||
.loading {
|
||||
text-align: center;
|
||||
color: #6b7280;
|
||||
padding: 24px;
|
||||
}
|
||||
|
||||
.empty {
|
||||
text-align: center;
|
||||
color: #9ca3af;
|
||||
padding: 24px;
|
||||
}
|
||||
|
||||
.spaces-table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
}
|
||||
|
||||
.spaces-table th {
|
||||
text-align: left;
|
||||
padding: 12px;
|
||||
background: #f9fafb;
|
||||
font-weight: 600;
|
||||
color: #374151;
|
||||
border-bottom: 2px solid #e5e7eb;
|
||||
}
|
||||
|
||||
.spaces-table td {
|
||||
padding: 12px;
|
||||
border-bottom: 1px solid #e5e7eb;
|
||||
}
|
||||
|
||||
.spaces-table tr:hover {
|
||||
background: #f9fafb;
|
||||
}
|
||||
|
||||
.badge {
|
||||
display: inline-block;
|
||||
padding: 4px 12px;
|
||||
border-radius: 12px;
|
||||
font-size: 12px;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.badge-active {
|
||||
background: #d1fae5;
|
||||
color: #065f46;
|
||||
}
|
||||
|
||||
.badge-inactive {
|
||||
background: #fee2e2;
|
||||
color: #991b1b;
|
||||
}
|
||||
|
||||
.actions {
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
}
|
||||
</style>
|
||||
513
frontend/src/views/AdminPending.vue
Normal file
513
frontend/src/views/AdminPending.vue
Normal file
@@ -0,0 +1,513 @@
|
||||
<template>
|
||||
<div class="admin-pending">
|
||||
<h2>Admin Dashboard - Pending Booking Requests</h2>
|
||||
|
||||
<!-- Filters Card -->
|
||||
<div class="card">
|
||||
<h3>Filters</h3>
|
||||
<div class="filters">
|
||||
<div class="form-group">
|
||||
<label for="filter-space">Filter by Space</label>
|
||||
<select id="filter-space" v-model="filterSpaceId" @change="loadPendingBookings">
|
||||
<option value="">All Spaces</option>
|
||||
<option v-for="space in spaces" :key="space.id" :value="space.id">
|
||||
{{ space.name }}
|
||||
</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Loading State -->
|
||||
<div v-if="loading" class="card">
|
||||
<div class="loading">Loading pending requests...</div>
|
||||
</div>
|
||||
|
||||
<!-- Empty State -->
|
||||
<div v-else-if="bookings.length === 0" class="card">
|
||||
<div class="empty">
|
||||
No pending requests found.
|
||||
{{ filterSpaceId ? 'Try different filters.' : 'All bookings have been processed.' }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Bookings Table -->
|
||||
<div v-else class="card">
|
||||
<h3>Pending Requests ({{ bookings.length }})</h3>
|
||||
<table class="bookings-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>User</th>
|
||||
<th>Space</th>
|
||||
<th>Date</th>
|
||||
<th>Time</th>
|
||||
<th>Title</th>
|
||||
<th>Description</th>
|
||||
<th>Actions</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="booking in bookings" :key="booking.id">
|
||||
<td>
|
||||
<div class="user-info">
|
||||
<div class="user-name">{{ booking.user?.full_name || 'Unknown' }}</div>
|
||||
<div class="user-email">{{ booking.user?.email || '-' }}</div>
|
||||
<div class="user-org" v-if="booking.user?.organization">
|
||||
{{ booking.user.organization }}
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<div class="space-info">
|
||||
<div class="space-name">{{ booking.space?.name || 'Unknown Space' }}</div>
|
||||
<div class="space-type">{{ formatType(booking.space?.type || '') }}</div>
|
||||
</div>
|
||||
</td>
|
||||
<td>{{ formatDate(booking.start_datetime) }}</td>
|
||||
<td>{{ formatTime(booking.start_datetime, booking.end_datetime) }}</td>
|
||||
<td>{{ booking.title }}</td>
|
||||
<td>
|
||||
<div class="description" :title="booking.description || '-'">
|
||||
{{ truncateText(booking.description || '-', 40) }}
|
||||
</div>
|
||||
</td>
|
||||
<td class="actions">
|
||||
<button
|
||||
class="btn btn-sm btn-success"
|
||||
@click="handleApprove(booking)"
|
||||
:disabled="processing === booking.id"
|
||||
>
|
||||
{{ processing === booking.id ? 'Processing...' : 'Approve' }}
|
||||
</button>
|
||||
<button
|
||||
class="btn btn-sm btn-danger"
|
||||
@click="showRejectModal(booking)"
|
||||
:disabled="processing === booking.id"
|
||||
>
|
||||
Reject
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<!-- Reject Modal -->
|
||||
<div v-if="rejectingBooking" class="modal" @click.self="closeRejectModal">
|
||||
<div class="modal-content">
|
||||
<h3>Reject Booking Request</h3>
|
||||
<div class="booking-summary">
|
||||
<p><strong>User:</strong> {{ rejectingBooking.user?.full_name }}</p>
|
||||
<p><strong>Space:</strong> {{ rejectingBooking.space?.name }}</p>
|
||||
<p><strong>Title:</strong> {{ rejectingBooking.title }}</p>
|
||||
<p>
|
||||
<strong>Date:</strong> {{ formatDate(rejectingBooking.start_datetime) }} -
|
||||
{{ formatTime(rejectingBooking.start_datetime, rejectingBooking.end_datetime) }}
|
||||
</p>
|
||||
</div>
|
||||
<form @submit.prevent="handleReject">
|
||||
<div class="form-group">
|
||||
<label for="reject_reason">Rejection Reason (optional)</label>
|
||||
<textarea
|
||||
id="reject_reason"
|
||||
v-model="rejectReason"
|
||||
rows="4"
|
||||
placeholder="Provide a reason for rejection..."
|
||||
></textarea>
|
||||
</div>
|
||||
<div class="form-actions">
|
||||
<button type="submit" class="btn btn-danger" :disabled="processing !== null">
|
||||
{{ processing !== null ? 'Rejecting...' : 'Confirm Rejection' }}
|
||||
</button>
|
||||
<button type="button" class="btn btn-secondary" @click="closeRejectModal">
|
||||
Cancel
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Error Message -->
|
||||
<div v-if="error" class="card">
|
||||
<div class="error">{{ error }}</div>
|
||||
</div>
|
||||
|
||||
<!-- Success Message -->
|
||||
<div v-if="success" class="card">
|
||||
<div class="success">{{ success }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, onMounted } from 'vue'
|
||||
import { adminBookingsApi, spacesApi, handleApiError } from '@/services/api'
|
||||
import type { Booking, Space } from '@/types'
|
||||
|
||||
const bookings = ref<Booking[]>([])
|
||||
const spaces = ref<Space[]>([])
|
||||
const loading = ref(false)
|
||||
const error = ref('')
|
||||
const success = ref('')
|
||||
const processing = ref<number | null>(null)
|
||||
const filterSpaceId = ref<string>('')
|
||||
const rejectingBooking = ref<Booking | null>(null)
|
||||
const rejectReason = ref('')
|
||||
|
||||
const loadPendingBookings = async () => {
|
||||
loading.value = true
|
||||
error.value = ''
|
||||
try {
|
||||
const filters: { space_id?: number } = {}
|
||||
if (filterSpaceId.value) {
|
||||
filters.space_id = Number(filterSpaceId.value)
|
||||
}
|
||||
bookings.value = await adminBookingsApi.getPending(filters)
|
||||
} catch (err) {
|
||||
error.value = handleApiError(err)
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
const loadSpaces = async () => {
|
||||
try {
|
||||
spaces.value = await spacesApi.list()
|
||||
} catch (err) {
|
||||
console.error('Failed to load spaces:', err)
|
||||
}
|
||||
}
|
||||
|
||||
const formatDate = (datetime: string): string => {
|
||||
const date = new Date(datetime)
|
||||
return date.toLocaleDateString('en-GB', {
|
||||
day: '2-digit',
|
||||
month: 'short',
|
||||
year: 'numeric'
|
||||
})
|
||||
}
|
||||
|
||||
const formatTime = (start: string, end: string): string => {
|
||||
const startDate = new Date(start)
|
||||
const endDate = new Date(end)
|
||||
const formatTimeOnly = (date: Date) =>
|
||||
date.toLocaleTimeString('en-GB', {
|
||||
hour: '2-digit',
|
||||
minute: '2-digit',
|
||||
hour12: false
|
||||
})
|
||||
return `${formatTimeOnly(startDate)} - ${formatTimeOnly(endDate)}`
|
||||
}
|
||||
|
||||
const formatType = (type: string): string => {
|
||||
const typeMap: Record<string, string> = {
|
||||
sala: 'Sala',
|
||||
birou: 'Birou'
|
||||
}
|
||||
return typeMap[type] || type
|
||||
}
|
||||
|
||||
const truncateText = (text: string, maxLength: number): string => {
|
||||
if (text.length <= maxLength) return text
|
||||
return text.substring(0, maxLength) + '...'
|
||||
}
|
||||
|
||||
const handleApprove = async (booking: Booking) => {
|
||||
if (!confirm('Are you sure you want to approve this booking?')) {
|
||||
return
|
||||
}
|
||||
|
||||
processing.value = booking.id
|
||||
error.value = ''
|
||||
success.value = ''
|
||||
|
||||
try {
|
||||
await adminBookingsApi.approve(booking.id)
|
||||
success.value = `Booking "${booking.title}" approved successfully!`
|
||||
|
||||
// Remove from list
|
||||
bookings.value = bookings.value.filter((b) => b.id !== booking.id)
|
||||
|
||||
// Clear success message after 3 seconds
|
||||
setTimeout(() => {
|
||||
success.value = ''
|
||||
}, 3000)
|
||||
} catch (err) {
|
||||
error.value = handleApiError(err)
|
||||
} finally {
|
||||
processing.value = null
|
||||
}
|
||||
}
|
||||
|
||||
const showRejectModal = (booking: Booking) => {
|
||||
rejectingBooking.value = booking
|
||||
rejectReason.value = ''
|
||||
}
|
||||
|
||||
const closeRejectModal = () => {
|
||||
rejectingBooking.value = null
|
||||
rejectReason.value = ''
|
||||
}
|
||||
|
||||
const handleReject = async () => {
|
||||
if (!rejectingBooking.value) return
|
||||
|
||||
processing.value = rejectingBooking.value.id
|
||||
error.value = ''
|
||||
success.value = ''
|
||||
|
||||
try {
|
||||
await adminBookingsApi.reject(
|
||||
rejectingBooking.value.id,
|
||||
rejectReason.value || undefined
|
||||
)
|
||||
success.value = `Booking "${rejectingBooking.value.title}" rejected successfully!`
|
||||
|
||||
// Remove from list
|
||||
bookings.value = bookings.value.filter((b) => b.id !== rejectingBooking.value!.id)
|
||||
|
||||
closeRejectModal()
|
||||
|
||||
// Clear success message after 3 seconds
|
||||
setTimeout(() => {
|
||||
success.value = ''
|
||||
}, 3000)
|
||||
} catch (err) {
|
||||
error.value = handleApiError(err)
|
||||
} finally {
|
||||
processing.value = null
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
loadSpaces()
|
||||
loadPendingBookings()
|
||||
})
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.admin-pending {
|
||||
max-width: 1600px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
.card {
|
||||
background: white;
|
||||
border-radius: 8px;
|
||||
padding: 24px;
|
||||
margin-bottom: 24px;
|
||||
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
.filters {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
|
||||
gap: 16px;
|
||||
}
|
||||
|
||||
.form-group {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 4px;
|
||||
}
|
||||
|
||||
.form-group label {
|
||||
font-weight: 500;
|
||||
color: #374151;
|
||||
}
|
||||
|
||||
.form-group select,
|
||||
.form-group textarea {
|
||||
padding: 8px 12px;
|
||||
border: 1px solid #d1d5db;
|
||||
border-radius: 4px;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.form-group select:focus,
|
||||
.form-group textarea:focus {
|
||||
outline: none;
|
||||
border-color: #3b82f6;
|
||||
box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.1);
|
||||
}
|
||||
|
||||
.form-actions {
|
||||
display: flex;
|
||||
gap: 12px;
|
||||
margin-top: 16px;
|
||||
}
|
||||
|
||||
.loading {
|
||||
text-align: center;
|
||||
color: #6b7280;
|
||||
padding: 24px;
|
||||
}
|
||||
|
||||
.empty {
|
||||
text-align: center;
|
||||
color: #9ca3af;
|
||||
padding: 24px;
|
||||
}
|
||||
|
||||
.error {
|
||||
padding: 12px;
|
||||
background: #fee2e2;
|
||||
color: #991b1b;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
.success {
|
||||
padding: 12px;
|
||||
background: #d1fae5;
|
||||
color: #065f46;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
.bookings-table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
}
|
||||
|
||||
.bookings-table th {
|
||||
text-align: left;
|
||||
padding: 12px;
|
||||
background: #f9fafb;
|
||||
font-weight: 600;
|
||||
color: #374151;
|
||||
border-bottom: 2px solid #e5e7eb;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.bookings-table td {
|
||||
padding: 12px;
|
||||
border-bottom: 1px solid #e5e7eb;
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
.bookings-table tr:hover {
|
||||
background: #f9fafb;
|
||||
}
|
||||
|
||||
.user-info,
|
||||
.space-info {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 4px;
|
||||
}
|
||||
|
||||
.user-name,
|
||||
.space-name {
|
||||
font-weight: 500;
|
||||
color: #374151;
|
||||
}
|
||||
|
||||
.user-email,
|
||||
.user-org,
|
||||
.space-type {
|
||||
font-size: 12px;
|
||||
color: #6b7280;
|
||||
}
|
||||
|
||||
.description {
|
||||
max-width: 200px;
|
||||
word-wrap: break-word;
|
||||
}
|
||||
|
||||
.actions {
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
flex-wrap: wrap;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.btn {
|
||||
padding: 10px 20px;
|
||||
border: none;
|
||||
border-radius: 4px;
|
||||
font-size: 14px;
|
||||
font-weight: 500;
|
||||
cursor: pointer;
|
||||
transition: all 0.2s;
|
||||
}
|
||||
|
||||
.btn:disabled {
|
||||
opacity: 0.5;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
.btn-sm {
|
||||
padding: 6px 12px;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.btn-success {
|
||||
background: #10b981;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.btn-success:hover:not(:disabled) {
|
||||
background: #059669;
|
||||
}
|
||||
|
||||
.btn-danger {
|
||||
background: #ef4444;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.btn-danger:hover:not(:disabled) {
|
||||
background: #dc2626;
|
||||
}
|
||||
|
||||
.btn-secondary {
|
||||
background: #6b7280;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.btn-secondary:hover:not(:disabled) {
|
||||
background: #4b5563;
|
||||
}
|
||||
|
||||
.modal {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
background: rgba(0, 0, 0, 0.5);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
z-index: 1000;
|
||||
}
|
||||
|
||||
.modal-content {
|
||||
background: white;
|
||||
border-radius: 8px;
|
||||
padding: 24px;
|
||||
max-width: 600px;
|
||||
width: 90%;
|
||||
box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
.modal-content h3 {
|
||||
margin-top: 0;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
|
||||
.booking-summary {
|
||||
background: #f9fafb;
|
||||
border-radius: 4px;
|
||||
padding: 12px;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
|
||||
.booking-summary p {
|
||||
margin: 8px 0;
|
||||
font-size: 14px;
|
||||
color: #374151;
|
||||
}
|
||||
|
||||
.booking-summary strong {
|
||||
color: #1f2937;
|
||||
}
|
||||
</style>
|
||||
515
frontend/src/views/AdminReports.vue
Normal file
515
frontend/src/views/AdminReports.vue
Normal file
@@ -0,0 +1,515 @@
|
||||
<template>
|
||||
<div class="admin-reports">
|
||||
<h2>Booking Reports</h2>
|
||||
|
||||
<!-- Date Range Filter -->
|
||||
<div class="filters">
|
||||
<label>
|
||||
Start Date:
|
||||
<input type="date" v-model="startDate" />
|
||||
</label>
|
||||
|
||||
<label>
|
||||
End Date:
|
||||
<input type="date" v-model="endDate" />
|
||||
</label>
|
||||
|
||||
<button @click="loadReports" class="btn-primary">Refresh</button>
|
||||
<button @click="clearFilters" class="btn-secondary">Clear Filters</button>
|
||||
</div>
|
||||
|
||||
<!-- Loading State -->
|
||||
<div v-if="loading" class="loading">Loading reports...</div>
|
||||
|
||||
<!-- Error State -->
|
||||
<div v-if="error" class="error">{{ error }}</div>
|
||||
|
||||
<!-- Tabs -->
|
||||
<div v-if="!loading && !error" class="tabs">
|
||||
<button
|
||||
@click="activeTab = 'usage'"
|
||||
:class="{ active: activeTab === 'usage' }"
|
||||
class="tab-button"
|
||||
>
|
||||
Space Usage
|
||||
</button>
|
||||
<button
|
||||
@click="activeTab = 'users'"
|
||||
:class="{ active: activeTab === 'users' }"
|
||||
class="tab-button"
|
||||
>
|
||||
Top Users
|
||||
</button>
|
||||
<button
|
||||
@click="activeTab = 'approval'"
|
||||
:class="{ active: activeTab === 'approval' }"
|
||||
class="tab-button"
|
||||
>
|
||||
Approval Rate
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<!-- Usage Report -->
|
||||
<div v-if="activeTab === 'usage' && !loading" class="report-content">
|
||||
<h3>Space Usage Report</h3>
|
||||
<canvas ref="usageChart"></canvas>
|
||||
<table class="report-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Space</th>
|
||||
<th>Total</th>
|
||||
<th>Approved</th>
|
||||
<th>Pending</th>
|
||||
<th>Rejected</th>
|
||||
<th>Canceled</th>
|
||||
<th>Hours</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="item in usageReport?.items" :key="item.space_id">
|
||||
<td>{{ item.space_name }}</td>
|
||||
<td>{{ item.total_bookings }}</td>
|
||||
<td class="status-approved">{{ item.approved_bookings }}</td>
|
||||
<td class="status-pending">{{ item.pending_bookings }}</td>
|
||||
<td class="status-rejected">{{ item.rejected_bookings }}</td>
|
||||
<td class="status-canceled">{{ item.canceled_bookings }}</td>
|
||||
<td>{{ item.total_hours.toFixed(1) }}h</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td><strong>Total</strong></td>
|
||||
<td><strong>{{ usageReport?.total_bookings }}</strong></td>
|
||||
<td colspan="5"></td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<!-- Top Users Report -->
|
||||
<div v-if="activeTab === 'users' && !loading" class="report-content">
|
||||
<h3>Top Users Report</h3>
|
||||
<canvas ref="usersChart"></canvas>
|
||||
<table class="report-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>User</th>
|
||||
<th>Email</th>
|
||||
<th>Total Bookings</th>
|
||||
<th>Approved</th>
|
||||
<th>Total Hours</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="item in topUsersReport?.items" :key="item.user_id">
|
||||
<td>{{ item.user_name }}</td>
|
||||
<td>{{ item.user_email }}</td>
|
||||
<td>{{ item.total_bookings }}</td>
|
||||
<td class="status-approved">{{ item.approved_bookings }}</td>
|
||||
<td>{{ item.total_hours.toFixed(1) }}h</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<!-- Approval Rate Report -->
|
||||
<div v-if="activeTab === 'approval' && !loading" class="report-content">
|
||||
<h3>Approval Rate Report</h3>
|
||||
<div class="stats">
|
||||
<div class="stat-card">
|
||||
<h3>{{ approvalReport?.total_requests }}</h3>
|
||||
<p>Total Requests</p>
|
||||
</div>
|
||||
<div class="stat-card approved">
|
||||
<h3>{{ approvalReport?.approval_rate }}%</h3>
|
||||
<p>Approval Rate</p>
|
||||
</div>
|
||||
<div class="stat-card rejected">
|
||||
<h3>{{ approvalReport?.rejection_rate }}%</h3>
|
||||
<p>Rejection Rate</p>
|
||||
</div>
|
||||
</div>
|
||||
<canvas ref="approvalChart"></canvas>
|
||||
<div class="breakdown">
|
||||
<p><strong>Approved:</strong> {{ approvalReport?.approved }}</p>
|
||||
<p><strong>Rejected:</strong> {{ approvalReport?.rejected }}</p>
|
||||
<p><strong>Pending:</strong> {{ approvalReport?.pending }}</p>
|
||||
<p><strong>Canceled:</strong> {{ approvalReport?.canceled }}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ref, onMounted, watch, nextTick } from 'vue'
|
||||
import { reportsApi } from '@/services/api'
|
||||
import Chart from 'chart.js/auto'
|
||||
import type { SpaceUsageReport, TopUsersReport, ApprovalRateReport } from '@/types'
|
||||
|
||||
const activeTab = ref('usage')
|
||||
const startDate = ref('')
|
||||
const endDate = ref('')
|
||||
const loading = ref(false)
|
||||
const error = ref('')
|
||||
|
||||
const usageReport = ref<SpaceUsageReport | null>(null)
|
||||
const topUsersReport = ref<TopUsersReport | null>(null)
|
||||
const approvalReport = ref<ApprovalRateReport | null>(null)
|
||||
|
||||
const usageChart = ref<HTMLCanvasElement | null>(null)
|
||||
const usersChart = ref<HTMLCanvasElement | null>(null)
|
||||
const approvalChart = ref<HTMLCanvasElement | null>(null)
|
||||
|
||||
let usageChartInstance: Chart | null = null
|
||||
let usersChartInstance: Chart | null = null
|
||||
let approvalChartInstance: Chart | null = null
|
||||
|
||||
const loadReports = async () => {
|
||||
loading.value = true
|
||||
error.value = ''
|
||||
|
||||
try {
|
||||
const params = {
|
||||
start_date: startDate.value || undefined,
|
||||
end_date: endDate.value || undefined
|
||||
}
|
||||
|
||||
usageReport.value = await reportsApi.getUsage(params)
|
||||
topUsersReport.value = await reportsApi.getTopUsers(params)
|
||||
approvalReport.value = await reportsApi.getApprovalRate(params)
|
||||
|
||||
await nextTick()
|
||||
renderCharts()
|
||||
} catch (e: any) {
|
||||
error.value = e.response?.data?.detail || 'Failed to load reports'
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
const clearFilters = () => {
|
||||
startDate.value = ''
|
||||
endDate.value = ''
|
||||
loadReports()
|
||||
}
|
||||
|
||||
const renderCharts = () => {
|
||||
// Render usage chart (bar chart)
|
||||
if (usageChart.value && usageReport.value) {
|
||||
if (usageChartInstance) {
|
||||
usageChartInstance.destroy()
|
||||
}
|
||||
|
||||
usageChartInstance = new Chart(usageChart.value, {
|
||||
type: 'bar',
|
||||
data: {
|
||||
labels: usageReport.value.items.map((i) => i.space_name),
|
||||
datasets: [
|
||||
{
|
||||
label: 'Total Bookings',
|
||||
data: usageReport.value.items.map((i) => i.total_bookings),
|
||||
backgroundColor: '#4CAF50'
|
||||
}
|
||||
]
|
||||
},
|
||||
options: {
|
||||
responsive: true,
|
||||
maintainAspectRatio: true,
|
||||
plugins: {
|
||||
legend: {
|
||||
display: false
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// Render users chart (horizontal bar)
|
||||
if (usersChart.value && topUsersReport.value) {
|
||||
if (usersChartInstance) {
|
||||
usersChartInstance.destroy()
|
||||
}
|
||||
|
||||
usersChartInstance = new Chart(usersChart.value, {
|
||||
type: 'bar',
|
||||
data: {
|
||||
labels: topUsersReport.value.items.map((i) => i.user_name),
|
||||
datasets: [
|
||||
{
|
||||
label: 'Total Bookings',
|
||||
data: topUsersReport.value.items.map((i) => i.total_bookings),
|
||||
backgroundColor: '#2196F3'
|
||||
}
|
||||
]
|
||||
},
|
||||
options: {
|
||||
responsive: true,
|
||||
maintainAspectRatio: true,
|
||||
indexAxis: 'y',
|
||||
plugins: {
|
||||
legend: {
|
||||
display: false
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// Render approval chart (pie chart)
|
||||
if (approvalChart.value && approvalReport.value) {
|
||||
if (approvalChartInstance) {
|
||||
approvalChartInstance.destroy()
|
||||
}
|
||||
|
||||
approvalChartInstance = new Chart(approvalChart.value, {
|
||||
type: 'pie',
|
||||
data: {
|
||||
labels: ['Approved', 'Rejected', 'Pending', 'Canceled'],
|
||||
datasets: [
|
||||
{
|
||||
data: [
|
||||
approvalReport.value.approved,
|
||||
approvalReport.value.rejected,
|
||||
approvalReport.value.pending,
|
||||
approvalReport.value.canceled
|
||||
],
|
||||
backgroundColor: ['#4CAF50', '#F44336', '#FFA500', '#9E9E9E']
|
||||
}
|
||||
]
|
||||
},
|
||||
options: {
|
||||
responsive: true,
|
||||
maintainAspectRatio: true
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
watch(activeTab, () => {
|
||||
nextTick(() => renderCharts())
|
||||
})
|
||||
|
||||
onMounted(() => {
|
||||
loadReports()
|
||||
})
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.admin-reports {
|
||||
padding: 20px;
|
||||
max-width: 1200px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
h2 {
|
||||
margin-bottom: 20px;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.filters {
|
||||
display: flex;
|
||||
gap: 15px;
|
||||
margin-bottom: 30px;
|
||||
align-items: center;
|
||||
padding: 15px;
|
||||
background: #f5f5f5;
|
||||
border-radius: 8px;
|
||||
}
|
||||
|
||||
.filters label {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 5px;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.filters input[type='date'] {
|
||||
padding: 8px;
|
||||
border: 1px solid #ddd;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
.btn-primary,
|
||||
.btn-secondary {
|
||||
padding: 8px 16px;
|
||||
border: none;
|
||||
border-radius: 4px;
|
||||
cursor: pointer;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.btn-primary {
|
||||
background: #4caf50;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.btn-primary:hover {
|
||||
background: #45a049;
|
||||
}
|
||||
|
||||
.btn-secondary {
|
||||
background: #9e9e9e;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.btn-secondary:hover {
|
||||
background: #757575;
|
||||
}
|
||||
|
||||
.loading,
|
||||
.error {
|
||||
padding: 20px;
|
||||
text-align: center;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
.error {
|
||||
background: #ffebee;
|
||||
color: #c62828;
|
||||
}
|
||||
|
||||
.tabs {
|
||||
display: flex;
|
||||
gap: 10px;
|
||||
margin-bottom: 20px;
|
||||
border-bottom: 2px solid #ddd;
|
||||
}
|
||||
|
||||
.tab-button {
|
||||
padding: 10px 20px;
|
||||
background: none;
|
||||
border: none;
|
||||
border-bottom: 3px solid transparent;
|
||||
cursor: pointer;
|
||||
font-weight: 500;
|
||||
color: #666;
|
||||
transition: all 0.3s;
|
||||
}
|
||||
|
||||
.tab-button:hover {
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.tab-button.active {
|
||||
color: #4caf50;
|
||||
border-bottom-color: #4caf50;
|
||||
}
|
||||
|
||||
.report-content {
|
||||
background: white;
|
||||
padding: 20px;
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
.report-content h3 {
|
||||
margin-bottom: 20px;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
canvas {
|
||||
max-height: 400px;
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
|
||||
.report-table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
.report-table th,
|
||||
.report-table td {
|
||||
padding: 12px;
|
||||
text-align: left;
|
||||
border-bottom: 1px solid #ddd;
|
||||
}
|
||||
|
||||
.report-table th {
|
||||
background: #f5f5f5;
|
||||
font-weight: 600;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.report-table tbody tr:hover {
|
||||
background: #f9f9f9;
|
||||
}
|
||||
|
||||
.report-table tfoot {
|
||||
font-weight: bold;
|
||||
background: #f5f5f5;
|
||||
}
|
||||
|
||||
.status-approved {
|
||||
color: #4caf50;
|
||||
}
|
||||
|
||||
.status-pending {
|
||||
color: #ffa500;
|
||||
}
|
||||
|
||||
.status-rejected {
|
||||
color: #f44336;
|
||||
}
|
||||
|
||||
.status-canceled {
|
||||
color: #9e9e9e;
|
||||
}
|
||||
|
||||
.stats {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
|
||||
gap: 20px;
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
|
||||
.stat-card {
|
||||
padding: 20px;
|
||||
background: #f5f5f5;
|
||||
border-radius: 8px;
|
||||
text-align: center;
|
||||
border: 2px solid transparent;
|
||||
}
|
||||
|
||||
.stat-card h3 {
|
||||
font-size: 2em;
|
||||
margin: 0 0 10px 0;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.stat-card p {
|
||||
margin: 0;
|
||||
color: #666;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.stat-card.approved {
|
||||
background: #e8f5e9;
|
||||
border-color: #4caf50;
|
||||
}
|
||||
|
||||
.stat-card.approved h3 {
|
||||
color: #4caf50;
|
||||
}
|
||||
|
||||
.stat-card.rejected {
|
||||
background: #ffebee;
|
||||
border-color: #f44336;
|
||||
}
|
||||
|
||||
.stat-card.rejected h3 {
|
||||
color: #f44336;
|
||||
}
|
||||
|
||||
.breakdown {
|
||||
margin-top: 20px;
|
||||
padding: 15px;
|
||||
background: #f5f5f5;
|
||||
border-radius: 8px;
|
||||
}
|
||||
|
||||
.breakdown p {
|
||||
margin: 8px 0;
|
||||
font-size: 1.1em;
|
||||
}
|
||||
</style>
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user