@bash-app/bash-common 30.443.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.
@@ -6,6 +6,7 @@ const ACTIVE_ASSIGNMENT_STATUSES = new Set([
6
6
  "Pending",
7
7
  "Assigned",
8
8
  "Accepted",
9
+ "InProgress",
9
10
  "Completed",
10
11
  ]);
11
12
  export function eventTaskNeededCount(task) {
@@ -111,4 +112,41 @@ export function isUserAssignedToEventTask(task, userId) {
111
112
  a.status &&
112
113
  ACTIVE_ASSIGNMENT_STATUSES.has(a.status));
113
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
+ }
114
152
  //# sourceMappingURL=eventTaskVolunteerRewardUtils.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"eventTaskVolunteerRewardUtils.js","sourceRoot":"","sources":["../../src/utils/eventTaskVolunteerRewardUtils.ts"],"names":[],"mappings":"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"}
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
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bash-app/bash-common",
3
- "version": "30.443.0",
3
+ "version": "30.444.0",
4
4
  "description": "Common data and scripts to use on the frontend and backend",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
@@ -658,7 +658,7 @@ type BashEventExtBase = Override<
658
658
  bashEventSuggestions?: (BashEventSuggestion & {
659
659
  creator: PublicUser;
660
660
  })[];
661
- eventTasks: EventTask[];
661
+ eventTasks: (EventTask & { assignments?: EventTaskAssignment[] })[];
662
662
  tickets?: TicketFlexible[]; // Only include tickets that the user has purchased and not all tickets (could be thousands + privacy)
663
663
  // Do not include in fetch. Could be hundreds of these
664
664
  invitations: Partial<InvitationExt>[];
@@ -891,7 +891,7 @@ export const BASH_EVENT_DATA_TO_INCLUDE = {
891
891
  },
892
892
  orderBy: { createdAt: "asc" },
893
893
  },
894
- eventTasks: true, // ✅ FIXED: assignedMemberId issue resolved by syncing API schema
894
+ eventTasks: { include: { assignments: true } },
895
895
  invitations: true,
