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.

fix openapi specs

Steven Tey818d5f7abd0d
diff --git a/apps/web/lib/stripe/create-stripe-outbound-payment.ts b/apps/web/lib/stripe/create-stripe-outbound-payment.ts
index 06a5baafb3..98f3cfc0d4 100644
--- a/apps/web/lib/stripe/create-stripe-outbound-payment.ts
+++ b/apps/web/lib/stripe/create-stripe-outbound-payment.ts
@@ -1,3 +1,4 @@
+import { DubApiError } from "../api/errors";
import { STRIPE_API_VERSION, stripeV2Fetch } from "./stripe-v2-client";
export interface CreateStripeOutboundPaymentParams {
@@ -46,7 +47,12 @@ export async function createStripeOutboundPayment({
);
if (error) {
- throw new Error(error.message);
+ throw new DubApiError({
+ code: "bad_request",
+ message:
+ error.message ??
+ `Failed to create Stripe outbound payment for recipient ${stripeRecipientId} and amount ${amount} (cents)`,
+ });
}
return data;
diff --git a/apps/web/lib/zod/schemas/commissions.ts b/apps/web/lib/zod/schemas/commissions.ts
index 02f76dc4a6..d4cf40b96b 100644
--- a/apps/web/lib/zod/schemas/commissions.ts
+++ b/apps/web/lib/zod/schemas/commissions.ts
@@ -133,9 +133,14 @@ export const getCommissionsQuerySchema = z
.enum(CommissionType)
.optional()
.describe(
- "Filter the list of commissions by type. " +
+ [
+ "Filter the list of commissions by type.",
"Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`). " +
- "Examples: `sale`, `sale,lead`, `-click`.",
+ "Examples:",
+ `- "sale"`,
+ `- "sale,lead"`,
+ `- "-click"`,
+ ].join("\n"),
),
customerId: z
.string()
@@ -149,9 +154,14 @@ export const getCommissionsQuerySchema = z
.string()
.optional()
.describe(
- "Filter the list of commissions by the associated partner. When specified, takes precedence over `tenantId`. " +
- "Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`). " +
- "Examples: `partner_abc`, `partner_abc,partner_xyz`, `-partner_abc`.",
+ [
+ "Filter the list of commissions by the associated partner. When specified, takes precedence over `tenantId`.",
+ "Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`).",
+ "Examples:",
+ `- "partner_abc"`,
+ `- "partner_abc,partner_xyz"`,
+ `- "-partner_abc"`,
+ ].join("\n"),
),
tenantId: z
.string()
@@ -163,17 +173,27 @@ export const getCommissionsQuerySchema = z
.string()
.optional()
.describe(
- "Filter the list of commissions by the associated partner group. " +
+ [
+ "Filter the list of commissions by the associated partner group.",
"Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`). " +
- "Examples: `group_abc`, `group_abc,group_xyz`, `-group_abc`.",
+ "Examples:",
+ `- "group_abc"`,
+ `- "group_abc,group_xyz"`,
+ `- "-group_abc"`,
+ ].join("\n"),
),
partnerTagId: z
.string()
.optional()
.describe(
- "Filter the list of commissions by the associated partner tag. " +
- "Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`). " +
- "Examples: `ptag_abc`, `ptag_abc,ptag_xyz`, `-ptag_abc`.",
+ [
+ "Filter the list of commissions by the associated partner tag.",
+ "Supports advanced filtering: single value, multiple values (comma-separated), or exclusion (prefix with `-`).",
+ "Examples:",
+ `- "ptag_abc"`,
+ `- "ptag_abc,ptag_xyz"`,
+ `- "-ptag_abc"`,
+ ].join("\n"),
),
invoiceId: z
.string()
@@ -213,14 +233,12 @@ export const getCommissionsQuerySchema = z
.max(10000)
.optional()
.meta({
- description:
+ description: [
"Filter by lead or sale event metadata. Top-level keys only. Compares string values only — numeric and boolean metadata values are not matched.",
- examples: [
- "metadata['key']='value'",
- "metadata['key']!='value'",
- "metadata['key']='value' AND metadata['key2']='value2'",
- "metadata['key']='value' OR metadata['key2']='value2'",
- ],
+ "Examples:",
+ `- "metadata['key']='value'"`,
+ `- "metadata['key']!='value'"`,
+ ].join("\n"),
}),
})
.extend({
diff --git a/apps/web/lib/zod/schemas/submitted-lead-form.ts b/apps/web/lib/zod/schemas/submitted-lead-form.ts
index 87935eff93..00db9f3ed1 100644
--- a/apps/web/lib/zod/schemas/submitted-lead-form.ts
+++ b/apps/web/lib/zod/schemas/submitted-lead-form.ts
@@ -29,7 +29,7 @@ export const textFieldSchema = fieldCommonSchema.extend({
type: z.literal("text"),
constraints: z
.object({
- maxLength: z.number().int().positive().optional(),
+ maxLength: z.number().int().min(1).optional(),
pattern: z.string().optional(),
})
.optional(),
@@ -40,7 +40,7 @@ export const textareaFieldSchema = fieldCommonSchema.extend({
type: z.literal("textarea"),
constraints: z
.object({
- maxLength: z.number().int().positive().optional(),
+ maxLength: z.number().int().min(1).optional(),
})
.optional(),
});
diff --git a/apps/web/scripts/fix-broken-partner-users.ts b/apps/web/scripts/fix-broken-partner-users.ts
index c22e06dc54..80d18b4503 100644
--- a/apps/web/scripts/fix-broken-partner-users.ts
+++ b/apps/web/scripts/fix-broken-partner-users.ts
@@ -6,7 +6,7 @@ async function main() {
while (true) {
const partnerUserIds = await prisma.partnerUser.findMany({
select: {
- userId: true,
+ partnerId: true,
},
take: 5000,
skip: batch * 5000,
@@ -14,27 +14,43 @@ async function main() {
if (partnerUserIds.length === 0) {
break;
}
- const users = await prisma.user.findMany({
+ const partners = await prisma.partner.findMany({
where: {
id: {
- in: partnerUserIds.map((partnerUser) => partnerUser.userId),
+ in: partnerUserIds.map((partnerUser) => partnerUser.partnerId),
},
},
});
- const usersThatDontExist = partnerUserIds.filter(
- (partnerUser) => !users.some((user) => user.id === partnerUser.userId),
+ const partnersThatDontExist = partnerUserIds.filter(
+ (partnerUser) =>
+ !partners.some((partner) => partner.id === partnerUser.partnerId),
);
- console.log(usersThatDontExist);
+ console.log(partnersThatDontExist);
- if (usersThatDontExist.length > 0) {
+ if (partnersThatDontExist.length > 0) {
const deletedPartnerUsers = await prisma.partnerUser.deleteMany({
where: {
- userId: {
- in: usersThatDontExist.map((partnerUser) => partnerUser.userId),
+ partnerId: {
+ in: partnersThatDontExist.map(
+ (partnerUser) => partnerUser.partnerId,
+ ),
},
},
});
console.log(`Deleted ${deletedPartnerUsers.count} partner users`);
+ const updatedUsers = await prisma.user.updateMany({
+ where: {
+ defaultPartnerId: {
+ in: partnersThatDontExist.map(
+ (partnerUser) => partnerUser.partnerId,
+ ),
+ },
+ },
+ data: {
+ defaultPartnerId: null,
+ },
+ });
+ console.log(`Reset defaultPartnerId for ${updatedUsers.count} users`);
}
batch++;
}
diff --git a/apps/web/scripts/stripe/fix-processed-payouts.ts b/apps/web/scripts/stripe/fix-processed-payouts.ts
deleted file mode 100644
index f8367b7a2c..0000000000
--- a/apps/web/scripts/stripe/fix-processed-payouts.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { prisma } from "@/lib/prisma";
-import "dotenv-flow/config";
-import { stripeConnectClient } from "./connect-client";
-
-async function main() {
- const partnersWithProcessingPayouts = await prisma.partner.findMany({
- where: {
- payouts: {
- some: {
- status: "processing",
- stripeTransferId: null,
- invoice: {
- status: "completed",
- },
- },
- },
- },
- });
-
- console.log(
- `Found ${partnersWithProcessingPayouts.length} partners with processing payouts`,
- );
-
- const results = await Promise.all(
- partnersWithProcessingPayouts.map(async (partner) => {
- try {
- const stripeConnectAccount =
- await stripeConnectClient.accounts.retrieve(partner.stripeConnectId!);
- return {
- partnerId: partner.id,
- email: partner.email,
- stripeConnectId: partner.stripeConnectId,
- payoutsEnabledAt: partner.payoutsEnabledAt,
- actualPayoutsEnabled: stripeConnectAccount.payouts_enabled,
- transfersEnabled: stripeConnectAccount.capabilities?.transfers,
- transfersEnabledStatus: stripeConnectAccount.capabilities?.transfers,
- };
- } catch (error) {
- return null;
- }
- }),
- );
-
- console.table(results.filter((result) => result !== null));
-}
-
-main();
diff --git a/apps/web/scripts/stripe/fix-processing-payouts.ts b/apps/web/scripts/stripe/fix-processing-payouts.ts
new file mode 100644
index 0000000000..9d353a79c9
--- /dev/null
+++ b/apps/web/scripts/stripe/fix-processing-payouts.ts
@@ -0,0 +1,42 @@
+import { prisma } from "@/lib/prisma";
+import "dotenv-flow/config";
+
+async function main() {
+ const payoutsStuckInProcessing = await prisma.payout.findMany({
+ where: {
+ method: "stablecoin",
+ status: "processing",
+ stripeTransferId: null,
+ invoice: {
+ status: "completed",
+ // paid over 7 days ago
+ paidAt: {
+ lt: new Date(Date.now() - 7 * 24 * 60 * 60 * 1000),
+ },
+ },
+ },
+ include: {
+ partner: true,
+ invoice: true,
+ },
+ });
+
+ console.log(
+ `Found ${payoutsStuckInProcessing.length} payouts stuck in processing`,
+ );
+
+ console.table(
+ payoutsStuckInProcessing.map(({ partner, invoice, ...payout }) => ({
+ partnerId: partner.id,
+ partnerEmail: partner.email,
+ payoutId: payout.id,
+ payoutAmount: payout.amount,
+ paidAt: invoice?.paidAt,
+ stripeChargeId: invoice?.stripeChargeMetadata?.["id"],
+ })),
+ );
+
+ // await markPayoutsAsProcessed(payoutsStuckInProcessing);
+}
+
+main();