Changeset 7881080 in Klonkt for src/middleware

Timestamp:

06/18/2026 03:28:34 AM (3 months ago)

Author:

roboburr <roboburr@…>

Branches:

main

Children:

8398935

Parents:

98ecf51

Message:

Hub #3: explicit is_primary flag + shared getPrimarySite() (DRY)

The "oldest site = primary site" assumption was duplicated independently in
resolveSite, hub.js, account.js and admin.js (fragile: if the oldest happened
to be an artist site, the hub home would be wrong). Now:

• sites.is_primary column + backfill (marks the oldest if none is primary yet; ensurePrimarySite sets it on fresh installs) → existing behaviour exactly preserved.
• one getPrimarySite() helper (is_primary, fallback oldest) replaces the 4 copies.
• god can CHOOSE the primary/main site: ★ button + "primary" badge on /admin/sites (exactly one primary via a transaction).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@…>

File:

• src/middleware/site.js (modified) (2 diffs)

src/middleware/site.js

@@ -12 +12 @@
 import db from '../config/database.js';
 import { getTenancy } from '../services/SettingsService.js';
+
+/**
+ * De primaire/hoofd-site — ÉÉN bron van waarheid (vervangt de "oudste site ="
+ * hoofd"-aanname die voorheen los in resolveSite/hub/account/admin stond).
+ * Leest de expliciete is_primary-vlag; valt terug op de oudste als die (nog)
+ * nergens staat, zodat bestaand gedrag exact behouden blijft.
+ */
+export function getPrimarySite() {
+  return db.prepare('SELECT * FROM sites WHERE is_primary = 1 LIMIT 1').get()
+      || db.prepare('SELECT * FROM sites ORDER BY created_at ASC LIMIT 1').get()
+      || null;
+}
 
 export function resolveSite(req, res, next) {
@@ -43 +55 @@
   }
 
-  // Solo (of hub zonder match): de primaire/owner-site (eerste aangemaakte).
-  const defaultSite = db.prepare('SELECT * FROM sites ORDER BY created_at ASC LIMIT 1').get();
+  // Solo (of hub zonder match): pin op de primaire/hoofd-site.
+  const defaultSite = getPrimarySite();
   if (defaultSite) {
     res.locals.site = defaultSite;