Add user delete process
This commit is contained in:
Urtzi Alfaro
119
services/external/app/api/city_operations.py
vendored
119
services/external/app/api/city_operations.py
vendored
@@ -18,7 +18,10 @@ from app.repositories.city_data_repository import CityDataRepository
|
||||
from app.cache.redis_wrapper import ExternalDataCache
|
||||
from app.services.weather_service import WeatherService
|
||||
from app.services.traffic_service import TrafficService
|
||||
from app.services.tenant_deletion_service import ExternalTenantDeletionService
|
||||
from shared.routing.route_builder import RouteBuilder
|
||||
from shared.auth.decorators import get_current_user_dep
|
||||
from shared.auth.access_control import service_only_access
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from app.core.database import get_db
|
||||
|
||||
@@ -389,3 +392,119 @@ async def get_current_traffic(
|
||||
except Exception as e:
|
||||
logger.error("Error fetching current traffic", error=str(e))
|
||||
raise HTTPException(status_code=500, detail="Internal server error")
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# Tenant Data Deletion Operations (Internal Service Only)
|
||||
# ============================================================================
|
||||
|
||||
@router.delete(
|
||||
route_builder.build_base_route("tenant/{tenant_id}", include_tenant_prefix=False),
|
||||
response_model=dict
|
||||
)
|
||||
@service_only_access
|
||||
async def delete_tenant_data(
|
||||
tenant_id: str = Path(..., description="Tenant ID to delete data for"),
|
||||
current_user: dict = Depends(get_current_user_dep),
|
||||
db: AsyncSession = Depends(get_db)
|
||||
):
|
||||
"""
|
||||
Delete tenant-specific external data (Internal service only)
|
||||
|
||||
IMPORTANT NOTE:
|
||||
The External service primarily stores SHARED city-wide data that is used
|
||||
by ALL tenants. This endpoint only deletes tenant-specific data:
|
||||
- Tenant-specific audit logs
|
||||
- Tenant-specific weather data (if any)
|
||||
|
||||
City-wide data (CityWeatherData, CityTrafficData, TrafficData, etc.)
|
||||
is intentionally PRESERVED as it's shared across all tenants.
|
||||
|
||||
**WARNING**: This operation is irreversible!
|
||||
|
||||
Returns:
|
||||
Deletion summary with counts of deleted records and note about preserved data
|
||||
"""
|
||||
try:
|
||||
logger.info("external.tenant_deletion.api_called", tenant_id=tenant_id)
|
||||
|
||||
deletion_service = ExternalTenantDeletionService(db)
|
||||
result = await deletion_service.safe_delete_tenant_data(tenant_id)
|
||||
|
||||
if not result.success:
|
||||
raise HTTPException(
|
||||
status_code=500,
|
||||
detail=f"Tenant data deletion failed: {', '.join(result.errors)}"
|
||||
)
|
||||
|
||||
return {
|
||||
"message": "Tenant-specific data deletion completed successfully",
|
||||
"note": "City-wide shared data (weather, traffic) has been preserved",
|
||||
"summary": result.to_dict()
|
||||
}
|
||||
|
||||
except HTTPException:
|
||||
raise
|
||||
except Exception as e:
|
||||
logger.error("external.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)}"
|
||||
)
|
||||
|
||||
|
||||
@router.get(
|
||||
route_builder.build_base_route("tenant/{tenant_id}/deletion-preview", include_tenant_prefix=False),
|
||||
response_model=dict
|
||||
)
|
||||
@service_only_access
|
||||
async def preview_tenant_data_deletion(
|
||||
tenant_id: str = Path(..., description="Tenant ID to preview deletion for"),
|
||||
current_user: dict = Depends(get_current_user_dep),
|
||||
db: AsyncSession = Depends(get_db)
|
||||
):
|
||||
"""
|
||||
Preview what tenant-specific data would be deleted (dry-run)
|
||||
|
||||
This shows counts of tenant-specific data only. City-wide shared data
|
||||
(CityWeatherData, CityTrafficData, TrafficData, etc.) will NOT be deleted.
|
||||
|
||||
Returns:
|
||||
Dictionary with entity names and their counts
|
||||
"""
|
||||
try:
|
||||
logger.info("external.tenant_deletion.preview_called", tenant_id=tenant_id)
|
||||
|
||||
deletion_service = ExternalTenantDeletionService(db)
|
||||
preview = await deletion_service.get_tenant_data_preview(tenant_id)
|
||||
|
||||
total_records = sum(v for k, v in preview.items() if not k.startswith("_"))
|
||||
|
||||
return {
|
||||
"tenant_id": tenant_id,
|
||||
"service": "external",
|
||||
"preview": preview,
|
||||
"total_records": total_records,
|
||||
"note": "City-wide data (weather, traffic) is shared and will NOT be deleted",
|
||||
"preserved_data": [
|
||||
"CityWeatherData (city-wide)",
|
||||
"CityTrafficData (city-wide)",
|
||||
"TrafficData (city-wide)",
|
||||
"TrafficMeasurementPoint (reference data)",
|
||||
"WeatherForecast (city-wide)"
|
||||
],
|
||||
"warning": "Only tenant-specific records will be permanently deleted"
|
||||
}
|
||||
|
||||
except Exception as e:
|
||||
logger.error("external.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)}"
|
||||
)
|
||||
|
||||
190
services/external/app/services/tenant_deletion_service.py
vendored
Normal file
190
services/external/app/services/tenant_deletion_service.py
vendored
Normal file
@@ -0,0 +1,190 @@
|
||||
# services/external/app/services/tenant_deletion_service.py
|
||||
"""
|
||||
Tenant Data Deletion Service for External Service
|
||||
Handles deletion of tenant-specific data for the External service
|
||||
"""
|
||||
|
||||
from typing import Dict
|
||||
from sqlalchemy import select, func, delete
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from sqlalchemy.dialects.postgresql import UUID
|
||||
import structlog
|
||||
|
||||
from shared.services.tenant_deletion import (
|
||||
BaseTenantDataDeletionService,
|
||||
TenantDataDeletionResult
|
||||
)
|
||||
from app.models import AuditLog, WeatherData
|
||||
|
||||
logger = structlog.get_logger(__name__)
|
||||
|
||||
|
||||
class ExternalTenantDeletionService(BaseTenantDataDeletionService):
|
||||
"""
|
||||
Service for deleting tenant-specific external data
|
||||
|
||||
IMPORTANT NOTE:
|
||||
The External service primarily stores SHARED city-wide data (weather, traffic)
|
||||
that is NOT tenant-specific. This data is used by ALL tenants and should
|
||||
NOT be deleted when a single tenant is removed.
|
||||
|
||||
Tenant-specific data in this service:
|
||||
- Audit logs (tenant_id)
|
||||
- Tenant-specific weather data (if any exists with tenant_id)
|
||||
|
||||
City-wide data that is NOT deleted (shared across all tenants):
|
||||
- CityWeatherData (no tenant_id - city-wide data)
|
||||
- CityTrafficData (no tenant_id - city-wide data)
|
||||
- TrafficData (no tenant_id - city-wide data)
|
||||
- TrafficMeasurementPoint (no tenant_id - reference data)
|
||||
- WeatherForecast (no tenant_id - city-wide forecasts)
|
||||
"""
|
||||
|
||||
def __init__(self, db: AsyncSession):
|
||||
self.db = db
|
||||
self.service_name = "external"
|
||||
|
||||
async def get_tenant_data_preview(self, tenant_id: str) -> Dict[str, int]:
|
||||
"""
|
||||
Get counts of what would be deleted for a tenant (dry-run)
|
||||
|
||||
Args:
|
||||
tenant_id: The tenant ID to preview deletion for
|
||||
|
||||
Returns:
|
||||
Dictionary with entity names and their counts
|
||||
"""
|
||||
logger.info("external.tenant_deletion.preview", tenant_id=tenant_id)
|
||||
preview = {}
|
||||
|
||||
try:
|
||||
# Count tenant-specific weather data (if any)
|
||||
weather_count = await self.db.scalar(
|
||||
select(func.count(WeatherData.id)).where(
|
||||
WeatherData.tenant_id == UUID(tenant_id)
|
||||
)
|
||||
)
|
||||
preview["tenant_weather_data"] = weather_count or 0
|
||||
|
||||
# Count audit logs
|
||||
audit_count = await self.db.scalar(
|
||||
select(func.count(AuditLog.id)).where(
|
||||
AuditLog.tenant_id == UUID(tenant_id)
|
||||
)
|
||||
)
|
||||
preview["audit_logs"] = audit_count or 0
|
||||
|
||||
# Add informational message about shared data
|
||||
logger.info(
|
||||
"external.tenant_deletion.preview_complete",
|
||||
tenant_id=tenant_id,
|
||||
preview=preview,
|
||||
note="City-wide data (traffic, weather) is shared and will NOT be deleted"
|
||||
)
|
||||
|
||||
except Exception as e:
|
||||
logger.error(
|
||||
"external.tenant_deletion.preview_error",
|
||||
tenant_id=tenant_id,
|
||||
error=str(e),
|
||||
exc_info=True
|
||||
)
|
||||
raise
|
||||
|
||||
return preview
|
||||
|
||||
async def delete_tenant_data(self, tenant_id: str) -> TenantDataDeletionResult:
|
||||
"""
|
||||
Permanently delete tenant-specific external data
|
||||
|
||||
NOTE: This only deletes tenant-specific data. City-wide shared data
|
||||
(CityWeatherData, CityTrafficData, TrafficData, etc.) is intentionally
|
||||
preserved as it's used by all tenants.
|
||||
|
||||
Args:
|
||||
tenant_id: The tenant ID to delete data for
|
||||
|
||||
Returns:
|
||||
TenantDataDeletionResult with deletion counts and any errors
|
||||
"""
|
||||
logger.info(
|
||||
"external.tenant_deletion.started",
|
||||
tenant_id=tenant_id,
|
||||
note="Only deleting tenant-specific data; city-wide data preserved"
|
||||
)
|
||||
result = TenantDataDeletionResult(tenant_id=tenant_id, service_name=self.service_name)
|
||||
|
||||
try:
|
||||
# Step 1: Delete tenant-specific weather data (if any exists)
|
||||
logger.info("external.tenant_deletion.deleting_weather_data", tenant_id=tenant_id)
|
||||
weather_result = await self.db.execute(
|
||||
delete(WeatherData).where(
|
||||
WeatherData.tenant_id == UUID(tenant_id)
|
||||
)
|
||||
)
|
||||
result.deleted_counts["tenant_weather_data"] = weather_result.rowcount
|
||||
logger.info(
|
||||
"external.tenant_deletion.weather_data_deleted",
|
||||
tenant_id=tenant_id,
|
||||
count=weather_result.rowcount
|
||||
)
|
||||
|
||||
# Step 2: Delete audit logs
|
||||
logger.info("external.tenant_deletion.deleting_audit_logs", tenant_id=tenant_id)
|
||||
audit_result = await self.db.execute(
|
||||
delete(AuditLog).where(
|
||||
AuditLog.tenant_id == UUID(tenant_id)
|
||||
)
|
||||
)
|
||||
result.deleted_counts["audit_logs"] = audit_result.rowcount
|
||||
logger.info(
|
||||
"external.tenant_deletion.audit_logs_deleted",
|
||||
tenant_id=tenant_id,
|
||||
count=audit_result.rowcount
|
||||
)
|
||||
|
||||
# Commit the transaction
|
||||
await self.db.commit()
|
||||
|
||||
# Calculate total deleted
|
||||
total_deleted = sum(result.deleted_counts.values())
|
||||
|
||||
# Add informational note about preserved data
|
||||
result.deleted_counts["_note"] = "City-wide data preserved (shared across tenants)"
|
||||
|
||||
logger.info(
|
||||
"external.tenant_deletion.completed",
|
||||
tenant_id=tenant_id,
|
||||
total_deleted=total_deleted,
|
||||
breakdown=result.deleted_counts,
|
||||
preserved_data="CityWeatherData, CityTrafficData, TrafficData (shared)"
|
||||
)
|
||||
|
||||
result.success = True
|
||||
|
||||
except Exception as e:
|
||||
await self.db.rollback()
|
||||
error_msg = f"Failed to delete external data for tenant {tenant_id}: {str(e)}"
|
||||
logger.error(
|
||||
"external.tenant_deletion.failed",
|
||||
tenant_id=tenant_id,
|
||||
error=str(e),
|
||||
exc_info=True
|
||||
)
|
||||
result.errors.append(error_msg)
|
||||
result.success = False
|
||||
|
||||
return result
|
||||
|
||||
|
||||
def get_external_tenant_deletion_service(db: AsyncSession) -> ExternalTenantDeletionService:
|
||||
"""
|
||||
Factory function to create ExternalTenantDeletionService instance
|
||||
|
||||
Args:
|
||||
db: AsyncSession database session
|
||||
|
||||
Returns:
|
||||
ExternalTenantDeletionService instance
|
||||
"""
|
||||
return ExternalTenantDeletionService(db)
|
||||
Reference in New Issue
Block a user