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

notification-bug-fix #87

Merged
allentj merged 13 commits from notification-bug-fix into dev 2025-08-18 13:42:27 +00:00
Conversation 0 Commits 13 Files Changed 2 +70 -8
2 changed files with 70 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
firestore.indexes.json
View File

@ -28,6 +28,34 @@
} }
] ]
}, },
{
"collectionGroup": "gyms",
"queryScope": "COLLECTION_GROUP",
"fields": [
{
"fieldPath": "userId",
"order": "ASCENDING"
},
{
"fieldPath": "createdAt",
"order": "DESCENDING"
}
]
},
{
"collectionGroup": "gyms",
"queryScope": "COLLECTION_GROUP",
"fields": [
{
"fieldPath": "isApproved",
"order": "ASCENDING"
},
{
"fieldPath": "createdAt",
"order": "ASCENDING"
}
]
},
{ {
"collectionGroup": "gyms", "collectionGroup": "gyms",
"queryScope": "COLLECTION_GROUP", "queryScope": "COLLECTION_GROUP",

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

@ -4,7 +4,7 @@ import * as admin from "firebase-admin";
const app = getAdmin(); const app = getAdmin();
const logger = getLogger(); const logger = getLogger();
const kTrainerRole = 'Trainer'; const kTrainerRole = "Trainer";
interface MembershipData { interface MembershipData {
id?: string; id?: string;
@ -439,15 +439,33 @@ async function processExpiredMembership(
membershipData: MembershipData membershipData: MembershipData
): Promise<void> { ): Promise<void> {
try { try {
await app.firestore().collection("memberships").doc(membershipId).update({ const payments = await getPaymentsForMembership(membershipId);
status: "EXPIRED", if (payments.length > 0) {
updatedAt: admin.firestore.FieldValue.serverTimestamp(), const latestPayment = payments[0];
}); const expiryDate = calculateExpiryDate(
latestPayment.dateTimestamp,
membershipData.subscription?.frequency || "monthly"
);
await app
.firestore()
.collection("memberships")
.doc(membershipId)
.update({
expirationDate: admin.firestore.Timestamp.fromDate(expiryDate),
status: "EXPIRED",
updatedAt: admin.firestore.FieldValue.serverTimestamp(),
});
} else {
await app.firestore().collection("memberships").doc(membershipId).update({
status: "EXPIRED",
updatedAt: admin.firestore.FieldValue.serverTimestamp(),
});
}
logger.info(`Marked membership ${membershipId} as EXPIRED`); logger.info(`Marked membership ${membershipId} as EXPIRED`);
await sendPlanExpiredNotification(membershipId, membershipData); await sendPlanExpiredNotification(membershipId, membershipData);
await sendTrainerNotifications(membershipId, membershipData, "expired"); await sendTrainerNotifications(membershipId, membershipData, "expired");
} catch (error) { } catch (error) {
logger.error(`Error processing membership ${membershipId}:`, error); logger.error(`Error processing membership ${membershipId}:`, error);
@ -461,8 +479,25 @@ async function processExpiringMembership(
try { try {
logger.info(`Processing expiring membership ${membershipId}`); logger.info(`Processing expiring membership ${membershipId}`);
await sendPlanExpiringNotification(membershipId, membershipData); const payments = await getPaymentsForMembership(membershipId);
if (payments.length > 0) {
const latestPayment = payments[0];
const expiryDate = calculateExpiryDate(
latestPayment.dateTimestamp,
membershipData.subscription?.frequency || "monthly"
);
await app
.firestore()
.collection("memberships")
.doc(membershipId)
.update({
expirationDate: admin.firestore.Timestamp.fromDate(expiryDate),
updatedAt: admin.firestore.FieldValue.serverTimestamp(),
});
}
await sendPlanExpiringNotification(membershipId, membershipData);
await sendTrainerNotifications(membershipId, membershipData, "expiring"); await sendTrainerNotifications(membershipId, membershipData, "expiring");
} catch (error) { } catch (error) {
logger.error( logger.error(
@ -547,7 +582,6 @@ async function sendTrainerNotifications(
const trainerName = await getTrainerName(assignment.trainerId); const trainerName = await getTrainerName(assignment.trainerId);
const trainerUserId = await getTrainerUserId(assignment.trainerId); const trainerUserId = await getTrainerUserId(assignment.trainerId);
const notifType = const notifType =
notificationType === "expired" notificationType === "expired"
? "trainer_client_plan_expired" ? "trainer_client_plan_expired"