Attempt to resurrect qomet code - need some rewrite

[qomet.git] / routes / courses.js

diff --git a/routes/courses.js b/routes/courses.js
index d221858..5ca6ad4 100644 (file)
--- a/routes/courses.js
+++ b/routes/courses.js
@@ -3,25 +3,24 @@ const access = require("../utils/access.js");
 const validator = require("../public/javascripts/utils/validation");
 const sanitizeHtml = require('sanitize-html');
 const ObjectId = require("bson-objectid");
-const CourseEntity = require("../entities/course");
 const CourseModel = require("../models/course");
 
-router.get('/add/course', access.ajax, access.logged, (req,res) => {
-       let code = req.query["code"];
-       let description = sanitizeHtml(req.query["description"]);
+router.post('/courses', access.ajax, access.logged, (req,res) => {
+       let code = req.body["code"];
+       let description = sanitizeHtml(req.body["description"]);
        let error = validator({code:code}, "Course");
        if (error.length > 0)
                return res.json({errmsg:error});
-       CourseEntity.insert(req.user._id, code, description, (err,course) => {
+       CourseModel.insert(req.user._id, code, description, (err,course) => {
                access.checkRequest(res, err, course, "Course addition failed", () => {
                        res.json(course);
                });
        });
 });
 
-router.get("/set/password", access.ajax, access.logged, (req,res) => {
-       let cid = req.query["cid"];
-       let pwd = req.query["pwd"];
+router.put("/courses/password", access.ajax, access.logged, (req,res) => {
+       let cid = req.body["cid"];
+       let pwd = req.body["pwd"];
        let error = validator({password:pwd, _id:cid}, "Course");
        if (error.length > 0)
                return res.json({errmsg:error});
@@ -32,7 +31,7 @@ router.get("/set/password", access.ajax, access.logged, (req,res) => {
        });
 });
 
-router.post('/import/students', access.ajax, access.logged, (req,res) => {
+router.put('/courses/student-list', access.ajax, access.logged, (req,res) => {
        let cid = req.body["cid"];
        let students = JSON.parse(req.body["students"]);
        let error = validator({_id:cid, students: students}, "Course");
@@ -49,20 +48,20 @@ router.post('/import/students', access.ajax, access.logged, (req,res) => {
        });
 });
 
-router.get('/get/student', access.ajax, (req,res) => {
-       let number = req.query["number"];
+router.get('/courses/student', access.ajax, (req,res) => {
        let cid = req.query["cid"];
+       let number = req.query["number"];
        let error = validator({ _id: cid, students: [{number:number}] }, "Course");
        if (error.length > 0)
                return res.json({errmsg:error});
-       CourseEntity.getStudent(ObjectId(cid), number, (err,ret) => {
+       CourseModel.getStudent(ObjectId(cid), number, (err,ret) => {
                access.checkRequest(res, err, ret, "Failed retrieving student", () => {
                        res.json({student: ret.students[0]});
                });
        });
 });
 
-router.get('/remove/course', access.ajax, access.logged, (req,res) => {
+router.delete('/courses', access.ajax, access.logged, (req,res) => {
        let cid = req.query["cid"];
        let error = validator({_id:cid}, "Course");
        if (error.length > 0)