From 08186da304e89de3b61d2a2f3b438598856579fc Mon Sep 17 00:00:00 2001
From: alex <alex@alexloehr.net>
Date: Sun, 22 Jun 2025 09:07:41 +0000
Subject: [PATCH] GS-2156
---
lib/db.js | 255 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 209 insertions(+), 46 deletions(-)
diff --git a/lib/db.js b/lib/db.js
index d13bd08..72d6bc0 100644
--- a/lib/db.js
+++ b/lib/db.js
@@ -1,5 +1,6 @@
const mysql = require("mysql2/promise")
+const searchLib = require("./search")
const {host, port, user, database, password} = require("./../settings").db
/////////////////////////////////////////////////////////////////////////
@@ -25,75 +26,118 @@
getUserByUserId,
getUserDefinedFields,
getUserDefinedField,
+ getUserTeilnahmen,
getObjIdFromRefId,
getRefIdFromObjId,
getKurse,
getKurs,
- getTeilnehmer,
+ getKursItems,
+ getKursItems2,
+ // getKursByObjId,
+ // getKursByRefId,
+ getKursTeilnehmer,
+ getKursTeilnehmerCount,
+
+ getUdf,
}
/////////////////////////////////////////////////////////////////////////
-async function getUsers (offset = 0, limit = 10) {
+async function getUserSearchQuery (offset, limit, search) {
const sel = `usr_id, login, firstname, lastname, gender, email, institution, street, city, zipcode, country, department, active`
- // TODO user defined fields
- // TODO check args for SQL Injection
-
- const pool = await poolP
- const [results, fields] = await pool.query(
- `SELECT ${sel}
- FROM ${database}.usr_data AS ud
- WHERE login REGEXP '^[0-9]+$'
- LIMIT ${limit}
- OFFSET ${offset}
+ if (!search || search === '') {
+ return `SELECT ${sel}
+ FROM ${database}.usr_data AS ud
+ WHERE login REGEXP '^[0-9]+$'
+ LIMIT ${limit}
+ OFFSET ${offset}
`
- )
- const count = await getUserCount()
- return {
- total: count,
- offset, limit,
- data: results,
+ }
+ else {
+ const ids = await searchLib.search(search)
+ if (!ids.length) {
+ throw "nothing found"
+ return await getUserSearchQuery(offset, limit)
+ } // nothing found
+ return `SELECT ${sel}
+ FROM ${database}.usr_data AS ud
+ WHERE login REGEXP '^[0-9]+$'
+ AND usr_id IN (${ids.join(",")})
+ LIMIT ${limit}
+ OFFSET ${offset}
+ `
}
}
-async function getUserCount () {
+async function getUsers (offset = 0, limit = 10, search = null) {
+ console.log("++++++++++ get users", offset, limit, search)
+ limit = Number(limit) || 10
+ offset = Number(offset) || 0
+ // TODO check args for SQL Injection
+
const pool = await poolP
- const [results, fields] = await pool.query(
- `SELECT COUNT(*)
- FROM ${database}.usr_data AS ud
- WHERE login REGEXP '^[0-9]+$'`
- )
- return results[0]["COUNT(*)"]
+
+ try {
+ let userSearchQuery = await getUserSearchQuery(offset, limit, search)
+ // console.log(userSearchQuery)
+ const [results, fields] = await pool.query(userSearchQuery)
+ const count = await getUserCount(offset, limit, search)
+ return {
+ total: count,
+ offset, limit,
+ data: results,
+ }
+ } catch (ex) {
+ return {
+ total: 0,
+ offset: 0,
+ limit: 0,
+ data: [],
+ }
+ }
+}
+
+async function getUserCount (offset, limit, search) {
+ const pool = await poolP
+ // const q = getUserSearchQuery(offset, limit, search)
+ 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)
+ return results[0].count
+
+ // const [results, fields] = await pool.query(
+ // `SELECT COUNT(*)
+ // FROM ${database}.usr_data AS ud
+ // WHERE login REGEXP '^[0-9]+$'`
+ // )
+ // return results[0]["COUNT(*)"]
}
async function getUserByLogin (login) {
const sel = `usr_id, login, firstname, lastname, gender, email, institution, street, city, zipcode, country, department, active`
- // TODO user defined fields
// TODO check args for SQL Injection
const pool = await poolP
const [results, fields] = await pool.query(
`SELECT ${sel}
FROM ${database}.usr_data AS ud
- WHERE login = '${login}'
- AND login REGEXP '^[0-9]+$'`
+ WHERE login = '${login}'`
)
return joinUDF(results[0])
}
async function getUserByUserId (userId) {
const sel = `usr_id, login, firstname, lastname, gender, email, institution, street, city, zipcode, country, department, active`
- // TODO user defined fields
// TODO check args for SQL Injection
const pool = await poolP
const [results, fields] = await pool.query(
`SELECT ${sel}
FROM ${database}.usr_data AS ud
- WHERE usr_id = '${userId}'
- AND login REGEXP '^[0-9]+$'`
+ WHERE usr_id = '${userId}'`
)
return joinUDF(results[0])
}
@@ -151,6 +195,7 @@
}
async function joinUDF (user) {
+ if (!user) return user
const fields = await getUserDefinedField(user.usr_id)
for (const field of fields) {
user[field.field_name] = field.value
@@ -164,36 +209,154 @@
const pool = await poolP
const q = `SELECT or2.ref_id, or2.obj_id, od.title, od.description, od.type
FROM ${database}.object_reference or2
- INNER JOIN ${database}.object_data od ON od.obj_id = or2.obj_id
- WHERE od.type = 'crs' AND or2.deleted IS NULL
+ INNER JOIN ${database}.object_data od ON od.obj_id = or2.obj_id
+ WHERE od.type = 'crs'
+ AND or2.deleted IS NULL
`
const [results] = await pool.query(q)
return results
}
-async function getKurs (obj_id) {
+// async function getKursByRefId (refId) {
+// const {ref_id, obj_id} = await getObjIdFromRefId(refId)
+// return getKursByObjId(obj_id)
+// }
+
+async function getKurs (ref_id) {
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.create_date
FROM ${database}.object_reference or2
- INNER JOIN ${database}.object_data od ON od.obj_id = or2.obj_id
- WHERE or2.obj_id = '${obj_id}'
+ INNER JOIN ${database}.object_data od ON od.obj_id = or2.obj_id
+ WHERE or2.ref_id = '${ref_id}'
`
- const [results] = await pool.query(q)
- return results.length ? results[0] : undefined
+ let [results] = await pool.query(q)
+ results = results.length ? results[0] : undefined
+ return results
}
-async function getTeilnehmer (obj_id) {
+async function getKursItems (ref_id) {
const pool = await poolP
- const q = `SELECT ci.parent_id, or2.ref_id, or2.obj_id, od.title, od.\`type\`, om.usr_id, ulm.status
+ // const q = `SELECT or2.ref_id, or2.obj_id, od.title, od.description, od.type
+ // FROM ${database}.object_reference or2
+ // INNER JOIN ${database}.object_data od ON od.obj_id = or2.obj_id
+ // WHERE or2.obj_id = '${obj_id}'
+ // `
+ const q = `SELECT ci.parent_id, or2.ref_id, or2.obj_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
- INNER JOIN ${database}.obj_members om ON om.obj_id = or2.obj_id
- INNER JOIN ${database}.ut_lp_marks ulm
- ON ulm.obj_id = or2.obj_id AND ulm.usr_id = om.usr_id
- WHERE (or2.ref_id = ${obj_id}
- OR parent_id = ${obj_id}) # Fliesenratgeber #AND om.usr_id = 6573 # Holger Börner / nicht-bestanden -
+ WHERE or2.ref_id = ${ref_id}
+ OR parent_id = ${ref_id}
+ AND or2.deleted is NULL
`
const [results] = await pool.query(q)
return results
}
+
+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
+
+ 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 *
+ FROM tree
+ ORDER BY tree.ref_id
+ `
+ const [results] = await pool.query(q)
+ return results
+}
+
+async function getKursTeilnehmer (ref_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})
+ ORDER BY usr_id
+ `
+ const [results] = await pool.query(q)
+ return results
+}
+
+async function getKursTeilnehmerCount (ref_id) {
+ const pool = await poolP
+ const q = `SELECT COUNT(*) as count
+ 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})
+ ORDER BY usr_id
+ `
+ let [results] = await pool.query(q)
+ results = results.length ? results[0] : undefined
+ return {ref_id, count: results.count}
+}
+
+async function getUserTeilnahmen (usr_id) {
+ const pool = await poolP
+ const q = `SELECT om.obj_id, or2.ref_id, om.usr_id, od.title, ulm.status, om.passed, ulm.status_changed
+ FROM ${database}.obj_members om
+ INNER JOIN ${database}.object_reference or2 ON or2.obj_id = om.obj_id
+ INNER JOIN ${database}.usr_data ud ON ud.usr_id = om.usr_id
+ INNER JOIN ${database}.object_data od ON od.obj_id = om.obj_id
+ LEFT JOIN ${database}.ut_lp_marks ulm
+ ON ulm.usr_id = om.usr_id AND ulm.obj_id = om.obj_id
+ WHERE om.usr_id = ${usr_id}
+ AND om.member = 1
+ `
+ console.log(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
+}
--
Gitblit v1.8.0