42d1420f9c
[Phase 0 Reset]
- 清除舊版 app/、alembic/versions/、雜亂測試腳本
- 新 requirements.txt (移除 caldav/redis/keycloak-lib，加入 apscheduler/croniter/docker/paramiko/ping3/dnspython)
[Phase 1 資料庫]
- 9 張資料表 SQLAlchemy Models：tenants / accounts / schedules / schedule_logs /
tenant_schedule_results / account_schedule_results / servers / server_status_logs / system_status_logs
- Alembic migration 001_create_all_tables (已套用到 10.1.0.20:5433/virtual_mis)
- seed.py：schedules 初始 3 筆 / servers 初始 4 筆
[Phase 2 CRUD API]
- GET/POST/PUT/DELETE: /api/v1/tenants / accounts / servers / schedules
- /api/v1/system-status
- 帳號編碼自動產生 (prefix + seq_no 4碼左補0)
- 燈號 (lights) 從最新排程結果取得
[Phase 3 Watchdog]
- APScheduler interval 3分鐘，原子 UPDATE status=Going 防重複執行
- 手動觸發 API: POST /api/v1/schedules/{id}/run
[Phase 4 Service Clients]
- KeycloakClient：vmis-admin realm，REST API (不用 python-keycloak)
- MailClient：Docker Mailserver @ 10.1.0.254:8080，含 MX DNS 驗證
- DockerClient：docker-py 本機 + paramiko SSH 遠端 compose
- NextcloudClient：OCS API user/quota
- SystemChecker：功能驗證 (traefik routers>0 / keycloak token / SMTP EHLO / DB SELECT 1 / ping)
[TDD]
- 37 tests / 37 passed (2.11s)
- SQLite in-memory + StaticPool，無需外部 DB
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
95 lines
3.2 KiB
Python
95 lines
3.2 KiB
Python
from typing import List, Optional
|
|
from fastapi import APIRouter, Depends, HTTPException, Query
|
|
from sqlalchemy import text
|
|
from sqlalchemy.orm import Session
|
|
|
|
from app.core.database import get_db
|
|
from app.models.tenant import Tenant
|
|
from app.models.result import TenantScheduleResult
|
|
from app.schemas.tenant import TenantCreate, TenantUpdate, TenantResponse, TenantStatusLight
|
|
|
|
router = APIRouter(prefix="/tenants", tags=["tenants"])
|
|
|
|
|
|
def _get_lights(db: Session, tenant_id: int) -> Optional[TenantStatusLight]:
|
|
result = (
|
|
db.query(TenantScheduleResult)
|
|
.filter(TenantScheduleResult.tenant_id == tenant_id)
|
|
.order_by(TenantScheduleResult.recorded_at.desc())
|
|
.first()
|
|
)
|
|
if not result:
|
|
return None
|
|
return TenantStatusLight(
|
|
sso_result=result.sso_result,
|
|
mailbox_result=result.mailbox_result,
|
|
nc_result=result.nc_result,
|
|
office_result=result.office_result,
|
|
quota_usage=result.quota_usage,
|
|
)
|
|
|
|
|
|
@router.get("", response_model=List[TenantResponse])
|
|
def list_tenants(
|
|
is_active: Optional[bool] = Query(None),
|
|
db: Session = Depends(get_db),
|
|
):
|
|
q = db.query(Tenant)
|
|
if is_active is not None:
|
|
q = q.filter(Tenant.is_active == is_active)
|
|
tenants = q.order_by(Tenant.id).all()
|
|
result = []
|
|
for t in tenants:
|
|
resp = TenantResponse.model_validate(t)
|
|
resp.lights = _get_lights(db, t.id)
|
|
result.append(resp)
|
|
return result
|
|
|
|
|
|
@router.post("", response_model=TenantResponse, status_code=201)
|
|
def create_tenant(payload: TenantCreate, db: Session = Depends(get_db)):
|
|
if db.query(Tenant).filter(Tenant.code == payload.code).first():
|
|
raise HTTPException(status_code=409, detail="Tenant code already exists")
|
|
if db.query(Tenant).filter(Tenant.domain == payload.domain).first():
|
|
raise HTTPException(status_code=409, detail="Domain already exists")
|
|
tenant = Tenant(**payload.model_dump())
|
|
db.add(tenant)
|
|
db.commit()
|
|
db.refresh(tenant)
|
|
resp = TenantResponse.model_validate(tenant)
|
|
resp.lights = None
|
|
return resp
|
|
|
|
|
|
@router.get("/{tenant_id}", response_model=TenantResponse)
|
|
def get_tenant(tenant_id: int, db: Session = Depends(get_db)):
|
|
tenant = db.get(Tenant, tenant_id)
|
|
if not tenant:
|
|
raise HTTPException(status_code=404, detail="Tenant not found")
|
|
resp = TenantResponse.model_validate(tenant)
|
|
resp.lights = _get_lights(db, tenant_id)
|
|
return resp
|
|
|
|
|
|
@router.put("/{tenant_id}", response_model=TenantResponse)
|
|
def update_tenant(tenant_id: int, payload: TenantUpdate, db: Session = Depends(get_db)):
|
|
tenant = db.get(Tenant, tenant_id)
|
|
if not tenant:
|
|
raise HTTPException(status_code=404, detail="Tenant not found")
|
|
for field, value in payload.model_dump(exclude_none=True).items():
|
|
setattr(tenant, field, value)
|
|
db.commit()
|
|
db.refresh(tenant)
|
|
resp = TenantResponse.model_validate(tenant)
|
|
resp.lights = _get_lights(db, tenant_id)
|
|
return resp
|
|
|
|
|
|
@router.delete("/{tenant_id}", status_code=204)
|
|
def delete_tenant(tenant_id: int, db: Session = Depends(get_db)):
|
|
tenant = db.get(Tenant, tenant_id)
|
|
if not tenant:
|
|
raise HTTPException(status_code=404, detail="Tenant not found")
|
|
db.delete(tenant)
|
|
db.commit()
|