Fringg
eb18994b7d
- Migrate 660+ datetime.utcnow() across 153 files to datetime.now(UTC) - Migrate 30+ datetime.now() without UTC to datetime.now(UTC) - Convert all 170 DateTime columns to DateTime(timezone=True) - Add migrate_datetime_to_timestamptz() in universal_migration with SET LOCAL timezone='UTC' safety - Remove 70+ .replace(tzinfo=None) workarounds - Fix utcfromtimestamp → fromtimestamp(..., tz=UTC) - Fix fromtimestamp() without tz= (system_logs, backup_service, referral_diagnostics) - Fix fromisoformat/isoparse to ensure aware output (platega, yookassa, wata, miniapp, nalogo) - Fix strptime() to add .replace(tzinfo=UTC) (backup_service, referral_diagnostics) - Fix datetime.combine() to include tzinfo=UTC (remnawave_sync, traffic_monitoring) - Fix datetime.max/datetime.min sentinels with .replace(tzinfo=UTC) - Rename panel_datetime_to_naive_utc → panel_datetime_to_utc - Remove DTZ003 from ruff ignore list
74 lines
1.8 KiB
Python
74 lines
1.8 KiB
Python
from datetime import UTC, datetime
|
|
|
|
import structlog
|
|
from sqlalchemy import select
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from app.database.models import PublicOffer
|
|
|
|
|
|
logger = structlog.get_logger(__name__)
|
|
|
|
|
|
async def get_public_offer(db: AsyncSession, language: str) -> PublicOffer | None:
|
|
result = await db.execute(select(PublicOffer).where(PublicOffer.language == language))
|
|
return result.scalar_one_or_none()
|
|
|
|
|
|
async def upsert_public_offer(
|
|
db: AsyncSession,
|
|
language: str,
|
|
content: str,
|
|
*,
|
|
enable_if_new: bool = True,
|
|
) -> PublicOffer:
|
|
offer = await get_public_offer(db, language)
|
|
|
|
if offer:
|
|
offer.content = content or ''
|
|
offer.updated_at = datetime.now(UTC)
|
|
else:
|
|
offer = PublicOffer(
|
|
language=language,
|
|
content=content or '',
|
|
is_enabled=bool(enable_if_new),
|
|
)
|
|
db.add(offer)
|
|
|
|
await db.commit()
|
|
await db.refresh(offer)
|
|
|
|
logger.info('✅ Публичная оферта для языка обновлена (ID:)', language=language, offer_id=offer.id)
|
|
|
|
return offer
|
|
|
|
|
|
async def set_public_offer_enabled(
|
|
db: AsyncSession,
|
|
language: str,
|
|
enabled: bool,
|
|
) -> PublicOffer:
|
|
offer = await get_public_offer(db, language)
|
|
|
|
if offer:
|
|
offer.is_enabled = bool(enabled)
|
|
offer.updated_at = datetime.now(UTC)
|
|
else:
|
|
offer = PublicOffer(
|
|
language=language,
|
|
content='',
|
|
is_enabled=bool(enabled),
|
|
)
|
|
db.add(offer)
|
|
|
|
await db.commit()
|
|
await db.refresh(offer)
|
|
|
|
logger.info(
|
|
'✅ Статус публичной оферты для языка %s обновлен: %s',
|
|
language,
|
|
'enabled' if offer.is_enabled else 'disabled',
|
|
)
|
|
|
|
return offer
|