Afegir cartells a les jams (i esquelet per a slow jams i notes)

folkugat_web/dal/sql/playlists/query.py

@@ -59,13 +59,15 @@ def get_playlist_entries(
         return map(conversion.row_to_playlist_entry, cur.fetchall())
 
 
-GetTuneSessionsRow = tuple[int, int, str, str, str, str | None, str | None, bool]
+GetTuneSessionsRow = tuple[int, int, str, str, str, str | None, str | None, str | None, str | None, bool]
 
 
 def get_tune_sessions(tema_ids: list[int], con: Connection | None = None) -> dict[int, list[Session]]:
     placeholders = ", ".join(["?" for _ in tema_ids])
     query = f"""
-      SELECT p.tema_id, s.id, s.date, s.start_time, s.end_time, s.venue_name, s.venue_url, s.is_live
+      SELECT
+        p.tema_id, s.id, s.date, s.start_time, s.end_time, s.venue_name,
+        s.venue_url, s.notes, s.cartell_url, s.is_live
       FROM playlists p JOIN sessions s ON p.session_id = s.id
       WHERE p.tema_id IN ({placeholders})
     """

folkugat_web/dal/sql/sessions/conversion.py

@@ -3,7 +3,17 @@ from typing import TypedDict
 
 from folkugat_web.model import sessions as model
 
-SessionRowTuple = tuple[int, str, str, str, str | None, str | None, bool]
+SessionRowTuple = tuple[
+    int,  # id
+    str,  # date
+    str,  # start_time
+    str,  # end_time
+    str | None,  # venue_name
+    str | None,  # venue_url
+    str | None,  # notes
+    str | None,  # cartell_url
+    bool,  # is_live
+]
 
 
 class SessionRowDict(TypedDict):
@@ -13,6 +23,8 @@ class SessionRowDict(TypedDict):
     end_time: str
     venue_name: str | None
     venue_url: str | None
+    notes: str | None
+    cartell_url: str | None
     is_live: bool
 
 
@@ -24,6 +36,8 @@ def session_to_row(sessio: model.Session) -> SessionRowDict:
         'end_time': sessio.end_time.isoformat(),
         'venue_name': sessio.venue.name,
         'venue_url': sessio.venue.url,
+        'notes': sessio.notes,
+        'cartell_url': sessio.cartell_url,
         'is_live': sessio.is_live,
     }
 
@@ -38,5 +52,7 @@ def row_to_session(row: SessionRowTuple) -> model.Session:
             name=row[4],
             url=row[5],
         ),
-        is_live=row[6],
+        notes=row[6],
+        cartell_url=row[7],
+        is_live=row[8],
     )

folkugat_web/dal/sql/sessions/ddl.py

@@ -15,6 +15,8 @@ def create_sessions_table(con: Connection):
         end_time TEXT NOT NULL,
         venue_name TEXT,
         venue_url TEXT,
+        notes TEXT,
+        cartell_url TEXT,
         is_live BOOLEAN DEFAULT false
     )
     """

folkugat_web/dal/sql/sessions/query.py

@@ -82,7 +82,7 @@ def get_sessions(session_id: int | None = None,
 
     clauses_str = " ".join(clauses)
     query = f"""
-      SELECT id, date, start_time, end_time, venue_name, venue_url, is_live
+      SELECT id, date, start_time, end_time, venue_name, venue_url, notes, cartell_url, is_live
       FROM sessions
       {clauses_str}
     """

folkugat_web/dal/sql/sessions/write.py

@@ -7,9 +7,9 @@ from . import conversion
 def insert_session(session: model.Session, con: Connection | None = None):
     query = """
       INSERT INTO sessions
-        (id, date, start_time, end_time, venue_name, venue_url, is_live)
+        (id, date, start_time, end_time, venue_name, venue_url, notes, cartell_url, is_live)
       VALUES
-        (:id, :date, :start_time, :end_time, :venue_name, :venue_url, :is_live)
+        (:id, :date, :start_time, :end_time, :venue_name, :venue_url, :notes, :cartell_url, :is_live)
       RETURNING *
     """
     data = conversion.session_to_row(session)
@@ -24,7 +24,8 @@ def update_session(session: model.Session, con: Connection | None = None):
     query = """
       UPDATE sessions SET
         date = :date, start_time = :start_time, end_time = :end_time,
-        venue_name = :venue_name, venue_url = :venue_url, is_live = :is_live
+        venue_name = :venue_name, venue_url = :venue_url,
+        notes = :notes, cartell_url = :cartell_url, is_live = :is_live
       WHERE id = :id
     """
     data = conversion.session_to_row(session)