Skip to content

Commit f72e441

Browse files
committed
Now going to add search and filters
1 parent 277f980 commit f72e441

File tree

5 files changed

+28
-16
lines changed

5 files changed

+28
-16
lines changed

Diff for: node_modules/nodemon/package.json

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: src/index.js

+4-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ var auth = require('./middleware/auth');
88
require('../src/db/mongoose');
99

1010
const app = express();
11-
const port = process.env.PORT || 3000;
11+
const port = 3000 || process.env.PORT;
1212

1313
//
1414
// ─── MIDDLEWARE ─────────────────────────────────────────────────────────────────
@@ -24,7 +24,6 @@ app.use(express.json());
2424
app.use(userRouter);
2525
app.use(taskRouter);
2626

27-
app.listen(port,()=>{
28-
console.log("Server is on port "+port);
29-
});
30-
27+
app.listen(port, () => {
28+
console.log("Server is on port " + port);
29+
});

Diff for: src/models/users.js

+11-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var mongoose = require('mongoose');
22
var validator = require('validator');
33
var bcrypt = require('bcryptjs');
44
var jwt = require('jsonwebtoken');
5-
5+
var Task = require('./tasks');
66

77
//
88
// ─── USER MODEL SCHEMA─────────────────────────────────────────────────────────────────
@@ -68,6 +68,16 @@ userSchema.virtual('tasks',{
6868
foreignField:'owner' //foreignField 'owner' of the Tasks
6969
})
7070

71+
//
72+
// ─── DELETE ALL RELATED TASKS ───────────────────────────────────────────────────
73+
//
74+
75+
userSchema.pre('remove', async function (next) {
76+
var user = this;
77+
await Task.deleteMany({owner:user._id});
78+
next();
79+
})
80+
7181
//
7282
// ─── GENERATEAUTHTOKEN ──────────────────────────────────────────────────────────
7383
//

Diff for: src/routers/task.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,17 @@ router.patch('/tasks/:id', auth, async (req, res) => {
9898
// ─── DELETE ROUTE ───────────────────────────────────────────────────────────────
9999
//
100100

101-
router.delete('/tasks/:id', async (req, res) => {
101+
router.delete('/tasks/:id', auth, async (req, res) => {
102102
var _id = req.params.id;
103103

104104
try {
105-
var task = await Task.findByIdAndDelete(_id);
105+
var task = await Task.findOne({_id, owner:req.user._id});
106+
106107
if(!task){
107108
return res.status(404).send();
108109
}
110+
111+
await task.remove();
109112
res.send(task);
110113
} catch (e) {
111114
res.status(400).send(e);

Diff for: src/routers/user.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ router.post('/users/logoutAll', auth, async (req, res) => {
8888
var user = req.user;
8989
user.tokens = [];
9090
await user.save();
91-
res.status(500).send("Logged out of all sessions!");
91+
res.status(200).send("Logged out of all sessions!");
9292
} catch (e) {
9393
res.status(400).send(e);
9494
}

0 commit comments

Comments
 (0)