cosqnet/fitlien-services
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

notification-bug-fix #113

Merged
dhanshas merged 79 commits from notification-bug-fix into dev 2025-09-09 09:06:59 +00:00
Conversation 0 Commits 79 Files Changed 1 +5 -12
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f1976f12b6 - Show all commits

17
functions/src/notifications/membershipStatusNotifications.ts
View File

@ -465,17 +465,11 @@ async function calculateDaysUntilExpiry(
);
const now = new Date();
const today = new Date(now.getFullYear(), now.getMonth(), now.getDate());
const expiryDateOnly = new Date(
expiryDate.getFullYear(),
expiryDate.getMonth(),
expiryDate.getDate()
);
const timeDiff = expiryDateOnly.getTime() - today.getTime();
const daysUntilExpiry = Math.ceil(timeDiff / (1000 * 3600 * 24));
const timeDiff = expiryDate.getTime() - now.getTime();
const daysUntilExpiry = Math.floor(timeDiff / (1000 * 3600 * 24));
return daysUntilExpiry;
return Math.max(0, daysUntilExpiry);
} catch (error) {
logger.error(
`Error calculating daysUntilExpiry for membership ${membershipId}:`,
@ -679,7 +673,7 @@ async function sendTrainerNotifications(
if (notificationType === "expiring") {
const now = new Date();
const timeDiff = expiryDate.getTime() - now.getTime();
daysUntilExpiry = Math.ceil(timeDiff / (1000 * 3600 * 24));
daysUntilExpiry = Math.floor(timeDiff / (1000 * 3600 * 24));
}
}
@ -869,7 +863,7 @@ async function sendPlanExpiringNotification(
const now = new Date();
const timeDiff = expiryDate.getTime() - now.getTime();
daysUntilExpiry = Math.ceil(timeDiff / (1000 * 3600 * 24));
daysUntilExpiry = Math.floor(timeDiff / (1000 * 3600 * 24));
}
const existing = await app
@ -929,7 +923,6 @@ async function sendPlanExpiringNotification(
);
}
}
async function getClientName(
membershipId: string,
clientId: string