Compare commits

...
Author SHA1 Message Date
nicoagostini 343a4f8275 fix/depreciation again 2025-05-22 13:09:26 -07:00
nicoagostini 0129315523 fix/depreciation again 2025-05-22 13:02:04 -07:00
SowinskiBraeden d82bfd5b56 fix/name allow spaces 2025-05-22 12:23:34 -07:00
Joaquin Paredes a7bb955c8a Merge pull request #39 from JoaquinPar/dev
Merge dev into main
2025-05-22 11:14:30 -07:00
Joaquin Paredes 7c34094a93 Merge pull request #36 from JoaquinPar/dev
Sprint 3 completed
2025-05-20 09:02:27 -07:00
3 changed files with 10 additions and 4 deletions

No files matched your search

+1 -1
View File
@@ -73,7 +73,7 @@ module.exports = (users) => {
router.post("/signup", async (req, res) => { router.post("/signup", async (req, res) => {
const userSchema = joi.object({ const userSchema = joi.object({
email: joi.string().email({ minDomainSegments: 2, tlds: { allow: true } }).required(), email: joi.string().email({ minDomainSegments: 2, tlds: { allow: true } }).required(),
name: joi.string().pattern(new RegExp('^[a-zA-Z]+$')).max(20).required(), name: joi.string().pattern(new RegExp('^[a-zA-Z0-9_ ]*$')).max(20).required(),
password: joi.string().max(20).min(8).required(), password: joi.string().max(20).min(8).required(),
repassword: joi.string().max(20).min(8).required(), repassword: joi.string().max(20).min(8).required(),
}); });
+1 -1
View File
@@ -477,7 +477,7 @@ module.exports = (middleware, users, plans, assets) => {
router.post("/updateAccount", async (req, res) => { router.post("/updateAccount", async (req, res) => {
const accountSchema = joi.object({ const accountSchema = joi.object({
email: joi.string().email({ minDomainSegments: 2, tlds: { allow: true } }), email: joi.string().email({ minDomainSegments: 2, tlds: { allow: true } }),
name: joi.string().pattern(new RegExp('^[a-zA-Z]+$')).max(20), name: joi.string().pattern(new RegExp('^[a-zA-Z0-9_ ]*$')).max(20),
password: joi.string().max(20).min(8), password: joi.string().max(20).min(8),
repassword: joi.string().max(20).min(8), repassword: joi.string().max(20).min(8),
}); });
+8 -2
View File
@@ -56,9 +56,15 @@ async function calculateTotalAssetValue(assets) {
if (asset.value < 1000) { if (asset.value < 1000) {
totalAssetValue += asset.value; totalAssetValue += asset.value;
} else { } else {
const assetYear = new Date(asset.year).getFullYear(); const assetYear = asset.year;
const age = today.getFullYear() - assetYear; const age = today.getFullYear() - assetYear;
let depreciatedValue = asset.value * Math.pow(0.85, age); let depreciatedValue;
if (age < 1){
depreciatedValue = asset.value * 0.9;
}else{
depreciatedValue = asset.value * Math.pow(0.90, age);
}
if (depreciatedValue < 1000) { if (depreciatedValue < 1000) {
totalAssetValue += 1000; totalAssetValue += 1000;