style: apply black and isort formatting across entire codebase
- Standardize quote style (single to double quotes) - Reorder and group imports alphabetically - Fix line breaks and indentation for consistency - Apply PEP 8 formatting standards Also updated Makefile to exclude both venv and .venv from code quality checks. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
@@ -19,8 +19,9 @@ This allows:
|
||||
import logging
|
||||
from datetime import datetime, timezone
|
||||
from typing import List, Optional
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from sqlalchemy import and_, or_
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from models.database.content_page import ContentPage
|
||||
|
||||
@@ -35,7 +36,7 @@ class ContentPageService:
|
||||
db: Session,
|
||||
slug: str,
|
||||
vendor_id: Optional[int] = None,
|
||||
include_unpublished: bool = False
|
||||
include_unpublished: bool = False,
|
||||
) -> Optional[ContentPage]:
|
||||
"""
|
||||
Get content page for a vendor with fallback to platform default.
|
||||
@@ -62,28 +63,20 @@ class ContentPageService:
|
||||
if vendor_id:
|
||||
vendor_page = (
|
||||
db.query(ContentPage)
|
||||
.filter(
|
||||
and_(
|
||||
ContentPage.vendor_id == vendor_id,
|
||||
*filters
|
||||
)
|
||||
)
|
||||
.filter(and_(ContentPage.vendor_id == vendor_id, *filters))
|
||||
.first()
|
||||
)
|
||||
|
||||
if vendor_page:
|
||||
logger.debug(f"Found vendor-specific page: {slug} for vendor_id={vendor_id}")
|
||||
logger.debug(
|
||||
f"Found vendor-specific page: {slug} for vendor_id={vendor_id}"
|
||||
)
|
||||
return vendor_page
|
||||
|
||||
# Fallback to platform default
|
||||
platform_page = (
|
||||
db.query(ContentPage)
|
||||
.filter(
|
||||
and_(
|
||||
ContentPage.vendor_id == None,
|
||||
*filters
|
||||
)
|
||||
)
|
||||
.filter(and_(ContentPage.vendor_id == None, *filters))
|
||||
.first()
|
||||
)
|
||||
|
||||
@@ -100,7 +93,7 @@ class ContentPageService:
|
||||
vendor_id: Optional[int] = None,
|
||||
include_unpublished: bool = False,
|
||||
footer_only: bool = False,
|
||||
header_only: bool = False
|
||||
header_only: bool = False,
|
||||
) -> List[ContentPage]:
|
||||
"""
|
||||
List all available pages for a vendor (includes vendor overrides + platform defaults).
|
||||
@@ -133,12 +126,7 @@ class ContentPageService:
|
||||
if vendor_id:
|
||||
vendor_pages = (
|
||||
db.query(ContentPage)
|
||||
.filter(
|
||||
and_(
|
||||
ContentPage.vendor_id == vendor_id,
|
||||
*filters
|
||||
)
|
||||
)
|
||||
.filter(and_(ContentPage.vendor_id == vendor_id, *filters))
|
||||
.order_by(ContentPage.display_order, ContentPage.title)
|
||||
.all()
|
||||
)
|
||||
@@ -146,12 +134,7 @@ class ContentPageService:
|
||||
# Get platform defaults
|
||||
platform_pages = (
|
||||
db.query(ContentPage)
|
||||
.filter(
|
||||
and_(
|
||||
ContentPage.vendor_id == None,
|
||||
*filters
|
||||
)
|
||||
)
|
||||
.filter(and_(ContentPage.vendor_id == None, *filters))
|
||||
.order_by(ContentPage.display_order, ContentPage.title)
|
||||
.all()
|
||||
)
|
||||
@@ -159,8 +142,7 @@ class ContentPageService:
|
||||
# Merge: vendor overrides take precedence
|
||||
vendor_slugs = {page.slug for page in vendor_pages}
|
||||
all_pages = vendor_pages + [
|
||||
page for page in platform_pages
|
||||
if page.slug not in vendor_slugs
|
||||
page for page in platform_pages if page.slug not in vendor_slugs
|
||||
]
|
||||
|
||||
# Sort by display_order
|
||||
@@ -183,7 +165,7 @@ class ContentPageService:
|
||||
show_in_footer: bool = True,
|
||||
show_in_header: bool = False,
|
||||
display_order: int = 0,
|
||||
created_by: Optional[int] = None
|
||||
created_by: Optional[int] = None,
|
||||
) -> ContentPage:
|
||||
"""
|
||||
Create a new content page.
|
||||
@@ -229,7 +211,9 @@ class ContentPageService:
|
||||
db.commit()
|
||||
db.refresh(page)
|
||||
|
||||
logger.info(f"Created content page: {slug} (vendor_id={vendor_id}, id={page.id})")
|
||||
logger.info(
|
||||
f"Created content page: {slug} (vendor_id={vendor_id}, id={page.id})"
|
||||
)
|
||||
return page
|
||||
|
||||
@staticmethod
|
||||
@@ -246,7 +230,7 @@ class ContentPageService:
|
||||
show_in_footer: Optional[bool] = None,
|
||||
show_in_header: Optional[bool] = None,
|
||||
display_order: Optional[int] = None,
|
||||
updated_by: Optional[int] = None
|
||||
updated_by: Optional[int] = None,
|
||||
) -> Optional[ContentPage]:
|
||||
"""
|
||||
Update an existing content page.
|
||||
@@ -338,9 +322,7 @@ class ContentPageService:
|
||||
|
||||
@staticmethod
|
||||
def list_all_vendor_pages(
|
||||
db: Session,
|
||||
vendor_id: int,
|
||||
include_unpublished: bool = False
|
||||
db: Session, vendor_id: int, include_unpublished: bool = False
|
||||
) -> List[ContentPage]:
|
||||
"""
|
||||
List only vendor-specific pages (no platform defaults).
|
||||
@@ -367,8 +349,7 @@ class ContentPageService:
|
||||
|
||||
@staticmethod
|
||||
def list_all_platform_pages(
|
||||
db: Session,
|
||||
include_unpublished: bool = False
|
||||
db: Session, include_unpublished: bool = False
|
||||
) -> List[ContentPage]:
|
||||
"""
|
||||
List only platform default pages.
|
||||
|
||||
Reference in New Issue
Block a user