Migrated links, lyrics and properties

folkugat_web/fragments/temes.py

@@ -1,10 +1,12 @@
-from fastapi import HTTPException, Request
+from fastapi import Request
 from folkugat_web.model import temes as model
 from folkugat_web.model.pagines import Pages
 from folkugat_web.services import sessions as sessions_service
+from folkugat_web.services.temes import links as links_service
 from folkugat_web.services.temes import query as temes_q
 from folkugat_web.services.temes import search as temes_s
 from folkugat_web.templates import templates
+from folkugat_web.utils import FnChain
 
 
 def temes_pagina(request: Request, logged_in: bool, query: str):
@@ -35,7 +37,12 @@ def temes_busca(request: Request, logged_in: bool, query: str, offset: int = 0,
     if offset > 0:
         prev_offset = max(offset - limit, 0)
 
-    temes = temes_q.temes_compute_stats(temes)
+    temes = (
+        FnChain.transform(temes) |
+        temes_q.temes_compute_stats |
+        links_service.add_links_to_temes |
+        list
+    ).result()
 
     return templates.TemplateResponse(
         "fragments/temes/results.html",
@@ -52,11 +59,7 @@ def temes_busca(request: Request, logged_in: bool, query: str, offset: int = 0,
     )
 
 
-def tema(request: Request, tema_id: int, logged_in: bool):
-    tema = temes_q.get_tema_by_id(tema_id)
-    if not tema:
-        raise HTTPException(status_code=404, detail="Could not find tune")
-    tema = temes_q.tema_compute_stats(tema)
+def tema(request: Request, logged_in: bool, tema: model.Tema):
     return templates.TemplateResponse(
         "fragments/tema/pagina.html",
         {