Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

revert response shape

Steven Tey183fb5e58e33
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/applications-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/applications-table.tsx
index 7305595c93..3cffc93cd8 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/applications-table.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/applications/applications-table.tsx
@@ -47,16 +47,19 @@ import { useAction } from "next-safe-action/hooks";
import { useEffect, useMemo, useState } from "react";
import { toast } from "sonner";
-type ApplicationPlatform = NonNullable<
- ProgramApplicationProps["partner"]["platforms"]
->[number];
+const SOCIAL_PLATFORM_FIELDS = [
+ "website",
+ "youtube",
+ "twitter",
+ "linkedin",
+ "instagram",
+ "tiktok",
+] as const;
type ApplicationRow = ProgramApplicationProps["partner"] & {
createdAt: ProgramApplicationProps["createdAt"];
applicationId: string;
- platformsByType: ReturnType<
- typeof buildSocialPlatformLookup<ApplicationPlatform>
- >;
+ platformsByType: ReturnType<typeof buildSocialPlatformLookup>;
};
const applicationsColumns = {
@@ -121,7 +124,15 @@ export function ApplicationsTable({
createdAt: application.createdAt,
applicationId: application.id,
platformsByType: buildSocialPlatformLookup(
- application.partner.platforms ?? [],
+ SOCIAL_PLATFORM_FIELDS.flatMap((type) => {
+ const identifier = application.partner[type];
+
+ if (!identifier) {
+ return [];
+ }
+
+ return [{ type, identifier, verifiedAt: null }];
+ }),
),
})),
[applications],
diff --git a/apps/web/lib/program-applications/list-program-applications.ts b/apps/web/lib/program-applications/list-program-applications.ts
index 4fc1830fd4..3ffb4905b0 100644
--- a/apps/web/lib/program-applications/list-program-applications.ts
+++ b/apps/web/lib/program-applications/list-program-applications.ts
@@ -1,6 +1,6 @@
import { formatApplicationFormData } from "@/lib/partners/format-application-form-data";
import { prisma } from "@/lib/prisma";
-import { buildSocialPlatformLookup } from "@/lib/social-utils";
+import { polyfillSocialMediaFields } from "@/lib/social-utils";
import { getProgramApplicationsQuerySchema } from "@/lib/zod/schemas/program-application";
import { Prisma, ProgramApplicationStatus } from "@prisma/client";
import * as z from "zod/v4";
@@ -71,49 +71,15 @@ function transformApplication(application: ProgramApplicationWithPartner) {
}),
);
- const platformsByType = buildSocialPlatformLookup(partner.platforms);
-
- const platforms = (
- [
- "website",
- "youtube",
- "twitter",
- "linkedin",
- "instagram",
- "tiktok",
- ] as const
- ).flatMap((type) => {
- const platform = platformsByType[type];
- const identifier = application[type] ?? platform?.identifier;
-
- if (!identifier) {
- return [];
- }
-
- return [
- {
- type,
- identifier,
- verifiedAt:
- platform?.identifier === identifier
- ? platform.verifiedAt ?? null
- : null,
- },
- ];
- });
-
return {
id: application.id,
createdAt: application.createdAt,
applicationFormData,
partner: {
...partner,
- name: application.name,
- email: application.email,
- country: application.country,
+ ...polyfillSocialMediaFields(partner.platforms),
groupId: application.groupId,
status: application.status,
- platforms,
},
};
}
diff --git a/apps/web/lib/zod/schemas/program-application.ts b/apps/web/lib/zod/schemas/program-application.ts
index 3b02dfe10f..d9bc2d6919 100644
--- a/apps/web/lib/zod/schemas/program-application.ts
+++ b/apps/web/lib/zod/schemas/program-application.ts
@@ -5,12 +5,11 @@ import {
EnrolledPartnerSchema,
getPartnersQuerySchema,
OldPartnerPlatformsFields,
- partnerPlatformSchema,
PARTNERS_MAX_PAGE_SIZE,
} from "./partners";
import { ProgramEnrollmentSchema } from "./programs";
-// @deprecated Use ProgramApplicationSchema instead. Kept for GET /api/partners/applications and webhook payloads for backward compatibility.
+// Response for GET /api/partners/applications, GET /api/program-applications, and webhook payloads.
export const PartnerApplicationSchema = z.object({
id: z.string(),
createdAt: z.coerce.date(),
@@ -40,39 +39,7 @@ export const PartnerApplicationSchema = z.object({
.nullable(),
});
-// Used by GET /api/program-applications. Omits the legacy flat social fields; use `partner.platforms` instead.
-export const ProgramApplicationSchema = PartnerApplicationSchema.extend({
- partner: PartnerApplicationSchema.shape.partner
- .omit({
- website: true,
- youtube: true,
- twitter: true,
- linkedin: true,
- instagram: true,
- tiktok: true,
- })
- .extend(
- EnrolledPartnerSchema.pick({
- networkStatus: true,
- defaultPayoutMethod: true,
- payoutsEnabledAt: true,
- }).shape,
- )
- .extend({
- platforms: z
- .array(
- partnerPlatformSchema.pick({
- type: true,
- identifier: true,
- verifiedAt: true,
- }),
- )
- .nullish()
- .describe(
- "The partner's website and social profiles, including when each was verified.",
- ),
- }),
-});
+export const ProgramApplicationSchema = PartnerApplicationSchema;
export const partnerApplicationWebhookSchema = PartnerApplicationSchema;
diff --git a/apps/web/playwright/api/program-applications/program-applications.spec.ts b/apps/web/playwright/api/program-applications/program-applications.spec.ts
index 7e0437e425..a2730a568f 100644
--- a/apps/web/playwright/api/program-applications/program-applications.spec.ts
+++ b/apps/web/playwright/api/program-applications/program-applications.spec.ts
@@ -160,8 +160,6 @@ test.describe("program applications", () => {
approvedUs,
] = seeded;
- // Application-level socials take precedence over the partner's platforms;
- // verifiedAt is only kept when both identifiers match.
await prisma.programApplication.update({
where: { id: pendingUsWithPlatforms.id },
data: {
@@ -249,7 +247,6 @@ test.describe("program applications", () => {
pendingUs.id,
]);
- // Legacy flat social fields (website, twitter, ...) must not be returned.
expect(data.find(({ id }) => id === pendingGb.id)).toStrictEqual({
id: pendingGb.id,
createdAt: pendingGb.createdAt.toISOString(),
@@ -262,17 +259,19 @@ test.describe("program applications", () => {
image: null,
description: null,
country: "GB",
- networkStatus: "draft",
- defaultPayoutMethod: null,
- payoutsEnabledAt: null,
groupId: extraGroup.id,
status: "pending",
- platforms: [],
+ website: null,
+ youtube: null,
+ twitter: null,
+ linkedin: null,
+ instagram: null,
+ tiktok: null,
},
});
});
- test("GET /program-applications – platforms and applicationFormData", async ({
+ test("GET /program-applications – social fields and applicationFormData", async ({
api,
}) => {
const { status, data } = await listApplications(api, {
@@ -285,23 +284,14 @@ test.describe("program applications", () => {
{ label: "How will you promote us?", value: "Newsletter" },
{ label: "Anything else?", value: null },
]);
- expect(data[0].partner.platforms).toStrictEqual([
- {
- type: "website",
- identifier: VERIFIED_WEBSITE,
- verifiedAt: VERIFIED_AT.toISOString(),
- },
- {
- type: "youtube",
- identifier: "partner_channel",
- verifiedAt: null,
- },
- {
- type: "twitter",
- identifier: "application_handle",
- verifiedAt: null,
- },
- ]);
+ expect(data[0].partner).toMatchObject({
+ website: VERIFIED_WEBSITE,
+ youtube: "partner_channel",
+ twitter: "partner_handle",
+ linkedin: null,
+ instagram: null,
+ tiktok: null,
+ });
});
test("GET /program-applications – status=rejected", async ({ api }) => {