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

notification-bug-fix #111

Merged
allentj merged 74 commits from notification-bug-fix into dev 2025-08-25 09:57:03 +00:00
Conversation 0 Commits 74 Files Changed 1 +3 -2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e1822f9257 - Show all commits

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

@ -588,6 +588,7 @@ async function sendTrainerNotifications(
gymName, gymName,
assignmentId: assignment.id, assignmentId: assignment.id,
formattedExpiryDate: formattedDate, formattedExpiryDate: formattedDate,
role: 'Trainer',
expiryDate: expiryDate expiryDate: expiryDate
? admin.firestore.Timestamp.fromDate(expiryDate) ? admin.firestore.Timestamp.fromDate(expiryDate)
: admin.firestore.Timestamp.fromDate(new Date()), : admin.firestore.Timestamp.fromDate(new Date()),

4
functions/src/notifications/processNotification.ts
View File

@ -181,8 +181,8 @@ function prepareNotificationMessage(
title = title =
notification.data?.title || notification.data?.title ||
(notification.data?.status === "accepted" (notification.data?.status === "accepted"
? "Trainer Request Accepted" ? "Trainer Invitation Accepted"
: "Trainer Request Update"); : "Trainer Invitation Update");
body = body =
notification.data?.message || notification.data?.message ||
`${ `${