Skip to content

Commit

Permalink
fix missing/additional paranthesis
Browse files Browse the repository at this point in the history
  • Loading branch information
@ryu-kyu
ryu-kyu committed Jul 28, 2023
1 parent 4ae58c1 commit afff06b
Show file tree
Hide file tree
Showing 2 changed files with 85 additions and 49 deletions.
107 changes: 68 additions & 39 deletions backend/module/interview/staff/change.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,47 +9,76 @@ router.put("/", (req, res) => {
return;
}

let temp_set = helpers.interview_data_set_new(req.body, 2);
let set = temp_set["set"];
let set_data = temp_set["data"];
let set_data_id = temp_set["data_id"];
if (set === "") {
res.status(400).json({ message: "There is nothing to change." });
return;
}
let temp_set = helpers.interview_data_set_new(req.body, 2);
let set = temp_set["set"];
let set_data = temp_set["data"];
let set_data_id = temp_set["data_id"];
if (set === "") {
res.status(400).json({ message: "There is nothing to change." });
return;
}

if (res.locals["type"] === "instructor") {
var temp_filter = helpers.interview_data_filter(req.body, set_data_id, true, res.locals["username"]);
} else {
var temp_filter = helpers.interview_data_filter(req.body, set_data_id, false, res.locals["username"]);
}
let filter = temp_filter["filter"];
let filter_data = temp_filter["data"];
if (filter === "") {
res.status(400).json({ message: "Pleaes add at least one condition." });
return;
}
if (res.locals["type"] === "instructor") {
var temp_filter = helpers.interview_data_filter(
req.body,
set_data_id,
true,
res.locals["username"]
);
} else {
var temp_filter = helpers.interview_data_filter(
req.body,
set_data_id,
false,
res.locals["username"]
);
}
let filter = temp_filter["filter"];
let filter_data = temp_filter["data"];
if (filter === "") {
res.status(400).json({ message: "Pleaes add at least one condition." });
return;
}

if (req.body["force"] === true || req.body["force"] === "true") {
var sql_change = "UPDATE course_" + res.locals["course_id"] + ".interview SET" + set.substring(0, set.length - 1) + " WHERE task = ($1)" + filter;
} else {
var sql_change = "UPDATE course_" + res.locals["course_id"] + ".interview SET" + set.substring(0, set.length - 1) + " WHERE task = ($1) AND group_id IS NULL" + filter;
}
if (req.body["force"] === true || req.body["force"] === "true") {
var sql_change =
"UPDATE course_" +
res.locals["course_id"] +
".interview SET" +
set.substring(0, set.length - 1) +
" WHERE task = ($1)" +
filter;
} else {
var sql_change =
"UPDATE course_" +
res.locals["course_id"] +
".interview SET" +
set.substring(0, set.length - 1) +
" WHERE task = ($1) AND group_id IS NULL" +
filter;
}

client.query(sql_change, [res.locals["task"]].concat(set_data).concat(filter_data), (err, pgRes) => {
if (err) {
if (err.code === "23505") {
res.status(409).json({ message: "You have another interview at the same time." });
} else {
res.status(404).json({ message: "Unknown error." });
}
} else if (pgRes.rowCount <= 1) {
let message = pgRes.rowCount + " interview has been changed.";
res.status(200).json({ message: message });
} else {
let message = pgRes.rowCount + " interviews have been changed.";
res.status(200).json({ message: message });
}
});
client.query(
sql_change,
[res.locals["task"]].concat(set_data).concat(filter_data),
(err, pgRes) => {
if (err) {
if (err.code === "23505") {
res
.status(409)
.json({ message: "You have another interview at the same time." });
} else {
res.status(404).json({ message: "Unknown error." });
}
} else if (pgRes.rowCount <= 1) {
let message = pgRes.rowCount + " interview has been changed.";
res.status(200).json({ message: message });
} else {
let message = pgRes.rowCount + " interviews have been changed.";
res.status(200).json({ message: message });
}
}
);
});

module.exports = router;
27 changes: 17 additions & 10 deletions backend/module/role/admin/get.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,23 @@ const client = require("../../../setup/db");
const helpers = require("../../../utilities/helpers");

router.get("/", (req, res) => {
if ("username" in req.query && !helpers.name_validate(req.query["username"])) {
var sql_role = "SELECT course_role.username, email, role, course_id FROM course_role LEFT JOIN user_info ON course_role.username = user_info.username WHERE course_role.username = ($1)";
var sql_role_data = [req.query["username"]];
} else if ("course_id" in req.query && !helpers.number_validate(req.query["course_id"])) {
var sql_role = "SELECT course_role.username, email, role, course_id FROM course_role LEFT JOIN user_info ON course_role.username = user_info.username WHERE course_id = ($1)";
var sql_role_data = [req.query["course_id"]];
} else {
res.status(200).json({ count: pg_res.rows.length, role: pg_res.rows });
}
});
if (
"username" in req.query &&
!helpers.name_validate(req.query["username"])
) {
var sql_role =
"SELECT course_role.username, email, role, course_id FROM course_role LEFT JOIN user_info ON course_role.username = user_info.username WHERE course_role.username = ($1)";
var sql_role_data = [req.query["username"]];
} else if (
"course_id" in req.query &&
!helpers.number_validate(req.query["course_id"])
) {
var sql_role =
"SELECT course_role.username, email, role, course_id FROM course_role LEFT JOIN user_info ON course_role.username = user_info.username WHERE course_id = ($1)";
var sql_role_data = [req.query["course_id"]];
} else {
res.status(200).json({ count: pg_res.rows.length, role: pg_res.rows });
}
});

module.exports = router;

0 comments on commit afff06b

Please sign in to comment.