Skip to content

Ht 20 add swagger documentation #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jarrodback merged 3 commits into from
Feb 7, 2022
Merged

Ht 20 add swagger documentation #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
78cf1f3
HT-20 Install swagger dependency and set up basic json file
JakeMinor Feb 7, 2022
42c0b26
HT-20 Add swagger endpoints for Bills and Auth Controller
JakeMinor Feb 7, 2022
2b1efd3
HT-20 fix failing tests
JakeMinor Feb 7, 2022
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
2 changes: 1 addition & 1 deletion server/.nyc_output/processinfo/index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"processes":{"12f11c28-311f-49b3-9c08-cfa6cf70d965":{"parent":null,"children":[]}},"files":{"C:\\Projects\\CSSD-Assignment\\server\\app.js":["12f11c28-311f-49b3-9c08-cfa6cf70d965"],"C:\\Projects\\CSSD-Assignment\\server\\database\\index.js":["12f11c28-311f-49b3-9c08-cfa6cf70d965"],"C:\\Projects\\CSSD-Assignment\\server\\config\\db.config.js":["12f11c28-311f-49b3-9c08-cfa6cf70d965"],"C:\\Projects\\CSSD-Assignment\\server\\models\\journey.model.js":["12f11c28-311f-49b3-9c08-cfa6cf70d965"],"C:\\Projects\\CSSD-Assignment\\server\\models\\bill.model.js":["12f11c28-311f-49b3-9c08-cfa6cf70d965"],"C:\\Projects\\CSSD-Assignment\\server\\utilities.js":["12f11c28-311f-49b3-9c08-cfa6cf70d965"],"C:\\Projects\\CSSD-Assignment\\server\\models\\location.model.js":["12f11c28-311f-49b3-9c08-cfa6cf70d965"],"C:\\Projects\\CSSD-Assignment\\server\\models\\user.model.js":["12f11c28-311f-49b3-9c08-cfa6cf70d965"],"C:\\Projects\\CSSD-Assignment\\server\\routes\\auth.routes.js":["12f11c28-311f-49b3-9c08-cfa6cf70d965"],"C:\\Projects\\CSSD-Assignment\\server\\controllers\\auth.controller.js":["12f11c28-311f-49b3-9c08-cfa6cf70d965"],"C:\\Projects\\CSSD-Assignment\\server\\business\\user.business.js":["12f11c28-311f-49b3-9c08-cfa6cf70d965"],"C:\\Projects\\CSSD-Assignment\\server\\datalayer\\mongo.js":["12f11c28-311f-49b3-9c08-cfa6cf70d965"],"C:\\Projects\\CSSD-Assignment\\server\\routes\\bill.routes.js":["12f11c28-311f-49b3-9c08-cfa6cf70d965"],"C:\\Projects\\CSSD-Assignment\\server\\controllers\\bill.controller.js":["12f11c28-311f-49b3-9c08-cfa6cf70d965"],"C:\\Projects\\CSSD-Assignment\\server\\business\\bill.business.js":["12f11c28-311f-49b3-9c08-cfa6cf70d965"]},"externalIds":{}}
{"processes":{"b2f11009-2b6c-4812-bc05-5d889a357cc7":{"parent":null,"children":[]}},"files":{"C:\\Projects\\CSSD-Assignment\\server\\app.js":["b2f11009-2b6c-4812-bc05-5d889a357cc7"],"C:\\Projects\\CSSD-Assignment\\server\\database\\index.js":["b2f11009-2b6c-4812-bc05-5d889a357cc7"],"C:\\Projects\\CSSD-Assignment\\server\\config\\db.config.js":["b2f11009-2b6c-4812-bc05-5d889a357cc7"],"C:\\Projects\\CSSD-Assignment\\server\\models\\journey.model.js":["b2f11009-2b6c-4812-bc05-5d889a357cc7"],"C:\\Projects\\CSSD-Assignment\\server\\models\\bill.model.js":["b2f11009-2b6c-4812-bc05-5d889a357cc7"],"C:\\Projects\\CSSD-Assignment\\server\\utilities.js":["b2f11009-2b6c-4812-bc05-5d889a357cc7"],"C:\\Projects\\CSSD-Assignment\\server\\models\\location.model.js":["b2f11009-2b6c-4812-bc05-5d889a357cc7"],"C:\\Projects\\CSSD-Assignment\\server\\models\\user.model.js":["b2f11009-2b6c-4812-bc05-5d889a357cc7"],"C:\\Projects\\CSSD-Assignment\\server\\routes\\auth.routes.js":["b2f11009-2b6c-4812-bc05-5d889a357cc7"],"C:\\Projects\\CSSD-Assignment\\server\\controllers\\auth.controller.js":["b2f11009-2b6c-4812-bc05-5d889a357cc7"],"C:\\Projects\\CSSD-Assignment\\server\\business\\user.business.js":["b2f11009-2b6c-4812-bc05-5d889a357cc7"],"C:\\Projects\\CSSD-Assignment\\server\\datalayer\\mongo.js":["b2f11009-2b6c-4812-bc05-5d889a357cc7"],"C:\\Projects\\CSSD-Assignment\\server\\routes\\bill.routes.js":["b2f11009-2b6c-4812-bc05-5d889a357cc7"],"C:\\Projects\\CSSD-Assignment\\server\\middleware\\auth\\authJwt.js":["b2f11009-2b6c-4812-bc05-5d889a357cc7"],"C:\\Projects\\CSSD-Assignment\\server\\controllers\\bill.controller.js":["b2f11009-2b6c-4812-bc05-5d889a357cc7"],"C:\\Projects\\CSSD-Assignment\\server\\business\\bill.business.js":["b2f11009-2b6c-4812-bc05-5d889a357cc7"]},"externalIds":{}}
5 changes: 5 additions & 0 deletions server/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ const bodyParser = require("body-parser");
const cors = require("cors");
const cookieSession = require("cookie-session");
const cookieParser = require("cookie-parser");
const swaggerUi = require('swagger-ui-express'),
swaggerDocument = require('./swagger.json')

require("./database");
require("dotenv").config();
Expand All @@ -26,6 +28,9 @@ app.use(cors({ origin: "http://localhost:8080", credentials: true }));
*/
const authRouter = require("./routes/auth.routes");
const billRouter = require("./routes/bill.routes");
app.get('/api-docs/swagger.json', (req, res) => res.json(swaggerDocument));
app.use('/api-docs', swaggerUi.serve, swaggerUi.setup(swaggerDocument))

/**
* View Engine setup
*/
Expand Down
4 changes: 2 additions & 2 deletions server/business/user.business.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ module.exports = class UserBusiness {
id: user._id,
};
})
.catch(() => {throw httpError(400, "Your email or password is incorrect.");
.catch(() => {throw httpError(401, "Your email or password is incorrect.");
});
}

Expand Down Expand Up @@ -84,7 +84,7 @@ module.exports = class UserBusiness {
throw httpError(400, "Username is already in use.");
if (error.message.includes("email"))
throw httpError(400, "Email is already in use.");
throw httpError(404, error.message);
throw httpError(500, error.message);
});
}

Expand Down
Loading