enable organization_id updates and visibility-based filtering

Author: Houpert

app/api/v1/services.py

@@ -211,7 +211,7 @@ async def create_service(
 async def list_services(
     service_type: Optional[str] = Query(None, description="Filter by service type"),
     is_active: Optional[bool] = Query(None, description="Filter by active status"),
-    organization_id: Optional[str] = Query(None, description="Filter by organization"),
+    organization_id: Optional[str] = Query(None, description="Visibility filter - returns global services + org-specific services"),
     page: int = Query(1, ge=1, description="Page number"),
     page_size: int = Query(50, ge=1, le=100, description="Items per page"),
     db: AsyncSession = Depends(get_db)
@@ -221,7 +221,7 @@ async def list_services(
 
     - **service_type**: Filter by service type
     - **is_active**: Filter by active status
-    - **organization_id**: Filter by organization (free-form string)
+    - **organization_id**: Visibility filter - returns global services (no org) plus services matching this org ID
     - **page**: Page number (default: 1)
     - **page_size**: Items per page (default: 50, max: 100)
     """

app/schemas/service.py

@@ -349,6 +349,7 @@ class ServiceUpdate(BaseModel):
     route: Optional[str] = Field(None, min_length=1, max_length=100)
     service_type: Optional[str] = None
     description: Optional[Dict[str, str]] = None
+    organization_id: Optional[str] = Field(None, max_length=100)
     is_active: Optional[bool] = None
     flavors: Optional[List[ServiceFlavorCreate]] = None
     metadata: Optional[Dict[str, Any]] = None

app/services/service_service.py

@@ -2,7 +2,7 @@
 import logging
 from typing import Optional
 from uuid import UUID
-from sqlalchemy import select, func, and_
+from sqlalchemy import select, func, and_, or_
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import selectinload, joinedload
@@ -326,8 +326,13 @@ async def get_services(
         if is_active is not None:
             filters.append(Service.is_active == is_active)
         if organization_id:
-            # Strict filter: only services with this exact organization_id
-            filters.append(Service.organization_id == organization_id)
+            # Visibility filter: show global services (no org) + services for this org
+            # Services with a different organization_id are excluded
+            filters.append(or_(
+                Service.organization_id.is_(None),
+                Service.organization_id == "",
+                Service.organization_id == organization_id
+            ))
 
         if filters:
             query = query.where(and_(*filters))

frontend/components/services/ServiceForm.tsx

@@ -61,12 +61,13 @@ export function ServiceForm({ service, onSuccess, onCancel }: ServiceFormProps)
   const onSubmit = async (data: ServiceFormData) => {
     try {
       if (service) {
-        // Update existing service (only name and description)
+        // Update existing service
         await updateMutation.mutateAsync({
           id: service.id,
           data: {
             name: data.name,
             description: data.description,
+            organization_id: data.organization_id || '',
           },
         });
       } else {

frontend/types/service.ts

@@ -229,6 +229,7 @@ export interface CreateServiceRequest {
 export interface UpdateServiceRequest {
   name?: string;
   description?: Partial<I18nDescription>;
+  organization_id?: string;
   default_template_id?: string | null;
 }