refactor(admin): remove geoserver config

app/api/v1/endpoints/admin_metadata.py

@@ -26,8 +26,6 @@ from app.domain.schemas.admin_metadata import (
     ProjectDatabaseResponse,
     ProjectDatabaseUpsertRequest,
     ProjectDbRole,
-    ProjectGeoServerConfigResponse,
-    ProjectGeoServerConfigUpsertRequest,
     ProjectMemberCreateRequest,
     ProjectMemberResponse,
     ProjectMemberUpdateRequest,
@@ -69,23 +67,6 @@ def _project_database_response(
     )
 
 
-def _geoserver_config_response(
-    record: models.ProjectGeoServerConfig,
-) -> ProjectGeoServerConfigResponse:
-    return ProjectGeoServerConfigResponse(
-        id=record.id,
-        project_id=record.project_id,
-        gs_base_url=record.gs_base_url,
-        gs_admin_user=record.gs_admin_user,
-        gs_datastore_name=record.gs_datastore_name,
-        default_extent=record.default_extent,
-        srid=record.srid,
-        configured=True,
-        has_password=bool(record.gs_admin_password_encrypted),
-        updated_at=record.updated_at,
-    )
-
-
 def _database_audit_payload(payload: ProjectDatabaseUpsertRequest) -> dict:
     return {
         "db_role": payload.db_role,
@@ -96,19 +77,6 @@ def _database_audit_payload(payload: ProjectDatabaseUpsertRequest) -> dict:
     }
 
 
-def _geoserver_audit_payload(
-    payload: ProjectGeoServerConfigUpsertRequest,
-) -> dict:
-    return {
-        "gs_base_url": payload.gs_base_url,
-        "gs_admin_user": payload.gs_admin_user,
-        "gs_datastore_name": payload.gs_datastore_name,
-        "default_extent": payload.default_extent,
-        "srid": payload.srid,
-        "password_updated": "gs_admin_password" in payload.model_fields_set,
-    }
-
-
 def _to_async_sqlalchemy_url(dsn: str) -> str:
     parsed = make_url(dsn)
     if parsed.drivername in {"postgresql", "postgres"}:
@@ -123,7 +91,7 @@ def _db_type_for_role(db_role: str) -> str:
 
 
 def _status_for_config_value_error(exc: ValueError) -> int:
-    if "ENCRYPTION_KEY" in str(exc):
+    if "DATABASE_ENCRYPTION_KEY" in str(exc):
         return status.HTTP_503_SERVICE_UNAVAILABLE
     return status.HTTP_400_BAD_REQUEST
 
@@ -535,83 +503,6 @@ async def check_project_database_health(
     )
 
 
-@router.get(
-    "/projects/{project_id}/geoserver",
-    response_model=ProjectGeoServerConfigResponse,
-)
-async def get_project_geoserver_config(
-    project_id: UUID = Path(...),
-    current_user=Depends(get_current_metadata_admin),
-    metadata_repo: MetadataRepository = Depends(get_metadata_repository),
-) -> ProjectGeoServerConfigResponse:
-    project = await metadata_repo.get_project_by_id(project_id)
-    if project is None:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Project not found")
-    record = await metadata_repo.get_geoserver_config_record(project_id)
-    if record is None:
-        return ProjectGeoServerConfigResponse(
-            id=None,
-            project_id=project_id,
-            gs_base_url=None,
-            gs_admin_user=None,
-            gs_datastore_name="ds_postgis",
-            default_extent=None,
-            srid=4326,
-            configured=False,
-            has_password=False,
-            updated_at=None,
-        )
-    return _geoserver_config_response(record)
-
-
-@router.put(
-    "/projects/{project_id}/geoserver",
-    response_model=ProjectGeoServerConfigResponse,
-)
-async def upsert_project_geoserver_config(
-    payload: ProjectGeoServerConfigUpsertRequest,
-    project_id: UUID = Path(...),
-    current_user=Depends(get_current_metadata_admin),
-    metadata_repo: MetadataRepository = Depends(get_metadata_repository),
-) -> ProjectGeoServerConfigResponse:
-    project = await metadata_repo.get_project_by_id(project_id)
-    if project is None:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Project not found")
-    try:
-        record = await metadata_repo.upsert_geoserver_config(
-            project_id,
-            gs_base_url=payload.gs_base_url,
-            gs_admin_user=payload.gs_admin_user,
-            gs_admin_password=payload.gs_admin_password,
-            password_update_requested="gs_admin_password" in payload.model_fields_set,
-            gs_datastore_name=payload.gs_datastore_name,
-            default_extent=payload.default_extent,
-            srid=payload.srid,
-        )
-    except ValueError as exc:
-        raise HTTPException(
-            status_code=_status_for_config_value_error(exc),
-            detail=str(exc),
-        ) from exc
-    except SQLAlchemyError as exc:
-        raise HTTPException(
-            status_code=status.HTTP_503_SERVICE_UNAVAILABLE,
-            detail=f"Metadata database error: {exc}",
-        ) from exc
-
-    await log_audit_event(
-        action=AuditAction.CONFIG_CHANGE,
-        user_id=current_user.id,
-        project_id=project_id,
-        resource_type="project_geoserver",
-        resource_id=str(project_id),
-        request_data=_geoserver_audit_payload(payload),
-        response_status=status.HTTP_200_OK,
-        session=metadata_repo.session,
-    )
-    return _geoserver_config_response(record)
-
-
 @router.get("/users/{user_id}", response_model=MetadataUserResponse)
 async def get_metadata_user(
     user_id: UUID = Path(...),

app/api/v1/endpoints/meta.py

@@ -16,7 +16,6 @@ from app.auth.project_dependencies import (
 from app.auth.metadata_dependencies import get_current_metadata_user
 from app.core.config import settings
 from app.domain.schemas.metadata import (
-    GeoServerConfigResponse,
     ProjectMetaResponse,
     ProjectSummaryResponse,
 )
@@ -34,25 +33,13 @@ async def get_project_metadata(
     """
     获取项目元数据
     
-    返回当前项目的完整元数据，包括项目基本信息和GeoServer配置
+    返回当前项目的完整元数据，包括项目基本信息和项目权限
     """
     project = await metadata_repo.get_project_by_id(ctx.project_id)
     if not project:
         raise HTTPException(
             status_code=status.HTTP_404_NOT_FOUND, detail="Project not found"
         )
-    geoserver = await metadata_repo.get_geoserver_config(ctx.project_id)
-    geoserver_payload = (
-        GeoServerConfigResponse(
-            gs_base_url=geoserver.gs_base_url,
-            gs_admin_user=geoserver.gs_admin_user,
-            gs_datastore_name=geoserver.gs_datastore_name,
-            default_extent=geoserver.default_extent,
-            srid=geoserver.srid,
-        )
-        if geoserver
-        else None
-    )
     return ProjectMetaResponse(
         project_id=project.id,
         name=project.name,
@@ -62,7 +49,6 @@ async def get_project_metadata(
         map_extent=project.map_extent,
         status=project.status,
         project_role=ctx.project_role,
-        geoserver=geoserver_payload,
     )
 
 

app/api/v1/endpoints/project.py

@@ -4,7 +4,7 @@ from fastapi.responses import PlainTextResponse
 from typing import Any, Dict, List
 from app.infra.db.metadb.repositories.metadata_repository import MetadataRepository
 from app.auth.project_dependencies import get_metadata_repository
-from app.domain.schemas.metadata import ProjectMetaResponse, GeoServerConfigResponse
+from app.domain.schemas.metadata import ProjectMetaResponse
 import app.services.project_info as project_info
 from app.infra.db.postgresql.database import get_database_instance as get_pg_db
 from app.infra.db.timescaledb.database import get_database_instance as get_ts_db
@@ -55,17 +55,6 @@ async def get_project_info_endpoint(
     project_detail = await metadata_repo.get_project_detail_by_code(network)
     if not project_detail:
         raise HTTPException(status_code=404, detail=f"Project {network} not found")
-        
-    geoserver_payload = None
-    if project_detail.geoserver:
-         geoserver_payload = GeoServerConfigResponse(
-            gs_base_url=project_detail.geoserver.gs_base_url,
-            gs_admin_user=project_detail.geoserver.gs_admin_user,
-            gs_datastore_name=project_detail.geoserver.gs_datastore_name,
-            default_extent=project_detail.geoserver.default_extent,
-            srid=project_detail.geoserver.srid,
-        )
-
     return ProjectMetaResponse(
         project_id=project_detail.project_id,
         name=project_detail.name,
@@ -75,7 +64,6 @@ async def get_project_info_endpoint(
         map_extent=project_detail.map_extent,
         status=project_detail.status,
         project_role="viewer", # Default role for public access
-        geoserver=geoserver_payload
     )
 
 @router.get("/listprojects/", summary="获取项目列表", description="获取服务器上所有可用的供水管网项目名称列表。")