fix(api): ensure we get correct date format

This commit is contained in:
Carl-Gerhard Lindesvärd
2025-05-27 09:32:14 +02:00
parent 95a30a660c
commit 39775142e2

View File

@@ -1,3 +1,4 @@
import { DateTime } from '@openpanel/common';
import { cacheable } from '@openpanel/redis'; import { cacheable } from '@openpanel/redis';
import { escape } from 'sqlstring'; import { escape } from 'sqlstring';
import { chQuery, formatClickhouseDate } from '../clickhouse/client'; import { chQuery, formatClickhouseDate } from '../clickhouse/client';
@@ -249,7 +250,9 @@ export async function getOrganizationSubscriptionChartEndDate(
organization.subscriptionChartEndDate && organization.subscriptionChartEndDate &&
new Date(endDate) > organization.subscriptionChartEndDate new Date(endDate) > organization.subscriptionChartEndDate
) { ) {
return organization.subscriptionChartEndDate.toISOString(); return DateTime.fromJSDate(organization.subscriptionChartEndDate)
.setZone(organization.timezone || DEFAULT_TIMEZONE)
.toFormat('yyyy-MM-dd HH:mm:ss');
} }
return endDate; return endDate;