More events team nonsense

2026-04-11 03:30:46 -04:00
parent 465bb30966
commit cfc57c838e
17 changed files with 355 additions and 259 deletions
--- a/app/routes/events-calendar.tsx
+++ b/app/routes/events-calendar.tsx
@@ -31,6 +31,7 @@ import {
 import { useLoaderData } from "@remix-run/react";
 import { useState } from "react";
 import utc from "dayjs/plugin/utc.js";
+import { EtMember } from "../../generated/prisma/client.js";

 export const links: LinksFunction = () => {
  return [
@@ -56,18 +57,31 @@ export async function loader({ context }: { context: RequestContext }) {
    });

  const now = new Date();
-  const eventsData = await context.env.D1.prepare(
-    "SELECT answer, approved, created_by, day, details, id, month, pending, performed_at, reached_minimum_player_count, type, year FROM events WHERE month = ? AND year = ? ORDER BY day;",
-  )
-    .bind(now.getUTCMonth() + 1, now.getUTCFullYear())
-    .all();
+  const eventsData = await context.data.prisma.event.findMany({
+    orderBy: {
+      day: "asc",
+    },
+    select: {
+      answer: true,
+      approved: true,
+      created_by: true,
+      day: true,
+      details: true,
+      id: true,
+      month: true,
+      pending: true,
+      performed_at: true,
+      reached_minimum_player_count: true,
+      type: true,
+      year: true,
+    },
+    where: {
+      month: now.getUTCMonth() + 1,
+      year: now.getUTCFullYear(),
+    },
+  });

-  if (eventsData.error)
-    throw new Response(null, {
-      status: 500,
-    });
-
-  const calendarData = eventsData.results.map((e) => {
+  const calendarData = eventsData.map((e) => {
    return {
      id: e.id,
      title: (e.type as string).toUpperCase(),
@@ -78,19 +92,17 @@ export async function loader({ context }: { context: RequestContext }) {
    };
  });

-  const memberData = await context.env.D1.prepare(
-    "SELECT id, name FROM et_members WHERE id IN (SELECT created_by FROM events WHERE month = ? AND year = ?);",
-  )
-    .bind(now.getUTCMonth() + 1, now.getUTCFullYear())
-    .all();
+  const memberData = await context.data.prisma.$queryRaw<
+    EtMember[]
+  >`SELECT id, name FROM et_members WHERE id IN (SELECT created_by FROM events WHERE month = ${now.getUTCMonth() + 1} AND year = ${now.getUTCFullYear()});`;

  return {
    calendarData,
    canManage: Boolean(
      [1 << 4, 1 << 12].find((p) => context.data.current_user.permissions & p),
    ),
-    eventList: eventsData.results,
-    memberData: memberData.results,
+    eventList: eventsData,
+    memberData,
  };
 }

@@ -111,15 +123,7 @@ export default function () {
          <ModalBody>
            <Heading size="md">Host</Heading>
            <Text>
-              {
-                (
-                  data.memberData.find(
-                    (m) => m.id === eventData.created_by,
-                  ) as {
-                    [k: string]: any;
-                  }
-                )?.name
-              }
+              {data.memberData.find((m) => m.id === eventData.created_by)?.name}
            </Text>
            <br />
            <Heading size="md">Event Type</Heading>
--- a/app/routes/events-team_.events-breakdown.tsx
+++ b/app/routes/events-team_.events-breakdown.tsx
@@ -25,14 +25,13 @@ export async function loader({ context }: { context: RequestContext }) {
      status: 403,
    });

-  const memberResults = await context.env.D1.prepare(
-    "SELECT id, name FROM et_members;",
-  ).all();
-
-  if (!memberResults.success)
-    throw new Response(null, {
-      status: 500,
-    });
+  const { prisma } = context.data;
+  const memberResults = await prisma.etMember.findMany({
+    select: {
+      id: true,
+      name: true,
+    },
+  });

  const data: {
    [k: string]: {
@@ -45,7 +44,7 @@ export async function loader({ context }: { context: RequestContext }) {
    };
  } = {};

-  for (const row of memberResults.results as Record<string, string>[]) {
+  for (const row of memberResults) {
    data[row.id].fotd = 0;
    data[row.id].gamenight = 0;
    data[row.id].name = row.name;
@@ -53,22 +52,26 @@ export async function loader({ context }: { context: RequestContext }) {
    data[row.id].qotd = 0;
  }

-  const eventsResult = await context.env.D1.prepare(
-    "SELECT answered_at, created_by, day, month, performed_at, reached_minimum_player_count, type, year FROM events;",
-  ).all();
+  const eventsResult = await prisma.event.findMany({
+    select: {
+      answered_at: true,
+      created_by: true,
+      day: true,
+      month: true,
+      performed_at: true,
+      reached_minimum_player_count: true,
+      type: true,
+      year: true,
+    },
+  });

-  if (!eventsResult.success)
-    throw new Response(null, {
-      status: 500,
-    });
-
-  for (const row of eventsResult.results) {
-    const creator = row.created_by as string;
-    const type = row.type as string;
+  for (const row of eventsResult) {
+    const creator = row.created_by;
+    const type = row.type;

    if (!data[creator]) continue;

-    if (row.performed_at) data[creator][type as string] += 10;
+    if (row.performed_at) data[creator][type] += 10;
    else {
      const now = new Date();
      const currentYear = now.getUTCFullYear();
@@ -76,33 +79,17 @@ export async function loader({ context }: { context: RequestContext }) {
      const currentDay = now.getUTCDate();

      if (
-        (row.year as number) < currentYear ||
-        (currentYear === row.year && currentMonth > (row.month as number)) ||
+        row.year < currentYear ||
+        (currentYear === row.year && currentMonth > row.month) ||
        (currentMonth === row.month &&
          currentYear === row.year &&
-          (row.day as number) < currentDay)
+          row.day < currentDay)
      )
        data[creator][type] -= 5;
    }

-    switch (row.type) {
-      case "gamenight":
-        if (row.reached_minimum_player_count) data[creator].gamenight += 10;
-
-        break;
-
-      case "rotw":
-        if (
-          (row.answered_at as number) - (row.performed_at as number) >=
-          86400000
-        )
-          data[creator].rotw += 10;
-
-        break;
-
-      default:
-        break;
-    }
+    if (row.type === "gamenight" && row.reached_minimum_player_count)
+      data[creator].gamenight += 10;
  }

  return data;
--- a/app/routes/events-team_.historical.tsx
+++ b/app/routes/events-team_.historical.tsx
@@ -44,9 +44,12 @@ export async function loader({ context }: { context: RequestContext }) {
      status: 403,
    });

-  return (
-    await context.env.D1.prepare("SELECT id, name FROM et_members;").all()
-  ).results;
+  return await context.data.prisma.etMember.findMany({
+    select: {
+      id: true,
+      name: true,
+    },
+  });
 }

 export default function () {
--- a/app/routes/events-team_.outstanding.tsx
+++ b/app/routes/events-team_.outstanding.tsx
@@ -37,14 +37,40 @@ export async function loader({ context }: { context: RequestContext }) {
    year--;
  }

-  const data = await context.env.D1.prepare(
-    "SELECT day, details, id FROM events WHERE approved = 1 AND month = ? AND year = ? AND (performed_at IS NULL OR (reached_minimum_player_count = 0 AND type = 'gamenight')) ORDER BY day;",
-  )
-    .bind(month, year)
-    .all();
+  const data = await context.data.prisma.event.findMany({
+    orderBy: {
+      day: "asc",
+    },
+    select: {
+      answered_at: true,
+      day: true,
+      details: true,
+      id: true,
+      performed_at: true,
+      reached_minimum_player_count: true,
+      type: true,
+    },
+    where: {
+      AND: {
+        approved: true,
+        month,
+        year,
+        OR: [
+          {
+            AND: [
+              {
+                reached_minimum_player_count: false,
+                type: "gamenight",
+              },
+            ],
+          },
+        ],
+      },
+    },
+  });

  return {
-    events: data.results as Record<string, string | number>[],
+    events: data,
    past_cutoff: now.getUTCDate() > 7,
  };
 }
@@ -52,7 +78,7 @@ export async function loader({ context }: { context: RequestContext }) {
 export default function () {
  const { events, past_cutoff } = useLoaderData<typeof loader>();
  const { isOpen, onClose, onOpen } = useDisclosure();
-  const [eventData, setEventData] = useState({} as { [k: string]: any });
+  const [eventData, setEventData] = useState({} as (typeof events)[number]);
  const [isBrowserSupported, setIsBrowserSupported] = useState(true);
  const toast = useToast();

@@ -74,10 +100,10 @@ export default function () {
    });
  }

-  function getStatus(event: { [k: string]: string | number }) {
+  function getStatus(event: (typeof events)[number]) {
    if (!event.performed_at) return "Approved";
    if (event.type === "rotw" && event.answered_at) return "Solved";
-    if (event.type === "gamenight" && event.areached_minimum_player_count)
+    if (event.type === "gamenight" && event.reached_minimum_player_count)
      return "Certified";

    return "Completed";
@@ -106,7 +132,7 @@ export default function () {
    });

    const newData = structuredClone(eventData);
-    newData.reached_minimum_player_count = 1;
+    newData.reached_minimum_player_count = true;

    setEventData(newData);
  }
@@ -134,9 +160,12 @@ export default function () {
    });

    const newData = structuredClone(eventData);
-    newData.performed_at = Date.now();

-    setEventData(newData);
+    setEventData(
+      Object.defineProperty(newData, "performed_at", {
+        value: new Date().toISOString(),
+      }),
+    );
  }

  async function forgotten() {
@@ -162,9 +191,12 @@ export default function () {
    });

    const newData = structuredClone(eventData);
-    newData.performed_at = 0;

-    setEventData(newData);
+    setEventData(
+      Object.defineProperty(newData, "performed_at", {
+        value: new Date().toISOString(),
+      }),
+    );
  }

  async function solve() {
@@ -190,9 +222,12 @@ export default function () {
    });

    const newData = structuredClone(eventData);
-    newData.answered_at = Date.now();

-    setEventData(newData);
+    setEventData(
+      Object.defineProperty(newData, "performed_at", {
+        value: new Date().toISOString(),
+      }),
+    );
  }

  return (
@@ -216,13 +251,13 @@ export default function () {
              <Box gap="8px">
                <Heading size="xs">Completion</Heading>
                <Button
-                  disabled={typeof eventData.completed_at === "number"}
+                  disabled={Boolean(eventData.performed_at)}
                  onClick={async () => await completed()}
                >
                  Mark as Complete
                </Button>
                <Button
-                  disabled={typeof eventData.completed_at === "number"}
+                  disabled={typeof eventData.performed_at === "number"}
                  onClick={async () => await forgotten()}
                >
                  Mark as Forgotten
@@ -243,7 +278,7 @@ export default function () {
                <Box gap="8px">
                  <Heading size="xs">Certified Status</Heading>
                  <Button
-                    disabled={Boolean(eventData.reached_minimum_player_count)}
+                    disabled={eventData.reached_minimum_player_count}
                    onClick={async () => await certify()}
                  >
                    {eventData.reached_minimum_player_count
@@ -277,8 +312,8 @@ export default function () {
              <Tr>
                <Td>{event.day}</Td>
                <Td>
-                  {(event.details as string).length > 100
-                    ? `${(event.details as string).substring(0, 97)}...`
+                  {event.details.length > 100
+                    ? `${event.details.substring(0, 97)}...`
                    : event.details}
                </Td>
                <Td>{getStatus(event)}</Td>