Skip to content

Commit 46fe1cd

Browse files
committed
alerts
1 parent 4166033 commit 46fe1cd

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

app/src/helperFunctions/projectGetSaveDel.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ export const deleteProject = (project: any): Promise<Object> => {
142142
body
143143
})
144144
.then((res) => res.json())
145-
.then((data) => {
145+
.then((data) => { console.log(data)
146146
return {_id: data._id, name: data.name, published:data.published, ...data.project};
147147
})
148148
.catch((err) => console.log(`Error deleting project ${err}`));

server/controllers/projectController.ts

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -69,31 +69,31 @@ const projectController: ProjectController = {
6969
deleteProject: async (req, res, next) => {
7070
// pull project name and userId from req.body
7171
const { _id, userId } = req.body;
72-
try {
73-
const response = await Projects.findOneAndDelete({ _id: _id, username: userId });
74-
res.locals.deleted = response;
75-
return next()
76-
} catch (err) {
77-
return next({
78-
log: `Error in projectController.deleteProject: ${err}`,
79-
message: {
80-
err: 'Error in projectController.deleteProject, check server logs for details'
81-
}
82-
});
83-
}
72+
// try {
73+
// const response = await Projects.findOneAndDelete({ _id: _id, username: userId });
74+
// res.locals.deleted = response;
75+
// return next()
76+
// } catch (err) {
77+
// return next({
78+
// log: `Error in projectController.deleteProject: ${err}`,
79+
// message: {
80+
// err: 'Error in projectController.deleteProject, check server logs for details'
81+
// }
82+
// });
83+
// }
8484
// @Denton, rewrote the above syntax for async await, would be good to test this further
85-
// Projects.findOneAndDelete({ _id, userId }, null, (err, deleted) => {
86-
// if (err) {
87-
// return next({
88-
// log: `Error in projectController.deleteProject: ${err}`,
89-
// message: {
90-
// err: 'Error in projectController.deleteProject, check server logs for details'
91-
// }
92-
// });
93-
// }
94-
// res.locals.deleted = deleted;
95-
// return next();
96-
// });
85+
Projects.findOneAndDelete({ _id, userId }, null, (err, deleted) => {
86+
if (err) {
87+
return next({
88+
log: `Error in projectController.deleteProject: ${err}`,
89+
message: {
90+
err: 'Error in projectController.deleteProject, check server logs for details'
91+
}
92+
});
93+
}
94+
res.locals.deleted = deleted;
95+
return next();
96+
});
9797
}
9898
};
9999
export default projectController;

0 commit comments

Comments
 (0)