@bash-app/bash-common 30.174.0 → 30.176.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/bashFeedTypes.d.ts +3 -0
- package/dist/bashFeedTypes.d.ts.map +1 -1
- package/dist/definitions.d.ts +7 -0
- package/dist/definitions.d.ts.map +1 -1
- package/dist/definitions.js +6 -0
- package/dist/definitions.js.map +1 -1
- package/dist/extendedSchemas.d.ts +226 -5
- package/dist/extendedSchemas.d.ts.map +1 -1
- package/dist/extendedSchemas.js +7 -0
- package/dist/extendedSchemas.js.map +1 -1
- package/dist/utils/addressUtils.d.ts +5 -0
- package/dist/utils/addressUtils.d.ts.map +1 -1
- package/dist/utils/addressUtils.js +8 -0
- package/dist/utils/addressUtils.js.map +1 -1
- package/package.json +1 -1
- package/prisma/schema.prisma +71 -4
- package/src/bashFeedTypes.ts +3 -0
- package/src/definitions.ts +8 -0
- package/src/extendedSchemas.ts +50 -4
- package/src/utils/addressUtils.ts +15 -0
package/dist/extendedSchemas.js
CHANGED
|
@@ -56,6 +56,10 @@ export const FRONT_END_USER_DATA_TO_SELECT = {
|
|
|
56
56
|
isFirstInCity: true,
|
|
57
57
|
/** Venmo / Zelle / CashApp handle for off-platform payouts (promoters). */
|
|
58
58
|
paymentHandle: true,
|
|
59
|
+
/** Host reputation fields */
|
|
60
|
+
hostRating: true,
|
|
61
|
+
totalRatings: true,
|
|
62
|
+
totalEventsHosted: true,
|
|
59
63
|
};
|
|
60
64
|
export const PRIVATE_USER_ACCOUNT_TO_SELECT = {
|
|
61
65
|
...FRONT_END_USER_DATA_TO_SELECT,
|
|
@@ -426,6 +430,9 @@ export const BASH_NOTIFICATION_DATA_TO_INCLUDE = {
|
|
|
426
430
|
creator: {
|
|
427
431
|
select: {
|
|
428
432
|
image: true,
|
|
433
|
+
uploadedImage: true,
|
|
434
|
+
imageUpdatedAt: true,
|
|
435
|
+
uploadedImageUpdatedAt: true,
|
|
429
436
|
},
|
|
430
437
|
},
|
|
431
438
|
service: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extendedSchemas.js","sourceRoot":"","sources":["../src/extendedSchemas.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"extendedSchemas.js","sourceRoot":"","sources":["../src/extendedSchemas.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,11 @@ import { IAddress } from "../definitions.js";
|
|
|
2
2
|
export declare function addressHasEnoughDataForGeolocation(address: IAddress): boolean;
|
|
3
3
|
export declare function addressValuesToDatabaseAddressString(addressValues: IAddress): string;
|
|
4
4
|
export declare function databaseAddressStringToAddressValues(addressString: string | undefined | null): IAddress;
|
|
5
|
+
/**
|
|
6
|
+
* City, state/region, and country for compact card/list UIs (no street or full formatted address).
|
|
7
|
+
* Detail pages should use {@link databaseAddressStringToOneLineString} or full address fields.
|
|
8
|
+
*/
|
|
9
|
+
export declare function formatLocalityForCardDisplay(city?: string | null, state?: string | null, country?: string | null): string;
|
|
5
10
|
export declare function databaseAddressStringToOneLineString(addressString: string | undefined | null): string;
|
|
6
11
|
export declare function databaseAddressStringToDisplayString(addressString: string | undefined | null): string;
|
|
7
12
|
export declare function addressToDisplayString(address: IAddress): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addressUtils.d.ts","sourceRoot":"","sources":["../../src/utils/addressUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAO7C,wBAAgB,kCAAkC,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAE7E;AAED,wBAAgB,oCAAoC,CAAC,aAAa,EAAE,QAAQ,GAAG,MAAM,CAGpF;AAED,wBAAgB,oCAAoC,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,QAAQ,CAavG;AAGD,wBAAgB,oCAAoC,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,MAAM,CAgCrG;AAED,wBAAgB,oCAAoC,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,MAAM,CAerG;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,QAAQ,GAAG,MAAM,CAKhE;AAGD,wBAAsB,yBAAyB,CAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAI,OAAO,CAAC,QAAQ,CAAC,CAwC7F;AAED,UAAU,sBAAsB;IAC9B,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,iBAAiB;IACzB,kBAAkB,CAAC,EAAE,sBAAsB,EAAE,CAAC;IAC9C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,iBAAiB,GAAG,QAAQ,CA0C3E;AAGD,wBAAsB,4BAA4B,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAC,GAAG,SAAS,CAAC,CAuBrH"}
|
|
1
|
+
{"version":3,"file":"addressUtils.d.ts","sourceRoot":"","sources":["../../src/utils/addressUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAO7C,wBAAgB,kCAAkC,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAE7E;AAED,wBAAgB,oCAAoC,CAAC,aAAa,EAAE,QAAQ,GAAG,MAAM,CAGpF;AAED,wBAAgB,oCAAoC,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,QAAQ,CAavG;AAGD;;;GAGG;AACH,wBAAgB,4BAA4B,CAC1C,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,EACpB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,EACrB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,GACtB,MAAM,CAKR;AAED,wBAAgB,oCAAoC,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,MAAM,CAgCrG;AAED,wBAAgB,oCAAoC,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,MAAM,CAerG;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,QAAQ,GAAG,MAAM,CAKhE;AAGD,wBAAsB,yBAAyB,CAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAI,OAAO,CAAC,QAAQ,CAAC,CAwC7F;AAED,UAAU,sBAAsB;IAC9B,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,iBAAiB;IACzB,kBAAkB,CAAC,EAAE,sBAAsB,EAAE,CAAC;IAC9C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,iBAAiB,GAAG,QAAQ,CA0C3E;AAGD,wBAAsB,4BAA4B,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAC,GAAG,SAAS,CAAC,CAuBrH"}
|
|
@@ -21,6 +21,14 @@ export function databaseAddressStringToAddressValues(addressString) {
|
|
|
21
21
|
}
|
|
22
22
|
return { place: '', street: '', city: '', state: '', zipCode: '', country: '' };
|
|
23
23
|
}
|
|
24
|
+
/**
|
|
25
|
+
* City, state/region, and country for compact card/list UIs (no street or full formatted address).
|
|
26
|
+
* Detail pages should use {@link databaseAddressStringToOneLineString} or full address fields.
|
|
27
|
+
*/
|
|
28
|
+
export function formatLocalityForCardDisplay(city, state, country) {
|
|
29
|
+
const parts = [city?.trim(), state?.trim(), country?.trim()].filter((p) => !!p && p.length > 0);
|
|
30
|
+
return parts.join(", ");
|
|
31
|
+
}
|
|
24
32
|
export function databaseAddressStringToOneLineString(addressString) {
|
|
25
33
|
if (addressString) {
|
|
26
34
|
// Special handling for place-only addresses
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addressUtils.js","sourceRoot":"","sources":["../../src/utils/addressUtils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"addressUtils.js","sourceRoot":"","sources":["../../src/utils/addressUtils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/prisma/schema.prisma
CHANGED
|
@@ -223,6 +223,8 @@ model Competition {
|
|
|
223
223
|
subtype String? // Subcategory
|
|
224
224
|
rules String? @db.Text // Detailed rules/disclaimers
|
|
225
225
|
judgingType JudgingType? // How winner is determined
|
|
226
|
+
/// Rubric for JUDGES mode: JSON array of { id, label, maxScore }
|
|
227
|
+
rubric Json?
|
|
226
228
|
startTime DateTime? // Competition start time (for voting)
|
|
227
229
|
endTime DateTime? // Competition end time (for voting)
|
|
228
230
|
allowSelfRegistration Boolean @default(false)
|
|
@@ -239,10 +241,12 @@ model Competition {
|
|
|
239
241
|
owner User @relation(fields: [userId], references: [id], onDelete: Cascade)
|
|
240
242
|
sponsor CompetitionSponsor[]
|
|
241
243
|
prizes Prize[]
|
|
242
|
-
participants
|
|
243
|
-
votes
|
|
244
|
-
matches
|
|
245
|
-
|
|
244
|
+
participants CompetitionParticipant[]
|
|
245
|
+
votes CompetitionVote[]
|
|
246
|
+
matches CompetitionMatch[]
|
|
247
|
+
judgeAssignments CompetitionJudgeAssignment[]
|
|
248
|
+
judgeScores CompetitionJudgeScore[]
|
|
249
|
+
notifications Notification[]
|
|
246
250
|
|
|
247
251
|
@@index([bashEventId])
|
|
248
252
|
@@index([competitionType])
|
|
@@ -250,6 +254,36 @@ model Competition {
|
|
|
250
254
|
@@index([endTime])
|
|
251
255
|
}
|
|
252
256
|
|
|
257
|
+
model CompetitionJudgeAssignment {
|
|
258
|
+
id String @id @default(cuid())
|
|
259
|
+
competitionId String
|
|
260
|
+
judgeUserId String
|
|
261
|
+
createdAt DateTime @default(now())
|
|
262
|
+
competition Competition @relation(fields: [competitionId], references: [id], onDelete: Cascade)
|
|
263
|
+
judge User @relation("CompetitionJudgeAssignments", fields: [judgeUserId], references: [id], onDelete: Cascade)
|
|
264
|
+
|
|
265
|
+
@@unique([competitionId, judgeUserId])
|
|
266
|
+
@@index([judgeUserId])
|
|
267
|
+
}
|
|
268
|
+
|
|
269
|
+
model CompetitionJudgeScore {
|
|
270
|
+
id String @id @default(cuid())
|
|
271
|
+
competitionId String
|
|
272
|
+
participantId String
|
|
273
|
+
judgeUserId String
|
|
274
|
+
scores Json
|
|
275
|
+
totalScore Float
|
|
276
|
+
notes String?
|
|
277
|
+
submittedAt DateTime @default(now())
|
|
278
|
+
competition Competition @relation(fields: [competitionId], references: [id], onDelete: Cascade)
|
|
279
|
+
participant CompetitionParticipant @relation(fields: [participantId], references: [id], onDelete: Cascade)
|
|
280
|
+
judge User @relation("CompetitionJudgeScoresAuthored", fields: [judgeUserId], references: [id], onDelete: Cascade)
|
|
281
|
+
|
|
282
|
+
@@unique([competitionId, participantId, judgeUserId])
|
|
283
|
+
@@index([competitionId])
|
|
284
|
+
@@index([judgeUserId])
|
|
285
|
+
}
|
|
286
|
+
|
|
253
287
|
model CompetitionSponsor {
|
|
254
288
|
id String @id @default(cuid())
|
|
255
289
|
competitionId String
|
|
@@ -286,6 +320,7 @@ model CompetitionParticipant {
|
|
|
286
320
|
matchesAsParticipant1 CompetitionMatch[] @relation("MatchParticipant1")
|
|
287
321
|
matchesAsParticipant2 CompetitionMatch[] @relation("MatchParticipant2")
|
|
288
322
|
matchesWon CompetitionMatch[] @relation("MatchWinner")
|
|
323
|
+
judgeScores CompetitionJudgeScore[]
|
|
289
324
|
|
|
290
325
|
@@index([competitionId])
|
|
291
326
|
@@index([userId])
|
|
@@ -621,6 +656,8 @@ model BashEvent {
|
|
|
621
656
|
topPromoterPrize String? // Optional prize label: "Free table for your crew"
|
|
622
657
|
promoterLeaderboardIsPublic Boolean @default(false) // Host opts in to public leaderboard
|
|
623
658
|
showAttendees Boolean @default(true)
|
|
659
|
+
/// Host opt-in: show soft "public interest" controls on the event page (signed-in viewers). Not a guest list; invite RSVP stays separate.
|
|
660
|
+
allowPublicInterestRsvp Boolean @default(false)
|
|
624
661
|
attendeeDisplayMode String @default("All") // "All" | "NetworkOnly" | "Hidden"
|
|
625
662
|
servicePreferences Json? // New tiered status: { "Entertainment": "need", "Sponsors": "booked_closed", ... }
|
|
626
663
|
bookedServices Json? // Booked service details: { "Entertainment": { serviceId: "...", providerId: "...", bookedAt: "..." }, ... }
|
|
@@ -704,6 +741,7 @@ model BashEvent {
|
|
|
704
741
|
userPromoCodeRedemption UserPromoCodeRedemption[]
|
|
705
742
|
userReport UserReport[]
|
|
706
743
|
vendorBookingRequests VendorBookingRequest[] @relation("VendorBookingEvent")
|
|
744
|
+
vendorBids VendorBid[]
|
|
707
745
|
media Media[] @relation("BashEventToMedia")
|
|
708
746
|
associatedServicesReferencingMe Service[] @relation("BashEventToService")
|
|
709
747
|
userConnections UserConnection[]
|
|
@@ -728,6 +766,9 @@ model BashEvent {
|
|
|
728
766
|
interests IdeaInterest[]
|
|
729
767
|
configurations IdeaConfiguration[]
|
|
730
768
|
|
|
769
|
+
/** Logged-in users: soft RSVP (Going / Maybe / NotGoing) for public published events — not org EventRSVP */
|
|
770
|
+
publicBashRsvps PublicBashRsvp[]
|
|
771
|
+
|
|
731
772
|
// Claiming Relations
|
|
732
773
|
claimRequests ClaimRequest[]
|
|
733
774
|
scrapedMetadata ScrapedEventMetadata?
|
|
@@ -825,6 +866,23 @@ model IdeaConfiguration {
|
|
|
825
866
|
@@index([isActive])
|
|
826
867
|
}
|
|
827
868
|
|
|
869
|
+
/// Soft RSVP for public Bash events (logged-in users). Distinct from org-scoped EventRSVP.
|
|
870
|
+
model PublicBashRsvp {
|
|
871
|
+
id String @id @default(cuid())
|
|
872
|
+
bashEventId String
|
|
873
|
+
userId String
|
|
874
|
+
status String @default("Maybe") // Going | Maybe | NotGoing
|
|
875
|
+
createdAt DateTime @default(now())
|
|
876
|
+
updatedAt DateTime @updatedAt
|
|
877
|
+
|
|
878
|
+
bashEvent BashEvent @relation(fields: [bashEventId], references: [id], onDelete: Cascade)
|
|
879
|
+
user User @relation(fields: [userId], references: [id], onDelete: Cascade)
|
|
880
|
+
|
|
881
|
+
@@unique([bashEventId, userId])
|
|
882
|
+
@@index([bashEventId])
|
|
883
|
+
@@index([userId])
|
|
884
|
+
}
|
|
885
|
+
|
|
828
886
|
// Per-event referral rewards: host defines tiers (e.g. 3 referrals = free drink)
|
|
829
887
|
model EventReferralReward {
|
|
830
888
|
id String @id @default(cuid())
|
|
@@ -1341,6 +1399,7 @@ model TargetAudience {
|
|
|
1341
1399
|
education Education[]
|
|
1342
1400
|
secondaryEducation Education[]
|
|
1343
1401
|
showOnDetailPage Boolean @default(true)
|
|
1402
|
+
notes String?
|
|
1344
1403
|
bashEvent BashEvent?
|
|
1345
1404
|
service Service?
|
|
1346
1405
|
}
|
|
@@ -1683,6 +1742,8 @@ model User {
|
|
|
1683
1742
|
competitionSponsorships CompetitionSponsor[]
|
|
1684
1743
|
competitionParticipations CompetitionParticipant[]
|
|
1685
1744
|
competitionVotes CompetitionVote[]
|
|
1745
|
+
competitionJudgeAssignments CompetitionJudgeAssignment[] @relation("CompetitionJudgeAssignments")
|
|
1746
|
+
competitionJudgeScoresAuthored CompetitionJudgeScore[] @relation("CompetitionJudgeScoresAuthored")
|
|
1686
1747
|
contacts Contact[]
|
|
1687
1748
|
contactLists ContactList[] @relation("UserContactLists")
|
|
1688
1749
|
contactlist ContactList[]
|
|
@@ -1732,6 +1793,7 @@ model User {
|
|
|
1732
1793
|
suspendedBy User? @relation("SuspendedUsers", fields: [suspendedById], references: [id])
|
|
1733
1794
|
suspendedUsers User[] @relation("SuspendedUsers")
|
|
1734
1795
|
favorites UserFavorite[]
|
|
1796
|
+
publicBashRsvps PublicBashRsvp[]
|
|
1735
1797
|
following UserFollowing[] @relation("Follower")
|
|
1736
1798
|
followers UserFollowing[] @relation("Following")
|
|
1737
1799
|
connectionRequestsSent UserConnection[] @relation("ConnectionRequestsSent")
|
|
@@ -2548,7 +2610,10 @@ model VendorBid {
|
|
|
2548
2610
|
bidAmountCents Int
|
|
2549
2611
|
eventDetails String
|
|
2550
2612
|
eventDate DateTime?
|
|
2613
|
+
/// When `bashEventId` is set, treat `BashEvent.amountOfGuests` as the source of truth for headcount; keep this in sync or leave null.
|
|
2551
2614
|
expectedAttendees Int?
|
|
2615
|
+
/// Optional link to the host bash. Prefer guest counts from `bashEvent.amountOfGuests` over duplicating `expectedAttendees`.
|
|
2616
|
+
bashEventId String?
|
|
2552
2617
|
status VendorBidStatus @default(Pending)
|
|
2553
2618
|
respondedAt DateTime?
|
|
2554
2619
|
responseMessage String?
|
|
@@ -2556,12 +2621,14 @@ model VendorBid {
|
|
|
2556
2621
|
paidAt DateTime?
|
|
2557
2622
|
createdAt DateTime @default(now())
|
|
2558
2623
|
updatedAt DateTime @updatedAt
|
|
2624
|
+
bashEvent BashEvent? @relation(fields: [bashEventId], references: [id], onDelete: SetNull)
|
|
2559
2625
|
user User @relation(fields: [userId], references: [id], onDelete: Cascade)
|
|
2560
2626
|
vendor Vendor @relation(fields: [vendorId], references: [id], onDelete: Cascade)
|
|
2561
2627
|
|
|
2562
2628
|
@@index([vendorId])
|
|
2563
2629
|
@@index([userId])
|
|
2564
2630
|
@@index([status])
|
|
2631
|
+
@@index([bashEventId])
|
|
2565
2632
|
}
|
|
2566
2633
|
|
|
2567
2634
|
model Exhibitor {
|
package/src/bashFeedTypes.ts
CHANGED
|
@@ -129,6 +129,7 @@ export interface BashFeedPostBashSummaryWire {
|
|
|
129
129
|
status?: string;
|
|
130
130
|
ideaExpiresAt?: string | null;
|
|
131
131
|
isAutoApprovable?: boolean;
|
|
132
|
+
ideaInterestThreshold?: number | null;
|
|
132
133
|
privacy:
|
|
133
134
|
| "Public"
|
|
134
135
|
| "ContactsOnly"
|
|
@@ -143,6 +144,8 @@ export interface BashFeedPostBashSummaryWire {
|
|
|
143
144
|
}>;
|
|
144
145
|
_count?: {
|
|
145
146
|
tickets: number;
|
|
147
|
+
/** IdeaInterest rows (Prisma relation name `interests`) */
|
|
148
|
+
interests?: number;
|
|
146
149
|
};
|
|
147
150
|
}
|
|
148
151
|
|
package/src/definitions.ts
CHANGED
|
@@ -32,6 +32,13 @@ export const STRIPE_CHECKOUT_TIMEOUT_MS = 20000 as const; // 20 seconds
|
|
|
32
32
|
export const STRIPE_REDIRECT_TIMEOUT_MS = 10000 as const; // 10 seconds for redirect
|
|
33
33
|
export const STRIPE_API_TIMEOUT_MS = 15000 as const; // 15 seconds for API calls
|
|
34
34
|
|
|
35
|
+
/**
|
|
36
|
+
* Bash Ideas: default number of *registered* interests (price willingness + email) to hit auto-publish.
|
|
37
|
+
* That is a “greenlight this concept” bar, not a forecast of door count — capacity and tickets are separate.
|
|
38
|
+
* Likes and favorites stay out of this meter (cheap signal vs. commitment); revisit weighting after data.
|
|
39
|
+
*/
|
|
40
|
+
export const DEFAULT_IDEA_INTEREST_THRESHOLD = 35 as const;
|
|
41
|
+
|
|
35
42
|
export const URL_PARAMS_BASH_EVENT_ID = "bashEventId" as const;
|
|
36
43
|
export const URL_PARAMS_BASH_EVENT_TITLE = "bashEventTitle" as const;
|
|
37
44
|
export const URL_PARAMS_BASH_EVENT_DESC = "bashEventDesc" as const;
|
|
@@ -627,6 +634,7 @@ export interface ServiceGetSubscriptionCostArgs {
|
|
|
627
634
|
serviceId: string;
|
|
628
635
|
}
|
|
629
636
|
|
|
637
|
+
/** All amounts in USD dollars (not cents), consistent with Stripe invoice fields after ÷100. */
|
|
630
638
|
export interface StripeSubscriptionItemCost {
|
|
631
639
|
tax: number;
|
|
632
640
|
subtotal: number;
|
package/src/extendedSchemas.ts
CHANGED
|
@@ -22,6 +22,7 @@ import {
|
|
|
22
22
|
Exhibitor,
|
|
23
23
|
IdeaConfiguration,
|
|
24
24
|
IdeaInterest,
|
|
25
|
+
IdeaInterestResponse,
|
|
25
26
|
Invitation,
|
|
26
27
|
Link,
|
|
27
28
|
Media,
|
|
@@ -75,7 +76,12 @@ import {
|
|
|
75
76
|
VolunteerService
|
|
76
77
|
} from "@prisma/client";
|
|
77
78
|
import { BlogStatus, SERVICE_LINK_DATA_TO_INCLUDE } from "./definitions.js";
|
|
78
|
-
import {
|
|
79
|
+
import {
|
|
80
|
+
DeepPartial,
|
|
81
|
+
Override,
|
|
82
|
+
RemoveCommonProperties,
|
|
83
|
+
UnionFromArray,
|
|
84
|
+
} from "./utils/typeUtils.js";
|
|
79
85
|
|
|
80
86
|
export interface ApiResponse<T> {
|
|
81
87
|
data: T;
|
|
@@ -148,6 +154,10 @@ export const FRONT_END_USER_DATA_TO_SELECT = {
|
|
|
148
154
|
isFirstInCity: true,
|
|
149
155
|
/** Venmo / Zelle / CashApp handle for off-platform payouts (promoters). */
|
|
150
156
|
paymentHandle: true,
|
|
157
|
+
/** Host reputation fields */
|
|
158
|
+
hostRating: true,
|
|
159
|
+
totalRatings: true,
|
|
160
|
+
totalEventsHosted: true,
|
|
151
161
|
} satisfies Prisma.UserSelect;
|
|
152
162
|
|
|
153
163
|
export const PRIVATE_USER_ACCOUNT_TO_SELECT = {
|
|
@@ -175,7 +185,10 @@ export interface CompetitionExt extends Competition {
|
|
|
175
185
|
votes?: CompetitionVote[];
|
|
176
186
|
}
|
|
177
187
|
|
|
178
|
-
export interface BashEventExt extends
|
|
188
|
+
export interface BashEventExt extends Omit<
|
|
189
|
+
BashEvent,
|
|
190
|
+
"ideaExpiresAt" | "ideaInterestThreshold" | "isAutoApprovable"
|
|
191
|
+
> {
|
|
179
192
|
targetAudience?: TargetAudience;
|
|
180
193
|
amountOfGuests?: AmountOfGuests;
|
|
181
194
|
recurrence?: Recurrence;
|
|
@@ -191,13 +204,44 @@ export interface BashEventExt extends BashEvent {
|
|
|
191
204
|
venueOwner?: PublicUser;
|
|
192
205
|
sponsorships?: SponsoredEventExt[];
|
|
193
206
|
competitions?: CompetitionExt[];
|
|
194
|
-
interests?: IdeaInterest[];
|
|
207
|
+
interests?: (IdeaInterest & { responses?: IdeaInterestResponse[] })[];
|
|
195
208
|
configurations?: IdeaConfiguration[];
|
|
209
|
+
/** GET /event/:id — tickets sold (non-cancelled), for social proof */
|
|
210
|
+
goingCount?: number;
|
|
211
|
+
/** GET /event/:id when status=Idea — total IdeaInterest rows */
|
|
212
|
+
ideaInterestCount?: number;
|
|
213
|
+
/** GET /event/:id — PublicBashRsvp counts (published / presale) */
|
|
214
|
+
publicRsvpCounts?: { going: number; interested: number; notGoing: number };
|
|
215
|
+
/** Current viewer's soft RSVP (PublicBashRsvp), if any */
|
|
216
|
+
myPublicRsvpStatus?: string | null;
|
|
217
|
+
/** GET /event/:id when status=Idea — viewer's IdeaInterest row (matched by email) */
|
|
218
|
+
myIdeaInterest?: (IdeaInterest & { responses: IdeaInterestResponse[] }) | null;
|
|
219
|
+
/** Rolling expiry timestamp for Idea events (aligned with Prisma `BashEvent.ideaExpiresAt`) */
|
|
220
|
+
ideaExpiresAt: Date | null;
|
|
221
|
+
/** Whether the Idea has met the auto-approval threshold */
|
|
222
|
+
isAutoApprovable: boolean;
|
|
223
|
+
/** Number of interests needed for auto-publish (see DEFAULT_IDEA_INTEREST_THRESHOLD) */
|
|
224
|
+
ideaInterestThreshold: number | null;
|
|
225
|
+
/** GET /event/:id when status=Idea — distinct service providers who sent a service-offer notification */
|
|
226
|
+
ideaServiceProviderInterestCount?: number;
|
|
196
227
|
// Event page visual customisation (stored as scalar columns on BashEvent)
|
|
197
228
|
backgroundImage: string | null;
|
|
198
229
|
themeColor: string | null;
|
|
199
230
|
}
|
|
200
231
|
|
|
232
|
+
/**
|
|
233
|
+
* Incoming create/update payload (e.g. Express JSON body): core date fields may still be ISO strings
|
|
234
|
+
* until normalized in the API (`getBashEventWithNormalizedDates` / `upsertBashEvent`).
|
|
235
|
+
*/
|
|
236
|
+
export type BashEventUpsertWireInput = Override<
|
|
237
|
+
DeepPartial<BashEventExt>,
|
|
238
|
+
Partial<BashEventExt> & {
|
|
239
|
+
startDateTime?: Date | string | null;
|
|
240
|
+
endDateTime?: Date | string | null;
|
|
241
|
+
ideaExpiresAt?: Date | string | null;
|
|
242
|
+
}
|
|
243
|
+
>;
|
|
244
|
+
|
|
201
245
|
export const TICKET_TIER_DATA_TO_INCLUDE = {
|
|
202
246
|
tickets: {
|
|
203
247
|
include: {
|
|
@@ -846,7 +890,6 @@ export interface TargetAudienceExt extends TargetAudience {
|
|
|
846
890
|
tags?: string[];
|
|
847
891
|
createdAt?: Date;
|
|
848
892
|
updatedAt?: Date;
|
|
849
|
-
notes?: string;
|
|
850
893
|
isHighlighted?: boolean;
|
|
851
894
|
associatedCampaigns?: string[];
|
|
852
895
|
icon?: string;
|
|
@@ -866,6 +909,9 @@ export const BASH_NOTIFICATION_DATA_TO_INCLUDE = {
|
|
|
866
909
|
creator: {
|
|
867
910
|
select: {
|
|
868
911
|
image: true,
|
|
912
|
+
uploadedImage: true,
|
|
913
|
+
imageUpdatedAt: true,
|
|
914
|
+
uploadedImageUpdatedAt: true,
|
|
869
915
|
},
|
|
870
916
|
},
|
|
871
917
|
service: {
|
|
@@ -30,6 +30,21 @@ export function databaseAddressStringToAddressValues(addressString: string | und
|
|
|
30
30
|
}
|
|
31
31
|
|
|
32
32
|
|
|
33
|
+
/**
|
|
34
|
+
* City, state/region, and country for compact card/list UIs (no street or full formatted address).
|
|
35
|
+
* Detail pages should use {@link databaseAddressStringToOneLineString} or full address fields.
|
|
36
|
+
*/
|
|
37
|
+
export function formatLocalityForCardDisplay(
|
|
38
|
+
city?: string | null,
|
|
39
|
+
state?: string | null,
|
|
40
|
+
country?: string | null
|
|
41
|
+
): string {
|
|
42
|
+
const parts = [city?.trim(), state?.trim(), country?.trim()].filter(
|
|
43
|
+
(p): p is string => !!p && p.length > 0
|
|
44
|
+
);
|
|
45
|
+
return parts.join(", ");
|
|
46
|
+
}
|
|
47
|
+
|
|
33
48
|
export function databaseAddressStringToOneLineString(addressString: string | undefined | null): string {
|
|
34
49
|
if (addressString) {
|
|
35
50
|
// Special handling for place-only addresses
|