This commit is contained in:
rgrgogu
2026-05-21 11:48:57 +08:00
parent db0e6f00f6
commit 7f06bf83f6
7 changed files with 137 additions and 230 deletions
+12 -55
View File
@@ -9,6 +9,7 @@ const { syncObjectivesCreate, syncObjectivesUpdate } = require("../../utils/cour
const { syncJunction } = require("../../utils/courses/junction.util");
const { archiveOne, archiveMany } = require("../../utils/courses/archive.util");
const { restoreOne, restoreMany } = require("../../utils/courses/restore.util");
const { getFieldValues } = require("../../utils/fieldValues.util");
// ── Models ────────────────────────────────────────────────────────────────────
@@ -408,11 +409,11 @@ exports.updateUnit = async (req, res) => {
}
};
exports.deleteUnit = async (req, res) => {
exports.archiveUnit = async (req, res) => {
const t = await sequelize.transaction();
try {
const { courseId, unitId } = req.params;
const record = await archiveOne(Unit, { unit_id: unitId, course_id: courseId, ...notDeleted }, req.body.deletedBy, t);
const record = await archiveOne(Unit, { unit_id: unitId, course_id: courseId, ...notDeleted }, req.user.user_id, t);
if (!record) return R.error(res, "Unit not found.", 404);
await t.commit();
return R.success(res, "Unit archived.");
@@ -427,13 +428,13 @@ exports.bulkArchiveUnits = async (req, res) => {
const t = await sequelize.transaction();
try {
const { courseId } = req.params;
const { ids = [], deletedBy } = req.body;
const { ids = [] } = req.body;
if (!ids.length) return R.error(res, "No IDs provided.", 400);
const units = await Unit.findAll({ where: { unit_id: ids, course_id: courseId, ...notDeleted } });
const validIds = units.map((u) => u.unit_id);
const count = await archiveMany(Unit, "unit_id", validIds, deletedBy, t);
const count = await archiveMany(Unit, "unit_id", validIds, req.user.user_id, t);
await t.commit();
return R.success(res, `${count} unit${count !== 1 ? "s" : ""} archived.`);
} catch (err) {
@@ -453,7 +454,7 @@ exports.getArchivedUnits = async (req, res) => {
const result = await paginate(Unit, req, {
excludeAttributes: adminExclude,
auditOptions: { mdl_Users, parentAlias: "Unit" },
context: "list",
context: "archived",
findOptions: {
where: { course_id: courseId, ...onlyDeleted },
paranoid: false,
@@ -487,7 +488,7 @@ exports.restoreUnit = async (req, res) => {
const t = await sequelize.transaction();
try {
const { courseId, unitId } = req.params;
const record = await restoreOne(Unit, { unit_id: unitId, course_id: courseId, ...onlyDeleted }, req.body.restoredBy, t);
const record = await restoreOne(Unit, { unit_id: unitId, course_id: courseId, ...onlyDeleted }, req.user.user_id, t);
if (!record) return R.error(res, "Archived unit not found.", 404);
await t.commit();
return R.success(res, "Unit restored.", { data: record });
@@ -502,13 +503,13 @@ exports.bulkRestoreUnits = async (req, res) => {
const t = await sequelize.transaction();
try {
const { courseId } = req.params;
const { ids = [], restoredBy } = req.body;
const { ids = [] } = req.body;
if (!ids.length) return R.error(res, "No IDs provided.", 400);
const units = await Unit.findAll({ where: { unit_id: ids, course_id: courseId, ...onlyDeleted }, paranoid: false });
const validIds = units.map((u) => u.unit_id);
const count = await restoreMany(Unit, "unit_id", validIds, restoredBy, t);
const count = await restoreMany(Unit, "unit_id", validIds, req.user.user_id, t);
await t.commit();
return R.success(res, `${count} unit${count !== 1 ? "s" : ""} restored.`);
} catch (err) {
@@ -1315,50 +1316,6 @@ exports.restoreAssessment = async (req, res) => {
}
};
exports.getCourseFieldValues = async (req, res) => {
try {
const { field } = req.query;
if (!field) return R.error(res, "Field is required.", 400);
const allowedFields = Object.keys(Course.rawAttributes).filter(
(key) => Course.rawAttributes[key].filterable === true
);
const dateFields = ["createdAt", "updatedAt", "deletedAt"];
if (!allowedFields.includes(field) && !dateFields.includes(field))
return R.error(res, "Invalid or restricted field.", 400);
if (auditByFields.includes(field)) {
const [rows] = await sequelize.query(`
SELECT DISTINCT u."personal_info"->'name'->>'full_name' AS value
FROM courses c
JOIN users u ON u.user_id = c."${field}"
WHERE c."${field}" IS NOT NULL
AND u."personal_info"->'name'->>'full_name' IS NOT NULL
ORDER BY value ASC
`);
return R.success(res, "Field values retrieved.", rows.map((r) => r.value).filter(Boolean));
}
if (dateFields.includes(field)) {
const results = await Course.findAll({
attributes: [[Sequelize.fn("DISTINCT", Sequelize.fn("DATE", Sequelize.col(field))), "value"]],
where: { [field]: { [Op.ne]: null } },
order: [[Sequelize.fn("DATE", Sequelize.col(field)), "DESC"]],
raw: true,
});
return R.success(res, "Field values retrieved.", results.map((r) => r.value).filter(Boolean));
}
const results = await Course.findAll({
attributes: [[Sequelize.fn("DISTINCT", Sequelize.col(field)), "value"]],
where: { [field]: { [Op.ne]: null } },
raw: true,
});
return R.success(res, "Field values retrieved.", results.map((r) => r.value).filter(Boolean).sort());
} catch (err) {
console.error("[COURSE][GET FIELD VALUES]", err);
return R.error(res, "Could not retrieve field values.", 500);
}
};
exports.getCourseFieldValues = getFieldValues(Course, "COURSE");
exports.getUnitFieldValues = getFieldValues(Unit, "UNIT");
exports.getLessonFieldValues = getFieldValues(Lesson, "LESSON");