Skip to content

Commit

Permalink
Complete the rework, with test params still set.
Browse files Browse the repository at this point in the history
  • Loading branch information
@cdconn00
cdconn00 committed Feb 22, 2024
1 parent d8fa38e commit d92cad3
Showing 1 changed file with 75 additions and 86 deletions.
161 changes: 75 additions & 86 deletions helpers/controllerActivityHelper.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ const redisActivityCheckKey = "ACTIVITYCHECKRUNNING";
function registerControllerActivityChecking() {
try {
if (process.env.NODE_ENV !== 'prod') {
// cron.schedule('* * * * *', async () => {
// // Lock the activity check to avoid multiple app instances trying to simulatenously run the check.
// const lockRunningActivityCheck = await redisLock(redisActivityCheckKey);
cron.schedule('* * * * *', async () => {
// Lock the activity check to avoid multiple app instances trying to simulatenously run the check.
const lockRunningActivityCheck = await redisLock(redisActivityCheckKey);

//checkControllerActivity();
checkControllersNeedingRemoval();
await checkControllerActivity();
await checkControllersNeedingRemoval();

// lockRunningActivityCheck(); // Releases the lock.
// });
lockRunningActivityCheck(); // Releases the lock.
});

console.log("Successfully registered activity CRON checks")
}
Expand All @@ -59,52 +59,48 @@ async function checkControllerActivity() {
$or: [{ nextActivityCheckDate: { $lte: today } }, { nextActivityCheckDate: null }]
});

console.log(usersNeedingActivityCheck.length);

const inactiveUsers = await getInactiveControllersInList(usersNeedingActivityCheck, minActivityDate);

console.log(inactiveUsers.length)

inactiveUsers.forEach(async user => {
console.log(`[${user.cid}] Inactive`)
// // Set check dates before emailing to prevent duplicate checks if an exception occurs.
// await User.updateOne(
// { "cid": user.cid },
// {
// nextActivityCheckDate: today.plus({ days: activityWindowInDays })
// }
// )
await User.updateMany(
{ "cid": { $in: usersNeedingActivityCheck.map(u => u.cid) } },
{
nextActivityCheckDate: today.plus({ days: activityWindowInDays })
}
)

// await User.updateOne(
// { "cid": user.cid },
// {
// removalWarningDeliveryDate: today.plus({ days: gracePeriodInDays })
// }
// )
const inactiveUserData = await getControllerInactivityData(usersNeedingActivityCheck, minActivityDate);

// transporter.sendMail({
// to: user.email,
// from: {
// name: "Albuquerque ARTCC",
// address: '[email protected]'
// },
// subject: `Controller Activity Warning | Albuquerque ARTCC`,
// template: 'activityReminder',
// context: {
// name: user.fname,
// requiredHours: requiredHoursPerPeriod,
// activityWindow: activityWindowInDays,
// daysRemaining: gracePeriodInDays,
// currentHours: (controllerHoursSummary[user.cid]?.toFixed(2) ?? 0)
// }
// });
inactiveUserData.forEach(async record => {
await User.updateOne(
{ "cid": record.user.cid },
{
removalWarningDeliveryDate: today.plus({ minutes: 2 })
}
)

transporter.sendMail({
to: "[email protected]",
//to: record.user.email,
from: {
name: "Albuquerque ARTCC",
address: '[email protected]'
},
subject: `Controller Activity Warning | Albuquerque ARTCC`,
template: 'activityReminder',
context: {
name: record.user.fname,
requiredHours: requiredHoursPerPeriod,
activityWindow: activityWindowInDays,
daysRemaining: gracePeriodInDays,
currentHours: record.hours.toFixed(2)
}
});
});
}
catch (e) {
console.error(e)
}
}


/**
* Checks for controllers that did not maintain activity and sends a removal email.
*/
Expand All @@ -120,7 +116,7 @@ async function checkControllersNeedingRemoval() {

usersNeedingRemovalWarningCheck.forEach(async user => {
const minActivityDate = luxon.fromJSDate(user.removalWarningDeliveryDate).minus({ days: activityWindowInDays - 1 });
const userHourSums = await ControllerHours.aggregate([
const userHourSums = await ControllerHours.aggregate([
{
$match: {
timeStart: { $gt: minActivityDate },
Expand All @@ -145,35 +141,31 @@ async function checkControllersNeedingRemoval() {
}
]);
const userTotalHoursInPeriod = (userHourSums && userHourSums.length > 0) ? userHourSums[0].total : 0;
const userTrainingRequestCount = await TrainingRequest.count({ studentCid: user.cid, startTime: { $gt: minActivityDate }});


// await User.updateOne(
// { "cid": user.cid },
// {
// removalWarningDeliveryDate: null
// }
// )

const userTrainingRequestCount = await TrainingRequest.count({ studentCid: user.cid, startTime: { $gt: minActivityDate } });

if (controllerIsInactive(user, userTotalHoursInPeriod, userTrainingRequestCount, minActivityDate)){
// transporter.sendMail({
// to: user.email,
// cc: '[email protected]',
// from: {
// name: "Albuquerque ARTCC",
// address: '[email protected]'
// },
// subject: `Controller Inactivity Notice | Albuquerque ARTCC`,
// template: 'activityWarning',
// context: {
// name: user.fname,
// requiredHours: requiredHoursPerPeriod,
// activityWindow: activityWindowInDays
// }
// });

console.log(`[${user.cid}] Inactive`)
await User.updateOne(
{ "cid": user.cid },
{
removalWarningDeliveryDate: null
}
)

if (controllerIsInactive(user, userTotalHoursInPeriod, userTrainingRequestCount, minActivityDate)) {
transporter.sendMail({
to: "[email protected]",
//cc: '[email protected]',
from: {
name: "Albuquerque ARTCC",
address: '[email protected]'
},
subject: `Controller Inactivity Notice | Albuquerque ARTCC`,
template: 'activityWarning',
context: {
name: user.fname,
requiredHours: requiredHoursPerPeriod,
activityWindow: activityWindowInDays
}
});
}
});
}
Expand All @@ -182,7 +174,7 @@ async function checkControllersNeedingRemoval() {
}
}

async function getInactiveControllersInList(controllersToGetStatusFor, minActivityDate){
async function getControllerInactivityData(controllersToGetStatusFor, minActivityDate) {
const controllerHoursSummary = {};
const controllerTrainingSummary = {};
const inactiveControllers = [];
Expand Down Expand Up @@ -215,7 +207,7 @@ async function getInactiveControllersInList(controllersToGetStatusFor, minActivi
])).forEach(i => controllerHoursSummary[i._id] = i.total);

(await TrainingRequest.aggregate([
{ $match: { startTime: { $gt: minActivityDate }, studentCid: { $in: controllerCids} } },
{ $match: { startTime: { $gt: minActivityDate }, studentCid: { $in: controllerCids } } },
{
$group: {
_id: "$studentCid",
Expand All @@ -228,27 +220,24 @@ async function getInactiveControllersInList(controllersToGetStatusFor, minActivi
let controllerHoursCount = controllerHoursSummary[user.cid] ?? 0;
let controllerTrainingSessions = controllerTrainingSummary[user.cid] != null ? controllerTrainingSummary[user.cid].length : 0

// Set check dates before emailing to prevent duplicate checks if an exception occurs.
// await User.updateOne(
// { "cid": user.cid },
// {
// nextActivityCheckDate: today.plus({ days: activityWindowInDays })
// }
// )

if (controllerIsInactive(user, controllerHoursCount, controllerTrainingSessions, minActivityDate)) {
inactiveControllers.push(user);
const inactiveControllerData = {
user: user,
hours: controllerHoursCount
};

inactiveControllers.push(inactiveControllerData);
}
});

return inactiveControllers;
}

function controllerIsInactive(user, hoursInPeriod, trainingSessionInPeriod, minActivityDate){
function controllerIsInactive(user, hoursInPeriod, trainingSessionInPeriod, minActivityDate) {
const controllerHasLessThanTwoHours = (hoursInPeriod ?? 0) < requiredHoursPerPeriod;
const controllerJoinedMoreThan60DaysAgo = (user.joinDate ?? user.createdAt) < minActivityDate;
const controllerIsNotObserverWithTrainingSession = user.rating != observerRatingCode || trainingSessionInPeriod < 1;

return controllerHasLessThanTwoHours && controllerJoinedMoreThan60DaysAgo && controllerIsNotObserverWithTrainingSession;
}

Expand Down

0 comments on commit d92cad3

Please sign in to comment.