Skip to content

Commit 5341a58

Browse files
abhishek1208abhishek1208
committed
fixed minor bugs and update lectures route
2 parents 00c543d + d018954 commit 5341a58

8 files changed

+294
-19
lines changed

‎docs/api_data.js

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

‎docs/api_data.json

+1-1
Large diffs are not rendered by default.

‎docs/api_project.js

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

‎docs/api_project.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ "name": "schedulecture", "version": "1.0.0", "description": "Link to API DOCS", "sampleUrl": false, "defaultVersion": "0.0.0", "apidoc": "0.3.0", "generator": { "name": "apidoc", "time": "2017-09-04T17:20:03.451Z", "url": "http://apidocjs.com", "version": "0.17.6" }}
1+
{ "name": "schedulecture", "version": "1.0.0", "description": "Link to API DOCS", "sampleUrl": false, "defaultVersion": "0.0.0", "apidoc": "0.3.0", "generator": { "name": "apidoc", "time": "2017-09-04T19:06:46.269Z", "url": "http://apidocjs.com", "version": "0.17.6" }}

‎package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
"scripts": {
1919
"test": "echo \"Error: no test specified\" && exit 1",
2020
"start": "node server.js",
21-
"apidoc": "apidoc -i routes/ -o docs/"
21+
"apidoc": "apidoc -i routes/ -o docs/",
22+
"postinstall": "cd public_html ; ./../node_modules/.bin/bower install"
2223
},
2324
"repository": {
2425
"type": "git",

‎routes/api_v1/batches.js

+97-3
Original file line numberDiff line numberDiff line change
@@ -269,10 +269,104 @@ router.delete('/:id', function (req, res) {
269269
})
270270
});
271271

272+
/**
273+
* @api {put} /api/v1/batches/:id/lectures PUT /api/v1/batches/:id/lectures
274+
* @apiName GetLecturesOfBatchById
275+
* @apiGroup Batch
276+
* @apiParam {Number} id batch by id
277+
* @apiSuccessExample {json} Success-Response:
278+
*
279+
*{
280+
"success": true,
281+
"data": [
282+
{
283+
"id": 2,
284+
"name": "Lecture 4",
285+
"date": "2016-09-15T03:30:00.000Z",
286+
"startTime": "2016-09-15T03:30:00.000Z",
287+
"endTime": "2016-09-15T03:30:00.000Z",
288+
"topic": "Actifsvssfvfv",
289+
"createdAt": "2017-09-04T18:19:53.405Z",
290+
"updatedAt": "2017-09-04T18:19:53.405Z",
291+
"batchId": 7,
292+
"roomId": null
293+
},
294+
{
295+
"id": 3,
296+
"name": "Lecture 5",
297+
"date": "2016-09-15T03:30:00.000Z",
298+
"startTime": "2016-09-15T03:30:00.000Z",
299+
"endTime": "2016-09-15T03:30:00.000Z",
300+
"topic": "Actifsvssfvfv",
301+
"createdAt": "2017-09-04T18:20:47.552Z",
302+
"updatedAt": "2017-09-04T18:20:47.552Z",
303+
"batchId": 7,
304+
"roomId": null
305+
},
306+
{
307+
"id": 4,
308+
"name": "Lecture 6",
309+
"date": "2016-09-15T03:30:00.000Z",
310+
"startTime": "2016-09-15T03:30:00.000Z",
311+
"endTime": "2016-09-15T03:30:00.000Z",
312+
"topic": "Fragments",
313+
"createdAt": "2017-09-04T18:55:36.882Z",
314+
"updatedAt": "2017-09-04T18:55:36.882Z",
315+
"batchId": 7,
316+
"roomId": null
317+
},
318+
{
319+
"id": 5,
320+
"name": "Lecture 6",
321+
"date": "2016-09-15T03:30:00.000Z",
322+
"startTime": "2016-09-15T03:30:00.000Z",
323+
"endTime": "2016-09-15T03:30:00.000Z",
324+
"topic": "Fragments",
325+
"createdAt": "2017-09-04T18:56:38.928Z",
326+
"updatedAt": "2017-09-04T18:56:38.928Z",
327+
"batchId": 7,
328+
"roomId": null
329+
},
330+
{
331+
"id": 7,
332+
"name": "Lecture 6",
333+
"date": "2016-09-15T03:30:00.000Z",
334+
"startTime": "2016-09-15T03:30:00.000Z",
335+
"endTime": "2016-09-15T03:30:00.000Z",
336+
"topic": "updated object",
337+
"createdAt": "2017-09-04T18:57:10.053Z",
338+
"updatedAt": "2017-09-04T18:59:34.881Z",
339+
"batchId": 7,
340+
"roomId": null
341+
}
342+
]
343+
}
344+
*/
272345
router.get('/:id/lectures', function (req, res) {
273-
db.actions.batches.getlectures(req.params.id, function (err, data) {
274-
res.send(data);
275-
})
346+
db.actions.batches.getlectures(req.params.id, function (err, lectures) {
347+
if (err) {
348+
console.log("ERROR" + err);
349+
res.status(500).send({
350+
success: false
351+
, code: "500"
352+
, error: {
353+
message: "Could not get all the lectures(Internal Server Error)."
354+
}
355+
})
356+
}
357+
else {
358+
if (lectures.length !== 0) {
359+
res.status(200).send({success: true, data: lectures.map((lecture) => lecture.get())});
360+
} else {
361+
res.status(404).send({
362+
success: false
363+
, code: "404"
364+
, error: {
365+
message: "There are no lectures."
366+
}
367+
})
368+
}
369+
} })
276370
});
277371

