Skip to content

Commit a270d67

Browse files
jlcoding01jlcoding01
committed
Add centralized error handling and validate inbound server data
1 parent ab56c80 commit a270d67

15 files changed

+753
-148
lines changed

‎.eslintrc.js

+26-27
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,31 @@
1-
2-
31
module.exports = {
4-
env: {
5-
es2021: true,
6-
node: true,
2+
env: {
3+
es2021: true,
4+
node: true,
5+
},
6+
extends: ["eslint:recommended", "airbnb-base", "prettier"],
7+
overrides: [
8+
{
9+
env: {
10+
node: true,
11+
},
12+
files: [".eslintrc.{js,cjs}"],
13+
parserOptions: {
14+
sourceType: "script",
15+
},
716
},
8-
extends: ["eslint:recommended", "airbnb-base", "prettier"],
9-
overrides: [
17+
],
18+
parserOptions: {
19+
ecmaVersion: "latest",
20+
sourceType: "module",
21+
},
22+
rules: {
23+
"no-underscore-dangle": [
24+
"error",
1025
{
11-
env: {
12-
node: true,
13-
},
14-
files: [".eslintrc.{js,cjs}"],
15-
parserOptions: {
16-
sourceType: "script",
17-
},
26+
allow: ["_id"],
1827
},
1928
],
20-
parserOptions: {
21-
ecmaVersion: "latest",
22-
sourceType: "module",
23-
},
24-
rules: {"no-underscore-dangle": [
25-
"error",
26-
{
27-
"allow": [
28-
"_id"
29-
]
30-
}
31-
]},
32-
};
29+
"no-unused-vars": ["error", { argsIgnorePattern: "next" }],
30+
},
31+
};

‎app.js

+18-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ const mainRouter = require("./routes/index");
55
const { createUser, login } = require("./controllers/users");
66
const { getClothingItem } = require("./controllers/clothingItems");
77
const auth = require("./middlewares/auth");
8+
const errorHandler = require("./middlewares/error-handler");
9+
const {
10+
validateUserBody,
11+
validateUserLogIn,
12+
} = require("./middlewares/validation");
13+
const { errors } = require("celebrate");
14+
const { requestLogger, errorLogger } = require("./middlewares/logger");
815

916
const app = express();
1017

@@ -13,14 +20,23 @@ const { PORT = 3001 } = process.env;
1320
app.use(express.json());
1421
app.use(cors());
1522

16-
app.post("/signup", createUser);
17-
app.post("/signin", login);
23+
app.post("/signup", validateUserBody, createUser);
24+
app.post("/signin", validateUserLogIn, login);
1825
app.get("/items", getClothingItem);
1926

2027
app.use(auth);
2128

29+
app.use(requestLogger);
30+
2231
app.use("/", mainRouter);
2332

33+
app.use(errorLogger);
34+
35+
//celebrate error handler
36+
app.use(errors());
37+
// centralized handler
38+
app.use(errorHandler);
39+
2440
mongoose
2541
.connect("mongodb://127.0.0.1:27017/wtwr_db")
2642
.then(() => {

‎controllers/clothingItems.js

+79-56
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,59 @@
11
const ClothingItem = require("../models/clothingItem");
2-
const {
3-
invalidDataError,
4-
notFoundError,
5-
defaultError,
6-
forbiddenError,
7-
} = require("../utils/errors");
2+
// const {
3+
// invalidDataError,
4+
// notFoundError,
5+
// defaultError,
6+
// forbiddenError,
7+
// } = require("../utils/errors");
8+
const BadRequestError = require("../errors/bad-request-err");
9+
const NotFoundError = require("../errors/not-found-err");
10+
const ForbiddenError = require("../errors/forbidden-err");
811

9-
const getClothingItem = (req, res) => {
12+
const getClothingItem = (req, res, next) => {
1013
ClothingItem.find({})
1114
.orFail()
1215
.then((item) => res.status(200).send(item))
1316
.catch((err) => {
1417
console.log(err.name);
15-
res
16-
.status(defaultError)
17-
.send({ message: "An error has occurred on the server" });
18+
next(err);
19+
// res
20+
// .status(defaultError)
21+
// .send({ message: "An error has occurred on the server" });
1822
});
1923
};
2024

21-
const createClothingItem = (req, res) => {
25+
const createClothingItem = (req, res, next) => {
2226
const { _id } = req.user;
2327
const { name, weather, imageUrl } = req.body;
2428
ClothingItem.create({ name, weather, imageUrl, owner: _id })
2529
.then((item) => res.status(201).send(item))
2630
.catch((err) => {
2731
console.log(err.name);
2832
if (err.name === "ValidationError") {
29-
return res
30-
.status(invalidDataError)
31-
.send({ message: "Bad Request! Invalid data passed" });
33+
next(new BadRequestError("Bad Request! Invalid data passed"));
34+
// return res
35+
// .status(invalidDataError)
36+
// .send({ message: "Bad Request! Invalid data passed" });
37+
} else {
38+
next(err);
3239
}
33-
return res
34-
.status(defaultError)
35-
.send({ message: "An error has occurred on the server" });
40+
// return res
41+
// .status(defaultError)
42+
// .send({ message: "An error has occurred on the server" });
3643
});
3744
};
3845

39-
const deleteClothingItem = (req, res) => {
46+
const deleteClothingItem = (req, res, next) => {
4047
const { _id } = req.user;
4148

4249
ClothingItem.findById(req.params.itemId)
4350
.orFail()
4451
.then((item) => {
4552
if (item.owner.toString() !== _id) {
46-
return res
47-
.status(forbiddenError)
48-
.send({ message: "Request Was Forbidden" });
53+
next(new ForbiddenError("Request Was Forbidden"));
54+
// return res
55+
// .status(forbiddenError)
56+
// .send({ message: "Request Was Forbidden" });
4957
}
5058
return ClothingItem.findByIdAndRemove(req.params.itemId).then(() =>
5159
res.send({ message: "Item successfully deleted", item })
@@ -54,22 +62,27 @@ const deleteClothingItem = (req, res) => {
5462
.catch((err) => {
5563
console.log(err.name);
5664
if (err.name === "CastError") {
57-
return res
58-
.status(invalidDataError)
59-
.send({ message: "Bad Request! Invalid data passed" });
65+
next(new BadRequestError("Bad Request! Invalid data passed"));
66+
// return res
67+
// .status(invalidDataError)
68+
// .send({ message: "Bad Request! Invalid data passed" });
69+
} else if (err.name === "DocumentNotFoundError") {
70+
next(
71+
new NotFoundError(" The request was sent to a non-existent address")
72+
);
73+
// return res
74+
// .status(notFoundError)
75+
// .send({ message: " The request was sent to a non-existent address" });
76+
} else {
77+
next(err);
6078
}
61-
if (err.name === "DocumentNotFoundError") {
62-
return res
63-
.status(notFoundError)
64-
.send({ message: " The request was sent to a non-existent address" });
65-
}
66-
return res
67-
.status(defaultError)
68-
.send({ message: "An error has occurred on the server" });
79+
// return res
80+
// .status(defaultError)
81+
// .send({ message: "An error has occurred on the server" });
6982
});
7083
};
7184

72-
const likeItem = (req, res) => {
85+
const likeItem = (req, res, next) => {
7386
ClothingItem.findByIdAndUpdate(
7487
req.params.itemId,
7588
{ $addToSet: { likes: req.user._id } },
@@ -80,22 +93,27 @@ const likeItem = (req, res) => {
8093
.catch((err) => {
8194
console.error(err);
8295
if (err.name === "CastError") {
83-
return res
84-
.status(invalidDataError)
85-
.send({ message: "Bad Request! Invalid data passed" });
86-
}
87-
if (err.name === "DocumentNotFoundError") {
88-
return res
89-
.status(notFoundError)
90-
.send({ message: " The request was sent to a non-existent address" });
96+
next(new BadRequestError("Bad Request! Invalid data passed"));
97+
// return res
98+
// .status(invalidDataError)
99+
// .send({ message: "Bad Request! Invalid data passed" });
100+
} else if (err.name === "DocumentNotFoundError") {
101+
next(
102+
new NotFoundError(" The request was sent to a non-existent address")
103+
);
104+
// return res
105+
// .status(notFoundError)
106+
// .send({ message: " The request was sent to a non-existent address" });
107+
} else {
108+
next(err);
91109
}
92-
return res
93-
.status(defaultError)
94-
.send({ message: "An error has occurred on the server" });
110+
// return res
111+
// .status(defaultError)
112+
// .send({ message: "An error has occurred on the server" });
95113
});
96114
};
97115

98-
const dislikeItem = (req, res) => {
116+
const dislikeItem = (req, res, next) => {
99117
ClothingItem.findByIdAndUpdate(
100118
req.params.itemId,
101119
{ $pull: { likes: req.user._id } },
@@ -106,18 +124,23 @@ const dislikeItem = (req, res) => {
106124
.catch((err) => {
107125
console.log(err.name);
108126
if (err.name === "CastError") {
109-
return res
110-
.status(invalidDataError)
111-
.send({ message: "Bad Request! Invalid data passed" });
112-
}
113-
if (err.name === "DocumentNotFoundError") {
114-
return res
115-
.status(notFoundError)
116-
.send({ message: " The request was sent to a non-existent address" });
127+
next(new BadRequestError("Bad Request! Invalid data passed"));
128+
// return res
129+
// .status(invalidDataError)
130+
// .send({ message: "Bad Request! Invalid data passed" });
131+
} else if (err.name === "DocumentNotFoundError") {
132+
next(
133+
new NotFoundError(" The request was sent to a non-existent address")
134+
);
135+
// return res
136+
// .status(notFoundError)
137+
// .send({ message: " The request was sent to a non-existent address" });
138+
} else {
139+
next(err);
117140
}
118-
return res
119-
.status(defaultError)
120-
.send({ message: "An error has occurred on the server" });
141+
// return res
142+
// .status(defaultError)
143+
// .send({ message: "An error has occurred on the server" });
121144
});
122145
};
123146

0 commit comments

Comments
 (0)