Skip to content

Commit

Permalink
fix conflict in routes.js
Browse files Browse the repository at this point in the history
  • Loading branch information
@tdkent
tdkent committed Jan 18, 2024
2 parents 4da0d46 + ac674f2 commit 7be6b64
Show file tree
Hide file tree
Showing 19 changed files with 852 additions and 572 deletions.
104 changes: 52 additions & 52 deletions package-lock.json
View file

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions src/controllers/bmdashboard/bmMaterialsController.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const mongoose = require('mongoose');

const bmMaterialsController = function (ItemMaterial, BuildingMaterial) {
const bmMaterialsController = function (BuildingMaterial) {
const bmMaterialsList = async function _matsList(req, res) {
try {
BuildingMaterial.find()
Expand Down Expand Up @@ -42,15 +42,9 @@ const bmMaterialsController = function (ItemMaterial, BuildingMaterial) {
matTypeId,
quantity,
priority,
brand,
brand: brandPref,
requestor: { requestorId },
} = req.body;
const newPurchaseRecord = {
quantity,
priority,
brand,
requestedBy: requestorId,
};
try {
// check if requestor has permission to make purchase request
//! Note: this code is disabled until permissions are added
Expand All @@ -64,6 +58,12 @@ const bmMaterialsController = function (ItemMaterial, BuildingMaterial) {
// check if the material is already being used in the project
// if no, add a new document to the collection
// if yes, update the existing document
const newPurchaseRecord = {
quantity,
priority,
brandPref,
requestedBy: requestorId,
};
const doc = await BuildingMaterial.findOne({ project: projectId, itemType: matTypeId });
if (!doc) {
const newDoc = {
Expand Down
3 changes: 2 additions & 1 deletion src/controllers/bmdashboard/bmProjectController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,11 @@ const bmMProjectController = function (BuildingProject) {
{ $unwind: '$buildingManager' },
{
$lookup: {
from: 'buildingMaterials',
from: 'buildingInventoryItems',
let: { id: '$_id' },
pipeline: [
{ $match: { $expr: { $eq: ['$project', '$$id'] } } },
{ $match: { __t: 'material_item' } },
{ $project: { updateRecord: 0, project: 0 } },
{
$lookup: {
Expand Down
221 changes: 132 additions & 89 deletions src/controllers/profileInitialSetupController.js
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
const mongoose = require('mongoose');
const { v4: uuidv4 } = require('uuid');
const moment = require('moment-timezone');
const jwt = require('jsonwebtoken');
const emailSender = require('../utilities/emailSender');
const config = require('../config');
const cache = require('../utilities/nodeCache')();
const mongoose = require("mongoose");
const { v4: uuidv4 } = require("uuid");
const moment = require("moment-timezone");
const jwt = require("jsonwebtoken");
const emailSender = require("../utilities/emailSender");
const config = require("../config");
const cache = require("../utilities/nodeCache")();

// returns the email body that includes the setup link for the recipient.
function sendLinkMessage(Link) {
Expand Down Expand Up @@ -121,13 +121,13 @@ const profileInitialSetupController = function (
let { email, baseUrl, weeklyCommittedHours } = req.body;
email = email.toLowerCase();
const token = uuidv4();
const expiration = moment().tz('America/Los_Angeles').add(1, 'week');
const expiration = moment().tz("America/Los_Angeles").add(1, "week");
try {
const existingEmail = await userProfile.findOne({
email,
});
if (existingEmail) {
res.status(400).send('email already in use');
res.status(400).send("email already in use");
} else {
await ProfileInitialSetupToken.findOneAndDelete({ email });

Expand Down Expand Up @@ -161,7 +161,7 @@ const profileInitialSetupController = function (
*/
const validateSetupToken = async (req, res) => {
const { token } = req.body;
const currentMoment = moment.tz('America/Los_Angeles');
const currentMoment = moment.tz("America/Los_Angeles");
try {
const foundToken = await ProfileInitialSetupToken.findOne({ token });

Expand All @@ -171,10 +171,10 @@ const profileInitialSetupController = function (
if (expirationMoment.isAfter(currentMoment)) {
res.status(200).send(foundToken);
} else {
res.status(400).send('Invalid token');
res.status(400).send("Invalid token");
}
} else {
res.status(404).send('Token not found');
res.status(404).send("Token not found");
}
} catch (error) {
res.status(500).send(`Error finding token: ${error}`);
Expand All @@ -192,83 +192,84 @@ const profileInitialSetupController = function (
*/
const setUpNewUser = async (req, res) => {
const { token } = req.body;
const currentMoment = moment.tz('America/Los_Angeles');
const currentMoment = moment.tz("America/Los_Angeles");
try {
const foundToken = await ProfileInitialSetupToken.findOne({ token });
const existingEmail = await userProfile.findOne({
email: foundToken.email,
});
if (existingEmail) {
res.status(400).send('email already in use');
res.status(400).send("email already in use");
} else if (foundToken) {
const expirationMoment = moment(foundToken.expiration);

if (expirationMoment.isAfter(currentMoment)) {
const defaultProject = await Project.findOne({
projectName: 'Orientation and Initial Setup',
});

const newUser = new userProfile();
newUser.password = req.body.password;
newUser.role = 'Volunteer';
newUser.firstName = req.body.firstName;
newUser.lastName = req.body.lastName;
newUser.jobTitle = req.body.jobTitle;
newUser.phoneNumber = req.body.phoneNumber;
newUser.bio = '';
newUser.weeklycommittedHours = foundToken.weeklyCommittedHours;
newUser.weeklycommittedHoursHistory = [
{
hours: newUser.weeklycommittedHours,
dateChanged: Date.now(),
},
];
newUser.personalLinks = [];
newUser.adminLinks = [];
newUser.teams = Array.from(new Set([]));
newUser.projects = Array.from(new Set([defaultProject]));
newUser.createdDate = Date.now();
newUser.email = req.body.email;
newUser.weeklySummaries = [{ summary: '' }];
newUser.weeklySummariesCount = 0;
newUser.weeklySummaryOption = 'Required';
newUser.mediaUrl = '';
newUser.collaborationPreference = req.body.collaborationPreference;
newUser.timeZone = req.body.timeZone || 'America/Los_Angeles';
newUser.location = req.body.location;
newUser.profilePic = req.body.profilePicture;
newUser.permissions = {
frontPermissions: [],
backPermissions: [],
};
newUser.bioPosted = 'default';
newUser.privacySettings.email = req.body.privacySettings.email;
newUser.privacySettings.phoneNumber = req.body.privacySettings.phoneNumber;
newUser.teamCode = '';
newUser.isFirstTimelog = true;

const savedUser = await newUser.save();

emailSender(
process.env.MANAGER_EMAIL || '[email protected]', // "[email protected]"
`NEW USER REGISTERED: ${savedUser.firstName} ${savedUser.lastName}`,
informManagerMessage(savedUser),
null,
null,
);
await ProfileInitialSetupToken.findByIdAndDelete(foundToken._id);

const jwtPayload = {
userid: savedUser._id,
role: savedUser.role,
permissions: savedUser.permissions,
expiryTimestamp: moment().add(
config.TOKEN.Lifetime,
config.TOKEN.Units,
),
};
const expirationMoment = moment(foundToken.expiration);

const token = jwt.sign(jwtPayload, JWT_SECRET);
if (expirationMoment.isAfter(currentMoment)) {
const defaultProject = await Project.findOne({
projectName: "Orientation and Initial Setup",
});

const newUser = new userProfile();
newUser.password = req.body.password;
newUser.role = "Volunteer";
newUser.firstName = req.body.firstName;
newUser.lastName = req.body.lastName;
newUser.jobTitle = req.body.jobTitle;
newUser.phoneNumber = req.body.phoneNumber;
newUser.bio = "";
newUser.weeklycommittedHours = foundToken.weeklyCommittedHours;
newUser.weeklycommittedHoursHistory = [
{
hours: newUser.weeklycommittedHours,
dateChanged: Date.now(),
},
];
newUser.personalLinks = [];
newUser.adminLinks = [];
newUser.teams = Array.from(new Set([]));
newUser.projects = Array.from(new Set([defaultProject]));
newUser.createdDate = Date.now();
newUser.email = req.body.email;
newUser.weeklySummaries = [{ summary: "" }];
newUser.weeklySummariesCount = 0;
newUser.weeklySummaryOption = "Required";
newUser.mediaUrl = "";
newUser.collaborationPreference = req.body.collaborationPreference;
newUser.timeZone = req.body.timeZone || "America/Los_Angeles";
newUser.location = req.body.location;
newUser.profilePic = req.body.profilePicture;
newUser.permissions = {
frontPermissions: [],
backPermissions: [],
};
newUser.bioPosted = "default";
newUser.privacySettings.email = req.body.privacySettings.email;
newUser.privacySettings.phoneNumber =
req.body.privacySettings.phoneNumber;
newUser.teamCode = "";
newUser.isFirstTimelog = true;

const savedUser = await newUser.save();

emailSender(
process.env.MANAGER_EMAIL || "[email protected]", // "[email protected]"
`NEW USER REGISTERED: ${savedUser.firstName} ${savedUser.lastName}`,
informManagerMessage(savedUser),
null,
null
);
await ProfileInitialSetupToken.findByIdAndDelete(foundToken._id);

const jwtPayload = {
userid: savedUser._id,
role: savedUser.role,
permissions: savedUser.permissions,
expiryTimestamp: moment().add(
config.TOKEN.Lifetime,
config.TOKEN.Units
),
};

const token = jwt.sign(jwtPayload, JWT_SECRET);

const locationData = {
firstName: req.body.firstName,
Expand All @@ -277,7 +278,7 @@ const profileInitialSetupController = function (
location: req.body.homeCountry,
};

res.send({ token }).status(200);
res.send({ token }).status(200);

const mapEntryResult = await setMapLocation(locationData);
if (mapEntryResult.type === 'Error') {
Expand All @@ -296,15 +297,15 @@ const profileInitialSetupController = function (
email: savedUser.email,
};

const allUserCache = JSON.parse(cache.getCache('allusers'));
allUserCache.push(NewUserCache);
cache.setCache('allusers', JSON.stringify(allUserCache));
} else {
res.status(400).send('Token is expired');
}
const allUserCache = JSON.parse(cache.getCache("allusers"));
allUserCache.push(NewUserCache);
cache.setCache("allusers", JSON.stringify(allUserCache));
} else {
res.status(400).send('Invalid token');
res.status(400).send("Token is expired");
}
} else {
res.status(400).send("Invalid token");
}
} catch (error) {
res.status(500).send(`Error: ${error}`);
}
Expand All @@ -328,12 +329,54 @@ const profileInitialSetupController = function (
}
};

const getTotalCountryCount = async (req, res) => {
try {
const users = [];
const results = await userProfile.find(
{},
"location totalTangibleHrs hoursByCategory"
);

results.forEach((item) => {
if (
(item.location?.coords.lat &&
item.location?.coords.lng &&
item.totalTangibleHrs >= 10) ||
(item.location?.coords.lat &&
item.location?.coords.lng &&
calculateTotalHours(item.hoursByCategory) >= 10)
) {
users.push(item);
}
});
const modifiedUsers = users.map((item) => ({
location: item.location,
}));

const mapUsers = await MapLocation.find({});
const combined = [...modifiedUsers, ...mapUsers];
const countries = combined.map((user) => user.location.country);
const totalUniqueCountries = [...new Set(countries)].length;
res.status(200).send({ CountryCount: totalUniqueCountries });
} catch (error) {
res.status(500).send(`Error: ${error}`);
}
};

function calculateTotalHours(hoursByCategory) {
let hours = 0;
Object.keys(hoursByCategory).forEach((x) => {
hours += hoursByCategory[x];
});
return hours;
}

return {
getSetupToken,
setUpNewUser,
validateSetupToken,
getTimeZoneAPIKeyByToken,
getTotalCountryCount,
};
};

Expand Down
Loading

0 comments on commit 7be6b64

Please sign in to comment.