qzl/social-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 添加日历事件订阅者功能及权限重构

Browse Source
This commit is contained in:
zl-q
2026-03-30 09:05:50 +08:00
parent f126d7a547
commit 1aac62f39e
13 changed files with 498 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/schemas/enums.py
+2 -2
View File
@@ -83,7 +83,6 @@ class InboxMessageStatus(str, Enum):
class SubscriptionStatus(str, Enum):
ACTIVE = "active"
PENDING = "pending"
PAUSED = "paused"
UNSUBSCRIBED = "unsubscribed"
@@ -97,7 +96,8 @@ class SubscriptionPermission(int, Enum):
VIEW = 1
INVITE = 2
EDIT = 4
OWNER = 7
DELETE = 8
OWNER = 15 # VIEW | INVITE | EDIT | DELETE
class FriendshipStatus(str, Enum):
backend/src/v1/schedule_items/dependencies.py
+4 -1
View File
@@ -11,17 +11,20 @@ from v1.inbox_messages.repository import SQLAlchemyInboxMessageRepository
from v1.schedule_items.repository import SQLAlchemyScheduleItemRepository
from v1.schedule_items.service import ScheduleItemService
from v1.users.dependencies import get_current_user
from v1.users.repository import SQLAlchemyUserRepository
def get_schedule_item_service(
async def get_schedule_item_service(
session: Annotated[AsyncSession, Depends(get_db)],
user: Annotated[CurrentUser, Depends(get_current_user)],
) -> ScheduleItemService:
repository = SQLAlchemyScheduleItemRepository(session)
inbox_repository = SQLAlchemyInboxMessageRepository(session)
user_repository = SQLAlchemyUserRepository(session)
return ScheduleItemService(
repository=repository,
session=session,
current_user=user,
inbox_repository=inbox_repository,
user_repository=user_repository,
)
backend/src/v1/schedule_items/repository.py
+8 -24
View File
@@ -21,16 +21,10 @@ logger = get_logger("v1.schedule_items.repository")
class ScheduleItemRepository(Protocol):
async def get_by_id(self, entity_id: UUID) -> ScheduleItem | None: ...
async def get_by_item_id(
self, item_id: UUID, owner_id: UUID
) -> ScheduleItem | None: ...
async def get_item(self, item_id: UUID) -> ScheduleItem | None: ...
async def create(self, data: dict) -> ScheduleItem: ...
async def update_by_item_id(
self, item_id: UUID, owner_id: UUID, data: dict
) -> ScheduleItem | None: ...
async def delete_by_item_id(
self, item_id: UUID, owner_id: UUID
) -> ScheduleItem | None: ...
async def update_item(self, item_id: UUID, data: dict) -> ScheduleItem | None: ...
async def delete_item(self, item_id: UUID) -> ScheduleItem | None: ...
async def list_by_date_range(
self, owner_id: UUID, start_at: datetime, end_at: datetime
) -> list[ScheduleItem]: ...
@@ -74,14 +68,11 @@ class SQLAlchemyScheduleItemRepository(BaseRepository[ScheduleItem]):
super().__init__(session, ScheduleItem)
self._session = session
async def get_by_item_id(
self, item_id: UUID, owner_id: UUID
) -> ScheduleItem | None:
async def get_item(self, item_id: UUID) -> ScheduleItem | None:
try:
stmt = (
select(ScheduleItem)
.where(ScheduleItem.id == item_id)
.where(ScheduleItem.owner_id == owner_id)
.where(ScheduleItem.deleted_at.is_(None))
)
result = await self._session.execute(stmt)
@@ -90,7 +81,6 @@ class SQLAlchemyScheduleItemRepository(BaseRepository[ScheduleItem]):
logger.exception(
"Schedule item lookup failed",
item_id=str(item_id),
owner_id=str(owner_id),
)
raise
@@ -104,19 +94,16 @@ class SQLAlchemyScheduleItemRepository(BaseRepository[ScheduleItem]):
logger.exception("Schedule item creation failed")
raise
async def update_by_item_id(
self, item_id: UUID, owner_id: UUID, data: dict
) -> ScheduleItem | None:
async def update_item(self, item_id: UUID, data: dict) -> ScheduleItem | None:
if not data:
return await self.get_by_item_id(item_id, owner_id)
return await self.get_item(item_id)
try:
existing = await self.get_by_item_id(item_id, owner_id)
existing = await self.get_item(item_id)
if existing is None:
return None
stmt = (
update(ScheduleItem)
.where(ScheduleItem.id == item_id)
.where(ScheduleItem.owner_id == owner_id)
.where(ScheduleItem.deleted_at.is_(None))
.values(**data)
.returning(ScheduleItem)
@@ -128,14 +115,11 @@ class SQLAlchemyScheduleItemRepository(BaseRepository[ScheduleItem]):
logger.exception("Schedule item update failed", item_id=str(item_id))
raise
async def delete_by_item_id(
self, item_id: UUID, owner_id: UUID
) -> ScheduleItem | None:
async def delete_item(self, item_id: UUID) -> ScheduleItem | None:
try:
stmt = (
update(ScheduleItem)
.where(ScheduleItem.id == item_id)
.where(ScheduleItem.owner_id == owner_id)
.where(ScheduleItem.deleted_at.is_(None))
.values(deleted_at=datetime.now(timezone.utc))
.returning(ScheduleItem)
backend/src/v1/schedule_items/schemas.py
+14
View File
@@ -40,6 +40,7 @@ __all__ = [
"ScheduleItemListRequest",
"ScheduleItemShareRequest",
"ScheduleItemShareResponse",
"SubscriberInfo",
]
@@ -104,6 +105,18 @@ class ScheduleItemUpdateRequest(BaseModel):
return value
class SubscriberInfo(BaseModel):
model_config: ClassVar[ConfigDict] = ConfigDict(from_attributes=True)
user_id: UUID
username: str | None = None
avatar_url: str | None = None
phone: str | None = None
permission: int
status: str
subscribed_at: datetime
class ScheduleItemResponse(BaseModel):
model_config: ClassVar[ConfigDict] = ConfigDict(from_attributes=True)
@@ -121,6 +134,7 @@ class ScheduleItemResponse(BaseModel):
updated_at: datetime
permission: int = 1
is_owner: bool = False
subscribers: list[SubscriberInfo] = []
class ScheduleItemListItem(BaseModel):
backend/src/v1/schedule_items/service.py
+103 -27
View File
@@ -11,6 +11,7 @@ from core.db.base_service import BaseService
from core.http.errors import ApiProblemError, problem_payload
from core.logging import get_logger
from models.inbox_messages import InboxMessage
from models.profile import Profile
from models.schedule_items import ScheduleItem
from schemas.enums import (
InboxMessageStatus,
@@ -31,12 +32,14 @@ from v1.schedule_items.schemas import (
ScheduleItemUpdateRequest,
ScheduleItemSourceType,
ScheduleItemStatus,
SubscriberInfo,
)
if TYPE_CHECKING:
from sqlalchemy.ext.asyncio import AsyncSession
from v1.auth.schemas import UserByPhoneResponse
from v1.auth.schemas import UserByIdResponse, UserByPhoneResponse
from v1.users.repository import UserRepository
logger = get_logger("v1.schedule_items.service")
@@ -45,6 +48,7 @@ _LEGACY_ARCHIVED_STATUSES = {"completed", "canceled"}
class AuthByPhoneGateway(Protocol):
async def get_user_by_phone(self, phone: str) -> "UserByPhoneResponse": ...
async def get_user_by_id(self, user_id: str) -> "UserByIdResponse": ...
class ScheduleItemService(BaseService):
@@ -52,6 +56,7 @@ class ScheduleItemService(BaseService):
_session: AsyncSession
_auth_gateway: AuthByPhoneGateway
_inbox_repository: InboxMessageRepository
_user_repository: UserRepository | None
def __init__(
self,
@@ -60,6 +65,7 @@ class ScheduleItemService(BaseService):
current_user: CurrentUser | None,
auth_gateway: AuthByPhoneGateway | None = None,
inbox_repository: InboxMessageRepository | None = None,
user_repository: UserRepository | None = None,
) -> None:
super().__init__(current_user=current_user)
self._repository = repository
@@ -68,6 +74,7 @@ class ScheduleItemService(BaseService):
if inbox_repository is None:
raise ValueError("inbox_repository is required")
self._inbox_repository = inbox_repository
self._user_repository = user_repository
async def create(self, request: ScheduleItemCreateRequest) -> ScheduleItemResponse:
return await self._create_with_source(
@@ -166,13 +173,52 @@ class ScheduleItemService(BaseService):
)
is_owner = item.owner_id == user_id
permission = 1
if not is_owner:
subscription = await self._repository.get_subscription(item_id, user_id)
if subscription:
permission = subscription.permission
subscription = await self._repository.get_subscription(item_id, user_id)
permission = subscription.permission if subscription else 1
return self._to_response(item, is_owner=is_owner, permission=permission)
subscriptions = await self._repository.get_subscriptions_by_item_id(item_id)
subscribers: list[SubscriberInfo] = []
if subscriptions:
subscriber_ids = [sub.subscriber_id for sub in subscriptions]
profiles: dict[UUID, Profile] = {}
if self._user_repository and subscriber_ids:
try:
profiles = await self._user_repository.get_by_user_ids(
subscriber_ids
)
except SQLAlchemyError:
logger.exception("Failed to get subscriber profiles")
for sub in subscriptions:
if sub.status == SubscriptionStatus.ACTIVE:
profile = profiles.get(sub.subscriber_id)
phone = None
try:
user_info = await self._auth_gateway.get_user_by_id(
str(sub.subscriber_id)
)
phone = user_info.phone
except Exception:
logger.warning(
"Failed to get phone for subscriber",
subscriber_id=str(sub.subscriber_id),
)
subscribers.append(
SubscriberInfo(
user_id=sub.subscriber_id,
username=profile.username if profile else None,
avatar_url=profile.avatar_url if profile else None,
phone=phone,
permission=sub.permission,
status=sub.status.value
if hasattr(sub.status, "value")
else str(sub.status),
subscribed_at=sub.created_at,
)
)
return self._to_response(
item, is_owner=is_owner, permission=permission, subscribers=subscribers
)
async def update(
self, item_id: UUID, request: ScheduleItemUpdateRequest
@@ -180,7 +226,7 @@ class ScheduleItemService(BaseService):
user_id = self.require_user_id()
try:
existing = await self._repository.get_by_item_id(item_id, user_id)
existing = await self._repository.get_item(item_id)
if existing is None:
raise ApiProblemError(
status_code=404,
@@ -190,10 +236,32 @@ class ScheduleItemService(BaseService):
),
)
# Build update dict from non-null fields
is_owner = existing.owner_id == user_id
subscription = await self._repository.get_subscription(item_id, user_id)
if not is_owner:
if (
subscription is None
or subscription.status != SubscriptionStatus.ACTIVE
):
raise ApiProblemError(
status_code=404,
detail=problem_payload(
code="SCHEDULE_ITEM_NOT_FOUND",
detail="Schedule item not found",
),
)
if not (subscription.permission & SubscriptionPermission.EDIT):
raise ApiProblemError(
status_code=403,
detail=problem_payload(
code="SCHEDULE_ITEM_FORBIDDEN",
detail="You do not have permission to edit this schedule item",
),
)
update_data = request.model_dump(exclude_unset=True)
# Handle metadata separately (model_dump returns dict)
if "metadata" in update_data:
metadata_value = update_data.pop("metadata")
update_data["extra_metadata"] = (
@@ -202,7 +270,6 @@ class ScheduleItemService(BaseService):
else metadata_value
)
# Validate time range
next_start = update_data.get("start_at", existing.start_at)
next_end = update_data.get("end_at", existing.end_at)
if isinstance(next_start, datetime):
@@ -230,11 +297,10 @@ class ScheduleItemService(BaseService):
)
if not update_data:
return self._to_response(existing)
return self._to_response(existing, is_owner=is_owner)
item = await self._repository.update_item(item_id, update_data)
item = await self._repository.update_by_item_id(
item_id, user_id, update_data
)
await self._notify_subscribers(item_id, existing.title, "updated")
await self._session.commit()
except SQLAlchemyError:
@@ -257,13 +323,13 @@ class ScheduleItemService(BaseService):
),
)
return self._to_response(item)
return self._to_response(item, is_owner=is_owner)
async def delete(self, item_id: UUID) -> None:
user_id = self.require_user_id()
try:
existing = await self._repository.get_by_item_id(item_id, user_id)
existing = await self._repository.get_item(item_id)
if existing is None:
raise ApiProblemError(
status_code=404,
@@ -273,10 +339,25 @@ class ScheduleItemService(BaseService):
),
)
is_owner = existing.owner_id == user_id
subscription = await self._repository.get_subscription(item_id, user_id)
if not is_owner:
if subscription is None or not (
subscription.permission & SubscriptionPermission.DELETE
):
raise ApiProblemError(
status_code=403,
detail=problem_payload(
code="SCHEDULE_ITEM_FORBIDDEN",
detail="You do not have permission to delete this schedule item",
),
)
title = existing.title
await self._repository.delete_subscriptions_by_item_id(item_id)
await self._notify_subscribers(item_id, title, "deleted")
await self._repository.delete_by_item_id(item_id, user_id)
await self._repository.delete_item(item_id)
await self._session.commit()
except SQLAlchemyError:
await self._session.rollback()
@@ -539,6 +620,7 @@ class ScheduleItemService(BaseService):
item: ScheduleItem,
is_owner: bool = False,
permission: int = 1,
subscribers: list[SubscriberInfo] | None = None,
) -> ScheduleItemResponse:
status_value = (
item.status.value if hasattr(item.status, "value") else str(item.status)
@@ -565,8 +647,9 @@ class ScheduleItemService(BaseService):
source_type=ScheduleItemSourceType(str(source_type_value)),
created_at=item.created_at,
updated_at=item.updated_at,
permission=permission if not is_owner else 7,
permission=permission,
is_owner=is_owner,
subscribers=subscribers or [],
)
async def accept_subscription(self, item_id: UUID) -> dict:
@@ -708,12 +791,5 @@ class ScheduleItemService(BaseService):
def _to_utc_required(self, dt: datetime) -> datetime:
normalized = self._to_utc(dt)
if normalized is None:
raise ApiProblemError(
status_code=400,
detail=problem_payload(
code="SCHEDULE_ITEM_DATETIME_REQUIRED",
detail="datetime is required",
),
)
assert normalized is not None, "datetime is required"
return normalized