Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Messaging unenrolled partners #3098

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
steven-tey merged 22 commits into from
Nov 13, 2025
Merged

Messaging unenrolled partners #3098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
aaffa5a
WIP messaging unenrolled partners
TWilson023 Nov 12, 2025
8476f38
Update page-client.tsx
TWilson023 Nov 12, 2025
2db24a9
Update logic for messaging partner
TWilson023 Nov 12, 2025
d384cf5
Update route.ts
TWilson023 Nov 12, 2025
ec2b881
Update message-program.ts
TWilson023 Nov 12, 2025
27020b3
Update page-client.tsx
TWilson023 Nov 12, 2025
50ada3b
Update mark-program-messages-read.ts
TWilson023 Nov 12, 2025
d807cf9
WIP partners side
TWilson023 Nov 12, 2025
5d9d4c6
Update partner/program info UI logic
TWilson023 Nov 12, 2025
e05eaa8
Update messaging disabled UI
TWilson023 Nov 12, 2025
9fddc89
Update message-program.ts
TWilson023 Nov 12, 2025
5c088a5
Update page-client.tsx
TWilson023 Nov 12, 2025
675e5f8
Merge branch 'main' into message-unenrolled-partners
TWilson023 Nov 12, 2025
7236765
Quick fixes
TWilson023 Nov 12, 2025
dc1707d
Merge branch 'message-unenrolled-partners' of github.com:dubinc/dub i…
TWilson023 Nov 12, 2025
e6bfae7
Misc. fixes + message button
TWilson023 Nov 12, 2025
46c2073
Button tweaks
TWilson023 Nov 12, 2025
8e3150a
Logic updates
TWilson023 Nov 12, 2025
55f6b1c
Merge branch 'main' into message-unenrolled-partners
steven-tey Nov 12, 2025
50b7a24
Update message-program.ts
steven-tey Nov 12, 2025
1b0b9e2
don't create messages for transactional emails
steven-tey Nov 12, 2025
2796482
add messagedAt to discoveredPartner
steven-tey Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion apps/web/app/(ee)/api/cron/messages/notify-partner/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ export async function POST(req: Request) {
createdAt: {
gt: subDays(new Date(), 3), // sent in the last 3 days
},
type: "direct", // only notify for direct messages
senderPartnerId: null, // not sent by the partner
readInApp: null, // unread messages only
readInEmail: null, // unread messages only
Expand Down
68 changes: 34 additions & 34 deletions apps/web/app/(ee)/api/messages/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,56 +21,56 @@ export const GET = withWorkspace(

const messagesLimit = messagesLimitArg ?? (partnerId ? undefined : 10);

const programEnrollments = await prisma.programEnrollment.findMany({
where: {
programId,
...(partnerId
? { partnerId }
: {
partner: {
messages: {
some: {
programId,
},
},
},
}),
},
take: 1000, // TODO: add pagination later
include: {
partner: {
include: {
const partners = await prisma.partner.findMany({
where: partnerId
? {
id: partnerId,
// Partner is either discoverable, enrolled in the program, or already has a message with the program
OR: [
{ discoverableAt: { not: null } },
{ programs: { some: { programId } } },
{ messages: { some: { programId } } },
],
}
: {
// Partner has messages with the program
messages: {
where: {
some: {
programId,
},
include: {
senderPartner: true,
senderUser: true,
},
orderBy: {
[sortBy]: sortOrder,
},
take: messagesLimit,
},
},
take: 1000, // TODO: add pagination later
include: {
messages: {
where: {
programId,
},
include: {
senderPartner: true,
senderUser: true,
},
orderBy: {
[sortBy]: sortOrder,
},
take: messagesLimit,
},
},
});

return NextResponse.json(
PartnerMessagesSchema.parse(
programEnrollments
partners
// Sort by most recent message
.sort((a, b) =>
sortOrder === "desc"
? (b.partner.messages?.[0]?.[sortBy]?.getTime() ?? 0) -
(a.partner.messages?.[0]?.[sortBy]?.getTime() ?? 0)
: (a.partner.messages?.[0]?.[sortBy]?.getTime() ?? 0) -
(b.partner.messages?.[0]?.[sortBy]?.getTime() ?? 0),
? (b.messages?.[0]?.[sortBy]?.getTime() ?? 0) -
(a.messages?.[0]?.[sortBy]?.getTime() ?? 0)
: (a.messages?.[0]?.[sortBy]?.getTime() ?? 0) -
(b.messages?.[0]?.[sortBy]?.getTime() ?? 0),
)
// Map to {partner, messages}
.map(({ partner: { messages, ...partner } }) => ({
.map(({ messages, ...partner }) => ({
partner,
messages,
})),
Expand Down
103 changes: 72 additions & 31 deletions apps/web/app/(ee)/api/partner-profile/messages/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,55 +17,96 @@ export const GET = withPartnerProfile(async ({ partner, searchParams }) => {

const messagesLimit = messagesLimitArg ?? (programSlug ? undefined : 10);

const programEnrollments = await prisma.programEnrollment.findMany({
const programs = await prisma.program.findMany({
where: {
partnerId: partner.id,
program: {
...(programSlug
? { slug: programSlug }
: {
messages: {
some: {
partnerId: partner.id,
// Partner is not banned from the program
partners: {
none: {
partnerId: partner.id,
status: "banned",
},
},

...(programSlug
? {
slug: programSlug,
OR: [
// Partner is enrolled in the program
// in this case, return messages regardless of messaging enabled status which is passed to the UI
{
partners: {
some: {
partnerId: partner.id,
},
},
},
}),
},
{
// Partner has received a direct message from the program
messages: {
some: {
partnerId: partner.id,
senderPartnerId: null, // Sent by the program
},
},
},
],
}
: {
OR: [
// Program has messaging enabled and partner has 1+ messages with the program
{
messagingEnabledAt: {
not: null,
},
messages: {
some: {
partnerId: partner.id,
},
},
},

// Partner has received a direct message from the program
{
messages: {
some: {
partnerId: partner.id,
senderPartnerId: null, // Sent by the program
},
},
},
],
}),
},
include: {
program: {
messages: {
where: {
partnerId: partner.id,
},
include: {
messages: {
where: {
partnerId: partner.id,
},
include: {
senderPartner: true,
senderUser: true,
},
orderBy: {
[sortBy]: sortOrder,
},
take: messagesLimit,
},
senderPartner: true,
senderUser: true,
},
orderBy: {
[sortBy]: sortOrder,
},
take: messagesLimit,
},
},
});

return NextResponse.json(
ProgramMessagesSchema.parse(
programEnrollments
programs
// Sort by most recent message
.sort((a, b) =>
sortOrder === "desc"
? (b.program.messages?.[0]?.[sortBy]?.getTime() ?? 0) -
(a.program.messages?.[0]?.[sortBy]?.getTime() ?? 0)
: (a.program.messages?.[0]?.[sortBy]?.getTime() ?? 0) -
(b.program.messages?.[0]?.[sortBy]?.getTime() ?? 0),
? (b.messages?.[0]?.[sortBy]?.getTime() ?? 0) -
(a.messages?.[0]?.[sortBy]?.getTime() ?? 0)
: (a.messages?.[0]?.[sortBy]?.getTime() ?? 0) -
(b.messages?.[0]?.[sortBy]?.getTime() ?? 0),
)
// Map to {program, messages}
.map(({ program: { messages, ...program } }) => ({
.map(({ messages, ...program }) => ({
program,
messages,
})),
Expand Down
Loading