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.

add back getDaysDifference

Steven Tey8c67d01ee39e
diff --git a/apps/web/app/(ee)/api/cron/payouts/process/process-payouts.ts b/apps/web/app/(ee)/api/cron/payouts/process/process-payouts.ts
index cebc718111..de79123857 100644
--- a/apps/web/app/(ee)/api/cron/payouts/process/process-payouts.ts
+++ b/apps/web/app/(ee)/api/cron/payouts/process/process-payouts.ts
@@ -17,6 +17,7 @@ import {
currencyFormatter,
log,
nFormatter,
+ pluralize,
} from "@dub/utils";
const nonUsdPaymentMethodTypes = {
@@ -291,7 +292,7 @@ export async function processPayouts({
if (userWhoInitiatedPayout.email) {
const emailRes = await sendEmail({
to: userWhoInitiatedPayout.email,
- subject: `Thank you for your ${currencyFormatter(totalPayoutAmount)} payout to ${nFormatter(res.count, { full: true })} partners`,
+ subject: `Thank you for your ${currencyFormatter(totalPayoutAmount)} payout to ${nFormatter(res.count, { full: true })} ${pluralize("partner", res.count)}`,
react: ProgramPayoutThankYou({
email: userWhoInitiatedPayout.email,
workspace,
diff --git a/apps/web/lib/analytics/format-date-tooltip.ts b/apps/web/lib/analytics/format-date-tooltip.ts
index b41a0e7c45..8873122df9 100644
--- a/apps/web/lib/analytics/format-date-tooltip.ts
+++ b/apps/web/lib/analytics/format-date-tooltip.ts
@@ -1,4 +1,4 @@
-import { differenceInDays } from "date-fns";
+import { getDaysDifference } from "@dub/utils";
export const formatDateTooltip = (
date: Date,
@@ -27,7 +27,7 @@ export const formatDateTooltip = (
}
if (start && end) {
- const daysDifference = differenceInDays(
+ const daysDifference = getDaysDifference(
typeof start === "string" ? new Date(start) : start,
typeof end === "string" ? new Date(end) : end,
);
diff --git a/apps/web/lib/analytics/utils/get-start-end-dates.ts b/apps/web/lib/analytics/utils/get-start-end-dates.ts
index cf0832cbd5..35f7800bb9 100644
--- a/apps/web/lib/analytics/utils/get-start-end-dates.ts
+++ b/apps/web/lib/analytics/utils/get-start-end-dates.ts
@@ -1,4 +1,5 @@
-import { differenceInDays, endOfDay } from "date-fns";
+import { getDaysDifference } from "@dub/utils";
+import { endOfDay } from "date-fns";
import { getIntervalData } from "./get-interval-data";
export const getStartEndDates = ({
@@ -22,7 +23,7 @@ export const getStartEndDates = ({
startDate = new Date(start ?? dataAvailableFrom ?? Date.now());
endDate = new Date(endOfDay(end ?? Date.now()));
- const daysDifference = differenceInDays(startDate, endDate);
+ const daysDifference = getDaysDifference(startDate, endDate);
if (daysDifference <= 2) {
granularity = "hour";
diff --git a/apps/web/lib/analytics/utils/valid-date-range-for-plan.ts b/apps/web/lib/analytics/utils/valid-date-range-for-plan.ts
index 881089ab61..81e0add44b 100644
--- a/apps/web/lib/analytics/utils/valid-date-range-for-plan.ts
+++ b/apps/web/lib/analytics/utils/valid-date-range-for-plan.ts
@@ -1,4 +1,4 @@
-import { differenceInDays } from "date-fns";
+import { getDaysDifference } from "@dub/utils";
export type DateRangeValidationResult =
| { valid: true }
@@ -32,7 +32,7 @@ export const validDateRangeForPlan = ({
(interval === "90d" ||
interval === "1y" ||
interval === "ytd" ||
- (start && differenceInDays(start, end || now) > 31))
+ (start && getDaysDifference(start, end || now) > 31))
) {
return {
valid: false,
@@ -43,7 +43,7 @@ export const validDateRangeForPlan = ({
}
// Pro plan users can only get analytics for 1 year
- if (plan === "pro" && start && differenceInDays(start, end || now) > 366) {
+ if (plan === "pro" && start && getDaysDifference(start, end || now) > 366) {
return {
valid: false,
code: "pro-limit",
diff --git a/packages/utils/src/functions/datetime/get-days-difference.ts b/packages/utils/src/functions/datetime/get-days-difference.ts
new file mode 100644
index 0000000000..e27d0b190a
--- /dev/null
+++ b/packages/utils/src/functions/datetime/get-days-difference.ts
@@ -0,0 +1,5 @@
+// Function to get the number of days between two dates
+export const getDaysDifference = (startDate: Date, endDate: Date) => {
+ const diffTime = Math.abs(endDate.getTime() - startDate.getTime());
+ return Math.ceil(diffTime / (1000 * 60 * 60 * 24));
+};
diff --git a/packages/utils/src/functions/datetime/index.ts b/packages/utils/src/functions/datetime/index.ts
index bd6244cdda..86342d6a13 100644
--- a/packages/utils/src/functions/datetime/index.ts
+++ b/packages/utils/src/functions/datetime/index.ts
@@ -5,5 +5,6 @@ export * from "./format-datetime";
export * from "./format-datetime-smart";
export * from "./format-period";
export * from "./get-datetime-local";
+export * from "./get-days-difference";
export * from "./get-first-and-last-day";
export * from "./parse-datetime";