Merge pull request #16 from CIAT-DAPA/develop

feat: add template information retrieval to bulletin responses

Author: Mino-02

src/api/bulletins_management.py

@@ -3,6 +3,7 @@
 from bson import ObjectId
 from services.bulletins_master_service import BulletinsMasterService
 from services.bulletins_version_service import BulletinsVersionService
+from services.templates_master_service import TemplatesMasterService
 from services.cards_service import CardsService
 from acb_orm.schemas.bulletins_master_schema import BulletinsMasterCreate, BulletinsMasterUpdate, BulletinsMasterRead
 from acb_orm.schemas.bulletins_version_schema import BulletinsVersionRead, BulletinsVersionCreate, BulletinsVersionUpdate
@@ -16,6 +17,7 @@
 router = APIRouter(prefix="/bulletins", tags=["Bulletin Management"])
 bulletins_master_service = BulletinsMasterService()
 bulletins_version_service = BulletinsVersionService()
+templates_master_service = TemplatesMasterService()
 cards_service = CardsService()
 security = HTTPBearer()
 
@@ -59,6 +61,22 @@ def extract_card_ids_from_data(data: dict) -> Set[str]:
     return card_ids
 
 
+def get_template_info_from_bulletin_master(bulletin_master) -> tuple[str | None, str | None]:
+    """Resolve the template display name and machine name used by a bulletin master, if available."""
+    template_master_id = getattr(bulletin_master, "base_template_master_id", None)
+    if not template_master_id:
+        return None, None
+
+    try:
+        template_master = templates_master_service.get_by_id(str(template_master_id))
+        return (
+            getattr(template_master, "template_name", None),
+            getattr(template_master, "name_machine", None),
+        )
+    except Exception:
+        return None, None
+
+
 # --- CRUD and queries for bulletin masters ---
 
 @router.post("/", response_model=BulletinsMasterRead)
@@ -309,11 +327,15 @@ def get_current_version_published(
         except Exception as e:
             # If cards fetch fails, continue without cards (graceful degradation)
             pass
+
+    template_name, template_machine_name = get_template_info_from_bulletin_master(bulletin_master)
 
     return BulletinWithCurrentVersionPublic(
         master=bulletin_master,
         current_version=current_version,
-        cards_metadata=cards_metadata
+        cards_metadata=cards_metadata,
+        template_name=template_name,
+        template_machine_name=template_machine_name
     )
 
 @router.get("/by-slug/{bulletinSlug}", response_model=BulletinWithCurrentVersionPublic)
@@ -370,11 +392,15 @@ def get_current_version_published_by_slug(
         except Exception as e:
             # If cards fetch fails, continue without cards (graceful degradation)
             pass
+
+    template_name, template_machine_name = get_template_info_from_bulletin_master(bulletin_master)
 
     return BulletinWithCurrentVersionPublic(
         master=bulletin_master,
+        template_name=template_name,
+        template_machine_name=template_machine_name,
         current_version=current_version,
-        cards_metadata=cards_metadata
+        cards_metadata=cards_metadata,
     )
 
 # --- CRUD and queries for bulletin versions ---

src/schemas/response_models.py

@@ -1,4 +1,4 @@
-from typing import Dict
+from typing import Dict, Optional
 from pydantic import BaseModel
 from acb_orm.schemas.templates_master_schema import TemplatesMasterRead
 from acb_orm.schemas.templates_version_schema import TemplatesVersionRead
@@ -20,4 +20,6 @@ class BulletinWithCurrentVersionPublic(BaseModel):
     """Public response model with embedded cards metadata."""
     master: BulletinsMasterRead
     current_version: BulletinsVersionRead
-    cards_metadata: Dict[str, CardsRead]
+    cards_metadata: Dict[str, CardsRead]
+    template_name: Optional[str] = None
+    template_machine_name: Optional[str] = None