From fa2e3ff654613ca067e301f4a401d38ccef97934 Mon Sep 17 00:00:00 2001 From: Bailey Mejia Date: Thu, 16 Nov 2023 22:03:03 -0800 Subject: [PATCH 1/4] my commit branch --- src/controllers/userProfileController.js | 1 + src/helpers/userHelper.js | 36 +++++++++++++++--------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/src/controllers/userProfileController.js b/src/controllers/userProfileController.js index ae5edd232..6e5fe758c 100644 --- a/src/controllers/userProfileController.js +++ b/src/controllers/userProfileController.js @@ -51,6 +51,7 @@ async function ValidatePassword(req, res) { } const userProfileController = function (UserProfile) { + console.log('Hello') const getUserProfiles = async function (req, res) { if ( !(await hasPermission(req.body.requestor.role, "getUserProfiles")) && diff --git a/src/helpers/userHelper.js b/src/helpers/userHelper.js index 05a123434..0b93ee956 100644 --- a/src/helpers/userHelper.js +++ b/src/helpers/userHelper.js @@ -781,7 +781,9 @@ const userHelper = function () { count = 1, featured = false ) { - console.log('Adding Badge'); + console.log('personId:', personId); + console.log('badgeId:', badgeId); + console.log('count:', count); userProfile.findByIdAndUpdate( personId, { @@ -797,22 +799,27 @@ const userHelper = function () { } } ); + console.log('made it to the end!'); }; const removeDupBadge = async function (personId, badgeId) { + console.log('Starting removeDupBadge process'); + console.log('badgeId', badgeId); userProfile.findByIdAndUpdate( personId, { $pull: { - badgeCollection: { badge: badgeId } + badgeCollection: { _id: mongoose.Types.ObjectId(badgeId) } } }, + { new: true }, err => { if (err) { throw new Error(err); } } ); + console.log('badgeId After!', badgeId); }; const changeBadgeCount = async function (personId, badgeId, count) { @@ -1027,19 +1034,27 @@ const userHelper = function () { // 'Personal Max', const checkPersonalMax = async function (personId, user, badgeCollection) { let badgeOfType; + let duplicateBadges = []; + for (let i = 0; i < badgeCollection.length; i += 1) { if (badgeCollection[i].badge?.type === "Personal Max") { - if (badgeOfType) { - removeDupBadge(personId, badgeOfType._id); + if (!badgeOfType) { + badgeOfType = badgeCollection[i]; + } else { + duplicateBadges.push(badgeCollection[i]); } } + for (let badge of duplicateBadges) { + await removeDupBadge(personId, badge._id); + } } await badge.findOne({ type: "Personal Max" }).then(results => { if ( user.lastWeekTangibleHrs && user.lastWeekTangibleHrs >= 1 && user.lastWeekTangibleHrs === user.personalBestMaxHrs - ) { + ) + { if (badgeOfType) { changeBadgeCount( personId, @@ -1047,9 +1062,7 @@ const userHelper = function () { user.personalBestMaxHrs ); } else { - addBadge(personId, mongoose.Types.ObjectId(results._id), user.personalBestMaxHrs); - } } }); @@ -1384,10 +1397,7 @@ const userHelper = function () { const awardNewBadges = async () => { console.log("Awarding"); try { - - const users = await userProfile.find({ isActive: true }).populate('badgeCollection.badge'); - - + const users = await userProfile.find({ isActive: true, firstName: 'Bailey', lastName: 'Personalmax' }).populate('badgeCollection.badge'); for (let i = 0; i < users.length; i += 1) { const user = users[i]; const { _id, badgeCollection } = user; @@ -1406,12 +1416,12 @@ const userHelper = function () { }; const getTangibleHoursReportedThisWeekByUserId = function (personId) { + console.log('getting reported tangible hours for the week'); const userId = mongoose.Types.ObjectId(personId); - + const pdtstart = moment().tz('America/Los_Angeles').startOf('week').format('YYYY-MM-DD'); const pdtend = moment().tz('America/Los_Angeles').endOf('week').format('YYYY-MM-DD'); - return timeEntries .find( { From 3e091128915257f4ce95afeb64cc23bf5352e244 Mon Sep 17 00:00:00 2001 From: Bailey Mejia Date: Fri, 24 Nov 2023 10:04:47 -0800 Subject: [PATCH 2/4] changes for personal max award --- src/helpers/userHelper.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/helpers/userHelper.js b/src/helpers/userHelper.js index 0b93ee956..79ac36350 100644 --- a/src/helpers/userHelper.js +++ b/src/helpers/userHelper.js @@ -381,6 +381,7 @@ const userHelper = function () { ) { hasWeeklySummary = true; } + console.log('ended update Result'); const cutOffDate = moment().subtract(1, "year"); @@ -759,7 +760,6 @@ const userHelper = function () { }; const increaseBadgeCount = async function (personId, badgeId) { - console.log("Increase Badge Count", personId, badgeId); userProfile.updateOne( { _id: personId, "badgeCollection.badge": badgeId }, { @@ -803,8 +803,6 @@ const userHelper = function () { }; const removeDupBadge = async function (personId, badgeId) { - console.log('Starting removeDupBadge process'); - console.log('badgeId', badgeId); userProfile.findByIdAndUpdate( personId, { @@ -1395,13 +1393,13 @@ const userHelper = function () { }; const awardNewBadges = async () => { - console.log("Awarding"); try { - const users = await userProfile.find({ isActive: true, firstName: 'Bailey', lastName: 'Personalmax' }).populate('badgeCollection.badge'); + const users = await userProfile.find({ isActive: true }).populate('badgeCollection.badge'); for (let i = 0; i < users.length; i += 1) { const user = users[i]; const { _id, badgeCollection } = user; const personId = mongoose.Types.ObjectId(_id); + await checkPersonalMax(personId, user, badgeCollection); await checkMostHrsWeek(personId, user, badgeCollection); await checkMinHoursMultiple(personId, user, badgeCollection); @@ -1416,7 +1414,6 @@ const userHelper = function () { }; const getTangibleHoursReportedThisWeekByUserId = function (personId) { - console.log('getting reported tangible hours for the week'); const userId = mongoose.Types.ObjectId(personId); const pdtstart = moment().tz('America/Los_Angeles').startOf('week').format('YYYY-MM-DD'); From 55baf7c3614c43b9aa0a200f2f3a027f67b6ac70 Mon Sep 17 00:00:00 2001 From: Bailey Mejia Date: Fri, 29 Dec 2023 14:50:35 -0800 Subject: [PATCH 3/4] Removed console logs --- src/controllers/userProfileController.js | 1 - src/helpers/userHelper.js | 6 ------ 2 files changed, 7 deletions(-) diff --git a/src/controllers/userProfileController.js b/src/controllers/userProfileController.js index 6e5fe758c..ae5edd232 100644 --- a/src/controllers/userProfileController.js +++ b/src/controllers/userProfileController.js @@ -51,7 +51,6 @@ async function ValidatePassword(req, res) { } const userProfileController = function (UserProfile) { - console.log('Hello') const getUserProfiles = async function (req, res) { if ( !(await hasPermission(req.body.requestor.role, "getUserProfiles")) && diff --git a/src/helpers/userHelper.js b/src/helpers/userHelper.js index 79ac36350..0bfa0ecb2 100644 --- a/src/helpers/userHelper.js +++ b/src/helpers/userHelper.js @@ -381,7 +381,6 @@ const userHelper = function () { ) { hasWeeklySummary = true; } - console.log('ended update Result'); const cutOffDate = moment().subtract(1, "year"); @@ -781,9 +780,6 @@ const userHelper = function () { count = 1, featured = false ) { - console.log('personId:', personId); - console.log('badgeId:', badgeId); - console.log('count:', count); userProfile.findByIdAndUpdate( personId, { @@ -799,7 +795,6 @@ const userHelper = function () { } } ); - console.log('made it to the end!'); }; const removeDupBadge = async function (personId, badgeId) { @@ -817,7 +812,6 @@ const userHelper = function () { } } ); - console.log('badgeId After!', badgeId); }; const changeBadgeCount = async function (personId, badgeId, count) { From 830d23b30388cf347ddd2cff728c21ced7eb2758 Mon Sep 17 00:00:00 2001 From: Bailey Mejia Date: Fri, 26 Jan 2024 23:45:53 -0800 Subject: [PATCH 4/4] Bailey fixed failed build errors --- src/helpers/userHelper.js | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/helpers/userHelper.js b/src/helpers/userHelper.js index 68f115d8d..d18973614 100644 --- a/src/helpers/userHelper.js +++ b/src/helpers/userHelper.js @@ -843,13 +843,11 @@ const userHelper = function () { personId, { $pull: { - Bailey-new-personalMax-backend badgeCollection: { _id: mongoose.Types.ObjectId(badgeId) } } }, { new: true }, err => { -development if (err) { throw new Error(err); } @@ -1113,13 +1111,11 @@ const changeBadgeCount = async function (personId, badgeId, count) { let duplicateBadges = []; for (let i = 0; i < badgeCollection.length; i += 1) { -Bailey-new-personalMax-backend if (badgeCollection[i].badge?.type === "Personal Max") { if (!badgeOfType) { badgeOfType = badgeCollection[i]; } else { duplicateBadges.push(badgeCollection[i]); - development } } for (let badge of duplicateBadges) { @@ -1128,13 +1124,12 @@ Bailey-new-personalMax-backend } await badge.findOne({ type: 'Personal Max' }).then((results) => { if ( - Bailey-new-personalMax-backend + user.lastWeekTangibleHrs && user.lastWeekTangibleHrs >= 1 && user.lastWeekTangibleHrs === user.personalBestMaxHrs ) { - development if (badgeOfType) { changeBadgeCount( personId, @@ -1142,10 +1137,8 @@ Bailey-new-personalMax-backend user.personalBestMaxHrs, ); } else { - Bailey-new-personalMax-backend addBadge(personId, mongoose.Types.ObjectId(results._id), user.personalBestMaxHrs); - development } } }); @@ -1503,11 +1496,8 @@ Bailey-new-personalMax-backend }; const awardNewBadges = async () => { - Bailey-new-personalMax-backend try { const users = await userProfile.find({ isActive: true }).populate('badgeCollection.badge'); - - development for (let i = 0; i < users.length; i += 1) { const user = users[i]; const { _id, badgeCollection } = user; @@ -1532,12 +1522,10 @@ Bailey-new-personalMax-backend const getTangibleHoursReportedThisWeekByUserId = function (personId) { const userId = mongoose.Types.ObjectId(personId); - Bailey-new-personalMax-backend const pdtstart = moment().tz('America/Los_Angeles').startOf('week').format('YYYY-MM-DD'); const pdtend = moment().tz('America/Los_Angeles').endOf('week').format('YYYY-MM-DD'); - development return timeEntries .find(