Add site to forum_category, now that groups are indirect.

migrations/20240112_create-initial-tables.sql

@@ -87,6 +87,7 @@ CREATE TABLE forum_category (
 
 CREATE TABLE forum_category_progress (
     forum_category_id INTEGER PRIMARY KEY REFERENCES forum_category(forum_category_id),
+    site_slug TEXT NOT NULL REFERENCES site(site_slug),
     thread_count INTEGER NOT NULL DEFAULT 0 CHECK (thread_count >= 0),
     post_count INTEGER NOT NULL DEFAULT 0 CHECK (post_count >= 0),
     last_thread_id INTEGER,

queries/forum.sql

@@ -7,10 +7,11 @@ DELETE FROM forum_group
     WHERE site_slug = :site_slug;
 
 -- :name add_forum_category :insert
-INSERT INTO forum_category (forum_category_id, name, description)
-    VALUES (:category_id, :name, :description)
+INSERT INTO forum_category (forum_category_id, site_slug, name, description)
+    VALUES (:category_id, :site_slug, :name, :description)
     ON CONFLICT (forum_category_id)
     DO UPDATE
     SET
+        site_slug = :site_slug,
         name = :name,
         description = :description;

yellowstone/job/index_forum_categories.py

@@ -36,7 +36,7 @@ def run(core: "BackupDispatcher", data: ForumCategoriesJob) -> None:
 
     groups = forum_categories.get(site_slug, wikidot=core.wikidot)
     for group in groups:
-        group_internal_id = core.database.add_forum_group(
+        core.database.add_forum_group(
             site_slug=site_slug,
             name=group.name,
             description=group.description,
@@ -48,8 +48,8 @@ def run(core: "BackupDispatcher", data: ForumCategoriesJob) -> None:
 
             # Upsert forum categories, associating internal forum group IDs
             core.database.add_forum_category(
-                group_id=group_internal_id,
                 category_id=category.id,
+                site_slug=site_slug,
                 name=category.name,
                 description=category.description,
             )