@bash-app/bash-common 30.442.0 → 30.443.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 +150 -1
- package/dist/extendedSchemas.d.ts.map +1 -1
- package/dist/extendedSchemas.js +11 -0
- package/dist/extendedSchemas.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.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 +51 -0
- package/dist/utils/eventTaskVolunteerRewardUtils.d.ts.map +1 -0
- package/dist/utils/eventTaskVolunteerRewardUtils.js +114 -0
- package/dist/utils/eventTaskVolunteerRewardUtils.js.map +1 -0
- package/package.json +1 -1
- package/prisma/schema.prisma +22 -0
- package/src/extendedSchemas.ts +18 -0
- package/src/index.ts +1 -0
- package/src/mirroredPrismaEnums.ts +1 -0
- package/src/utils/__tests__/eventTaskVolunteerRewardUtils.test.ts +57 -0
- package/src/utils/eventTaskVolunteerRewardUtils.ts +190 -0
|
@@ -155,6 +155,7 @@ export const CreditSourceType = {
|
|
|
155
155
|
CompetitionWin: "CompetitionWin",
|
|
156
156
|
HornClear: "HornClear",
|
|
157
157
|
IntrosEarlyReveal: "IntrosEarlyReveal",
|
|
158
|
+
TaskVolunteerReward: "TaskVolunteerReward",
|
|
158
159
|
};
|
|
159
160
|
/**
|
|
160
161
|
* Mirrors Prisma `BracketType`. Includes HEAT / BATTLE_ROYALE before all consumers
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mirroredPrismaEnums.js","sourceRoot":"","sources":["../src/mirroredPrismaEnums.ts"],"names":[],"mappings":"AAWA;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG;IACvC,IAAI,EAAE,MAAM;IACZ,YAAY,EAAE,cAAc;IAC5B,QAAQ,EAAE,UAAU;IACpB,aAAa,EAAE,eAAe;IAC9B,aAAa,EAAE,eAAe;IAC9B,cAAc,EAAE,gBAAgB;IAChC,cAAc,EAAE,gBAAgB;IAChC,YAAY,EAAE,cAAc;IAC5B,iBAAiB,EAAE,mBAAmB;IACtC,iBAAiB,EAAE,mBAAmB;IACtC,eAAe,EAAE,iBAAiB;IAClC,eAAe,EAAE,iBAAiB;IAClC,eAAe,EAAE,iBAAiB;IAClC,aAAa,EAAE,eAAe;CAI/B,CAAC;AAIF;;;GAGG;AACH,MAAM,CAAC,MAAM,6BAA6B,GAAG;IAC3C,aAAa,EAAE,eAAe;IAC9B,YAAY,EAAE,cAAc;IAC5B,aAAa,EAAE,eAAe;IAC9B,kBAAkB,EAAE,oBAAoB;IACxC,YAAY,EAAE,cAAc;CAI7B,CAAC;AAIF;;;;GAIG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACnC,WAAW,EAAE,aAAa;IAC1B,mBAAmB,EAAE,qBAAqB;IAC1C,QAAQ,EAAE,UAAU;CAC2D,CAAC;AAIlF;;;;GAIG;AACH,MAAM,CAAC,MAAM,8BAA8B,GAAG;IAC5C,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,SAAS;IAClB,uBAAuB,EAAE,yBAAyB;IAClD,cAAc,EAAE,gBAAgB;IAChC,kBAAkB,EAAE,oBAAoB;CAIzC,CAAC;AAIF;;;;GAIG;AACH,MAAM,CAAC,MAAM,mCAAmC,GAG5C;IACF,OAAO,EAAE,iBAAiB;IAC1B,OAAO,EAAE,SAAS;IAClB,uBAAuB,EAAE,gBAAgB;IACzC,cAAc,EAAE,iBAAiB;IACjC,kBAAkB,EAAE,UAAU;CAC/B,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,QAAQ,EAAE,UAAU;IACpB,YAAY,EAAE,cAAc;IAC5B,iBAAiB,EAAE,mBAAmB;IACtC,uBAAuB,EAAE,yBAAyB;IAClD,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,SAAS;IAClB,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,yBAAyB,EAAE,2BAA2B;IACtD,wBAAwB,EAAE,0BAA0B;CACS,CAAC;AAIhE;;;;GAIG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG;IACpC,UAAU,EAAE,YAAY;IACxB,UAAU,EAAE,YAAY;CACyD,CAAC;AAIpF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG;IACvC,IAAI,EAAE,MAAM;IACZ,iBAAiB,EAAE,mBAAmB;IACtC,SAAS,EAAE,WAAW;IACtB,kBAAkB,EAAE,oBAAoB;CAIzC,CAAC;AAIF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,gBAAgB,EAAE,kBAAkB;IACpC,cAAc,EAAE,gBAAgB;IAChC,UAAU,EAAE,YAAY;IACxB,cAAc,EAAE,gBAAgB;IAChC,aAAa,EAAE,eAAe;IAC9B,WAAW,EAAE,aAAa;IAC1B,eAAe,EAAE,iBAAiB;IAClC,gBAAgB,EAAE,kBAAkB;IACpC,kBAAkB,EAAE,oBAAoB;IACxC,YAAY,EAAE,cAAc;IAC5B,qBAAqB,EAAE,uBAAuB;IAC9C,gBAAgB,EAAE,kBAAkB;IACpC,kBAAkB,EAAE,oBAAoB;IACxC,gBAAgB,EAAE,kBAAkB;IACpC,mBAAmB,EAAE,qBAAqB;IAC1C,mBAAmB,EAAE,qBAAqB;IAC1C,gBAAgB,EAAE,kBAAkB;IACpC,cAAc,EAAE,gBAAgB;IAChC,iBAAiB,EAAE,mBAAmB;IACtC,iBAAiB,EAAE,mBAAmB;IACtC,cAAc,EAAE,gBAAgB;IAChC,iBAAiB,EAAE,mBAAmB;IACtC,cAAc,EAAE,gBAAgB;IAChC,mBAAmB,EAAE,qBAAqB;IAC1C,SAAS,EAAE,WAAW;IACtB,kBAAkB,EAAE,oBAAoB;IACxC,cAAc,EAAE,gBAAgB;IAChC,eAAe,EAAE,iBAAiB;IAClC,eAAe,EAAE,iBAAiB;IAClC,cAAc,EAAE,gBAAgB;IAChC,gBAAgB,EAAE,kBAAkB;IACpC,sBAAsB,EAAE,wBAAwB;IAChD,sBAAsB,EAAE,wBAAwB;IAChD,mBAAmB,EAAE,qBAAqB;IAC1C,kBAAkB,EAAE,oBAAoB;IACxC,oBAAoB,EAAE,sBAAsB;IAC5C,eAAe,EAAE,iBAAiB;IAClC,wBAAwB,EAAE,0BAA0B;IACpD,mBAAmB,EAAE,qBAAqB;IAC1C,cAAc,EAAE,gBAAgB;IAChC,SAAS,EAAE,WAAW;IACtB,iBAAiB,EAAE,mBAAmB;
|
|
1
|
+
{"version":3,"file":"mirroredPrismaEnums.js","sourceRoot":"","sources":["../src/mirroredPrismaEnums.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"eventTaskVolunteerRewardUtils.test.d.ts","sourceRoot":"","sources":["../../../src/utils/__tests__/eventTaskVolunteerRewardUtils.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import { countEventTaskFilledSlots, eventTaskMaxBashPointsLiability, totalEventTaskBashPointsOffer, validateHostTaskBashPointsOffer, } from "../eventTaskVolunteerRewardUtils.js";
|
|
2
|
+
describe("eventTaskVolunteerRewardUtils", () => {
|
|
3
|
+
it("counts legacy assignee plus assignment rows without double count", () => {
|
|
4
|
+
expect(countEventTaskFilledSlots({
|
|
5
|
+
neededCount: 6,
|
|
6
|
+
bashPointsReward: 25,
|
|
7
|
+
assignedToId: "u1",
|
|
8
|
+
status: "Accepted",
|
|
9
|
+
assignments: [{ userId: "u1", status: "Accepted", bashPointsPaidAt: null }],
|
|
10
|
+
})).toBe(1);
|
|
11
|
+
expect(countEventTaskFilledSlots({
|
|
12
|
+
neededCount: 6,
|
|
13
|
+
bashPointsReward: 25,
|
|
14
|
+
assignedToId: null,
|
|
15
|
+
status: "Open",
|
|
16
|
+
assignments: [
|
|
17
|
+
{ userId: "u1", status: "Accepted", bashPointsPaidAt: null },
|
|
18
|
+
{ userId: "u2", status: "Accepted", bashPointsPaidAt: null },
|
|
19
|
+
],
|
|
20
|
+
})).toBe(2);
|
|
21
|
+
});
|
|
22
|
+
it("computes max liability and validates host balance", () => {
|
|
23
|
+
expect(eventTaskMaxBashPointsLiability({ neededCount: 6, bashPointsReward: 25 })).toBe(150);
|
|
24
|
+
const tasks = [
|
|
25
|
+
{ id: "t1", neededCount: 2, bashPointsReward: 10 },
|
|
26
|
+
{ id: "t2", neededCount: 1, bashPointsReward: 50 },
|
|
27
|
+
];
|
|
28
|
+
expect(totalEventTaskBashPointsOffer({ tasks })).toBe(70);
|
|
29
|
+
expect(validateHostTaskBashPointsOffer({
|
|
30
|
+
hostBashPointsBalance: 100,
|
|
31
|
+
tasks,
|
|
32
|
+
patch: { taskId: "t2", bashPointsReward: 80 },
|
|
33
|
+
}).ok).toBe(false);
|
|
34
|
+
expect(validateHostTaskBashPointsOffer({
|
|
35
|
+
hostBashPointsBalance: 100,
|
|
36
|
+
tasks,
|
|
37
|
+
patch: { taskId: "t2", bashPointsReward: 30 },
|
|
38
|
+
}).ok).toBe(true);
|
|
39
|
+
});
|
|
40
|
+
});
|
|
41
|
+
//# sourceMappingURL=eventTaskVolunteerRewardUtils.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"eventTaskVolunteerRewardUtils.test.js","sourceRoot":"","sources":["../../../src/utils/__tests__/eventTaskVolunteerRewardUtils.test.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EACzB,+BAA+B,EAC/B,6BAA6B,EAC7B,+BAA+B,GAChC,MAAM,qCAAqC,CAAC;AAE7C,QAAQ,CAAC,+BAA+B,EAAE,GAAG,EAAE;IAC7C,EAAE,CAAC,kEAAkE,EAAE,GAAG,EAAE;QAC1E,MAAM,CACJ,yBAAyB,CAAC;YACxB,WAAW,EAAE,CAAC;YACd,gBAAgB,EAAE,EAAE;YACpB,YAAY,EAAE,IAAI;YAClB,MAAM,EAAE,UAAU;YAClB,WAAW,EAAE,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC;SAC5E,CAAC,CACH,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACV,MAAM,CACJ,yBAAyB,CAAC;YACxB,WAAW,EAAE,CAAC;YACd,gBAAgB,EAAE,EAAE;YACpB,YAAY,EAAE,IAAI;YAClB,MAAM,EAAE,MAAM;YACd,WAAW,EAAE;gBACX,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,gBAAgB,EAAE,IAAI,EAAE;gBAC5D,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,gBAAgB,EAAE,IAAI,EAAE;aAC7D;SACF,CAAC,CACH,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACZ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QAC3D,MAAM,CACJ,+BAA+B,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,gBAAgB,EAAE,EAAE,EAAE,CAAC,CAC1E,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACZ,MAAM,KAAK,GAAG;YACZ,EAAE,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,EAAE,gBAAgB,EAAE,EAAE,EAAE;YAClD,EAAE,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,EAAE,gBAAgB,EAAE,EAAE,EAAE;SACnD,CAAC;QACF,MAAM,CAAC,6BAA6B,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC1D,MAAM,CACJ,+BAA+B,CAAC;YAC9B,qBAAqB,EAAE,GAAG;YAC1B,KAAK;YACL,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,EAAE,EAAE,EAAE;SAC9C,CAAC,CAAC,EAAE,CACN,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACd,MAAM,CACJ,+BAA+B,CAAC;YAC9B,qBAAqB,EAAE,GAAG;YAC1B,KAAK;YACL,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,EAAE,EAAE,EAAE;SAC9C,CAAC,CAAC,EAAE,CACN,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACf,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import type { EventTask, EventTaskAssignment } from "@prisma/client";
|
|
2
|
+
/** Default volunteer slots when host does not set neededCount. */
|
|
3
|
+
export declare const DEFAULT_EVENT_TASK_NEEDED_COUNT = 1;
|
|
4
|
+
export declare const MIN_EVENT_TASK_NEEDED_COUNT = 1;
|
|
5
|
+
export declare const MAX_EVENT_TASK_NEEDED_COUNT = 99;
|
|
6
|
+
export type EventTaskAssignmentLike = Pick<EventTaskAssignment, "status" | "bashPointsPaidAt"> & {
|
|
7
|
+
userId: string;
|
|
8
|
+
};
|
|
9
|
+
export type EventTaskSlotsLike = Pick<EventTask, "neededCount" | "bashPointsReward" | "assignedToId"> & {
|
|
10
|
+
status?: EventTask["status"];
|
|
11
|
+
assignments?: EventTaskAssignmentLike[] | null;
|
|
12
|
+
};
|
|
13
|
+
export declare function eventTaskNeededCount(task: Pick<EventTask, "neededCount">): number;
|
|
14
|
+
/** Counts filled volunteer slots (legacy assignedToId + assignment rows). */
|
|
15
|
+
export declare function countEventTaskFilledSlots(task: EventTaskSlotsLike): number;
|
|
16
|
+
export declare function countEventTaskOpenSlots(task: EventTaskSlotsLike): number;
|
|
17
|
+
export declare function eventTaskHasOpenSlots(task: EventTaskSlotsLike): boolean;
|
|
18
|
+
/** Per-volunteer reward (0 when unset). */
|
|
19
|
+
export declare function eventTaskBashPointsPerVolunteer(task: Pick<EventTask, "bashPointsReward">): number;
|
|
20
|
+
/** Max BashPoints liability if every slot completes. */
|
|
21
|
+
export declare function eventTaskMaxBashPointsLiability(task: Pick<EventTask, "neededCount" | "bashPointsReward">): number;
|
|
22
|
+
export type EventTaskOfferRow = Pick<EventTask, "id" | "neededCount" | "bashPointsReward">;
|
|
23
|
+
export declare function totalEventTaskBashPointsOffer(args: {
|
|
24
|
+
tasks: EventTaskOfferRow[];
|
|
25
|
+
patch?: {
|
|
26
|
+
taskId: string;
|
|
27
|
+
neededCount?: number | null;
|
|
28
|
+
bashPointsReward?: number | null;
|
|
29
|
+
};
|
|
30
|
+
}): number;
|
|
31
|
+
export type HostTaskOfferValidation = {
|
|
32
|
+
ok: true;
|
|
33
|
+
} | {
|
|
34
|
+
ok: false;
|
|
35
|
+
reason: string;
|
|
36
|
+
};
|
|
37
|
+
export declare function validateHostTaskBashPointsOffer(args: {
|
|
38
|
+
hostBashPointsBalance: number;
|
|
39
|
+
tasks: EventTaskOfferRow[];
|
|
40
|
+
patch?: {
|
|
41
|
+
taskId: string;
|
|
42
|
+
neededCount?: number | null;
|
|
43
|
+
bashPointsReward?: number | null;
|
|
44
|
+
};
|
|
45
|
+
}): HostTaskOfferValidation;
|
|
46
|
+
export declare function formatEventTaskBashPointsBadge(task: Pick<EventTask, "bashPointsReward">): string | null;
|
|
47
|
+
export declare function formatEventTaskAssignmentSlotsLabel(task: EventTaskSlotsLike): string;
|
|
48
|
+
export declare function isUserAssignedToEventTask(task: EventTaskSlotsLike & {
|
|
49
|
+
assignedToId?: string | null;
|
|
50
|
+
}, userId: string | null | undefined): boolean;
|
|
51
|
+
//# sourceMappingURL=eventTaskVolunteerRewardUtils.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"eventTaskVolunteerRewardUtils.d.ts","sourceRoot":"","sources":["../../src/utils/eventTaskVolunteerRewardUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAc,MAAM,gBAAgB,CAAC;AAEjF,kEAAkE;AAClE,eAAO,MAAM,+BAA+B,IAAI,CAAC;AAEjD,eAAO,MAAM,2BAA2B,IAAI,CAAC;AAC7C,eAAO,MAAM,2BAA2B,KAAK,CAAC;AAE9C,MAAM,MAAM,uBAAuB,GAAG,IAAI,CACxC,mBAAmB,EACnB,QAAQ,GAAG,kBAAkB,CAC9B,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEvB,MAAM,MAAM,kBAAkB,GAAG,IAAI,CACnC,SAAS,EACT,aAAa,GAAG,kBAAkB,GAAG,cAAc,CACpD,GAAG;IACF,MAAM,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;IAC7B,WAAW,CAAC,EAAE,uBAAuB,EAAE,GAAG,IAAI,CAAC;CAChD,CAAC;AASF,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,GACnC,MAAM,CAMR;AAED,6EAA6E;AAC7E,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,kBAAkB,GAAG,MAAM,CAe1E;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,kBAAkB,GAAG,MAAM,CAKxE;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAEvE;AAED,2CAA2C;AAC3C,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,kBAAkB,CAAC,GACxC,MAAM,CAIR;AAED,wDAAwD;AACxD,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,aAAa,GAAG,kBAAkB,CAAC,GACxD,MAAM,CAER;AAED,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAClC,SAAS,EACT,IAAI,GAAG,aAAa,GAAG,kBAAkB,CAC1C,CAAC;AAEF,wBAAgB,6BAA6B,CAAC,IAAI,EAAE;IAClD,KAAK,EAAE,iBAAiB,EAAE,CAAC;IAC3B,KAAK,CAAC,EAAE;QACN,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAC5B,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KAClC,CAAC;CACH,GAAG,MAAM,CAgBT;AAED,MAAM,MAAM,uBAAuB,GAC/B;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,GACZ;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAElC,wBAAgB,+BAA+B,CAAC,IAAI,EAAE;IACpD,qBAAqB,EAAE,MAAM,CAAC;IAC9B,KAAK,EAAE,iBAAiB,EAAE,CAAC;IAC3B,KAAK,CAAC,EAAE;QACN,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAC5B,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KAClC,CAAC;CACH,GAAG,uBAAuB,CAkC1B;AAED,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,kBAAkB,CAAC,GACxC,MAAM,GAAG,IAAI,CAIf;AAED,wBAAgB,mCAAmC,CACjD,IAAI,EAAE,kBAAkB,GACvB,MAAM,CAIR;AAED,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,kBAAkB,GAAG;IAAE,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,EAC3D,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAChC,OAAO,CAST"}
|
|
@@ -0,0 +1,114 @@
|
|
|
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
|
+
"Completed",
|
|
10
|
+
]);
|
|
11
|
+
export function eventTaskNeededCount(task) {
|
|
12
|
+
const n = task.neededCount ?? DEFAULT_EVENT_TASK_NEEDED_COUNT;
|
|
13
|
+
if (!Number.isFinite(n) || n < MIN_EVENT_TASK_NEEDED_COUNT) {
|
|
14
|
+
return DEFAULT_EVENT_TASK_NEEDED_COUNT;
|
|
15
|
+
}
|
|
16
|
+
return Math.min(Math.floor(n), MAX_EVENT_TASK_NEEDED_COUNT);
|
|
17
|
+
}
|
|
18
|
+
/** Counts filled volunteer slots (legacy assignedToId + assignment rows). */
|
|
19
|
+
export function countEventTaskFilledSlots(task) {
|
|
20
|
+
const assignments = task.assignments ?? [];
|
|
21
|
+
const fromRows = assignments.filter((a) => a.status && ACTIVE_ASSIGNMENT_STATUSES.has(a.status)).length;
|
|
22
|
+
if (task.assignedToId) {
|
|
23
|
+
const legacyCounted = assignments.some((a) => a.userId === task.assignedToId);
|
|
24
|
+
if (!legacyCounted) {
|
|
25
|
+
return fromRows + 1;
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
return fromRows;
|
|
29
|
+
}
|
|
30
|
+
export function countEventTaskOpenSlots(task) {
|
|
31
|
+
return Math.max(0, eventTaskNeededCount(task) - countEventTaskFilledSlots(task));
|
|
32
|
+
}
|
|
33
|
+
export function eventTaskHasOpenSlots(task) {
|
|
34
|
+
return countEventTaskOpenSlots(task) > 0;
|
|
35
|
+
}
|
|
36
|
+
/** Per-volunteer reward (0 when unset). */
|
|
37
|
+
export function eventTaskBashPointsPerVolunteer(task) {
|
|
38
|
+
const n = task.bashPointsReward ?? 0;
|
|
39
|
+
if (!Number.isFinite(n) || n <= 0)
|
|
40
|
+
return 0;
|
|
41
|
+
return Math.floor(n);
|
|
42
|
+
}
|
|
43
|
+
/** Max BashPoints liability if every slot completes. */
|
|
44
|
+
export function eventTaskMaxBashPointsLiability(task) {
|
|
45
|
+
return eventTaskNeededCount(task) * eventTaskBashPointsPerVolunteer(task);
|
|
46
|
+
}
|
|
47
|
+
export function totalEventTaskBashPointsOffer(args) {
|
|
48
|
+
let total = 0;
|
|
49
|
+
for (const t of args.tasks) {
|
|
50
|
+
const isPatch = args.patch?.taskId === t.id;
|
|
51
|
+
const neededCount = isPatch
|
|
52
|
+
? (args.patch?.neededCount ?? t.neededCount)
|
|
53
|
+
: t.neededCount;
|
|
54
|
+
const bashPointsReward = isPatch
|
|
55
|
+
? (args.patch?.bashPointsReward ?? t.bashPointsReward)
|
|
56
|
+
: t.bashPointsReward;
|
|
57
|
+
total += eventTaskMaxBashPointsLiability({
|
|
58
|
+
neededCount,
|
|
59
|
+
bashPointsReward,
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
return total;
|
|
63
|
+
}
|
|
64
|
+
export function validateHostTaskBashPointsOffer(args) {
|
|
65
|
+
const perVolunteer = args.patch
|
|
66
|
+
? eventTaskBashPointsPerVolunteer({
|
|
67
|
+
bashPointsReward: args.patch.bashPointsReward ?? null,
|
|
68
|
+
})
|
|
69
|
+
: 0;
|
|
70
|
+
const needed = args.patch
|
|
71
|
+
? eventTaskNeededCount({ neededCount: args.patch.neededCount ?? null })
|
|
72
|
+
: 0;
|
|
73
|
+
if (args.patch && perVolunteer > 0 && needed < MIN_EVENT_TASK_NEEDED_COUNT) {
|
|
74
|
+
return {
|
|
75
|
+
ok: false,
|
|
76
|
+
reason: "Set at least one volunteer slot when offering BashPoints.",
|
|
77
|
+
};
|
|
78
|
+
}
|
|
79
|
+
if (perVolunteer < 0) {
|
|
80
|
+
return { ok: false, reason: "BashPoints reward cannot be negative." };
|
|
81
|
+
}
|
|
82
|
+
const totalOffer = totalEventTaskBashPointsOffer({
|
|
83
|
+
tasks: args.tasks,
|
|
84
|
+
patch: args.patch,
|
|
85
|
+
});
|
|
86
|
+
if (totalOffer > args.hostBashPointsBalance) {
|
|
87
|
+
return {
|
|
88
|
+
ok: false,
|
|
89
|
+
reason: `Total BashPoints offered across tasks (${totalOffer}) exceeds your balance (${args.hostBashPointsBalance}). Lower rewards or slots, or earn more BashPoints.`,
|
|
90
|
+
};
|
|
91
|
+
}
|
|
92
|
+
return { ok: true };
|
|
93
|
+
}
|
|
94
|
+
export function formatEventTaskBashPointsBadge(task) {
|
|
95
|
+
const bp = eventTaskBashPointsPerVolunteer(task);
|
|
96
|
+
if (bp <= 0)
|
|
97
|
+
return null;
|
|
98
|
+
return `+${bp} BP`;
|
|
99
|
+
}
|
|
100
|
+
export function formatEventTaskAssignmentSlotsLabel(task) {
|
|
101
|
+
const needed = eventTaskNeededCount(task);
|
|
102
|
+
const filled = countEventTaskFilledSlots(task);
|
|
103
|
+
return `${filled}/${needed} assigned`;
|
|
104
|
+
}
|
|
105
|
+
export function isUserAssignedToEventTask(task, userId) {
|
|
106
|
+
if (!userId)
|
|
107
|
+
return false;
|
|
108
|
+
if (task.assignedToId === userId)
|
|
109
|
+
return true;
|
|
110
|
+
return (task.assignments ?? []).some((a) => a.userId === userId &&
|
|
111
|
+
a.status &&
|
|
112
|
+
ACTIVE_ASSIGNMENT_STATUSES.has(a.status));
|
|
113
|
+
}
|
|
114
|
+
//# 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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"}
|
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,
|
|
@@ -1876,12 +1877,23 @@ export const TASK_COMMENT_DATA_TO_INCLUDE = {
|
|
|
1876
1877
|
},
|
|
1877
1878
|
} satisfies Prisma.TaskCommentInclude;
|
|
1878
1879
|
|
|
1880
|
+
export interface EventTaskAssignmentExt extends EventTaskAssignment {
|
|
1881
|
+
user: PublicUser;
|
|
1882
|
+
}
|
|
1883
|
+
|
|
1879
1884
|
export interface EventTaskExt extends EventTask {
|
|
1880
1885
|
creator: PublicUser;
|
|
1881
1886
|
assignedTo?: PublicUser | null;
|
|
1887
|
+
assignments?: EventTaskAssignmentExt[];
|
|
1882
1888
|
comments?: TaskCommentExt[];
|
|
1883
1889
|
}
|
|
1884
1890
|
|
|
1891
|
+
export const EVENT_TASK_ASSIGNMENT_DATA_TO_INCLUDE = {
|
|
1892
|
+
user: {
|
|
1893
|
+
select: FRONT_END_USER_DATA_TO_SELECT,
|
|
1894
|
+
},
|
|
1895
|
+
} satisfies Prisma.EventTaskAssignmentInclude;
|
|
1896
|
+
|
|
1885
1897
|
export const EVENT_TASK_DATA_TO_INCLUDE = {
|
|
1886
1898
|
creator: {
|
|
1887
1899
|
select: FRONT_END_USER_DATA_TO_SELECT,
|
|
@@ -1889,6 +1901,12 @@ export const EVENT_TASK_DATA_TO_INCLUDE = {
|
|
|
1889
1901
|
assignedTo: {
|
|
1890
1902
|
select: FRONT_END_USER_DATA_TO_SELECT,
|
|
1891
1903
|
},
|
|
1904
|
+
assignments: {
|
|
1905
|
+
include: EVENT_TASK_ASSIGNMENT_DATA_TO_INCLUDE,
|
|
1906
|
+
orderBy: {
|
|
1907
|
+
createdAt: "asc" as const,
|
|
1908
|
+
},
|
|
1909
|
+
},
|
|
1892
1910
|
comments: {
|
|
1893
1911
|
include: TASK_COMMENT_DATA_TO_INCLUDE,
|
|
1894
1912
|
orderBy: {
|
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";
|
|
@@ -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
|
+
});
|
|
@@ -0,0 +1,190 @@
|
|
|
1
|
+
import type { EventTask, EventTaskAssignment, TaskStatus } from "@prisma/client";
|
|
2
|
+
|
|
3
|
+
/** Default volunteer slots when host does not set neededCount. */
|
|
4
|
+
export const DEFAULT_EVENT_TASK_NEEDED_COUNT = 1;
|
|
5
|
+
|
|
6
|
+
export const MIN_EVENT_TASK_NEEDED_COUNT = 1;
|
|
7
|
+
export const MAX_EVENT_TASK_NEEDED_COUNT = 99;
|
|
8
|
+
|
|
9
|
+
export type EventTaskAssignmentLike = Pick<
|
|
10
|
+
EventTaskAssignment,
|
|
11
|
+
"status" | "bashPointsPaidAt"
|
|
12
|
+
> & { userId: string };
|
|
13
|
+
|
|
14
|
+
export type EventTaskSlotsLike = Pick<
|
|
15
|
+
EventTask,
|
|
16
|
+
"neededCount" | "bashPointsReward" | "assignedToId"
|
|
17
|
+
> & {
|
|
18
|
+
status?: EventTask["status"];
|
|
19
|
+
assignments?: EventTaskAssignmentLike[] | null;
|
|
20
|
+
};
|
|
21
|
+
|
|
22
|
+
const ACTIVE_ASSIGNMENT_STATUSES = new Set<TaskStatus>([
|
|
23
|
+
"Pending",
|
|
24
|
+
"Assigned",
|
|
25
|
+
"Accepted",
|
|
26
|
+
"Completed",
|
|
27
|
+
]);
|
|
28
|
+
|
|
29
|
+
export function eventTaskNeededCount(
|
|
30
|
+
task: Pick<EventTask, "neededCount">
|
|
31
|
+
): number {
|
|
32
|
+
const n = task.neededCount ?? DEFAULT_EVENT_TASK_NEEDED_COUNT;
|
|
33
|
+
if (!Number.isFinite(n) || n < MIN_EVENT_TASK_NEEDED_COUNT) {
|
|
34
|
+
return DEFAULT_EVENT_TASK_NEEDED_COUNT;
|
|
35
|
+
}
|
|
36
|
+
return Math.min(Math.floor(n), MAX_EVENT_TASK_NEEDED_COUNT);
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
/** Counts filled volunteer slots (legacy assignedToId + assignment rows). */
|
|
40
|
+
export function countEventTaskFilledSlots(task: EventTaskSlotsLike): number {
|
|
41
|
+
const assignments = task.assignments ?? [];
|
|
42
|
+
const fromRows = assignments.filter(
|
|
43
|
+
(a) => a.status && ACTIVE_ASSIGNMENT_STATUSES.has(a.status)
|
|
44
|
+
).length;
|
|
45
|
+
|
|
46
|
+
if (task.assignedToId) {
|
|
47
|
+
const legacyCounted = assignments.some(
|
|
48
|
+
(a) => a.userId === task.assignedToId
|
|
49
|
+
);
|
|
50
|
+
if (!legacyCounted) {
|
|
51
|
+
return fromRows + 1;
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
return fromRows;
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
export function countEventTaskOpenSlots(task: EventTaskSlotsLike): number {
|
|
58
|
+
return Math.max(
|
|
59
|
+
0,
|
|
60
|
+
eventTaskNeededCount(task) - countEventTaskFilledSlots(task)
|
|
61
|
+
);
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
export function eventTaskHasOpenSlots(task: EventTaskSlotsLike): boolean {
|
|
65
|
+
return countEventTaskOpenSlots(task) > 0;
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
/** Per-volunteer reward (0 when unset). */
|
|
69
|
+
export function eventTaskBashPointsPerVolunteer(
|
|
70
|
+
task: Pick<EventTask, "bashPointsReward">
|
|
71
|
+
): number {
|
|
72
|
+
const n = task.bashPointsReward ?? 0;
|
|
73
|
+
if (!Number.isFinite(n) || n <= 0) return 0;
|
|
74
|
+
return Math.floor(n);
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
/** Max BashPoints liability if every slot completes. */
|
|
78
|
+
export function eventTaskMaxBashPointsLiability(
|
|
79
|
+
task: Pick<EventTask, "neededCount" | "bashPointsReward">
|
|
80
|
+
): number {
|
|
81
|
+
return eventTaskNeededCount(task) * eventTaskBashPointsPerVolunteer(task);
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
export type EventTaskOfferRow = Pick<
|
|
85
|
+
EventTask,
|
|
86
|
+
"id" | "neededCount" | "bashPointsReward"
|
|
87
|
+
>;
|
|
88
|
+
|
|
89
|
+
export function totalEventTaskBashPointsOffer(args: {
|
|
90
|
+
tasks: EventTaskOfferRow[];
|
|
91
|
+
patch?: {
|
|
92
|
+
taskId: string;
|
|
93
|
+
neededCount?: number | null;
|
|
94
|
+
bashPointsReward?: number | null;
|
|
95
|
+
};
|
|
96
|
+
}): number {
|
|
97
|
+
let total = 0;
|
|
98
|
+
for (const t of args.tasks) {
|
|
99
|
+
const isPatch = args.patch?.taskId === t.id;
|
|
100
|
+
const neededCount = isPatch
|
|
101
|
+
? (args.patch?.neededCount ?? t.neededCount)
|
|
102
|
+
: t.neededCount;
|
|
103
|
+
const bashPointsReward = isPatch
|
|
104
|
+
? (args.patch?.bashPointsReward ?? t.bashPointsReward)
|
|
105
|
+
: t.bashPointsReward;
|
|
106
|
+
total += eventTaskMaxBashPointsLiability({
|
|
107
|
+
neededCount,
|
|
108
|
+
bashPointsReward,
|
|
109
|
+
});
|
|
110
|
+
}
|
|
111
|
+
return total;
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
export type HostTaskOfferValidation =
|
|
115
|
+
| { ok: true }
|
|
116
|
+
| { ok: false; reason: string };
|
|
117
|
+
|
|
118
|
+
export function validateHostTaskBashPointsOffer(args: {
|
|
119
|
+
hostBashPointsBalance: number;
|
|
120
|
+
tasks: EventTaskOfferRow[];
|
|
121
|
+
patch?: {
|
|
122
|
+
taskId: string;
|
|
123
|
+
neededCount?: number | null;
|
|
124
|
+
bashPointsReward?: number | null;
|
|
125
|
+
};
|
|
126
|
+
}): HostTaskOfferValidation {
|
|
127
|
+
const perVolunteer = args.patch
|
|
128
|
+
? eventTaskBashPointsPerVolunteer({
|
|
129
|
+
bashPointsReward: args.patch.bashPointsReward ?? null,
|
|
130
|
+
})
|
|
131
|
+
: 0;
|
|
132
|
+
const needed = args.patch
|
|
133
|
+
? eventTaskNeededCount({ neededCount: args.patch.neededCount ?? null })
|
|
134
|
+
: 0;
|
|
135
|
+
|
|
136
|
+
if (args.patch && perVolunteer > 0 && needed < MIN_EVENT_TASK_NEEDED_COUNT) {
|
|
137
|
+
return {
|
|
138
|
+
ok: false,
|
|
139
|
+
reason: "Set at least one volunteer slot when offering BashPoints.",
|
|
140
|
+
};
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
if (perVolunteer < 0) {
|
|
144
|
+
return { ok: false, reason: "BashPoints reward cannot be negative." };
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
const totalOffer = totalEventTaskBashPointsOffer({
|
|
148
|
+
tasks: args.tasks,
|
|
149
|
+
patch: args.patch,
|
|
150
|
+
});
|
|
151
|
+
|
|
152
|
+
if (totalOffer > args.hostBashPointsBalance) {
|
|
153
|
+
return {
|
|
154
|
+
ok: false,
|
|
155
|
+
reason: `Total BashPoints offered across tasks (${totalOffer}) exceeds your balance (${args.hostBashPointsBalance}). Lower rewards or slots, or earn more BashPoints.`,
|
|
156
|
+
};
|
|
157
|
+
}
|
|
158
|
+
|
|
159
|
+
return { ok: true };
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
export function formatEventTaskBashPointsBadge(
|
|
163
|
+
task: Pick<EventTask, "bashPointsReward">
|
|
164
|
+
): string | null {
|
|
165
|
+
const bp = eventTaskBashPointsPerVolunteer(task);
|
|
166
|
+
if (bp <= 0) return null;
|
|
167
|
+
return `+${bp} BP`;
|
|
168
|
+
}
|
|
169
|
+
|
|
170
|
+
export function formatEventTaskAssignmentSlotsLabel(
|
|
171
|
+
task: EventTaskSlotsLike
|
|
172
|
+
): string {
|
|
173
|
+
const needed = eventTaskNeededCount(task);
|
|
174
|
+
const filled = countEventTaskFilledSlots(task);
|
|
175
|
+
return `${filled}/${needed} assigned`;
|
|
176
|
+
}
|
|
177
|
+
|
|
178
|
+
export function isUserAssignedToEventTask(
|
|
179
|
+
task: EventTaskSlotsLike & { assignedToId?: string | null },
|
|
180
|
+
userId: string | null | undefined
|
|
181
|
+
): boolean {
|
|
182
|
+
if (!userId) return false;
|
|
183
|
+
if (task.assignedToId === userId) return true;
|
|
184
|
+
return (task.assignments ?? []).some(
|
|
185
|
+
(a) =>
|
|
186
|
+
a.userId === userId &&
|
|
187
|
+
a.status &&
|
|
188
|
+
ACTIVE_ASSIGNMENT_STATUSES.has(a.status)
|
|
189
|
+
);
|
|
190
|
+
}
|