fix: fix order of operations when updating hyperboard (#173)

Author: Jipperism

src/controllers/HyperboardController.ts

@@ -113,8 +113,10 @@ export class HyperboardController extends Controller {
           }),
         ),
         backgroundImg: z
-          .string()
-          .url("Background image URL is not valid")
+          .union([
+            z.string().url("Background image URL is not valid"),
+            z.literal(""),
+          ])
           .optional(),
         borderColor: z
           .string()
@@ -437,8 +439,10 @@ export class HyperboardController extends Controller {
           }),
         ),
         backgroundImg: z
-          .string()
-          .url("Background image URL is not valid")
+          .union([
+            z.string().url("Background image URL is not valid"),
+            z.literal(""),
+          ])
           .optional(),
         borderColor: z
           .string()
@@ -587,16 +591,8 @@ export class HyperboardController extends Controller {
             collection.id,
           );
         }
-        // Update metadata anyway because they are not collection specific
-        await dataService.upsertHyperboardHypercertMetadata(
-          collection.hypercerts.map((hc) => ({
-            hypercert_id: hc.hypercertId,
-            hyperboard_id: hyperboardId,
-            collection_id: currentCollection.id,
-            display_size: hc.factor,
-          })),
-        );
 
+        // Update metadata anyway because they are not collection specific
         const currentUserIsAdminForCollection =
           currentCollection.collection_admins
             .flatMap((x) => x.admins)
@@ -622,6 +618,15 @@ export class HyperboardController extends Controller {
               collection_id: currentCollection.id,
             })),
           );
+
+          await dataService.upsertHyperboardHypercertMetadata(
+            collection.hypercerts.map((hc) => ({
+              hypercert_id: hc.hypercertId,
+              hyperboard_id: hyperboardId,
+              collection_id: currentCollection.id,
+              display_size: hc.factor,
+            })),
+          );
         }
       } catch (e) {
         console.error(e);

src/services/SupabaseDataService.ts

@@ -304,8 +304,9 @@ export class SupabaseDataService {
         oc
           .columns(["hyperboard_id", "hypercert_id", "collection_id"])
           .doUpdateSet((eb) => ({
-            hyperboard_id: eb.ref("excluded.hyperboard_id"),
             hypercert_id: eb.ref("excluded.hypercert_id"),
+            collection_id: eb.ref("excluded.collection_id"),
+            hyperboard_id: eb.ref("excluded.hyperboard_id"),
             display_size: eb.ref("excluded.display_size"),
           })),
       )