From 39775142e20a688d9f9af23e7e39610646f77cc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl-Gerhard=20Lindesva=CC=88rd?= <lindesvard@gmail.com>
Date: Tue, 27 May 2025 09:32:14 +0200
Subject: [PATCH] fix(api): ensure we get correct date format

---
 packages/db/src/services/organization.service.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/db/src/services/organization.service.ts b/packages/db/src/services/organization.service.ts
index 71517fcb..bc4a582b 100644
--- a/packages/db/src/services/organization.service.ts
+++ b/packages/db/src/services/organization.service.ts
@@ -1,3 +1,4 @@
+import { DateTime } from '@openpanel/common';
 import { cacheable } from '@openpanel/redis';
 import { escape } from 'sqlstring';
 import { chQuery, formatClickhouseDate } from '../clickhouse/client';
@@ -249,7 +250,9 @@ export async function getOrganizationSubscriptionChartEndDate(
     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;