From 846df9e0f36145aae237818362dadff78453a7b9 Mon Sep 17 00:00:00 2001
From: alex <alex@alexloehr.net>
Date: Wed, 17 Sep 2025 17:15:34 +0000
Subject: [PATCH] GS-2308
---
lib/db.js | 65 +++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 11 deletions(-)
diff --git a/lib/db.js b/lib/db.js
index bee8d63..0cc8cc2 100644
--- a/lib/db.js
+++ b/lib/db.js
@@ -1,6 +1,7 @@
const mysql = require("mysql2/promise")
const dayjs = require("dayjs")
+const log = require("../logger")
const searchLib = require("./search")
const {host, port, user, database, password} = require("./../settings").db
@@ -44,7 +45,9 @@
getUdf,
- getMemberRoleForCourse,
+ getKursTeilnehmerRolle,
+ getKursTeilnehmerByRole,
+ getKursRoles,
setStatus,
}
@@ -78,7 +81,7 @@
}
async function getUsers (offset = 0, limit = 10, search = null) {
- console.log("++++++++++ get users", offset, limit, search)
+ log.info("++++++++++ get users", offset, limit, search)
limit = Number(limit) || 10
offset = Number(offset) || 0
// TODO check args for SQL Injection
@@ -87,8 +90,9 @@
try {
let userSearchQuery = await getUserSearchQuery(offset, limit, search)
- // console.log(userSearchQuery)
+ // log.info(userSearchQuery)
const [results, fields] = await pool.query(userSearchQuery)
+ // console.log(results, fields)
const count = await getUserCount(offset, limit, search)
return {
total: count,
@@ -172,6 +176,10 @@
/////// obj_id / ref_id ////////////////////////////////////////////////////////////////
+/**
+ * @param refId
+ * @returns {Promise<{ref_id,obj_id}|undefined>}
+ */
async function getObjIdFromRefId (refId) {
const pool = await poolP
const [results] = await pool.query(
@@ -213,7 +221,7 @@
async function getKurse () {
const pool = await poolP
- const q = `SELECT or2.ref_id, or2.obj_id, od.title, od.description, od.type
+ const q = `SELECT or2.ref_id, or2.obj_id, od.title, od.description, od.type, od.offline
FROM ${database}.object_reference or2
INNER JOIN ${database}.object_data od ON od.obj_id = or2.obj_id
WHERE od.type = 'crs'
@@ -230,10 +238,11 @@
async function getKurs (ref_id) {
const pool = await poolP
- const q = `SELECT or2.ref_id, or2.obj_id, od.title, od.description, od.type, od.create_date
+ const q = `SELECT or2.ref_id, or2.obj_id, od.title, od.description, od.type, od.create_date, od.offline
FROM ${database}.object_reference or2
INNER JOIN ${database}.object_data od ON od.obj_id = or2.obj_id
WHERE or2.ref_id = '${ref_id}'
+ AND or2.deleted IS NULL
`
let [results] = await pool.query(q)
results = results.length ? results[0] : undefined
@@ -316,9 +325,10 @@
INNER JOIN ${database}.usr_data ud ON ud.usr_id = om.usr_id
LEFT JOIN ${database}.ut_lp_marks ulm ON ulm.obj_id = or2.obj_id AND ud.usr_id = ulm.usr_id
WHERE (or2.ref_id = ${ref_id} OR parent_id = ${ref_id})
+ AND or2.deleted IS NULL
ORDER BY usr_id
`
- // console.log(q)
+ // log.info(q)
const [results] = await pool.query(q)
return results
}
@@ -349,7 +359,7 @@
AND om.usr_id = ${usr_id}
ORDER BY usr_id
`
- // console.log(q)
+ // log.info(q)
const [results] = await pool.query(q)
return results[0]
}
@@ -385,7 +395,7 @@
WHERE om.usr_id = ${usr_id}
AND om.member = 1
`
- console.log(q)
+ log.info(q)
const [results] = await pool.query(q)
return results
}
@@ -402,7 +412,7 @@
/////// ROLLEN ////////////////////////////////////////////////////////////////
-async function getMemberRoleForCourse (obj_id) {
+async function getKursTeilnehmerRolle (obj_id) {
const pool = await poolP
const q = `SELECT obj_id, title, description
from object_data od
@@ -420,6 +430,36 @@
}
}
+async function getKursTeilnehmerByRole (obj_id) {
+ const pool = await poolP
+ const q = `
+ SELECT obj_id as role_id, ru.usr_id, ud.firstname, ud.lastname
+ FROM ${database}.object_data od
+ INNER JOIN ${database}.rbac_ua ru ON ru.rol_id = od.obj_id
+ INNER JOIN ${database}.usr_data ud ON ud.usr_id = ru.usr_id
+ WHERE type = "role" #AND title LIKE 'il_crs_member_157'
+ AND od.description LIKE 'Member%${obj_id}'
+ `
+ const [results] = await pool.query(q)
+ return results
+}
+
+async function getKursRoles (ref_id) {
+ const pool = await poolP
+ const q = `
+ SELECT pa.rol_id, or2.ref_id, or2.obj_id, od2.type, od2.title, od2.description
+ FROM ${database}.rbac_pa pa
+ INNER JOIN ${database}.object_reference or2 ON or2.ref_id = pa.ref_id
+ INNER JOIN ${database}.object_data od ON od.obj_id = or2.obj_id
+ INNER JOIN ${database}.object_data od2 ON od2.obj_id = pa.rol_id
+ WHERE pa.ref_id = ${ref_id}
+ `
+ const [results] = await pool.query(q)
+ return results
+}
+
+
+
/////// STATUS ////////////////////////////////////////////////////////////////
/**
@@ -435,12 +475,15 @@
*
* @param courseId
* @param userId
- * @param passed
- * @param status
+ * @param {Number} passed
+ * @param {Number} status
* @returns {Promise<{status: string}>}
*/
async function setStatus (courseId, userId, passed = null, status = null) {
const pool = await poolP
+ log.info(`------------setStatus----- courseId=${courseId} userId=${userId} passed=${passed} status=${status}`)
+ passed = isNaN(Number(passed)) ? passed : Number(passed)
+ status = isNaN(Number(status)) ? status : Number(status)
// ACHTUNG Transactions funktioneren so nicht, erst mal ohne machen...
const q = `
--
Gitblit v1.8.0