wip: update membership system

Author: brage-andreas

apps/dashboard/src/app/(internal)/arrangementer/components/qr-code-scanned-modal.tsx

@@ -5,10 +5,10 @@ import {
   type User,
   findActiveMembership,
   getAttendeeQueuePosition,
-  getMembershipGrade,
   getUnreservedAttendeeCount,
+  getMembershipTypeName,
 } from "@dotkomonline/types"
-import { getCurrentUTC } from "@dotkomonline/utils"
+import { getCurrentUTC, getStudyGrade } from "@dotkomonline/utils"
 import { Button, Flex, Group, Image, Stack, Text, Title, useComputedColorScheme } from "@mantine/core"
 import { useMediaQuery } from "@mantine/hooks"
 import { type ContextModalProps, modals } from "@mantine/modals"
@@ -167,7 +167,8 @@ const UserBox = ({ user, isMobile }: UserBoxProps) => {
   const isLightMode = useComputedColorScheme() === "light"
 
   const membership = findActiveMembership(user)
-  const grade = membership ? getMembershipGrade(membership) : null
+  const grade = getStudyGrade(membership?.semester)
+  const membershipType = membership && getMembershipTypeName(membership.type)
 
   return (
     <Stack>
@@ -183,7 +184,8 @@ const UserBox = ({ user, isMobile }: UserBoxProps) => {
         <Image src={user.imageUrl} alt={user.name ?? user.profileSlug} radius="md" w={100} h={100} />
         <Stack gap={2}>
           <Title order={4}>{user.name}</Title>
-          <Text size="sm">Klasse: {grade}</Text>
+          <Text size="sm">{membership ? `Medlemskap: ${membershipType}` : "Ingen aktivt medlemskap"}</Text>
+          <Text size="sm">{membership ? (grade ? `Klasse: ${grade}` : "Ingen klassetrinn") : "-"}</Text>
           <Text size="sm">Kjønn: {user.gender || "Ikke oppgitt"}</Text>
           <Text size="sm">Kostholdsrestriksjoner: {user.dietaryRestrictions || "Ingen"}</Text>
         </Stack>

apps/dashboard/src/app/(internal)/brukere/[id]/edit-card.tsx

@@ -1,12 +1,6 @@
 import { env } from "@/lib/env"
 import { useSession } from "@dotkomonline/oauth2/react"
-import {
-  UserWriteSchema,
-  type WorkspaceUser,
-  findActiveMembership,
-  getMembershipGrade,
-  getMembershipTypeName,
-} from "@dotkomonline/types"
+import { UserWriteSchema, type WorkspaceUser, findActiveMembership, getMembershipTypeName } from "@dotkomonline/types"
 import { Button, Group, Loader, Stack, Text, TextInput, Title } from "@mantine/core"
 import { useDebouncedValue } from "@mantine/hooks"
 import { IconCheck, IconLink, IconUsersGroup, IconX, IconArrowUpRight } from "@tabler/icons-react"
@@ -15,6 +9,7 @@ import { useLinkOwUserToWorkspaceUserMutation, useUpdateUserMutation } from "../
 import { useFindWorkspaceUserQuery, useGroupAllByMemberQuery, useIsAdminQuery } from "../queries"
 import { useUserProfileEditForm } from "./edit-form"
 import { useUserDetailsContext } from "./provider"
+import { getStudyGrade } from "@dotkomonline/utils"
 
 export const UserEditCard: FC = () => {
   const session = useSession()
@@ -57,7 +52,7 @@ export const UserEditCard: FC = () => {
   })
 
   const activeMembership = findActiveMembership(user)
-  const grade = activeMembership ? getMembershipGrade(activeMembership) : null
+  const grade = getStudyGrade(activeMembership?.semester)
   const membershipType = activeMembership ? getMembershipTypeName(activeMembership.type) : null
 
   return (

apps/dashboard/src/app/(internal)/brukere/components/membership-form.tsx

@@ -9,12 +9,14 @@ import {
   getMembershipTypeName,
   getSpecializationName,
 } from "@dotkomonline/types"
-import { getCurrentUTC } from "@dotkomonline/utils"
-import { addYears, isBefore } from "date-fns"
+import { getNextSemesterStart, getCurrentSemesterStart } from "@dotkomonline/utils"
+import { isBefore } from "date-fns"
 import type { z } from "zod"
+import { createNumberInput } from "@/components/forms/NumberInput"
+import { Code, Stack, Text } from "@mantine/core"
 
 export const MembershipWriteFormSchema = MembershipWriteSchema.superRefine((data, ctx) => {
-  if (isBefore(data.end, data.start)) {
+  if (data.end && isBefore(data.end, data.start)) {
     ctx.addIssue({
       code: "custom",
       message: "Sluttdato må være etter startdato",
@@ -26,13 +28,14 @@ export const MembershipWriteFormSchema = MembershipWriteSchema.superRefine((data
 type MembershipWriteFormSchema = z.infer<typeof MembershipWriteFormSchema>
 
 const DEFAULT_VALUES: Partial<MembershipWriteFormSchema> = {
-  start: getCurrentUTC(),
-  end: addYears(getCurrentUTC(), 1),
+  start: getCurrentSemesterStart(),
+  end: getNextSemesterStart(),
   specialization: null,
+  semester: 0,
 }
 
 interface UseMembershipWriteFormProps {
-  onSubmit(data: z.infer<typeof MembershipWriteFormSchema>): void
+  onSubmit(data: MembershipWriteFormSchema): void
   defaultValues?: Partial<MembershipWrite>
   label?: string
 }
@@ -59,6 +62,7 @@ export const useMembershipWriteForm = ({
       }),
       specialization: createSelectInput({
         label: "Spesialisering",
+        description: "Masterspesialisering",
         required: false,
         clearable: true,
         placeholder: "Velg spesialisering",
@@ -68,6 +72,7 @@ export const useMembershipWriteForm = ({
             value: specialization,
             label: getSpecializationName(specialization) ?? specialization,
           })),
+        disabled: false,
       }),
       start: createDateTimeInput({
         label: "Startdato",
@@ -77,6 +82,40 @@ export const useMembershipWriteForm = ({
         label: "Sluttdato",
         required: true,
       }),
+      semester: createNumberInput({
+        label: "Semester",
+        description: (
+          <Stack gap="xs">
+            <Text size="xs" c="dimmed">
+              Hvilket semester medlemskapet innebærer. 0-indeksert.
+            </Text>
+            <Stack gap="0.25rem">
+              <Text size="xs" c="dimmed">
+                <Code>0</Code> → 1. semester (1. årstrinn)
+              </Text>
+              <Text size="xs" c="dimmed">
+                <Code>1</Code> → 2. semester (1. årstrinn)
+              </Text>
+              <Text size="xs" c="dimmed">
+                <Code>2</Code> → 3. semester (2. årstrinn)
+              </Text>
+              <Text size="xs" c="dimmed">
+                ...
+              </Text>
+              <Text size="xs" c="dimmed">
+                <Code>8</Code> → 9. semester (5. årstrinn)
+              </Text>
+              <Text size="xs" c="dimmed">
+                <Code>9</Code> → 10. semester (5. årstrinn)
+              </Text>
+            </Stack>
+          </Stack>
+        ),
+        required: false,
+        min: 0,
+        max: 9,
+        allowDecimal: false,
+      }),
     },
   })
 }

apps/rpc/src/modules/event/attendance-service.ts

@@ -23,11 +23,17 @@ import {
   type User,
   type UserId,
   findActiveMembership,
-  getMembershipGrade,
   hasAttendeePaid,
   isAttendable,
 } from "@dotkomonline/types"
-import { createAbsoluteEventPageUrl, createPoolName, getCurrentUTC, ogJoin, slugify } from "@dotkomonline/utils"
+import {
+  createAbsoluteEventPageUrl,
+  createPoolName,
+  getCurrentUTC,
+  ogJoin,
+  slugify,
+  getStudyGrade,
+} from "@dotkomonline/utils"
 import {
   addDays,
   addHours,
@@ -600,6 +606,8 @@ export function getAttendanceService(
         (!isFuture(reservationActiveAt) && (pool.capacity === 0 || poolAttendees.length < pool.capacity)) ||
         options.immediateReservation
 
+      const userGrade = membership.semester != null ? getStudyGrade(membership.semester) : null
+
       const attendee = await attendanceRepository.createAttendee(
         handle,
         attendance.id,
@@ -610,7 +618,7 @@ export function getAttendanceService(
           earliestReservationAt: reservationActiveAt,
           reserved: isImmediateReservation,
           selections: [],
-          userGrade: getMembershipGrade(membership),
+          userGrade,
         } satisfies AttendeeWrite)
       )
 

apps/rpc/src/modules/event/attendance.e2e-spec.ts

@@ -5,7 +5,7 @@ import {
   type MembershipWrite,
   findActiveMembership,
 } from "@dotkomonline/types"
-import { getCurrentUTC } from "@dotkomonline/utils"
+import { getCurrentUTC, getCurrentSemesterStart, getNextSemesterStart, isSpringSemester } from "@dotkomonline/utils"
 import { faker } from "@faker-js/faker"
 import type { ApiResponse, GetUsers200ResponseOneOfInner } from "auth0"
 import { addDays, addHours, addMinutes, isFuture, subHours } from "date-fns"
@@ -41,9 +41,10 @@ export function getMockAttendancePool(input: Partial<AttendancePoolWrite> = {}):
 export function getMockMembership(input: Partial<MembershipWrite> = {}): MembershipWrite {
   return {
     type: "BACHELOR_STUDENT",
-    start: addDays(getCurrentUTC(), -100),
-    end: addDays(getCurrentUTC(), 100),
+    start: getCurrentSemesterStart(),
+    end: getNextSemesterStart(),
     specialization: null,
+    semester: isSpringSemester() ? 1 : 2,
     ...input,
   }
 }