@bash-app/bash-common 30.442.0 → 30.444.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/extendedSchemas.d.ts +87 -224
- package/dist/extendedSchemas.d.ts.map +1 -1
- package/dist/extendedSchemas.js +12 -7
- package/dist/extendedSchemas.js.map +1 -1
- package/dist/index.d.ts +3 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -0
- package/dist/index.js.map +1 -1
- package/dist/membershipDefinitions.js +2 -2
- package/dist/membershipDefinitions.js.map +1 -1
- package/dist/mirroredPrismaEnums.d.ts +1 -0
- package/dist/mirroredPrismaEnums.d.ts.map +1 -1
- package/dist/mirroredPrismaEnums.js +1 -0
- package/dist/mirroredPrismaEnums.js.map +1 -1
- package/dist/utils/__tests__/eventTaskVolunteerRewardUtils.test.d.ts +2 -0
- package/dist/utils/__tests__/eventTaskVolunteerRewardUtils.test.d.ts.map +1 -0
- package/dist/utils/__tests__/eventTaskVolunteerRewardUtils.test.js +41 -0
- package/dist/utils/__tests__/eventTaskVolunteerRewardUtils.test.js.map +1 -0
- package/dist/utils/eventTaskVolunteerRewardUtils.d.ts +61 -0
- package/dist/utils/eventTaskVolunteerRewardUtils.d.ts.map +1 -0
- package/dist/utils/eventTaskVolunteerRewardUtils.js +152 -0
- package/dist/utils/eventTaskVolunteerRewardUtils.js.map +1 -0
- package/dist/utils/organizationMembershipValidation.d.ts +7 -0
- package/dist/utils/organizationMembershipValidation.d.ts.map +1 -0
- package/dist/utils/organizationMembershipValidation.js +16 -0
- package/dist/utils/organizationMembershipValidation.js.map +1 -0
- package/dist/utils/ticketTierValidation.d.ts +8 -0
- package/dist/utils/ticketTierValidation.d.ts.map +1 -0
- package/dist/utils/ticketTierValidation.js +14 -0
- package/dist/utils/ticketTierValidation.js.map +1 -0
- package/package.json +1 -1
- package/prisma/schema.prisma +22 -0
- package/src/extendedSchemas.ts +25 -11
- package/src/index.ts +5 -0
- package/src/membershipDefinitions.ts +2 -2
- package/src/mirroredPrismaEnums.ts +1 -0
- package/src/utils/__tests__/eventTaskVolunteerRewardUtils.test.ts +57 -0
- package/src/utils/eventTaskVolunteerRewardUtils.ts +246 -0
- package/src/utils/organizationMembershipValidation.ts +18 -0
- package/src/utils/ticketTierValidation.ts +18 -0
|
@@ -0,0 +1,152 @@
|
|
|
1
|
+
/** Default volunteer slots when host does not set neededCount. */
|
|
2
|
+
export const DEFAULT_EVENT_TASK_NEEDED_COUNT = 1;
|
|
3
|
+
export const MIN_EVENT_TASK_NEEDED_COUNT = 1;
|
|
4
|
+
export const MAX_EVENT_TASK_NEEDED_COUNT = 99;
|
|
5
|
+
const ACTIVE_ASSIGNMENT_STATUSES = new Set([
|
|
6
|
+
"Pending",
|
|
7
|
+
"Assigned",
|
|
8
|
+
"Accepted",
|
|
9
|
+
"InProgress",
|
|
10
|
+
"Completed",
|
|
11
|
+
]);
|
|
12
|
+
export function eventTaskNeededCount(task) {
|
|
13
|
+
const n = task.neededCount ?? DEFAULT_EVENT_TASK_NEEDED_COUNT;
|
|
14
|
+
if (!Number.isFinite(n) || n < MIN_EVENT_TASK_NEEDED_COUNT) {
|
|
15
|
+
return DEFAULT_EVENT_TASK_NEEDED_COUNT;
|
|
16
|
+
}
|
|
17
|
+
return Math.min(Math.floor(n), MAX_EVENT_TASK_NEEDED_COUNT);
|
|
18
|
+
}
|
|
19
|
+
/** Counts filled volunteer slots (legacy assignedToId + assignment rows). */
|
|
20
|
+
export function countEventTaskFilledSlots(task) {
|
|
21
|
+
const assignments = task.assignments ?? [];
|
|
22
|
+
const fromRows = assignments.filter((a) => a.status && ACTIVE_ASSIGNMENT_STATUSES.has(a.status)).length;
|
|
23
|
+
if (task.assignedToId) {
|
|
24
|
+
const legacyCounted = assignments.some((a) => a.userId === task.assignedToId);
|
|
25
|
+
if (!legacyCounted) {
|
|
26
|
+
return fromRows + 1;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
return fromRows;
|
|
30
|
+
}
|
|
31
|
+
export function countEventTaskOpenSlots(task) {
|
|
32
|
+
return Math.max(0, eventTaskNeededCount(task) - countEventTaskFilledSlots(task));
|
|
33
|
+
}
|
|
34
|
+
export function eventTaskHasOpenSlots(task) {
|
|
35
|
+
return countEventTaskOpenSlots(task) > 0;
|
|
36
|
+
}
|
|
37
|
+
/** Per-volunteer reward (0 when unset). */
|
|
38
|
+
export function eventTaskBashPointsPerVolunteer(task) {
|
|
39
|
+
const n = task.bashPointsReward ?? 0;
|
|
40
|
+
if (!Number.isFinite(n) || n <= 0)
|
|
41
|
+
return 0;
|
|
42
|
+
return Math.floor(n);
|
|
43
|
+
}
|
|
44
|
+
/** Max BashPoints liability if every slot completes. */
|
|
45
|
+
export function eventTaskMaxBashPointsLiability(task) {
|
|
46
|
+
return eventTaskNeededCount(task) * eventTaskBashPointsPerVolunteer(task);
|
|
47
|
+
}
|
|
48
|
+
export function totalEventTaskBashPointsOffer(args) {
|
|
49
|
+
let total = 0;
|
|
50
|
+
for (const t of args.tasks) {
|
|
51
|
+
const isPatch = args.patch?.taskId === t.id;
|
|
52
|
+
const neededCount = isPatch
|
|
53
|
+
? (args.patch?.neededCount ?? t.neededCount)
|
|
54
|
+
: t.neededCount;
|
|
55
|
+
const bashPointsReward = isPatch
|
|
56
|
+
? (args.patch?.bashPointsReward ?? t.bashPointsReward)
|
|
57
|
+
: t.bashPointsReward;
|
|
58
|
+
total += eventTaskMaxBashPointsLiability({
|
|
59
|
+
neededCount,
|
|
60
|
+
bashPointsReward,
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
return total;
|
|
64
|
+
}
|
|
65
|
+
export function validateHostTaskBashPointsOffer(args) {
|
|
66
|
+
const perVolunteer = args.patch
|
|
67
|
+
? eventTaskBashPointsPerVolunteer({
|
|
68
|
+
bashPointsReward: args.patch.bashPointsReward ?? null,
|
|
69
|
+
})
|
|
70
|
+
: 0;
|
|
71
|
+
const needed = args.patch
|
|
72
|
+
? eventTaskNeededCount({ neededCount: args.patch.neededCount ?? null })
|
|
73
|
+
: 0;
|
|
74
|
+
if (args.patch && perVolunteer > 0 && needed < MIN_EVENT_TASK_NEEDED_COUNT) {
|
|
75
|
+
return {
|
|
76
|
+
ok: false,
|
|
77
|
+
reason: "Set at least one volunteer slot when offering BashPoints.",
|
|
78
|
+
};
|
|
79
|
+
}
|
|
80
|
+
if (perVolunteer < 0) {
|
|
81
|
+
return { ok: false, reason: "BashPoints reward cannot be negative." };
|
|
82
|
+
}
|
|
83
|
+
const totalOffer = totalEventTaskBashPointsOffer({
|
|
84
|
+
tasks: args.tasks,
|
|
85
|
+
patch: args.patch,
|
|
86
|
+
});
|
|
87
|
+
if (totalOffer > args.hostBashPointsBalance) {
|
|
88
|
+
return {
|
|
89
|
+
ok: false,
|
|
90
|
+
reason: `Total BashPoints offered across tasks (${totalOffer}) exceeds your balance (${args.hostBashPointsBalance}). Lower rewards or slots, or earn more BashPoints.`,
|
|
91
|
+
};
|
|
92
|
+
}
|
|
93
|
+
return { ok: true };
|
|
94
|
+
}
|
|
95
|
+
export function formatEventTaskBashPointsBadge(task) {
|
|
96
|
+
const bp = eventTaskBashPointsPerVolunteer(task);
|
|
97
|
+
if (bp <= 0)
|
|
98
|
+
return null;
|
|
99
|
+
return `+${bp} BP`;
|
|
100
|
+
}
|
|
101
|
+
export function formatEventTaskAssignmentSlotsLabel(task) {
|
|
102
|
+
const needed = eventTaskNeededCount(task);
|
|
103
|
+
const filled = countEventTaskFilledSlots(task);
|
|
104
|
+
return `${filled}/${needed} assigned`;
|
|
105
|
+
}
|
|
106
|
+
export function isUserAssignedToEventTask(task, userId) {
|
|
107
|
+
if (!userId)
|
|
108
|
+
return false;
|
|
109
|
+
if (task.assignedToId === userId)
|
|
110
|
+
return true;
|
|
111
|
+
return (task.assignments ?? []).some((a) => a.userId === userId &&
|
|
112
|
+
a.status &&
|
|
113
|
+
ACTIVE_ASSIGNMENT_STATUSES.has(a.status));
|
|
114
|
+
}
|
|
115
|
+
/** Validate edits before coercion so invalid values never silently change. */
|
|
116
|
+
export function validateEventTaskFields(task, requireTitle = false) {
|
|
117
|
+
if ((requireTitle || task.title !== undefined) &&
|
|
118
|
+
(typeof task.title !== "string" || !task.title.trim()))
|
|
119
|
+
return "Enter a task title";
|
|
120
|
+
if (typeof task.title === "string" && task.title.trim().length > 150)
|
|
121
|
+
return "Task titles must be 150 characters or fewer";
|
|
122
|
+
for (const [key, min, max, label] of [
|
|
123
|
+
["neededCount", 1, 99, "Volunteer slots"],
|
|
124
|
+
["bashPointsReward", 0, 2147483647, "BashPoints"],
|
|
125
|
+
]) {
|
|
126
|
+
const value = task[key];
|
|
127
|
+
if (value == null || value === "")
|
|
128
|
+
continue;
|
|
129
|
+
const n = Number(value);
|
|
130
|
+
if (!Number.isInteger(n) || n < min || n > max)
|
|
131
|
+
return `${label} must be a whole number from ${min} to ${max}`;
|
|
132
|
+
}
|
|
133
|
+
for (const value of [task.doBy, task.dueBy])
|
|
134
|
+
if (value != null &&
|
|
135
|
+
value !== "" &&
|
|
136
|
+
Number.isNaN(new Date(value).getTime()))
|
|
137
|
+
return "Enter a valid task date";
|
|
138
|
+
if (task.doBy &&
|
|
139
|
+
task.dueBy &&
|
|
140
|
+
new Date(task.dueBy) < new Date(task.doBy))
|
|
141
|
+
return "Due by must be on or after Do by";
|
|
142
|
+
return null;
|
|
143
|
+
}
|
|
144
|
+
/** Acceptance is per volunteer; another volunteer's acceptance grants no access. */
|
|
145
|
+
export function isUserAcceptedForEventTask(task, userId) {
|
|
146
|
+
if (!userId)
|
|
147
|
+
return false;
|
|
148
|
+
const accepted = new Set(["Accepted", "Assigned", "InProgress", "Completed"]);
|
|
149
|
+
const own = task.assignments?.find(assignment => assignment.userId === userId);
|
|
150
|
+
return own ? accepted.has(own.status) : task.assignedToId === userId && Boolean(task.status && accepted.has(task.status));
|
|
151
|
+
}
|
|
152
|
+
//# sourceMappingURL=eventTaskVolunteerRewardUtils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"eventTaskVolunteerRewardUtils.js","sourceRoot":"","sources":["../../src/utils/eventTaskVolunteerRewardUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
/** Membership prices are stored as whole cents in a signed 32-bit column. */
|
|
2
|
+
export declare function membershipDollarsToCents(value: string): number | null;
|
|
3
|
+
export declare function validateOrganizationMembershipPrices(values: {
|
|
4
|
+
baseMembershipPriceCents?: unknown;
|
|
5
|
+
premiumMembershipPriceCents?: unknown;
|
|
6
|
+
}): string | null;
|
|
7
|
+
//# sourceMappingURL=organizationMembershipValidation.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"organizationMembershipValidation.d.ts","sourceRoot":"","sources":["../../src/utils/organizationMembershipValidation.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAIrE;AAED,wBAAgB,oCAAoC,CAAC,MAAM,EAAE;IAC3D,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,2BAA2B,CAAC,EAAE,OAAO,CAAC;CACvC,GAAG,MAAM,GAAG,IAAI,CAOhB"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
/** Membership prices are stored as whole cents in a signed 32-bit column. */
|
|
2
|
+
export function membershipDollarsToCents(value) {
|
|
3
|
+
if (!/^\d+(?:\.\d{1,2})?$/.test(value.trim()))
|
|
4
|
+
return null;
|
|
5
|
+
const cents = Math.round(Number(value) * 100);
|
|
6
|
+
return Number.isSafeInteger(cents) && cents <= 2147483647 ? cents : null;
|
|
7
|
+
}
|
|
8
|
+
export function validateOrganizationMembershipPrices(values) {
|
|
9
|
+
for (const value of [values.baseMembershipPriceCents, values.premiumMembershipPriceCents]) {
|
|
10
|
+
if (value != null && (typeof value !== "number" || !Number.isSafeInteger(value) || value < 0 || value > 2147483647)) {
|
|
11
|
+
return "Membership fees must be non-negative whole cents within the supported range.";
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
return null;
|
|
15
|
+
}
|
|
16
|
+
//# sourceMappingURL=organizationMembershipValidation.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"organizationMembershipValidation.js","sourceRoot":"","sources":["../../src/utils/organizationMembershipValidation.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,MAAM,UAAU,wBAAwB,CAAC,KAAa;IACpD,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QAAE,OAAO,IAAI,CAAC;IAC3D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC;IAC9C,OAAO,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;AAC3E,CAAC;AAED,MAAM,UAAU,oCAAoC,CAAC,MAGpD;IACC,KAAK,MAAM,KAAK,IAAI,CAAC,MAAM,CAAC,wBAAwB,EAAE,MAAM,CAAC,2BAA2B,CAAC,EAAE,CAAC;QAC1F,IAAI,KAAK,IAAI,IAAI,IAAI,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,GAAG,UAAU,CAAC,EAAE,CAAC;YACpH,OAAO,8EAA8E,CAAC;QACxF,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
/** Monetary amounts are cents; null capacity means unlimited, never zero. */
|
|
2
|
+
export declare function validateTicketTierFields(tier: {
|
|
3
|
+
title?: string | null;
|
|
4
|
+
price?: number | null;
|
|
5
|
+
priceBashPoints?: number | null;
|
|
6
|
+
maximumNumberOfTickets?: number | null;
|
|
7
|
+
}, requireTitle?: boolean): string | null;
|
|
8
|
+
//# sourceMappingURL=ticketTierValidation.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ticketTierValidation.d.ts","sourceRoot":"","sources":["../../src/utils/ticketTierValidation.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,wBAAgB,wBAAwB,CAAC,IAAI,EAAE;IAC7C,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,sBAAsB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACxC,EAAE,YAAY,UAAO,GAAG,MAAM,GAAG,IAAI,CAWrC"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
/** Monetary amounts are cents; null capacity means unlimited, never zero. */
|
|
2
|
+
export function validateTicketTierFields(tier, requireTitle = true) {
|
|
3
|
+
if ((requireTitle || tier.title !== undefined) && !tier.title?.trim())
|
|
4
|
+
return "Give every ticket tier a name before saving.";
|
|
5
|
+
for (const [label, value] of [["Ticket price", tier.price], ["BashPoints price", tier.priceBashPoints]]) {
|
|
6
|
+
if (value != null && (!Number.isSafeInteger(value) || value < 0 || value > 2147483647))
|
|
7
|
+
return `${label} must be a non-negative whole amount${label === "Ticket price" ? " in cents" : ""}.`;
|
|
8
|
+
}
|
|
9
|
+
const count = tier.maximumNumberOfTickets;
|
|
10
|
+
if (count != null && (!Number.isInteger(count) || count < 1 || count > 2147483647))
|
|
11
|
+
return "Ticket quantity must be a positive whole number. Leave it blank for unlimited tickets.";
|
|
12
|
+
return null;
|
|
13
|
+
}
|
|
14
|
+
//# sourceMappingURL=ticketTierValidation.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ticketTierValidation.js","sourceRoot":"","sources":["../../src/utils/ticketTierValidation.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,MAAM,UAAU,wBAAwB,CAAC,IAKxC,EAAE,YAAY,GAAG,IAAI;IACpB,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE;QACnE,OAAO,8CAA8C,CAAC;IACxD,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,cAAc,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,kBAAkB,EAAE,IAAI,CAAC,eAAe,CAAC,CAAU,EAAE,CAAC;QACjH,IAAI,KAAK,IAAI,IAAI,IAAI,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,GAAG,UAAU,CAAC;YACpF,OAAO,GAAG,KAAK,uCAAuC,KAAK,KAAK,cAAc,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC;IACzG,CAAC;IACD,MAAM,KAAK,GAAG,IAAI,CAAC,sBAAsB,CAAC;IAC1C,IAAI,KAAK,IAAI,IAAI,IAAI,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,GAAG,UAAU,CAAC;QAChF,OAAO,wFAAwF,CAAC;IAClG,OAAO,IAAI,CAAC;AACd,CAAC"}
|
package/package.json
CHANGED
package/prisma/schema.prisma
CHANGED
|
@@ -552,6 +552,8 @@ model EventTask {
|
|
|
552
552
|
assignedToId String?
|
|
553
553
|
status TaskStatus?
|
|
554
554
|
neededCount Int? // Number of volunteers needed
|
|
555
|
+
/// Closed-loop BashPoints paid to each volunteer when their assignment is completed.
|
|
556
|
+
bashPointsReward Int?
|
|
555
557
|
estimatedDuration Int? // Estimated duration in minutes
|
|
556
558
|
doBy DateTime? // Suggested "do this by" — stay-ahead, not a deadline
|
|
557
559
|
dueBy DateTime? // Hard deadline for the volunteer
|
|
@@ -563,11 +565,29 @@ model EventTask {
|
|
|
563
565
|
notificationsReferencingMe Notification[]
|
|
564
566
|
comments TaskComment[]
|
|
565
567
|
invitations TaskInvitation[]
|
|
568
|
+
assignments EventTaskAssignment[]
|
|
566
569
|
expenses Expense[]
|
|
567
570
|
potluckItem PotluckItem? @relation("PotluckItemTask")
|
|
568
571
|
bashEventSuggestion BashEventSuggestion? @relation("SuggestionTask")
|
|
569
572
|
}
|
|
570
573
|
|
|
574
|
+
/// Volunteer slot on a task (supports neededCount > 1). Legacy rows may only use assignedToId.
|
|
575
|
+
model EventTaskAssignment {
|
|
576
|
+
id String @id @default(cuid())
|
|
577
|
+
taskId String
|
|
578
|
+
userId String
|
|
579
|
+
status TaskStatus @default(Accepted)
|
|
580
|
+
bashPointsPaidAt DateTime?
|
|
581
|
+
createdAt DateTime @default(now())
|
|
582
|
+
updatedAt DateTime @updatedAt
|
|
583
|
+
task EventTask @relation(fields: [taskId], references: [id], onDelete: Cascade)
|
|
584
|
+
user User @relation("EventTaskAssignments", fields: [userId], references: [id], onDelete: Cascade)
|
|
585
|
+
|
|
586
|
+
@@unique([taskId, userId])
|
|
587
|
+
@@index([taskId])
|
|
588
|
+
@@index([userId])
|
|
589
|
+
}
|
|
590
|
+
|
|
571
591
|
model TaskComment {
|
|
572
592
|
id String @id @default(cuid())
|
|
573
593
|
taskId String
|
|
@@ -4915,6 +4935,7 @@ model User {
|
|
|
4915
4935
|
documentID DocumentID?
|
|
4916
4936
|
eventTasksAssignedToMe EventTask[] @relation("TasksAssignedToMe")
|
|
4917
4937
|
eventTasks EventTask[]
|
|
4938
|
+
eventTaskAssignments EventTaskAssignment[] @relation("EventTaskAssignments")
|
|
4918
4939
|
potluckItemsClaimed PotluckItem[] @relation("PotluckItemsClaimedBy")
|
|
4919
4940
|
bashEventSuggestionsCreated BashEventSuggestion[] @relation("BashEventSuggestionsCreated")
|
|
4920
4941
|
eventBroadcastsSent EventBroadcast[] @relation("EventBroadcastsSent")
|
|
@@ -12065,6 +12086,7 @@ enum CreditSourceType {
|
|
|
12065
12086
|
CompetitionWin // Adventures reward for winning a competition prize
|
|
12066
12087
|
HornClear // Stuff the horn: 5 points per clear, 100 per UTC day
|
|
12067
12088
|
IntrosEarlyReveal // BashPoints spent on a paid early identity reveal
|
|
12089
|
+
TaskVolunteerReward // Host BashPoints paid to a volunteer for completing a task assignment
|
|
12068
12090
|
}
|
|
12069
12091
|
|
|
12070
12092
|
enum ReferralTier {
|
package/src/extendedSchemas.ts
CHANGED
|
@@ -29,6 +29,7 @@ import {
|
|
|
29
29
|
EntertainmentService,
|
|
30
30
|
EventService,
|
|
31
31
|
EventTask,
|
|
32
|
+
EventTaskAssignment,
|
|
32
33
|
Exhibitor,
|
|
33
34
|
IdeaConfiguration,
|
|
34
35
|
IdeaDateOption,
|
|
@@ -657,7 +658,7 @@ type BashEventExtBase = Override<
|
|
|
657
658
|
bashEventSuggestions?: (BashEventSuggestion & {
|
|
658
659
|
creator: PublicUser;
|
|
659
660
|
})[];
|
|
660
|
-
eventTasks: EventTask[];
|
|
661
|
+
eventTasks: (EventTask & { assignments?: EventTaskAssignment[] })[];
|
|
661
662
|
tickets?: TicketFlexible[]; // Only include tickets that the user has purchased and not all tickets (could be thousands + privacy)
|
|
662
663
|
// Do not include in fetch. Could be hundreds of these
|
|
663
664
|
invitations: Partial<InvitationExt>[];
|
|
@@ -890,7 +891,7 @@ export const BASH_EVENT_DATA_TO_INCLUDE = {
|
|
|
890
891
|
},
|
|
891
892
|
orderBy: { createdAt: "asc" },
|
|
892
893
|
},
|
|
893
|
-
eventTasks:
|
|
894
|
+
eventTasks: { include: { assignments: true } },
|
|
894
895
|
invitations: true,
|
|
895
896
|
competitions: {
|
|
896
897
|
include: {
|
|
@@ -1867,32 +1868,45 @@ export const BASH_NOTIFICATION_DATA_TO_INCLUDE = {
|
|
|
1867
1868
|
} satisfies Prisma.NotificationInclude;
|
|
1868
1869
|
|
|
1869
1870
|
export interface TaskCommentExt extends TaskComment {
|
|
1870
|
-
author:
|
|
1871
|
+
author: PublicTeaserUser;
|
|
1871
1872
|
}
|
|
1872
1873
|
|
|
1873
1874
|
export const TASK_COMMENT_DATA_TO_INCLUDE = {
|
|
1874
1875
|
author: {
|
|
1875
|
-
select:
|
|
1876
|
+
select: PUBLIC_TEASER_USER_DATA_TO_SELECT,
|
|
1876
1877
|
},
|
|
1877
1878
|
} satisfies Prisma.TaskCommentInclude;
|
|
1878
1879
|
|
|
1880
|
+
export interface EventTaskAssignmentExt extends EventTaskAssignment {
|
|
1881
|
+
user: PublicTeaserUser & { email?: string };
|
|
1882
|
+
}
|
|
1883
|
+
|
|
1879
1884
|
export interface EventTaskExt extends EventTask {
|
|
1880
|
-
|
|
1881
|
-
|
|
1885
|
+
/** Scoped to the signed-in recipient by the event tasks API. */
|
|
1886
|
+
pendingInviteForMe?: boolean;
|
|
1887
|
+
creator: PublicTeaserUser;
|
|
1888
|
+
assignedTo?: (PublicTeaserUser & { email?: string }) | null;
|
|
1889
|
+
assignments?: EventTaskAssignmentExt[];
|
|
1882
1890
|
comments?: TaskCommentExt[];
|
|
1883
1891
|
}
|
|
1884
1892
|
|
|
1893
|
+
export const EVENT_TASK_ASSIGNMENT_DATA_TO_INCLUDE = {
|
|
1894
|
+
user: {
|
|
1895
|
+
select: PUBLIC_TEASER_USER_DATA_TO_SELECT,
|
|
1896
|
+
},
|
|
1897
|
+
} satisfies Prisma.EventTaskAssignmentInclude;
|
|
1898
|
+
|
|
1885
1899
|
export const EVENT_TASK_DATA_TO_INCLUDE = {
|
|
1886
1900
|
creator: {
|
|
1887
|
-
select:
|
|
1901
|
+
select: PUBLIC_TEASER_USER_DATA_TO_SELECT,
|
|
1888
1902
|
},
|
|
1889
1903
|
assignedTo: {
|
|
1890
|
-
select:
|
|
1904
|
+
select: PUBLIC_TEASER_USER_DATA_TO_SELECT,
|
|
1891
1905
|
},
|
|
1892
|
-
|
|
1893
|
-
include:
|
|
1906
|
+
assignments: {
|
|
1907
|
+
include: EVENT_TASK_ASSIGNMENT_DATA_TO_INCLUDE,
|
|
1894
1908
|
orderBy: {
|
|
1895
|
-
createdAt: "
|
|
1909
|
+
createdAt: "asc" as const,
|
|
1896
1910
|
},
|
|
1897
1911
|
},
|
|
1898
1912
|
} satisfies Prisma.EventTaskInclude;
|
package/src/index.ts
CHANGED
|
@@ -421,6 +421,7 @@ export * from "./utils/service/offerComparisonUtils.js";
|
|
|
421
421
|
export * from "./utils/service/unifiedPricingResolver.js";
|
|
422
422
|
export * from "./utils/service/defaultOfferAmountUtils.js";
|
|
423
423
|
export * from "./utils/service/volunteerCompensationUtils.js";
|
|
424
|
+
export * from "./utils/eventTaskVolunteerRewardUtils.js";
|
|
424
425
|
export * from "./utils/service/cancellationPolicyRefundResolver.js";
|
|
425
426
|
export * from "./utils/venueLoyalty/eligibilityUtils.js";
|
|
426
427
|
export * from "./utils/venueLoyalty/redemptionCodeUtils.js";
|
|
@@ -489,3 +490,7 @@ export {
|
|
|
489
490
|
// Event Templates
|
|
490
491
|
export * from "./templates/eventTemplates.js";
|
|
491
492
|
|
|
493
|
+
|
|
494
|
+
export * from "./utils/ticketTierValidation.js";
|
|
495
|
+
|
|
496
|
+
export * from "./utils/organizationMembershipValidation";
|
|
@@ -439,11 +439,11 @@ export const PARTNER_PAYMENT_FEES: Record<MembershipTier, {
|
|
|
439
439
|
capCents: 10000, // $100 cap
|
|
440
440
|
},
|
|
441
441
|
Elite: {
|
|
442
|
-
percent: 0.
|
|
442
|
+
percent: 0.04, // At or below Pro so Elite never costs more
|
|
443
443
|
capCents: 7500, // $75 cap
|
|
444
444
|
},
|
|
445
445
|
Legend: {
|
|
446
|
-
percent: 0.
|
|
446
|
+
percent: 0.04, // At or below Pro so Legend never costs more
|
|
447
447
|
capCents: 7500, // $75 cap
|
|
448
448
|
},
|
|
449
449
|
} as const;
|
|
@@ -203,6 +203,7 @@ export const CreditSourceType = {
|
|
|
203
203
|
CompetitionWin: "CompetitionWin",
|
|
204
204
|
HornClear: "HornClear",
|
|
205
205
|
IntrosEarlyReveal: "IntrosEarlyReveal",
|
|
206
|
+
TaskVolunteerReward: "TaskVolunteerReward",
|
|
206
207
|
} as const satisfies Record<CreditSourceTypeEnum, CreditSourceTypeEnum>;
|
|
207
208
|
|
|
208
209
|
export type CreditSourceType = CreditSourceTypeEnum;
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
import {
|
|
2
|
+
countEventTaskFilledSlots,
|
|
3
|
+
eventTaskMaxBashPointsLiability,
|
|
4
|
+
totalEventTaskBashPointsOffer,
|
|
5
|
+
validateHostTaskBashPointsOffer,
|
|
6
|
+
} from "../eventTaskVolunteerRewardUtils.js";
|
|
7
|
+
|
|
8
|
+
describe("eventTaskVolunteerRewardUtils", () => {
|
|
9
|
+
it("counts legacy assignee plus assignment rows without double count", () => {
|
|
10
|
+
expect(
|
|
11
|
+
countEventTaskFilledSlots({
|
|
12
|
+
neededCount: 6,
|
|
13
|
+
bashPointsReward: 25,
|
|
14
|
+
assignedToId: "u1",
|
|
15
|
+
status: "Accepted",
|
|
16
|
+
assignments: [{ userId: "u1", status: "Accepted", bashPointsPaidAt: null }],
|
|
17
|
+
})
|
|
18
|
+
).toBe(1);
|
|
19
|
+
expect(
|
|
20
|
+
countEventTaskFilledSlots({
|
|
21
|
+
neededCount: 6,
|
|
22
|
+
bashPointsReward: 25,
|
|
23
|
+
assignedToId: null,
|
|
24
|
+
status: "Open",
|
|
25
|
+
assignments: [
|
|
26
|
+
{ userId: "u1", status: "Accepted", bashPointsPaidAt: null },
|
|
27
|
+
{ userId: "u2", status: "Accepted", bashPointsPaidAt: null },
|
|
28
|
+
],
|
|
29
|
+
})
|
|
30
|
+
).toBe(2);
|
|
31
|
+
});
|
|
32
|
+
|
|
33
|
+
it("computes max liability and validates host balance", () => {
|
|
34
|
+
expect(
|
|
35
|
+
eventTaskMaxBashPointsLiability({ neededCount: 6, bashPointsReward: 25 })
|
|
36
|
+
).toBe(150);
|
|
37
|
+
const tasks = [
|
|
38
|
+
{ id: "t1", neededCount: 2, bashPointsReward: 10 },
|
|
39
|
+
{ id: "t2", neededCount: 1, bashPointsReward: 50 },
|
|
40
|
+
];
|
|
41
|
+
expect(totalEventTaskBashPointsOffer({ tasks })).toBe(70);
|
|
42
|
+
expect(
|
|
43
|
+
validateHostTaskBashPointsOffer({
|
|
44
|
+
hostBashPointsBalance: 100,
|
|
45
|
+
tasks,
|
|
46
|
+
patch: { taskId: "t2", bashPointsReward: 80 },
|
|
47
|
+
}).ok
|
|
48
|
+
).toBe(false);
|
|
49
|
+
expect(
|
|
50
|
+
validateHostTaskBashPointsOffer({
|
|
51
|
+
hostBashPointsBalance: 100,
|
|
52
|
+
tasks,
|
|
53
|
+
patch: { taskId: "t2", bashPointsReward: 30 },
|
|
54
|
+
}).ok
|
|
55
|
+
).toBe(true);
|
|
56
|
+
});
|
|
57
|
+
});
|