From 7d0735bcc3ebb29a9e0e5897fe215204e5d514c1 Mon Sep 17 00:00:00 2001
From: alex <alex@alexloehr.net>
Date: Wed, 16 Jul 2025 08:33:37 +0000
Subject: [PATCH] adding login res to deleteUser
---
lib/db.js | 238 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 209 insertions(+), 29 deletions(-)
diff --git a/lib/db.js b/lib/db.js
index 0d319c9..a2ed632 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,13 +40,21 @@
// getKursByObjId,
// getKursByRefId,
getKursTeilnehmer,
+ getSingleKursTeilnehmer,
getKursTeilnehmerCount,
+ getUdf,
+
+ getKursTeilnehmerRolle,
+ getKursTeilnehmerByRole,
+ getKursRoles,
+
+ setStatus,
}
/////////////////////////////////////////////////////////////////////////
-function getUserSearchQuery (offset, limit, search) {
+async function getUserSearchQuery (offset, limit, search) {
const sel = `usr_id, login, firstname, lastname, gender, email, institution, street, city, zipcode, country, department, active`
if (!search || search === '') {
return `SELECT ${sel}
@@ -55,10 +65,10 @@
`
}
else {
- const ids = searchLib.search(search)
+ const ids = await searchLib.search(search)
if (!ids.length) {
throw "nothing found"
- return getUserSearchQuery(offset, limit)
+ return await getUserSearchQuery(offset, limit)
} // nothing found
return `SELECT ${sel}
FROM ${database}.usr_data AS ud
@@ -71,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
@@ -79,8 +89,8 @@
const pool = await poolP
try {
- let userSearchQuery = getUserSearchQuery(offset, limit, search)
- // console.log(userSearchQuery)
+ let userSearchQuery = await getUserSearchQuery(offset, limit, search)
+ // log.info(userSearchQuery)
const [results, fields] = await pool.query(userSearchQuery)
const count = await getUserCount(offset, limit, search)
return {
@@ -101,7 +111,7 @@
async function getUserCount (offset, limit, search) {
const pool = await poolP
// const q = getUserSearchQuery(offset, limit, search)
- const q = getUserSearchQuery(0, 1000000, search) // hier darf kein Limit sein, offset=0
+ const q = await getUserSearchQuery(0, 1000000, search) // hier darf kein Limit sein, offset=0
const q2 = `SELECT COUNT(*) AS count
FROM (${q}) AS X`
const [results, fields] = await pool.query(q2)
@@ -165,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(
@@ -227,6 +241,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
@@ -255,29 +270,30 @@
async function getKursItems2 (ref_id) {
const pool = await poolP
const q = `
- WITH RECURSIVE tree (parent_id, obj_id, ref_id, title, type) AS (SELECT ci.parent_id,
- or2.obj_id,
- ci.obj_id as ref_id,
- od.title,
- od.type
- 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
- WHERE ci.obj_id = ${ref_id} -- Kurs ref_id
- AND or2.deleted is NULL
+ WITH RECURSIVE tree (parent_id, obj_id, ref_id, title, type) AS
+ (SELECT ci.parent_id,
+ or2.obj_id,
+ ci.obj_id as ref_id,
+ od.title,
+ od.type
+ 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
+ WHERE ci.obj_id = ${ref_id} -- Kurs ref_id
+ AND or2.deleted is NULL
- UNION ALL
+ UNION ALL
- SELECT child.parent_id,
- or2.obj_id,
- child.obj_id as ref_id,
- od.title,
- od.type
- FROM ${database}.crs_items child
- INNER JOIN ${database}.object_reference or2 ON or2.ref_id = child.obj_id
- INNER JOIN ${database}.object_data od ON od.obj_id = or2.obj_id
- JOIN tree ON child.parent_id = tree.ref_id
- WHERE or2.deleted is NULL)
+ SELECT child.parent_id,
+ or2.obj_id,
+ child.obj_id as ref_id,
+ od.title,
+ od.type
+ FROM ${database}.crs_items child
+ INNER JOIN ${database}.object_reference or2 ON or2.ref_id = child.obj_id
+ INNER JOIN ${database}.object_data od ON od.obj_id = or2.obj_id
+ JOIN tree ON child.parent_id = tree.ref_id
+ WHERE or2.deleted is NULL)
SELECT *
FROM tree
ORDER BY tree.ref_id
@@ -308,10 +324,43 @@
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
`
+ // 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) {
@@ -345,7 +394,138 @@
WHERE om.usr_id = ${usr_id}
AND om.member = 1
`
- console.log(q)
+ log.info(q)
const [results] = await pool.query(q)
return results
}
+
+/////// UDF ////////////////////////////////////////////////////////////////
+
+async function getUdf () {
+ const pool = await poolP
+ const q = `SELECT field_id, field_name, field_type
+ from ${database}.udf_definition;`
+ const [results] = await pool.query(q)
+ return results
+}
+
+/////// ROLLEN ////////////////////////////////////////////////////////////////
+
+async function getKursTeilnehmerRolle (obj_id) {
+ const pool = await poolP
+ const q = `SELECT obj_id, title, description
+ from object_data od
+ WHERE type = "role" #AND title LIKE 'il_crs_member_157'
+ AND od.description LIKE 'Member%${obj_id}'
+ `
+ const [results] = await pool.query(q)
+ // darf nur einen Treffer ergeben
+ if (results.length) {
+ const {obj_id, title, description} = results[0]
+ return obj_id
+ }
+ else {
+ return null
+ }
+}
+
+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 ////////////////////////////////////////////////////////////////
+
+/**
+ * Zwei Möglichkeiten:
+ * 1. es gibt schon einen Eintrag in ut_lp_marks, dann muss man diesen updaten
+ * 2. es gibt noch keinen Eintrag in ut_lp_marks, dann muss erst einer erstellt werden (NEIN! Für neuen TN sind bereits beide Einträge vorhanden, kann also wegfallen)
+ *
+ * Weiterhin haben wir es mit zwei Tabellen zu tun:
+ * - obj_members (passed)
+ * - ut_lp_marks (status)
+ *
+ * UPDATE: Wir nehmen an, dass beide Einträge schon vorhanden sind!
+ *
+ * @param courseId
+ * @param userId
+ * @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 = `
+START TRANSACTION;
+
+UPDATE ${database}.ut_lp_marks ulm
+SET status = ${status}
+WHERE ulm.usr_id = 31793 AND ulm.obj_id = 32212;
+
+UPDATE ${database}.obj_members om
+SET passed = ${passed}
+WHERE om.usr_id = ${userId} AND om.obj_id = ${courseId};
+
+COMMIT;
+`
+
+ let date = dayjs().format('YYYY-MM-DD HH:mm:ss')
+ const q1 = `
+ UPDATE ${database}.ut_lp_marks ulm
+ SET status = ${status},
+ status_changed = "${date}"
+ WHERE ulm.usr_id = ${userId}
+ AND ulm.obj_id = ${courseId};
+ `
+ const q2 = `
+ UPDATE ${database}.obj_members om
+ SET passed = ${passed}
+ 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"}
+ }
+ else {
+ throw {
+ status: "error",
+ reason: {affectedRows1, affectedRows2}
+ }
+ }
+}
--
Gitblit v1.8.0