From ece59f8adfbfc6427585ee4e68a6c0a147459efb Mon Sep 17 00:00:00 2001
From: alex <alex@alexloehr.net>
Date: Sat, 12 Jul 2025 16:02:32 +0000
Subject: [PATCH] adding better logging
---
lib/db.js | 103 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 87 insertions(+), 16 deletions(-)
diff --git a/lib/db.js b/lib/db.js
index 76e3064..af6fa94 100644
--- a/lib/db.js
+++ b/lib/db.js
@@ -1,5 +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
@@ -38,11 +40,14 @@
// getKursByObjId,
// getKursByRefId,
getKursTeilnehmer,
+ getSingleKursTeilnehmer,
getKursTeilnehmerCount,
getUdf,
- getMemberRoleForCourse,
+ getKursTeilnehmerRolle,
+ getKursTeilnehmerByRole,
+ getKursRoles,
setStatus,
}
@@ -76,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
@@ -85,7 +90,7 @@
try {
let userSearchQuery = await getUserSearchQuery(offset, limit, search)
- // console.log(userSearchQuery)
+ // log.info(userSearchQuery)
const [results, fields] = await pool.query(userSearchQuery)
const count = await getUserCount(offset, limit, search)
return {
@@ -170,6 +175,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(
@@ -316,9 +325,40 @@
WHERE (or2.ref_id = ${ref_id} OR parent_id = ${ref_id})
ORDER BY usr_id
`
- console.log(q)
+ // log.info(q)
const [results] = await pool.query(q)
return results
+}
+
+async function getSingleKursTeilnehmer (ref_id, usr_id) {
+ const pool = await poolP
+ const q = `SELECT ci.parent_id,
+ or2.ref_id,
+ or2.obj_id,
+ od.title,
+ od.type,
+ om.usr_id,
+ ud.login,
+ ud.firstname,
+ ud.lastname,
+ ud.active,
+ om.passed,
+ ulm.status,
+ ulm.status_changed
+ FROM ${database}.crs_items ci
+ INNER JOIN ${database}.object_reference or2 ON or2.ref_id = ci.obj_id
+ INNER JOIN ${database}.object_data od ON od.obj_id = or2.obj_id
+ INNER JOIN ${database}.obj_members om ON om.obj_id = or2.obj_id AND om.member = 1
+ 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 om.usr_id = ${usr_id}
+ ORDER BY usr_id
+ `
+ // log.info(q)
+ const [results] = await pool.query(q)
+ return results[0]
}
async function getKursTeilnehmerCount (ref_id) {
@@ -352,7 +392,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
}
@@ -369,7 +409,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
@@ -387,6 +427,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 ////////////////////////////////////////////////////////////////
/**
@@ -402,9 +472,9 @@
*
* @param courseId
* @param userId
- * @param passed
- * @param status
- * @returns {Promise<void>}
+ * @param {Number} passed
+ * @param {Number} status
+ * @returns {Promise<{status: string}>}
*/
async function setStatus (courseId, userId, passed = null, status = null) {
const pool = await poolP
@@ -424,11 +494,13 @@
COMMIT;
`
+ let date = dayjs().format('YYYY-MM-DD HH:mm:ss')
const q1 = `
UPDATE ${database}.ut_lp_marks ulm
- SET status = ${status}
- WHERE ulm.usr_id = 31793
- AND ulm.obj_id = 32212;
+ SET status = ${status},
+ status_changed = "${date}"
+ WHERE ulm.usr_id = ${userId}
+ AND ulm.obj_id = ${courseId};
`
const q2 = `
UPDATE ${database}.obj_members om
@@ -436,14 +508,14 @@
WHERE om.usr_id = ${userId}
AND om.obj_id = ${courseId};
`
+
const [results1] = await pool.query(q1)
const [results2] = await pool.query(q2)
const {affectedRows: affectedRows1} = results1
const {affectedRows: affectedRows2} = results2
+
if (affectedRows1 && affectedRows2) {
- return {
- status: "ok",
- }
+ return {status: "ok"}
}
else {
throw {
@@ -451,5 +523,4 @@
reason: {affectedRows1, affectedRows2}
}
}
- // return {results1, results2}
}
--
Gitblit v1.8.0