From 26df3b2287acca225a1142b27c571252c75e37bd Mon Sep 17 00:00:00 2001
From: alex <alex@alexloehr.net>
Date: Tue, 12 Aug 2025 13:18:04 +0000
Subject: [PATCH] adding prod
---
lib/db.js | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/lib/db.js b/lib/db.js
index 13c40a1..96dfa0e 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
@@ -46,6 +47,7 @@
getKursTeilnehmerRolle,
getKursTeilnehmerByRole,
+ getKursRoles,
setStatus,
}
@@ -79,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
@@ -88,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,
@@ -239,6 +242,7 @@
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
@@ -321,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
}
@@ -354,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]
}
@@ -390,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
}
@@ -439,6 +444,20 @@
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 ////////////////////////////////////////////////////////////////
@@ -456,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