Add user delete process 2

services/recipes/app/api/recipe_operations.py

@@ -225,6 +225,7 @@ async def get_recipe_count(
 # ============================================================================
 
 from shared.auth.access_control import service_only_access
+from shared.services.tenant_deletion import TenantDataDeletionResult
 from app.services.tenant_deletion_service import RecipesTenantDeletionService
 
 
@@ -260,7 +261,7 @@ async def delete_tenant_data(
     except HTTPException:
         raise
     except Exception as e:
-        logger.error("recipes.tenant_deletion.api_error", tenant_id=tenant_id, error=str(e), exc_info=True)
+        logger.error(f"recipes.tenant_deletion.api_error - tenant_id: {tenant_id}, error: {str(e)}", exc_info=True)
         raise HTTPException(status_code=500, detail=f"Failed to delete tenant data: {str(e)}")
 
 
@@ -278,10 +279,13 @@ async def preview_tenant_data_deletion(
     Preview what data would be deleted for a tenant (dry-run)
     """
     try:
-        logger.info("recipes.tenant_deletion.preview_called", tenant_id=tenant_id)
+        logger.info(f"recipes.tenant_deletion.preview_called - tenant_id: {tenant_id}")
 
         deletion_service = RecipesTenantDeletionService(db)
-        result = await deletion_service.preview_deletion(tenant_id)
+        preview_data = await deletion_service.get_tenant_data_preview(tenant_id)
+        result = TenantDataDeletionResult(tenant_id=tenant_id, service_name=deletion_service.service_name)
+        result.deleted_counts = preview_data
+        result.success = True
 
         if not result.success:
             raise HTTPException(
@@ -298,5 +302,5 @@ async def preview_tenant_data_deletion(
     except HTTPException:
         raise
     except Exception as e:
-        logger.error("recipes.tenant_deletion.preview_error", tenant_id=tenant_id, error=str(e), exc_info=True)
+        logger.error(f"recipes.tenant_deletion.preview_error - tenant_id: {tenant_id}, error: {str(e)}", exc_info=True)
         raise HTTPException(status_code=500, detail=f"Failed to preview tenant data deletion: {str(e)}")

services/recipes/app/api/recipes.py

@@ -18,9 +18,10 @@ from ..schemas.recipes import (
 )
 from ..models import AuditLog
 from shared.routing import RouteBuilder, RouteCategory
-from shared.auth.access_control import require_user_role
+from shared.auth.access_control import require_user_role, service_only_access
 from shared.auth.decorators import get_current_user_dep
 from shared.security import create_audit_logger, AuditSeverity, AuditAction
+from shared.services.tenant_deletion import TenantDataDeletionResult
 
 route_builder = RouteBuilder('recipes')
 logger = logging.getLogger(__name__)
@@ -395,6 +396,7 @@ async def get_recipe_deletion_summary(
 # ===== Tenant Data Deletion Endpoints =====
 
 @router.delete("/tenant/{tenant_id}")
+@service_only_access
 async def delete_tenant_data(
     tenant_id: str,
     current_user: dict = Depends(get_current_user_dep),
@@ -407,13 +409,6 @@ async def delete_tenant_data(
 
     logger.info(f"Tenant data deletion request received for tenant: {tenant_id}")
 
-    # Only allow internal service calls
-    if current_user.get("type") != "service":
-        raise HTTPException(
-            status_code=403,
-            detail="This endpoint is only accessible to internal services"
-        )
-
     try:
         from app.services.tenant_deletion_service import RecipesTenantDeletionService
 
@@ -434,6 +429,7 @@ async def delete_tenant_data(
 
 
 @router.get("/tenant/{tenant_id}/deletion-preview")
+@service_only_access
 async def preview_tenant_data_deletion(
     tenant_id: str,
     current_user: dict = Depends(get_current_user_dep),
@@ -444,16 +440,6 @@ async def preview_tenant_data_deletion(
     Accessible by internal services and tenant admins
     """
 
-    # Allow internal services and admins
-    is_service = current_user.get("type") == "service"
-    is_admin = current_user.get("role") in ["owner", "admin"]
-
-    if not (is_service or is_admin):
-        raise HTTPException(
-            status_code=403,
-            detail="Insufficient permissions"
-        )
-
     try:
         from app.services.tenant_deletion_service import RecipesTenantDeletionService