Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
209 changes: 106 additions & 103 deletions src/controllers/WeeklySummaryEmailAssignmentController.js
Original file line number Diff line number Diff line change
@@ -1,108 +1,111 @@
const WeeklySummaryEmailAssignmentController = function (WeeklySummaryEmailAssignment, userProfile) {
const getWeeklySummaryEmailAssignment = async function (req, res) {
try {
const assignments = await WeeklySummaryEmailAssignment.find().populate('assignedTo').exec();
res.status(200).send(assignments);
} catch (error) {
res.status(500).send(error);
const WeeklySummaryEmailAssignmentController = function (
WeeklySummaryEmailAssignment,
userProfile,
) {
const getWeeklySummaryEmailAssignment = async function (req, res) {
try {
const assignments = await WeeklySummaryEmailAssignment.find().populate('assignedTo').exec();
res.status(200).send(assignments);
} catch (error) {
res.status(500).send(error);
}
};

const setWeeklySummaryEmailAssignment = async function (req, res) {
try {
const { email } = req.body;

if (!email) {
res.status(400).send('bad request');
return;
}
};

const setWeeklySummaryEmailAssignment = async function (req, res) {
try {
const { email } = req.body;

if (!email) {
res.status(400).send('bad request');
return;
}

const user = await userProfile.findOne({ email });
if (!user) {
return res.status(400).send('User profile not found');
}

const newAssignment = new WeeklySummaryEmailAssignment({
email,
assignedTo: user._id,
});

await newAssignment.save();
const assignment = await WeeklySummaryEmailAssignment.find({ email }).populate('assignedTo').exec();

res.status(200).send(assignment[0]);
} catch (error) {
res.status(500).send(error);

const user = await userProfile.findOne({ email });
if (!user) {
return res.status(400).send('User profile not found');
}
};

const deleteWeeklySummaryEmailAssignment = async function (req, res) {
try {
const { id } = req.params;

if (!id) {
res.status(400).send('bad request');
return;
}

const deletedAssignment = await WeeklySummaryEmailAssignment.findOneAndDelete({ _id: id });
if (!deletedAssignment) {
res.status(404).send('Assignment not found');
return;
}

res.status(200).send({ id });
} catch (error) {
res.status(500).send(error);

const newAssignment = new WeeklySummaryEmailAssignment({
email,
assignedTo: user._id,
});

await newAssignment.save();
const assignment = await WeeklySummaryEmailAssignment.find({ email })
.populate('assignedTo')
.exec();

res.status(200).send(assignment[0]);
} catch (error) {
res.status(500).send(error);
}
};

const deleteWeeklySummaryEmailAssignment = async function (req, res) {
try {
const { id } = req.params;

if (!id) {
res.status(400).send('bad request');
return;
}
};

const updateWeeklySummaryEmailAssignment = async function (req, res) {
try{
const { id } = req.params;
const { email } = req.body;

if (!id || (!email)) {
res.status(400).send('bad request');
return;
}

const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
if (!emailRegex.test(email)) {
return res.status(400).json({
error: 'Invalid email format'
});
}

const updateAssignment = await WeeklySummaryEmailAssignment.findOneAndUpdate(
{ _id: id },
{
email,
},
{
new: true
}
);

if (!updateAssignment) {
res.status(404).send('Assignment not found');
return;
}

res.status(200).send(updateAssignment);

} catch (error) {
res.status(500).send(error);

const deletedAssignment = await WeeklySummaryEmailAssignment.findOneAndDelete({ _id: id });
if (!deletedAssignment) {
res.status(404).send('Assignment not found');
return;
}
};

return {
getWeeklySummaryEmailAssignment,
setWeeklySummaryEmailAssignment,
deleteWeeklySummaryEmailAssignment,
updateWeeklySummaryEmailAssignment
};

res.status(200).send({ id });
} catch (error) {
res.status(500).send(error);
}
};

module.exports = WeeklySummaryEmailAssignmentController;


const updateWeeklySummaryEmailAssignment = async function (req, res) {
try {
const { id } = req.params;
const { email } = req.body;

if (!id || !email) {
res.status(400).send('bad request');
return;
}

const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
if (!emailRegex.test(email)) {
return res.status(400).json({
error: 'Invalid email format',
});
}

const updateAssignment = await WeeklySummaryEmailAssignment.findOneAndUpdate(
{ _id: id },
{
email,
},
{
new: true,
},
);

if (!updateAssignment) {
res.status(404).send('Assignment not found');
return;
}

res.status(200).send(updateAssignment);
} catch (error) {
res.status(500).send(error);
}
};

return {
getWeeklySummaryEmailAssignment,
setWeeklySummaryEmailAssignment,
deleteWeeklySummaryEmailAssignment,
updateWeeklySummaryEmailAssignment,
};
};

module.exports = WeeklySummaryEmailAssignmentController;
13 changes: 8 additions & 5 deletions src/controllers/automation/sentryController.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ const sentryService = require('../../services/automation/sentryService');
const appAccessService = require('../../services/automation/appAccessService');
const { checkAppAccess } = require('./utils');


// Controller function to invite a user
async function inviteUser(req, res) {
const { targetUser } = req.body;
Expand All @@ -15,11 +14,16 @@ async function inviteUser(req, res) {
if (!checkAppAccess(requestor.role)) {
res.status(403).send({ message: 'Unauthorized request' });
return;
}
}

try {
const invitation = await sentryService.inviteUser(targetUser.email);
await appAccessService.upsertAppAccess(targetUser.targetUserId, 'sentry', 'invited', targetUser.email);
await appAccessService.upsertAppAccess(
targetUser.targetUserId,
'sentry',
'invited',
targetUser.email,
);
res.status(201).json({ message: 'Invitation sent', data: invitation });
} catch (error) {
res.status(500).json({ message: error.message });
Expand Down Expand Up @@ -50,8 +54,7 @@ async function removeUser(req, res) {
}
}


module.exports = {
inviteUser,
removeUser,
};
};
2 changes: 1 addition & 1 deletion src/controllers/bmdashboard/bmEquipmentController.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ const bmEquipmentController = (BuildingEquipment) => {
return res.status(400).send({ error: 'Request body must be a non-empty array.' });
}

const invalid = updates.some(item => {
const invalid = updates.some((item) => {
if (!item.equipmentId || !mongoose.Types.ObjectId.isValid(item.equipmentId)) {
res.status(400).send({ error: 'Invalid or missing equipmentId.' });
return true;
Expand Down
Loading