sprint2: 8 services + 8 routes visibility filter + BaseSearchProvider + owned_mixin on models
Check Cross-Plugin Imports / check (push) Has been cancelled
Check Cross-Plugin Imports / check (push) Has been cancelled
This commit is contained in:
+84
-68
@@ -53,19 +53,23 @@ async def list_saved_views(
|
||||
"""List saved views for the current user, optionally filtered by entity_type."""
|
||||
tenant_id = uuid.UUID(current_user["tenant_id"])
|
||||
user_id = uuid.UUID(current_user["user_id"])
|
||||
is_admin = current_user.get("is_system_admin", False)
|
||||
|
||||
query = select(SavedView).where(
|
||||
SavedView.tenant_id == tenant_id,
|
||||
SavedView.user_id == user_id,
|
||||
SavedView.deleted_at.is_(None),
|
||||
)
|
||||
if entity_type:
|
||||
query = query.where(SavedView.entity_type == entity_type)
|
||||
query = query.order_by(SavedView.name)
|
||||
try:
|
||||
query = select(SavedView).where(
|
||||
SavedView.tenant_id == tenant_id,
|
||||
SavedView.user_id == user_id,
|
||||
SavedView.deleted_at.is_(None),
|
||||
)
|
||||
if entity_type:
|
||||
query = query.where(SavedView.entity_type == entity_type)
|
||||
query = query.order_by(SavedView.name)
|
||||
|
||||
result = await db.execute(query)
|
||||
views = result.scalars().all()
|
||||
return [_view_to_dict(v) for v in views]
|
||||
result = await db.execute(query)
|
||||
views = result.scalars().all()
|
||||
return [_view_to_dict(v) for v in views]
|
||||
except PermissionError as e:
|
||||
raise HTTPException(status_code=403, detail=str(e)) from e
|
||||
|
||||
|
||||
@router.post("", status_code=status.HTTP_201_CREATED, dependencies=[Depends(require_permission("contacts:read"))])
|
||||
@@ -77,30 +81,34 @@ async def create_saved_view(
|
||||
"""Create a new saved view for the current user."""
|
||||
tenant_id = uuid.UUID(current_user["tenant_id"])
|
||||
user_id = uuid.UUID(current_user["user_id"])
|
||||
is_admin = current_user.get("is_system_admin", False)
|
||||
|
||||
# Check uniqueness within user+entity
|
||||
existing = await db.execute(
|
||||
select(SavedView).where(
|
||||
SavedView.tenant_id == tenant_id,
|
||||
SavedView.user_id == user_id,
|
||||
SavedView.entity_type == body.entity_type,
|
||||
SavedView.name == body.name,
|
||||
SavedView.deleted_at.is_(None),
|
||||
try:
|
||||
# Check uniqueness within user+entity
|
||||
existing = await db.execute(
|
||||
select(SavedView).where(
|
||||
SavedView.tenant_id == tenant_id,
|
||||
SavedView.user_id == user_id,
|
||||
SavedView.entity_type == body.entity_type,
|
||||
SavedView.name == body.name,
|
||||
SavedView.deleted_at.is_(None),
|
||||
)
|
||||
)
|
||||
)
|
||||
if existing.scalar_one_or_none() is not None:
|
||||
raise HTTPException(409, detail={"detail": "View name already exists", "code": "duplicate"})
|
||||
if existing.scalar_one_or_none() is not None:
|
||||
raise HTTPException(409, detail={"detail": "View name already exists", "code": "duplicate"})
|
||||
|
||||
saved = SavedView(
|
||||
tenant_id=tenant_id,
|
||||
user_id=user_id,
|
||||
name=body.name,
|
||||
entity_type=body.entity_type,
|
||||
view_config=body.view_config,
|
||||
)
|
||||
db.add(saved)
|
||||
await db.flush()
|
||||
return _view_to_dict(saved)
|
||||
saved = SavedView(
|
||||
tenant_id=tenant_id,
|
||||
user_id=user_id,
|
||||
name=body.name,
|
||||
entity_type=body.entity_type,
|
||||
view_config=body.view_config,
|
||||
)
|
||||
db.add(saved)
|
||||
await db.flush()
|
||||
return _view_to_dict(saved)
|
||||
except PermissionError as e:
|
||||
raise HTTPException(status_code=403, detail=str(e)) from e
|
||||
|
||||
|
||||
@router.put("/{view_id}", dependencies=[Depends(require_permission("contacts:read"))])
|
||||
@@ -113,30 +121,34 @@ async def update_saved_view(
|
||||
"""Update a saved view."""
|
||||
tenant_id = uuid.UUID(current_user["tenant_id"])
|
||||
user_id = uuid.UUID(current_user["user_id"])
|
||||
is_admin = current_user.get("is_system_admin", False)
|
||||
|
||||
try:
|
||||
vid = uuid.UUID(view_id)
|
||||
except (ValueError, TypeError):
|
||||
raise HTTPException(400, detail={"detail": "Invalid view_id", "code": "invalid_id"}) from None
|
||||
try:
|
||||
vid = uuid.UUID(view_id)
|
||||
except (ValueError, TypeError):
|
||||
raise HTTPException(400, detail={"detail": "Invalid view_id", "code": "invalid_id"}) from None
|
||||
|
||||
result = await db.execute(
|
||||
select(SavedView).where(
|
||||
SavedView.id == vid,
|
||||
SavedView.tenant_id == tenant_id,
|
||||
SavedView.user_id == user_id,
|
||||
SavedView.deleted_at.is_(None),
|
||||
result = await db.execute(
|
||||
select(SavedView).where(
|
||||
SavedView.id == vid,
|
||||
SavedView.tenant_id == tenant_id,
|
||||
SavedView.user_id == user_id,
|
||||
SavedView.deleted_at.is_(None),
|
||||
)
|
||||
)
|
||||
)
|
||||
saved = result.scalar_one_or_none()
|
||||
if saved is None:
|
||||
raise HTTPException(404, detail={"detail": "Saved view not found", "code": "not_found"})
|
||||
saved = result.scalar_one_or_none()
|
||||
if saved is None:
|
||||
raise HTTPException(404, detail={"detail": "Saved view not found", "code": "not_found"})
|
||||
|
||||
if body.name is not None:
|
||||
saved.name = body.name
|
||||
if body.view_config is not None:
|
||||
saved.view_config = body.view_config
|
||||
await db.flush()
|
||||
return _view_to_dict(saved)
|
||||
if body.name is not None:
|
||||
saved.name = body.name
|
||||
if body.view_config is not None:
|
||||
saved.view_config = body.view_config
|
||||
await db.flush()
|
||||
return _view_to_dict(saved)
|
||||
except PermissionError as e:
|
||||
raise HTTPException(status_code=403, detail=str(e)) from e
|
||||
|
||||
|
||||
@router.delete("/{view_id}", status_code=status.HTTP_204_NO_CONTENT, dependencies=[Depends(require_permission("contacts:read"))])
|
||||
@@ -148,25 +160,29 @@ async def delete_saved_view(
|
||||
"""Delete a saved view (soft-delete)."""
|
||||
tenant_id = uuid.UUID(current_user["tenant_id"])
|
||||
user_id = uuid.UUID(current_user["user_id"])
|
||||
is_admin = current_user.get("is_system_admin", False)
|
||||
|
||||
try:
|
||||
vid = uuid.UUID(view_id)
|
||||
except (ValueError, TypeError):
|
||||
raise HTTPException(400, detail={"detail": "Invalid view_id", "code": "invalid_id"}) from None
|
||||
try:
|
||||
vid = uuid.UUID(view_id)
|
||||
except (ValueError, TypeError):
|
||||
raise HTTPException(400, detail={"detail": "Invalid view_id", "code": "invalid_id"}) from None
|
||||
|
||||
result = await db.execute(
|
||||
select(SavedView).where(
|
||||
SavedView.id == vid,
|
||||
SavedView.tenant_id == tenant_id,
|
||||
SavedView.user_id == user_id,
|
||||
SavedView.deleted_at.is_(None),
|
||||
result = await db.execute(
|
||||
select(SavedView).where(
|
||||
SavedView.id == vid,
|
||||
SavedView.tenant_id == tenant_id,
|
||||
SavedView.user_id == user_id,
|
||||
SavedView.deleted_at.is_(None),
|
||||
)
|
||||
)
|
||||
)
|
||||
saved = result.scalar_one_or_none()
|
||||
if saved is None:
|
||||
raise HTTPException(404, detail={"detail": "Saved view not found", "code": "not_found"})
|
||||
saved = result.scalar_one_or_none()
|
||||
if saved is None:
|
||||
raise HTTPException(404, detail={"detail": "Saved view not found", "code": "not_found"})
|
||||
|
||||
from datetime import datetime, timezone
|
||||
saved.deleted_at = datetime.now(timezone.utc)
|
||||
await db.flush()
|
||||
return Response(status_code=status.HTTP_204_NO_CONTENT)
|
||||
from datetime import datetime, timezone
|
||||
saved.deleted_at = datetime.now(timezone.utc)
|
||||
await db.flush()
|
||||
return Response(status_code=status.HTTP_204_NO_CONTENT)
|
||||
except PermissionError as e:
|
||||
raise HTTPException(status_code=403, detail=str(e)) from e
|
||||
|
||||
Reference in New Issue
Block a user