duanshuwen/WonderQ-Admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(hotelGroups): add offer display fields and related logic

Browse Source 
- Add new database columns (coverImage, priceAmount, priceUnit, tags, status) to HotelGroup model
- Create hotel_group_dict serializer to handle image/coverImage synchronization and tag formatting
- Update site config endpoints to use the new serializer and filter published hotel groups
- Add Alembic migration for the new database schema changes
- Update test fixtures and API contract tests for the new fields
- Revise public and admin API documentation to document the new hotel group fields and usage rules
This commit is contained in:
duanshuwen
2026-07-03 22:44:57 +08:00
parent 201e835eab
commit 1aac3c64b2
9 changed files with 188 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
app/routers/admin.py
View File

@@ -36,7 +36,7 @@ from ..models import (
from ..schemas import AdminProductQuery, LeadQuery, LeadStatus, LeadStatusIn, LoginIn, ProductCreateIn, ProductStatus, ProductUpdateIn, SiteConfigPatchIn, SiteConfigReorderIn
from ..seed import create_media, reset_guizhou_content
from ..route_sections import replace_route_section_products, route_section_dict, route_section_query
from ..serializers import admin_product_dict, destination_dict, encode_value, lead_dict, model_dict
from ..serializers import admin_product_dict, destination_dict, encode_value, hotel_group_dict, lead_dict, model_dict
from .shared import site_config
@@ -109,10 +109,10 @@ SITE_CONFIG_MODULES = {
"model": HotelGroup,
"entity": "hotel_group",
"primary": "title",
"fields": {"title", "description", "image", "isActive", "sortOrder"},
"fields": {"title", "description", "image", "coverImage", "priceAmount", "priceUnit", "tags", "status", "isActive", "sortOrder"},
"none_to_empty": set(),
"empty_to_none": {"description", "image"},
"create_defaults": {"description": None, "image": None},
"empty_to_none": {"description", "image", "coverImage", "priceUnit"},
"create_defaults": {"description": None, "image": None, "coverImage": None, "priceAmount": None, "priceUnit": "起/晚", "tags": [], "status": "published"},
},
"vehicleOptions": {
"model": VehicleOption,
@@ -133,7 +133,7 @@ SITE_CONFIG_MODULES = {
},
}
CAMPAIGN_STATUSES = {"draft", "published"}
PUBLISH_STATUSES = {"draft", "published"}
def media_error(status_code: int, message: str, code: str, details: dict | None = None) -> None:
@@ -329,7 +329,7 @@ def normalize_campaign_tags(value) -> list[str]:
return []
tags = [item.strip() for item in value if isinstance(item, str) and item.strip()]
if len(tags) > 3:
site_config_error(422, "campaign tags cannot exceed 3", "MODULE_CONFIG_VALIDATION_ERROR", {"field": "tags", "max": 3})
site_config_error(422, "tags cannot exceed 3", "MODULE_CONFIG_VALIDATION_ERROR", {"field": "tags", "max": 3})
return tags
@@ -344,9 +344,9 @@ def site_field_value(config: dict, field: str, value):
return value
def validate_campaign_status(value):
def validate_publish_status(value):
status_value = clean_site_value(value)
if status_value not in CAMPAIGN_STATUSES:
if status_value not in PUBLISH_STATUSES:
site_config_error(422, "status must be draft or published", "MODULE_CONFIG_VALIDATION_ERROR", {"field": "status"})
return status_value
@@ -394,6 +394,8 @@ def site_item_dict(module: str, item) -> dict:
return map_image_admin_dict(item)
if module == "routeSections":
return route_section_dict(item)
if module == "hotelGroups":
return hotel_group_dict(item)
return destination_dict(item) if module == "destinations" else model_dict(item)
@@ -438,7 +440,19 @@ def site_create_payload(module: str, config: dict, body: SiteConfigPatchIn, db:
payload["slug"] = slug
if not payload.get("priceUnit"):
payload["priceUnit"] = "起/人"
payload["status"] = validate_campaign_status(payload.get("status", "draft"))
payload["status"] = validate_publish_status(payload.get("status", "draft"))
if module == "hotelGroups":
if not payload.get("priceUnit"):
payload["priceUnit"] = "起/晚"
payload["status"] = validate_publish_status(payload.get("status", "published"))
if not payload.get("coverImage") and payload.get("image"):
payload["coverImage"] = payload["image"]
if not payload.get("image") and payload.get("coverImage"):
payload["image"] = payload["coverImage"]
if "status" in fields and "isActive" not in fields:
payload["isActive"] = payload["status"] == "published"
if "isActive" in fields and "status" not in fields:
payload["status"] = "published" if payload.get("isActive") else "draft"
return payload
@@ -456,9 +470,18 @@ def apply_site_patch(module: str, config: dict, item, body: SiteConfigPatchIn) -
site_config_error(422, "必填字段不能为空", "MODULE_CONFIG_VALIDATION_ERROR", {"field": field})
if module == "campaigns" and field == "slug" and not value:
site_config_error(422, "required field is empty", "MODULE_CONFIG_VALIDATION_ERROR", {"field": field})
if module == "campaigns" and field == "status":
value = validate_campaign_status(value)
if module in {"campaigns", "hotelGroups"} and field == "status":
value = validate_publish_status(value)
setattr(item, field, value)
if module == "hotelGroups":
if "coverImage" in fields and "image" not in fields:
item.image = item.coverImage
if "image" in fields and "coverImage" not in fields:
item.coverImage = item.image
if "status" in fields and "isActive" not in fields:
item.isActive = item.status == "published"
if "isActive" in fields and "status" not in fields:
item.status = "published" if item.isActive else "draft"
def create_route_section_config(body: SiteConfigPatchIn, request: Request, db: Session) -> dict:
@@ -650,7 +673,7 @@ def admin_site_config(_user: AdminUser = Depends(require_admin), db: Session = D
],
"routeSections": [route_section_dict(item) for item in db.scalars(route_section_query()).all()],
"hotelGroups": [
model_dict(item)
hotel_group_dict(item)
for item in db.scalars(select(HotelGroup).order_by(HotelGroup.sortOrder.asc())).all()
],
"vehicleOptions": [

6
app/routers/shared.py
View File

@@ -2,7 +2,7 @@ from sqlalchemy import select
from sqlalchemy.orm import Session, selectinload
from ..models import Campaign, CtaBanner, Destination, HeroSlide, HotelGroup, MapImage, ThemeCard, VehicleOption
from ..route_sections import route_section_dict, route_section_query
from ..serializers import destination_dict, model_dict
from ..serializers import destination_dict, hotel_group_dict, model_dict
def site_config(db: Session, active_only: bool, include_public_extras: bool = True) -> dict:
@@ -19,7 +19,7 @@ def site_config(db: Session, active_only: bool, include_public_extras: bool = Tr
map_stmt = map_stmt.where(MapImage.isActive.is_(True))
theme_stmt = theme_stmt.where(ThemeCard.isActive.is_(True))
cta_stmt = cta_stmt.where(CtaBanner.isActive.is_(True))
hotel_stmt = hotel_stmt.where(HotelGroup.isActive.is_(True))
hotel_stmt = hotel_stmt.where(HotelGroup.isActive.is_(True), HotelGroup.status == "published")
vehicle_stmt = vehicle_stmt.where(VehicleOption.isActive.is_(True))
hero_slides = db.scalars(hero_stmt).all()
@@ -41,6 +41,6 @@ def site_config(db: Session, active_only: bool, include_public_extras: bool = Tr
route_sections = [section for section in route_sections if section.isActive]
result["campaigns"] = [model_dict(item) for item in campaigns]
result["routeSections"] = [route_section_dict(item, public=True) for item in route_sections]
result["hotelGroups"] = [model_dict(item) for item in db.scalars(hotel_stmt).all()]
result["hotelGroups"] = [hotel_group_dict(item) for item in db.scalars(hotel_stmt).all()]
result["vehicleOptions"] = [model_dict(item) for item in db.scalars(vehicle_stmt).all()]
return result