[Feature] PEPPER in enviPath (#332)

Co-authored-by: Tim Lorsbach <tim@lorsba.ch>
Reviewed-on: enviPath/enviPy#332

epapi/v1/endpoints/additional_information.py

@@ -9,6 +9,7 @@ from envipy_additional_information import registry
 from envipy_additional_information.groups import GroupEnum
 from epapi.utils.schema_transformers import build_rjsf_output
 from epapi.utils.validation_errors import handle_validation_error
+from epdb.models import AdditionalInformation
 from ..dal import get_scenario_for_read, get_scenario_for_write
 
 logger = logging.getLogger(__name__)
@@ -44,12 +45,14 @@ def list_scenario_info(request, scenario_uuid: UUID):
     scenario = get_scenario_for_read(request.user, scenario_uuid)
 
     result = []
-    for ai in scenario.get_additional_information():
+
+    for ai in AdditionalInformation.objects.filter(scenario=scenario):
         result.append(
             {
-                "type": ai.__class__.__name__,
+                "type": ai.get().__class__.__name__,
                 "uuid": getattr(ai, "uuid", None),
-                "data": ai.model_dump(mode="json"),
+                "data": ai.data,
+                "attach_object": ai.content_object.simple_json() if ai.content_object else None,
             }
         )
     return result
@@ -85,20 +88,17 @@ def update_scenario_info(
     scenario = get_scenario_for_write(request.user, scenario_uuid)
     ai_uuid_str = str(ai_uuid)
 
-    # Find item to determine type for validation
-    found_type = None
-    for type_name, items in scenario.additional_information.items():
-        if any(item.get("uuid") == ai_uuid_str for item in items):
-            found_type = type_name
-            break
+    ai = AdditionalInformation.objects.filter(uuid=ai_uuid_str, scenario=scenario)
 
-    if found_type is None:
-        raise HttpError(404, f"Additional information not found: {ai_uuid}")
+    if not ai.exists():
+        raise HttpError(404, f"Additional information with UUID {ai_uuid} not found")
+
+    ai = ai.first()
 
     # Get the model class for validation
-    cls = registry.get_model(found_type.lower())
+    cls = registry.get_model(ai.type.lower())
     if not cls:
-        raise HttpError(500, f"Unknown model type in data: {found_type}")
+        raise HttpError(500, f"Unknown model type in data: {ai.type}")
 
     # Validate the payload against the model
     try:

epapi/v1/endpoints/scenarios.py

@@ -13,9 +13,9 @@ from epdb.logic import PackageManager
 from epdb.views import _anonymous_or_real
 from ..pagination import EnhancedPageNumberPagination
 from ..schemas import (
+    ReviewStatusFilter,
     ScenarioOutSchema,
     ScenarioCreateSchema,
-    ScenarioReviewStatusAndRelatedFilter,
 )
 from ..dal import get_user_entities_for_read, get_package_entities_for_read
 from envipy_additional_information import registry
@@ -29,7 +29,7 @@ router = Router()
 @paginate(
     EnhancedPageNumberPagination,
     page_size=s.API_PAGINATION_DEFAULT_PAGE_SIZE,
-    filter_schema=ScenarioReviewStatusAndRelatedFilter,
+    filter_schema=ReviewStatusFilter,
 )
 def list_all_scenarios(request):
     user = request.user
@@ -44,7 +44,7 @@ def list_all_scenarios(request):
 @paginate(
     EnhancedPageNumberPagination,
     page_size=s.API_PAGINATION_DEFAULT_PAGE_SIZE,
-    filter_schema=ScenarioReviewStatusAndRelatedFilter,
+    filter_schema=ReviewStatusFilter,
 )
 def list_package_scenarios(request, package_uuid: UUID):
     user = request.user

epapi/v1/schemas.py

@@ -22,12 +22,6 @@ class StructureReviewStatusFilter(FilterSchema):
     review_status: Annotated[Optional[bool], FilterLookup("compound__package__reviewed")] = None
 
 
-class ScenarioReviewStatusAndRelatedFilter(ReviewStatusFilter):
-    """Filter schema for review_status and parent query parameter."""
-
-    exclude_related: Annotated[Optional[bool], FilterLookup("parent__isnull")] = None
-
-
 # Base schema for all package-scoped entities
 class PackageEntityOutSchema(Schema):
     """Base schema for entities belonging to a package."""