896
896
  competitions: {
897
897
  include: {
@@ -1868,38 +1868,40 @@ export const BASH_NOTIFICATION_DATA_TO_INCLUDE = {
1868
1868
  } satisfies Prisma.NotificationInclude;
1869
1869
 
1870
1870
  export interface TaskCommentExt extends TaskComment {
1871
- author: PublicUser;
1871
+ author: PublicTeaserUser;
1872
1872
  }
1873
1873
 
1874
1874
  export const TASK_COMMENT_DATA_TO_INCLUDE = {
1875
1875
  author: {
1876
- select: FRONT_END_USER_DATA_TO_SELECT,
1876
+ select: PUBLIC_TEASER_USER_DATA_TO_SELECT,
1877
1877
  },
1878
1878
  } satisfies Prisma.TaskCommentInclude;
1879
1879
 
1880
1880
  export interface EventTaskAssignmentExt extends EventTaskAssignment {
1881
- user: PublicUser;
1881
+ user: PublicTeaserUser & { email?: string };
1882
1882
  }
1883
1883
 
1884
1884
  export interface EventTaskExt extends EventTask {
1885
- creator: PublicUser;
1886
- assignedTo?: PublicUser | null;
1885
+ /** Scoped to the signed-in recipient by the event tasks API. */
1886
+ pendingInviteForMe?: boolean;
1887
+ creator: PublicTeaserUser;
1888
+ assignedTo?: (PublicTeaserUser & { email?: string }) | null;
1887
1889
  assignments?: EventTaskAssignmentExt[];
1888
1890
  comments?: TaskCommentExt[];
1889
1891
  }
1890
1892
 
1891
1893
  export const EVENT_TASK_ASSIGNMENT_DATA_TO_INCLUDE = {
1892
1894
  user: {
1893
- select: FRONT_END_USER_DATA_TO_SELECT,
1895
+ select: PUBLIC_TEASER_USER_DATA_TO_SELECT,
1894
1896
  },
1895
1897
  } satisfies Prisma.EventTaskAssignmentInclude;
1896
1898
 
1897
1899
  export const EVENT_TASK_DATA_TO_INCLUDE = {
1898
1900
  creator: {
1899
- select: FRONT_END_USER_DATA_TO_SELECT,
1901
+ select: PUBLIC_TEASER_USER_DATA_TO_SELECT,
1900
1902
  },
1901
1903
  assignedTo: {
1902
- select: FRONT_END_USER_DATA_TO_SELECT,
1904
+ select: PUBLIC_TEASER_USER_DATA_TO_SELECT,
1903
1905
  },
1904
1906
  assignments: {
1905
1907
  include: EVENT_TASK_ASSIGNMENT_DATA_TO_INCLUDE,
@@ -1907,12 +1909,6 @@ export const EVENT_TASK_DATA_TO_INCLUDE = {
1907
1909
  createdAt: "asc" as const,
1908
1910
  },
1909
1911
  },
1910
- comments: {
1911
- include: TASK_COMMENT_DATA_TO_INCLUDE,
1912
- orderBy: {
1913
- createdAt: "desc" as const,
1914
- },
1915
- },
1916
1912
  } satisfies Prisma.EventTaskInclude;
1917
1913
 
1918
1914
  export interface InvitationExt extends Invitation {
package/src/index.ts CHANGED
@@ -490,3 +490,7 @@ export {
490
490
  // Event Templates
491
491
  export * from "./templates/eventTemplates.js";
492
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.05, // 5% (same as Creator, sustainable floor)
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.05, // 5% (same as Creator/Elite, sustainable floor)
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;
@@ -1,4 +1,8 @@
1
- import type { EventTask, EventTaskAssignment, TaskStatus } from "@prisma/client";
1
+ import type {
2
+ EventTask,
3
+ EventTaskAssignment,
4
+ TaskStatus,
5
+ } from "@prisma/client";
2
6
 
3
7
  /** Default volunteer slots when host does not set neededCount. */
4
8
  export const DEFAULT_EVENT_TASK_NEEDED_COUNT = 1;
@@ -23,6 +27,7 @@ const ACTIVE_ASSIGNMENT_STATUSES = new Set<TaskStatus>([
23
27
  "Pending",
24
28
  "Assigned",
25
29
  "Accepted",
30
+ "InProgress",
26
31
  "Completed",
27
32
  ]);
28
33
 
@@ -112,8 +117,7 @@ export function totalEventTaskBashPointsOffer(args: {
112
117
  }
113
118
 
114
119
  export type HostTaskOfferValidation =
115
- | { ok: true }
116
- | { ok: false; reason: string };
120
+ { ok: true } | { ok: false; reason: string };
117
121
 
118
122
  export function validateHostTaskBashPointsOffer(args: {
119
123
  hostBashPointsBalance: number;
@@ -188,3 +192,55 @@ export function isUserAssignedToEventTask(
188
192
  ACTIVE_ASSIGNMENT_STATUSES.has(a.status)
189
193
  );
190
194
  }
195
+
196
+ /** Validate edits before coercion so invalid values never silently change. */
197
+ export function validateEventTaskFields(
198
+ task: {
199
+ title?: unknown;
200
+ neededCount?: unknown;
201
+ bashPointsReward?: unknown;
202
+ doBy?: unknown;
203
+ dueBy?: unknown;
204
+ },
205
+ requireTitle = false
206
+ ): string | null {
207
+ if (
208
+ (requireTitle || task.title !== undefined) &&
209
+ (typeof task.title !== "string" || !task.title.trim())
210
+ )
211
+ return "Enter a task title";
212
+ if (typeof task.title === "string" && task.title.trim().length > 150)
213
+ return "Task titles must be 150 characters or fewer";
214
+ for (const [key, min, max, label] of [
215
+ ["neededCount", 1, 99, "Volunteer slots"],
216
+ ["bashPointsReward", 0, 2147483647, "BashPoints"],
217
+ ] as const) {
218
+ const value = task[key];
219
+ if (value == null || value === "") continue;
220
+ const n = Number(value);
221
+ if (!Number.isInteger(n) || n < min || n > max)
222
+ return `${label} must be a whole number from ${min} to ${max}`;
223
+ }
224
+ for (const value of [task.doBy, task.dueBy])
225
+ if (
226
+ value != null &&
227
+ value !== "" &&
228
+ Number.isNaN(new Date(value as string).getTime())
229
+ )
230
+ return "Enter a valid task date";
231
+ if (
232
+ task.doBy &&
233
+ task.dueBy &&
234
+ new Date(task.dueBy as string) < new Date(task.doBy as string)
235
+ )
236
+ return "Due by must be on or after Do by";
237
+ return null;
238
+ }
239
+
240
+ /** Acceptance is per volunteer; another volunteer's acceptance grants no access. */
241
+ export function isUserAcceptedForEventTask(task: EventTaskSlotsLike, userId: string | null | undefined): boolean {
242
+ if (!userId) return false;
243
+ const accepted = new Set<TaskStatus>(["Accepted", "Assigned", "InProgress", "Completed"]);
244
+ const own = task.assignments?.find(assignment => assignment.userId === userId);
245
+ return own ? accepted.has(own.status) : task.assignedToId === userId && Boolean(task.status && accepted.has(task.status));
246
+ }
@@ -0,0 +1,18 @@
1
+ /** Membership prices are stored as whole cents in a signed 32-bit column. */
2
+ export function membershipDollarsToCents(value: string): number | null {
3
+ if (!/^\d+(?:\.\d{1,2})?$/.test(value.trim())) return null;
4
+ const cents = Math.round(Number(value) * 100);
5
+ return Number.isSafeInteger(cents) && cents <= 2147483647 ? cents : null;
6
+ }
7
+
8
+ export function validateOrganizationMembershipPrices(values: {
9
+ baseMembershipPriceCents?: unknown;
10
+ premiumMembershipPriceCents?: unknown;
11
+ }): string | null {
12
+ for (const value of [values.baseMembershipPriceCents, values.premiumMembershipPriceCents]) {
13
+ if (value != null && (typeof value !== "number" || !Number.isSafeInteger(value) || value < 0 || value > 2147483647)) {
14
+ return "Membership fees must be non-negative whole cents within the supported range.";
15
+ }
16
+ }
17
+ return null;
18
+ }
@@ -0,0 +1,18 @@
1
+ /** Monetary amounts are cents; null capacity means unlimited, never zero. */
2
+ export function validateTicketTierFields(tier: {
3
+ title?: string | null;
4
+ price?: number | null;
5
+ priceBashPoints?: number | null;
6
+ maximumNumberOfTickets?: number | null;
7
+ }, requireTitle = true): string | null {
8
+ if ((requireTitle || tier.title !== undefined) && !tier.title?.trim())
9
+ return "Give every ticket tier a name before saving.";
10
+ for (const [label, value] of [["Ticket price", tier.price], ["BashPoints price", tier.priceBashPoints]] as const) {
11
+ if (value != null && (!Number.isSafeInteger(value) || value < 0 || value > 2147483647))
12
+ return `${label} must be a non-negative whole amount${label === "Ticket price" ? " in cents" : ""}.`;
13
+ }
14
+ const count = tier.maximumNumberOfTickets;
15
+ if (count != null && (!Number.isInteger(count) || count < 1 || count > 2147483647))
16
+ return "Ticket quantity must be a positive whole number. Leave it blank for unlimited tickets.";
17
+ return null;
18
+ }