feature/IO-3096-GlobalNotifications - Checkpoint, merge master, ready DB
This commit is contained in:
@@ -115,7 +115,7 @@ const scenarioParser = async (req, jobIdField) => {
|
||||
})
|
||||
.map((assoc) => {
|
||||
const settings = assoc.notification_settings[scenario.key];
|
||||
const watcherEmail = assoc.user || assoc.useremail;
|
||||
const watcherEmail = assoc.useremail;
|
||||
const matchingWatcher = jobWatchers.find((watcher) => watcher.email === watcherEmail);
|
||||
|
||||
// Build watcher object with notification preferences and personal details
|
||||
@@ -126,7 +126,7 @@ const scenarioParser = async (req, jobIdField) => {
|
||||
fcm: settings.fcm,
|
||||
firstName: matchingWatcher ? matchingWatcher.firstName : undefined,
|
||||
lastName: matchingWatcher ? matchingWatcher.lastName : undefined,
|
||||
employeeId: matchingWatcher ? matchingWatcher.employeeId : undefined
|
||||
employeeId: matchingWatcher ? assoc.id : undefined
|
||||
};
|
||||
})
|
||||
}));
|
||||
|
||||
Reference in New Issue
Block a user