Merge pull request #252 from UTDNebula/JUP-71

JUP-71 Backend Changes
UTDNebula · Nov 5, 2024 · 5e63afc · 5e63afc
2 parents 6088f55 + 0973f43
commit 5e63afc
Show file tree

Hide file tree

Showing 11 changed files with 1,722 additions and 19 deletions.
diff --git a/src/app/manage/[clubId]/edit/officers/page.tsx b/src/app/manage/[clubId]/edit/officers/page.tsx
@@ -21,7 +21,7 @@ export default async function Page({
     name: officer.userMetadata.firstName + ' ' + officer.userMetadata.lastName,
     locked: officer.memberType == 'President' || role == 'Officer',
     position: officer.memberType as 'President' | 'Officer',
-    title: officer.title as string,
+    title: '', // TODO: link from officers table
   }));
 
   return (

diff --git a/src/components/club/listing/ClubInfoSegment.tsx b/src/components/club/listing/ClubInfoSegment.tsx
@@ -73,7 +73,7 @@ const ClubInfoSegment: FC<{
                           officer.userMetadata.lastName}
                       </p>
                       <p className="mt-2 text-sm text-slate-400">
-                        {officer.title ?? 'Officer'}
+                        Officer {/* TODO: link to officers table */}
                       </p>
                     </div>
                   </div>

diff --git a/src/server/api/routers/clubEdit.ts b/src/server/api/routers/clubEdit.ts
@@ -1,6 +1,6 @@
 import { db } from '@src/server/db';
 import { createTRPCRouter, protectedProcedure } from '../trpc';
-import { and, eq, inArray, sql } from 'drizzle-orm';
+import { and, eq, inArray } from 'drizzle-orm';
 import { editClubSchema } from '@src/utils/formSchemas';
 import { TRPCError } from '@trpc/server';
 import { z } from 'zod';
@@ -136,20 +136,21 @@ export const clubEditRouter = createTRPCRouter({
             ),
           );
       }
-      const promises: Promise<unknown>[] = [];
-      for (const modded of input.modified) {
-        const prom = ctx.db
-          .update(userMetadataToClubs)
-          .set({ title: modded.title })
-          .where(
-            and(
-              eq(userMetadataToClubs.userId, modded.userId),
-              eq(userMetadataToClubs.clubId, input.clubId),
-            ),
-          );
-        promises.push(prom);
-      }
-      await Promise.allSettled(promises);
+      // TODO: link to officers table
+      // const promises: Promise<unknown>[] = [];
+      // for (const modded of input.modified) {
+      //   const prom = ctx.db
+      //     .update(userMetadataToClubs)
+      //     .set({ title: modded.title })
+      //     .where(
+      //       and(
+      //         eq(userMetadataToClubs.userId, modded.userId),
+      //         eq(userMetadataToClubs.clubId, input.clubId),
+      //       ),
+      //     );
+      //   promises.push(prom);
+      // }
+      // await Promise.allSettled(promises);
       if (input.created.length === 0) return;
 
       await ctx.db
@@ -164,7 +165,7 @@ export const clubEditRouter = createTRPCRouter({
         )
         .onConflictDoUpdate({
           target: [userMetadataToClubs.userId, userMetadataToClubs.clubId],
-          set: { memberType: 'Officer' as const, title: sql`excluded.title` },
+          set: { memberType: 'Officer' as const },
           where: eq(userMetadataToClubs.memberType, 'Member'),
         });
     }),

diff --git a/src/server/db/migrations/0008_military_mole_man.sql b/src/server/db/migrations/0008_military_mole_man.sql
@@ -0,0 +1,16 @@
+CREATE TABLE IF NOT EXISTS "officers" (
+	"id" text NOT NULL,
+	"club_id" text NOT NULL,
+	"name" text NOT NULL,
+	"position" text NOT NULL,
+	"image" text DEFAULT '/nebula-logo.png' NOT NULL,
+	"is_president" boolean DEFAULT false NOT NULL,
+	CONSTRAINT officers_club_id_id PRIMARY KEY("club_id","id")
+);
+--> statement-breakpoint
+ALTER TABLE "user_metadata_to_clubs" DROP COLUMN IF EXISTS "title";--> statement-breakpoint
+DO $$ BEGIN
+ ALTER TABLE "officers" ADD CONSTRAINT "officers_club_id_club_id_fk" FOREIGN KEY ("club_id") REFERENCES "club"("id") ON DELETE no action ON UPDATE no action;
+EXCEPTION
+ WHEN duplicate_object THEN null;
+END $$;
diff --git a/src/server/db/migrations/0009_colossal_omega_flight.sql b/src/server/db/migrations/0009_colossal_omega_flight.sql
@@ -0,0 +1,4 @@
+ALTER TABLE "officers" DROP CONSTRAINT "officers_club_id_id";--> statement-breakpoint
+ALTER TABLE "officers" ADD PRIMARY KEY ("id");--> statement-breakpoint
+ALTER TABLE "officers" ALTER COLUMN "id" SET DATA TYPE uuid;--> statement-breakpoint
+ALTER TABLE "officers" ALTER COLUMN "id" SET DEFAULT gen_random_uuid();