Plans page created, listing the plans from the database, new plan page created and saving to database
This commit is contained in:
1 parent
1d8ec431b2
commit
b944c37c02
5 files changed
+134
-9
No files matched your search
+72
-5
@@ -1,7 +1,7 @@
|
||||
const status = require("../util/statuses");
|
||||
const joi = require("joi");
|
||||
|
||||
module.exports = (middleware, users) => {
|
||||
module.exports = (middleware, users, plans) => {
|
||||
const router = require("express").Router();
|
||||
|
||||
router.use(middleware);
|
||||
@@ -16,11 +16,78 @@ module.exports = (middleware, users) => {
|
||||
return res.status(status.Ok);
|
||||
});
|
||||
|
||||
router.get('/plans', (req, res) => {
|
||||
res.render('plans', { user: req.user });
|
||||
return res.status(status.Ok);
|
||||
router.get('/plans', async (req, res) => {
|
||||
if (!req.session.email) {
|
||||
return res.status(status.Unauthorized).redirect('/login');
|
||||
}
|
||||
|
||||
try {
|
||||
|
||||
// console.log(req.user.email);
|
||||
const userPlans = await plans.find({userEmail: req.user.email }).toArray();
|
||||
// console.log(userPlans);
|
||||
res.render('plans', {
|
||||
user: req.user,
|
||||
plans: userPlans
|
||||
});
|
||||
|
||||
} catch (err) {
|
||||
console.error("Error fetching plans:", err);
|
||||
req.session.errMessage = "Could not load your plans. Please try again.";
|
||||
res.status(status.InternalServerError).redirect('/home');
|
||||
}
|
||||
});
|
||||
|
||||
router.get('/newPlan', (req, res) => {
|
||||
const errMessage = req.session.errMessage;
|
||||
req.session.errMessage = "";
|
||||
res.render('newPlan', { user: req.user, errMessage: errMessage });
|
||||
});
|
||||
|
||||
router.post('/newPlan', async (req, res) => {
|
||||
if (!req.session.email) {
|
||||
return res.status(status.Unauthorized).redirect('/login');
|
||||
}
|
||||
|
||||
const planSchema = joi.object({
|
||||
name: joi.string().min(3).max(100).required(),
|
||||
retirementAge: joi.number().min(18).max(120).required(),
|
||||
retirementExpenses: joi.number().min(0).required(),
|
||||
retirementAssets: joi.number().min(0).required(),
|
||||
retirementLiabilities: joi.number().min(0).required(),
|
||||
});
|
||||
|
||||
const validationOptions = { convert: true, abortEarly: false };
|
||||
const { error, value } = planSchema.validate(req.body, validationOptions);
|
||||
|
||||
if (error) {
|
||||
console.error("Plan validation error:", error.details);
|
||||
req.session.errMessage = "Invalid input: " + error.details.map(d => d.message.replace(/"/g, '')).join(', ');
|
||||
res.status(status.BadRequest).redirect("/newPlan");
|
||||
return;
|
||||
}
|
||||
const newPlan = {
|
||||
userEmail: req.user.email,
|
||||
name: value.name,
|
||||
retirementAge: value.retirementAge,
|
||||
retirementExpenses: value.retirementExpenses,
|
||||
retirementAssets: value.retirementAssets,
|
||||
retirementLiabilities: value.retirementLiabilities,
|
||||
progress: "0%"
|
||||
};
|
||||
|
||||
try{
|
||||
await plans.insertOne(newPlan);
|
||||
req.session.errMessage = "";
|
||||
res.redirect('/plans');
|
||||
}
|
||||
catch(err){
|
||||
console.error("Error saving plan:", err);
|
||||
req.session.errMessage = "An error occurred while saving your plan. Please try again.";
|
||||
res.status(status.InternalServerError).redirect("/newPlan");
|
||||
}
|
||||
});
|
||||
|
||||
router.get('/more', (req, res) => {
|
||||
res.render('more', { user: req.user });
|
||||
return res.status(status.Ok);
|
||||
@@ -43,7 +110,7 @@ module.exports = (middleware, users) => {
|
||||
});
|
||||
|
||||
router.post('/questionnaire', (req, res) => {
|
||||
console.log("Questionnaire POST body:", req.body);
|
||||
// console.log("Questionnaire POST body:", req.body);
|
||||
|
||||
const questionnaireSchema = joi.object({
|
||||
dob: joi.date().required(),
|
||||
|
||||
Reference in new issue
Block a user