278372

‎routes/api_v1/centres.js

+56-5
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,15 @@ const db = require('../../db');
1414
* @apiParam {string} name
1515
* @apiSuccessExample {json} Success-Response:
1616
* {
17-
"id": 1,
18-
"name": "PitamPura",
19-
"updatedAt": "2017-09-04T17:35:27.545Z",
20-
"createdAt": "2017-09-04T17:35:27.545Z"
17+
"success": true,
18+
"data": {
19+
"id": 2,
20+
"name": "Dwarka",
21+
"updatedAt": "2017-09-04T18:42:59.639Z",
22+
"createdAt": "2017-09-04T18:42:59.639Z"
23+
}
2124
}
25+
*
2226
*
2327
*/
2428
router.post('/new', function (req, res) {
@@ -54,6 +58,25 @@ router.post('/new', function (req, res) {
5458
* @api {get} /api/v1/centres GET /api/v1/centres
5559
* @apiName GetCentres
5660
* @apiGroup Centre
61+
* @apiSuccessExample {json} Success-Response:
62+
*
63+
* {
64+
"success": true,
65+
"data": [
66+
{
67+
"id": 1,
68+
"name": "PitamPura",
69+
"createdAt": "2017-09-04T17:35:27.545Z",
70+
"updatedAt": "2017-09-04T17:35:27.545Z"
71+
},
72+
{
73+
"id": 2,
74+
"name": "Dwarka",
75+
"createdAt": "2017-09-04T18:42:59.639Z",
76+
"updatedAt": "2017-09-04T18:42:59.639Z"
77+
}
78+
]
79+
}
5780
*
5881
*/
5982
router.get('/', function (req, res) {
@@ -70,7 +93,7 @@ router.get('/', function (req, res) {
7093
}
7194
else {
7295
if (centres.length !== 0) {
73-
res.status(200).send({success: true, data: centres.map((course) => centre.get())});
96+
res.status(200).send({success: true, data: centres.map((centre) => centre.get())});
7497
} else {
7598
res.status(404).send({
7699
success: false
@@ -89,6 +112,18 @@ router.get('/', function (req, res) {
89112
* @apiName GetCentresById
90113
* @apiGroup Centre
91114
* @apiParam {number} id
115+
* @apiSuccessExample {json} Success-Response:
116+
*
117+
* {
118+
"success": true,
119+
"data": {
120+
"id": 1,
121+
"name": "PitamPura",
122+
"createdAt": "2017-09-04T17:35:27.545Z",
123+
"updatedAt": "2017-09-04T17:35:27.545Z"
124+
}
125+
}
126+
*
92127
*
93128
*/
94129
router.get('/:id', function (req, res) {
@@ -125,6 +160,17 @@ router.get('/:id', function (req, res) {
125160
* @apiName EditCentre
126161
* @apiGroup Centre
127162
* @apiParam {Object} values updated centre object
163+
* @apiSuccessExample {json} Success-Response:
164+
*
165+
* {
166+
"success": true,
167+
"data": {
168+
"id": 2,
169+
"name": "Dwarka Sec-11",
170+
"createdAt": "2017-09-04T18:42:59.639Z",
171+
"updatedAt": "2017-09-04T18:44:31.624Z"
172+
}
173+
}
128174
*/
129175
router.put('/:id', function (req, res) {
130176
db.actions.centres.edit(req.params.id, req.body.values, function (err, centre) {
@@ -161,6 +207,11 @@ router.put('/:id', function (req, res) {
161207
* @apiName DeleteCentre
162208
* @apiGroup Centre
163209
* @apiParam {number} id
210+
* @apiSuccessExample {json} Success-Response:
211+
*
212+
* {
213+
"success": true
214+
}
164215
*/
165216
router.delete('/:id', function (req, res) {
166217
db.actions.centres.deleteCentre(req.params.id, function (err, centreDeleted) {

0 commit comments

Comments
 (0)