Skip to content

Commit 0e539db

Browse files
committed
feat: add membership calcuation tests
1 parent c1a9537 commit 0e539db

File tree

10 files changed

+2063
-36
lines changed

10 files changed

+2063
-36
lines changed

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,17 @@ import {
2323
type User,
2424
type UserId,
2525
findActiveMembership,
26-
getMembershipGrade,
2726
hasAttendeePaid,
2827
isAttendable,
2928
} from "@dotkomonline/types"
30-
import { createAbsoluteEventPageUrl, createPoolName, getCurrentUTC, ogJoin, slugify } from "@dotkomonline/utils"
29+
import {
30+
createAbsoluteEventPageUrl,
31+
createPoolName,
32+
getCurrentUTC,
33+
ogJoin,
34+
slugify,
35+
getStudyGrade,
36+
} from "@dotkomonline/utils"
3137
import {
3238
addDays,
3339
addHours,
@@ -600,6 +606,8 @@ export function getAttendanceService(
600606
(!isFuture(reservationActiveAt) && (pool.capacity === 0 || poolAttendees.length < pool.capacity)) ||
601607
options.immediateReservation
602608

609+
const userGrade = membership.semester != null ? getStudyGrade(membership.semester) : null
610+
603611
const attendee = await attendanceRepository.createAttendee(
604612
handle,
605613
attendance.id,
@@ -610,7 +618,7 @@ export function getAttendanceService(
610618
earliestReservationAt: reservationActiveAt,
611619
reserved: isImmediateReservation,
612620
selections: [],
613-
userGrade: getMembershipGrade(membership),
621+
userGrade,
614622
} satisfies AttendeeWrite)
615623
)
616624

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,8 @@ import {
44
type AttendanceWrite,
55
type MembershipWrite,
66
findActiveMembership,
7-
getCurrentSemesterStart,
8-
getNextSemesterStart,
9-
isSpringSemester,
107
} from "@dotkomonline/types"
11-
import { getCurrentUTC } from "@dotkomonline/utils"
8+
import { getCurrentUTC, getCurrentSemesterStart, getNextSemesterStart, isSpringSemester } from "@dotkomonline/utils"
129
import { faker } from "@faker-js/faker"
1310
import type { ApiResponse, GetUsers200ResponseOneOfInner } from "auth0"
1411
import { addDays, addHours, addMinutes, isFuture, subHours } from "date-fns"

apps/rpc/src/modules/user/membership-service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
isSpringSemester,
44
getSpringSemesterStart,
55
getSemesterDifference,
6-
} from "@dotkomonline/types"
6+
} from "@dotkomonline/utils"
77
import invariant from "tiny-invariant"
88
import type { NTNUGroup } from "../feide/feide-groups-repository"
99
import { getLogger } from "@dotkomonline/logger"

0 commit comments

Comments
 (0)