From e17e002b6902094d5811d0669313e67d96bb6ca4 Mon Sep 17 00:00:00 2001
From: alex <alex@alexloehr.net>
Date: Thu, 05 Jun 2025 09:19:00 +0000
Subject: [PATCH] fixed user by login
---
lib/db.js | 105 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 78 insertions(+), 27 deletions(-)
diff --git a/lib/db.js b/lib/db.js
index af4a00c..8355623 100644
--- a/lib/db.js
+++ b/lib/db.js
@@ -25,21 +25,26 @@
getUserByUserId,
getUserDefinedFields,
getUserDefinedField,
+ getUserTeilnahmen,
getObjIdFromRefId,
getRefIdFromObjId,
getKurse,
+ getKurs,
getKursItems,
// getKursByObjId,
// getKursByRefId,
getKursTeilnehmer,
getKursTeilnehmerCount,
+
}
/////////////////////////////////////////////////////////////////////////
async function getUsers (offset = 0, limit = 10) {
+ limit = Number(limit) || 10
+ offset = Number(offset) || 0
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
@@ -73,30 +78,26 @@
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])
}
@@ -154,6 +155,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
@@ -167,8 +169,9 @@
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
@@ -179,6 +182,18 @@
// 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
+ FROM ${database}.object_reference or2
+ INNER JOIN ${database}.object_data od ON od.obj_id = or2.obj_id
+ WHERE or2.ref_id = '${ref_id}'
+ `
+ let [results] = await pool.query(q)
+ results = results.length ? results[0] : undefined
+ return results
+}
+
async function getKursItems (ref_id) {
const pool = await poolP
// const q = `SELECT or2.ref_id, or2.obj_id, od.title, od.description, od.type
@@ -186,26 +201,41 @@
// 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, or2.deleted
+ 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
- WHERE or2.ref_id = ${ref_id} OR parent_id = ${ref_id}
- `
+ 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 or2.ref_id = ${ref_id}
+ OR parent_id = ${ref_id}
+ AND or2.deleted is NULL
+ `
const [results] = await pool.query(q)
return results
- // return results.length ? results[0] : undefined
}
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#, ulm.status
+ 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
- INNER JOIN ${database}.usr_data ud ON ud.usr_id = om.usr_id
- WHERE (or2.ref_id = ${ref_id} OR parent_id = ${ref_id})
+ 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
@@ -215,13 +245,34 @@
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
- INNER JOIN ${database}.usr_data ud ON ud.usr_id = om.usr_id
- WHERE (or2.ref_id = ${ref_id} OR parent_id = ${ref_id})
+ 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 }
+ 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
}
--
Gitblit v1.8.0