SowinskiBraeden/RetirementCalculator
1
0 Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into feature/ai-challenge2

Browse Source
This commit is contained in:
Nícolas Agostini authored and GitHub committed 2025-05-14 11:24:31 -07:00
2 parents 73d61d76de 370d5d3292
commit 5771f1372f
7 files changed
+157 -79
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/router/user.js
+32 -24
View File
@@ -86,7 +86,7 @@ module.exports = (middleware, users, plans, assets) => {
});
router.get('/assets', async (req, res) => {
let userAssets = await assets.find({ userId: new ObjectId(req.session.user._id) }).toArray();
let userAssets = await assets.find({ userId: new ObjectId(req.session.userId) }).toArray();
res.render('assets', {
user: req.session.user,
errMessage: req.session.errMessage,
@@ -99,7 +99,7 @@ module.exports = (middleware, users, plans, assets) => {
router.get('/plans', async (req, res) => {
try {
const userPlansFromDB = await plans.find({ userId: new ObjectId(req.session.user._id) }).toArray();
const userPlansFromDB = await plans.find({ userId: new ObjectId(req.session.userId) }).toArray();
for (const plan of userPlansFromDB) {
const percentage = await calculatePlanProgress(plan, assets, req.session.user._id);
@@ -108,6 +108,7 @@ module.exports = (middleware, users, plans, assets) => {
const updatedUserPlans = await plans.find({ userId: new ObjectId(req.session.user._id) }).toArray();
res.render('plans', {
user: req.session.user,
plans: updatedUserPlans,
@@ -124,18 +125,17 @@ module.exports = (middleware, users, plans, assets) => {
try {
const planId = req.params.id;
let userAssets = await assets.find({ userId: new ObjectId(req.session.user._id) }).toArray();
let userAssets = await assets.find({ userId: new ObjectId(req.session.userId) }).toArray();
if (!ObjectId.isValid(planId)) {
req.session.errMessage = "Invalid plan ID format.";
return res.status(status.BadRequest).redirect('/plans');
}
const plan = await plans.findOne({ userId: new ObjectId(req.session.user._id), _id: new ObjectId(planId) });
const plan = await plans.findOne({ userId: new ObjectId(req.session.userId), _id: new ObjectId(planId) });
if (!plan) {
console.log(`Plan not found with ID: ${planId} for user: ${req.session.user.email}`);
console.log(`Plan not found with ID: ${planId} for user: ${req.session.userId}`);
req.session.errMessage = "Plan not found or you do not have permission to view it.";
return res.status(status.NotFound).redirect('/plans');
}
@@ -188,7 +188,7 @@ module.exports = (middleware, users, plans, assets) => {
return;
}
const newPlan = {
userId: new ObjectId(req.session.user._id),
userId: new ObjectId(req.session.userId),
name: value.name,
retirementAge: value.retirementAge,
retirementExpenses: value.retirementExpenses,
@@ -198,7 +198,7 @@ module.exports = (middleware, users, plans, assets) => {
};
try {
await plans.insertOne({ userId: new ObjectId(req.session.user._id), ...newPlan });
await plans.insertOne({ userId: new ObjectId(req.session.userId), ...newPlan });
req.session.errMessage = "";
res.redirect('/plans');
}
@@ -272,7 +272,7 @@ module.exports = (middleware, users, plans, assets) => {
}
users.updateOne(
{ _id: new ObjectId(req.session.user._id) },
{ _id: new ObjectId(req.session.userId) },
{
$set: {
financialData: true,
@@ -287,13 +287,13 @@ module.exports = (middleware, users, plans, assets) => {
}
).then((result) => {
if (result.matchedCount === 0) {
console.log(`User not found during questionnaire update: ${req.session.user.email}`);
console.log(`User not found during questionnaire update: ${req.session.userId}`);
req.session.errMessage = "User session invalid. Please log in again.";
res.status(status.NotFound).redirect("/login");
return;
}
if (result.modifiedCount === 0 && result.matchedCount === 1) {
console.log(`User questionnaire data unchanged (already up-to-date): ${req.session.user.email}`);
console.log(`User questionnaire data unchanged (already up-to-date): ${req.session.userId}`);
}
req.session.user.financialData = true;
@@ -325,7 +325,7 @@ module.exports = (middleware, users, plans, assets) => {
if (valid.err) {
req.session.errMessage = "Invalid input",
res.status(status.BadRequest);
res.status(status.BadRequest);
return res.redirect("/profile");
}
@@ -343,17 +343,17 @@ module.exports = (middleware, users, plans, assets) => {
}
users.updateOne(
{ email: req.session.email },
{ _id: new ObjectId(req.session.userId) },
{ $set: update }
).then((result) => {
if (result.matchedCount === 0) {
console.log(`User not found during account update: ${req.session.email}`);
console.log(`User not found during account update: ${req.session.userId}`);
req.session.errMessage = "User session invalid. Please log in again.";
res.status(status.NotFound).redirect("/login");
return;
}
if (result.modifiedCount === 0 && result.matchedCount === 1) {
console.log(`User account data unchanged (already up-to-date): ${req.session.email}`);
console.log(`User account data unchanged (already up-to-date): ${req.session.userId}`);
}
req.session.errMessage = "";
@@ -385,7 +385,7 @@ module.exports = (middleware, users, plans, assets) => {
}
let newAsset = {
userId: new ObjectId(req.session.user._id),
userId: new ObjectId(req.session.userId),
...req.body,
updatedAt: new Date(),
};
@@ -429,7 +429,7 @@ module.exports = (middleware, users, plans, assets) => {
return res.redirect("/assets");
}
if (req.body.userId != req.session.user._id) {
if (req.body.userId != req.session.userId) {
req.session.errMessage = "Cannot change asset owner",
res.status(status.BadRequest);
return res.redirect("/assets");
@@ -499,20 +499,20 @@ module.exports = (middleware, users, plans, assets) => {
router.post("/deleteUser", (req, res) => {
// not as critical if results aren't as expected only if crashing
assets.deleteMany({ userId: new ObjectId(req.session.user._id) }).catch((err) => {
assets.deleteMany({ userId: new ObjectId(req.session.userId) }).catch((err) => {
console.error("Error deleting user assets: ", err);
req.session.errMessage = "An error occured while deleting your account. Please try again.";
return res.status(status.InternalServerError).redirect("/profile");
});
plans.deleteMany({ userId: new ObjectId(req.session.user._id) }).catch((err) => {
plans.deleteMany({ userId: new ObjectId(req.session.userId) }).catch((err) => {
console.error("Error deleting user assets: ", err);
req.session.errMessage = "An error occured while deleting your account. Please try again.";
return res.status(status.InternalServerError).redirect("/profile");
});
users.deleteOne(
{ _id: new ObjectId(req.session.user._id) },
{ _id: new ObjectId(req.session.userId) },
).then((result) => {
if (result.deletedCount === 0) {
console.error(`User not found: ${req.body.id}`);
@@ -543,11 +543,19 @@ module.exports = (middleware, users, plans, assets) => {
country = data.results[0].formatted_address;
let results = await getRates(country);
req.session.geoData = {
country: results.abbreviation,
toCurrencyRates: results.exRates,
geoData: req.session.geoData
if (!results.exRates) {
req.session.geoData = {
message: "error"
}
} else {
req.session.geoData = {
country: results.abbreviation,
toCurrencyRates: results.exRates,
geoData: req.session.geoData
}
}
}
return res.status(status.Ok).send({ data: req.session.geoData });