b701182f6b
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 29s
CI/CD Pipeline / Frontend Lint (pull_request) Failing after 13s
CI/CD Pipeline / PR Build Web Image (pull_request) Successful in 28s
CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped
CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped
CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped
CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 1m19s
CI/CD Pipeline / Validate - Migration (alembic) (pull_request) Successful in 1m18s
PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 1m3s
Preview Deploy / Deploy Preview Environment (pull_request) Failing after 32s
CI/CD Pipeline / Validate - Code Quality (pull_request) Successful in 4m15s
CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped
CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped
CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped
PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m1s
CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped
CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
CI/CD Pipeline / Deploy Production (pull_request) Has been skipped
CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped
CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped
CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped
CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped
AI Code Review / AI Code Review (pull_request) Successful in 3m44s
CI/CD Pipeline / Integration Tests (pull_request) Successful in 2m41s
CI/CD Pipeline / Unit Tests (pull_request) Failing after 3m15s
CI/CD Pipeline / PR Build API Image (pull_request) Successful in 5m33s
CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 9m23s
Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 35s
SQLAlchemy 从数据库读出的 DateTime 是 naive(不带时区), 但领域模型 VerificationCode 用的是 aware datetime(带 timezone.utc), 直接比较会报 "can't compare offset-naive and offset-aware datetimes"。 修复:_to_entity 时给所有 datetime 字段补 timezone.utc。 影响:send-verification-code 限流检查、bind-contact 验证码校验(is_expired)
91 lines
3.2 KiB
Python
Executable File
91 lines
3.2 KiB
Python
Executable File
"""
|
|
验证码仓储 SQLAlchemy 实现
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from datetime import datetime, timezone
|
|
from typing import Optional
|
|
|
|
from sqlalchemy.orm import Session
|
|
|
|
from packages.adapters.sqlalchemy_impl.models import VerificationCodeModel
|
|
from packages.domain.verification_code import VerificationCode
|
|
from packages.ports.verification_code_repository import VerificationCodeRepository
|
|
|
|
|
|
class SQLAlchemyVerificationCodeRepository(VerificationCodeRepository):
|
|
def __init__(self, session: Session):
|
|
self.session = session
|
|
|
|
def save(self, code: VerificationCode) -> None:
|
|
model = self.session.get(VerificationCodeModel, code.id)
|
|
if model is None:
|
|
model = VerificationCodeModel(id=code.id)
|
|
self.session.add(model)
|
|
|
|
model.recipient = code.recipient
|
|
model.code = code.code
|
|
model.code_type = code.code_type
|
|
model.expires_at = code.expires_at
|
|
model.used_at = code.used_at
|
|
model.attempts = code.attempts
|
|
model.created_at = code.created_at
|
|
|
|
self.session.commit()
|
|
self.session.refresh(model)
|
|
|
|
def find_latest(self, recipient: str, code_type: str) -> Optional[VerificationCode]:
|
|
model = (
|
|
self.session.query(VerificationCodeModel)
|
|
.filter(
|
|
VerificationCodeModel.recipient == recipient.strip(),
|
|
VerificationCodeModel.code_type == code_type,
|
|
)
|
|
.order_by(VerificationCodeModel.created_at.desc())
|
|
.first()
|
|
)
|
|
return self._to_entity(model)
|
|
|
|
def find_by_id(self, code_id: str) -> Optional[VerificationCode]:
|
|
return self._to_entity(self.session.get(VerificationCodeModel, code_id))
|
|
|
|
def count_today(self, recipient: str, code_type: str) -> int:
|
|
now = datetime.now(timezone.utc)
|
|
start_of_day = now.replace(hour=0, minute=0, second=0, microsecond=0)
|
|
return (
|
|
self.session.query(VerificationCodeModel)
|
|
.filter(
|
|
VerificationCodeModel.recipient == recipient.strip(),
|
|
VerificationCodeModel.code_type == code_type,
|
|
VerificationCodeModel.created_at >= start_of_day,
|
|
)
|
|
.count()
|
|
)
|
|
|
|
@staticmethod
|
|
def _to_entity(model: VerificationCodeModel | None) -> VerificationCode | None:
|
|
if model is None:
|
|
return None
|
|
|
|
# SQLAlchemy 从数据库读出的 DateTime 是 naive(不带时区),
|
|
# 领域模型期望 aware datetime(带 timezone.utc),直接用会报
|
|
# "can't compare offset-naive and offset-aware datetimes"
|
|
def _ensure_aware(dt: datetime | None) -> datetime | None:
|
|
if dt is None:
|
|
return None
|
|
if dt.tzinfo is None:
|
|
return dt.replace(tzinfo=timezone.utc)
|
|
return dt
|
|
|
|
return VerificationCode(
|
|
id=model.id,
|
|
recipient=model.recipient,
|
|
code=model.code,
|
|
code_type=model.code_type,
|
|
expires_at=_ensure_aware(model.expires_at),
|
|
used_at=_ensure_aware(model.used_at),
|
|
attempts=model.attempts,
|
|
created_at=_ensure_aware(model.created_at),
|
|
)
|