From 2ce2d771a607d23ce67e6b07f86cb8cc76558771 Mon Sep 17 00:00:00 2001
From: alex <alex@alexloehr.net>
Date: Thu, 15 May 2025 21:47:42 +0000
Subject: [PATCH] update settings
---
lib/db.js | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/lib/db.js b/lib/db.js
index b70af0e..61b297f 100644
--- a/lib/db.js
+++ b/lib/db.js
@@ -20,13 +20,14 @@
module.exports = {
getUsers,
+ getUserCount,
getUserByLogin,
getUserByUserId,
}
/////////////////////////////////////////////////////////////////////////
-async function getUsers (limit = 10, offset = 0) {
+async function getUsers (offset = 0, limit = 10) {
const sel = `usr_id, login, firstname, lastname, gender, email, institution, street, city, zipcode, country, department, active`
// TODO user defined fields
@@ -34,11 +35,27 @@
const [results, fields] = await pool.query(
`SELECT ${sel}
FROM ilias.usr_data AS ud
+ WHERE login REGEXP '^[0-9]+$'
LIMIT ${limit}
OFFSET ${offset}
`
)
- return results
+ const count = await getUserCount()
+ return {
+ total: count,
+ offset, limit,
+ data: results,
+ }
+}
+
+async function getUserCount () {
+ const pool = await poolP
+ const [results, fields] = await pool.query(
+ `SELECT COUNT(*)
+ FROM ilias.usr_data AS ud
+ WHERE login REGEXP '^[0-9]+$'`
+ )
+ return results[0]["COUNT(*)"]
}
async function getUserByLogin (login) {
@@ -49,7 +66,8 @@
const [results, fields] = await pool.query(
`SELECT ${sel}
FROM ilias.usr_data AS ud
- WHERE login = '${login}'`
+ WHERE login = '${login}'
+ AND login REGEXP '^[0-9]+$'`
)
return results
}
@@ -62,7 +80,8 @@
const [results, fields] = await pool.query(
`SELECT ${sel}
FROM ilias.usr_data AS ud
- WHERE usr_id = '${userId}'`
+ WHERE usr_id = '${userId}'
+ AND login REGEXP '^[0-9]+$'`
)
return results
}
--
Gitblit v1.8.0