more stuff

Author: sophp516

prisma/schema.prisma

@@ -45,6 +45,8 @@ enum Role {
   VIDEO
   INSTRUCTOR
   PM
+  THREE_D_MODELING
+  ANIMATION
 }
 
 enum Level {
@@ -110,6 +112,7 @@ model Member {
   major           String?  @db.VarChar(255)
   minor           String?  @db.VarChar(255)
   linkedinUrl     String?  @map("linkedin_url") @db.Text
+  githubId        String?  @map("github_id") @db.VarChar(255)
   notionPageId    String?  @unique @map("notion_page_id") @db.VarChar(255)
   currentRole     String?  @map("current_role") @db.VarChar(255)
   roles           String[] @default([])
@@ -212,6 +215,8 @@ model Project {
   gcalendarUrl    String?       @map("gcalendar_url") @db.Text
 
   repos           Repo[]
+  slackChannelId  String?       @map("slack_channel_id") @db.VarChar(255)
+  githubTeamSlug  String?       @map("github_team_slug") @db.VarChar(255)
   notionPageId    String?       @unique @map("notion_page_id") @db.VarChar(255)
   memberTermRoles MemberTermRole[]
   bidsPref1       Bid[]         @relation("BidPref1")

prisma/sync-from-notion.ts

@@ -431,6 +431,7 @@ async function syncMembers(
     const classYear = props.year?.multi_select?.[0]?.name ?? null;
     const { major, minor } = extractMajorMinor(props);
     const linkedinUrl = props.linkedin?.url || props.linkedin?.rich_text?.[0]?.plain_text || null;
+    const githubId = props.github?.url?.replace(/^https?:\/\/(www\.)?github\.com\//, "").replace(/\/$/, "") || props.github?.rich_text?.[0]?.plain_text || null;
 
     const memberTermNames = extractMemberTermNames(props);
     const termIds = memberTermNames.map(t => termIdByName.get(t)).filter((id): id is string => !!id);
@@ -469,8 +470,8 @@ async function syncMembers(
     try {
       const member = await prisma.member.upsert({
         where: { notionPageId },
-        update: { fullName, imageUrl, daliEmail, classYear, major, minor, linkedinUrl, isAlum, isActive: !isAlum, currentRole, roles, coreRoleNames, termsInDali: { set: termIds.map(id => ({ id })) } },
-        create: { fullName, imageUrl, daliEmail, joinedTermId, notionPageId, classYear, major, minor, linkedinUrl, isAlum, isActive: !isAlum, currentRole, roles, coreRoleNames, termsInDali: { connect: termIds.map(id => ({ id })) } },
+        update: { fullName, imageUrl, daliEmail, classYear, major, minor, linkedinUrl, githubId, isAlum, isActive: !isAlum, currentRole, roles, coreRoleNames, termsInDali: { set: termIds.map(id => ({ id })) } },
+        create: { fullName, imageUrl, daliEmail, joinedTermId, notionPageId, classYear, major, minor, linkedinUrl, githubId, isAlum, isActive: !isAlum, currentRole, roles, coreRoleNames, termsInDali: { connect: termIds.map(id => ({ id })) } },
       });
 
       // Sync HiredRoles

src/routes/applications.ts

@@ -3,12 +3,31 @@ import { prisma } from "../../lib/prisma.js";
 
 const router = Router();
 
-// GET /applications?userId=
+// GET /applications?userId=&term=&status=
 router.get("/", async (req, res) => {
   try {
-    const { userId } = req.query;
+    const { userId, term, status } = req.query;
+
+    // Admin listing: filter by term (and optionally status), no userId required
     if (!userId || typeof userId !== "string") {
-      return res.status(400).json({ error: "userId query param required" });
+      const where: any = {};
+      if (term && typeof term === "string") {
+        where.term = { name: term };
+      }
+      if (status && typeof status === "string") {
+        where.status = status;
+      }
+
+      const applications = await prisma.application.findMany({
+        where,
+        include: {
+          term: true,
+          user: { select: { id: true, firstName: true, lastName: true, dartmouthEmail: true } },
+        },
+        orderBy: { submittedAt: "desc" },
+      });
+
+      return res.json(applications);
     }
 
     const applications = await prisma.application.findMany({

src/routes/auth.ts

@@ -112,6 +112,19 @@ router.post("/google/member", async (req: Request, res: Response) => {
       include: { member: true },
     });
 
+    // Auto-link Member record if not yet linked
+    if (!user.member) {
+      await prisma.member.updateMany({
+        where: { daliEmail: email, userId: null },
+        data: { userId: user.id },
+      });
+    }
+
+    const member = user.member ?? await prisma.member.findUnique({ where: { daliEmail: email }, include: { user: true } });
+
+    // dartmouthLinked = the member's linked User has a @dartmouth.edu email (not @dali)
+    const dartmouthLinked = !!(member as any)?.user?.dartmouthEmail?.endsWith("@dartmouth.edu");
+
     const accessToken = await issueTokens(res, user.id, "USER");
 
     return res.json({
@@ -122,7 +135,8 @@ router.post("/google/member", async (req: Request, res: Response) => {
         firstName: user.firstName,
         lastName: user.lastName,
         picture: user.picture,
-        isMember: !!user.member,
+        isMember: !!member,
+        dartmouthLinked,
       },
     });
   } catch (err: any) {
@@ -277,8 +291,9 @@ router.post("/refresh", async (req: Request, res: Response) => {
 });
 
 // ── POST /auth/link-member ─────────────────────────────────────────────────
-// Links the authenticated User to their Member record by matching
-// user.dartmouthEmail === member.daliEmail. Bearer JWT required.
+// Called by a logged-in DALI member (@dali.dartmouth.edu). They provide their
+// @dartmouth.edu email; we find that User and set Member.userId = dartmouth_user.id
+// so that logging in with the Dartmouth account also shows isMember=true.
 
 router.post("/link-member", async (req: Request, res: Response) => {
   try {
@@ -298,24 +313,35 @@ router.post("/link-member", async (req: Request, res: Response) => {
       return res.status(403).json({ error: "Only USER accounts can link a DALI profile" });
     }
 
-    const user = await prisma.user.findUnique({
+    // Caller must be a DALI member user (has a Member record)
+    const callerUser = await prisma.user.findUnique({
       where: { id: payload.id },
       include: { member: true },
     });
 
-    if (!user) return res.status(404).json({ error: "User not found" });
-    if (user.member) return res.status(409).json({ error: "Account is already linked to a DALI profile" });
+    if (!callerUser) return res.status(404).json({ error: "User not found" });
 
-    const member = await prisma.member.findUnique({
-      where: { daliEmail: user.dartmouthEmail },
+    const member = callerUser.member;
+    if (!member) return res.status(404).json({ error: "No DALI profile found for your account" });
+
+    // The Dartmouth email they want to link to
+    const { dartmouthEmail } = req.body;
+    if (!dartmouthEmail || !dartmouthEmail.endsWith("@dartmouth.edu")) {
+      return res.status(400).json({ error: "A valid @dartmouth.edu email is required" });
+    }
+
+    const dartmouthUser = await prisma.user.findUnique({
+      where: { dartmouthEmail },
+      include: { member: true },
     });
 
-    if (!member) return res.status(404).json({ error: "No DALI profile found for your email address" });
-    if (member.userId !== null) return res.status(409).json({ error: "This DALI profile is already linked to another account" });
+    if (!dartmouthUser) return res.status(404).json({ error: "No account found for that Dartmouth email. Make sure you have signed in with it at least once." });
+    if (dartmouthUser.member) return res.status(409).json({ error: "That Dartmouth account is already linked to a DALI profile" });
 
+    // Point Member.userId to the Dartmouth User so their login shows isMember=true
     await prisma.member.update({
       where: { id: member.id },
-      data: { userId: user.id },
+      data: { userId: dartmouthUser.id },
     });
 
     return res.json({ ok: true, memberId: member.id });