From d4ae60cc11e08968ab20d09a3c367462161e4d26 Mon Sep 17 00:00:00 2001
From: alex <alex@alexloehr.net>
Date: Thu, 19 Jun 2025 15:47:02 +0000
Subject: [PATCH] GS-2156
---
app.js | 114 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 83 insertions(+), 31 deletions(-)
diff --git a/app.js b/app.js
index 9110702..e31d23f 100644
--- a/app.js
+++ b/app.js
@@ -3,10 +3,12 @@
logger: true
})
const _ = require("lodash")
-const db = require("./lib/db")
-
-const settings = require("./settings")
const fs = require("node:fs")
+
+const db = require("./lib/db")
+const libIlias = require("./lib/libIlias")
+const settings = require("./settings")
+const search = require("./lib/search.js")
/////////////////////////////////////////////////////////////////////////
@@ -27,26 +29,43 @@
return res.send({status: "error", error: "access denied"})
}
else {
- console.log("NO AUTH FOR ",req.url)
+ console.log("NO AUTH FOR ", req.url)
+ }
+})
+
+/////// SEARCH ////////////////////////////////////////////////////////////////
+
+const searchLib = require("./lib/search")
+searchLib.doIndex().catch(console.error)
+fastify.get("/api/search/user", async function (req, res) {
+ console.log(req.query)
+ const search = req.query?.search
+ if (!search) {
+ return res.code(422).send({status: "error", msg: "no search"})
+ }
+ else {
+ console.log(search)
+ const data = await searchLib.search(search)
+ return res.send(data)
}
})
fastify
/////// USER ////////////////////////////////////////////////////////////////
- .get('/api/users', async function (req, res) {
- const {offset, limit} = req.query
- const users = await db.getUsers(offset, limit)
+ .get('/api/user', async function (req, res) {
+ const {offset, limit, search} = req.query
+ const users = await db.getUsers(offset, limit, search)
return res.send(users)
})
- .get("/api/users/count", async function (req, res) {
+ .get("/api/user/count", async function (req, res) {
const count = await db.getUserCount()
return res.send(count)
})
.get("/api/user/login/:login", async function (req, res) {
const {login} = req.params
const user = await db.getUserByLogin(login)
- if (user.length) {
- return res.send(user[0])
+ if (user) {
+ return res.send(user)
}
else {
return res.code(404).send({status: "error", msg: "not found"})
@@ -54,7 +73,7 @@
})
.get("/api/user/userid/:userid", async function (req, res) {
const {userid} = req.params
- if(!userid || isNaN(Number(userid))) {
+ if (!userid || isNaN(Number(userid))) {
return res.code(500).send({status: "error", msg: "userid error"})
}
const user = await db.getUserByUserId(userid)
@@ -66,16 +85,34 @@
}
})
.get("/api/user/teilnahmen/:userId", async function (req, res) {
- const {userid} = req.params
- if(!userid || isNaN(Number(userid))) {
- return res.code(500).send({status: "error", msg: "userid error"})
+ let userId = req.params.userId
+ console.log(`--------${userId}-----------`, typeof userId)
+ if (!userId || isNaN(Number(userId))) {
+ return res.code(500).send({status: "error", msg: "userId error"})
}
- const tn = await db.getUserTeilnahmen(userid)
+ const tn = await db.getUserTeilnahmen(userId)
if (tn) {
return res.send(tn)
}
else {
return res.code(404).send({status: "error", msg: "not found"})
+ }
+ })
+
+
+ .delete("/api/user", async function (req, res) { // DELETE ALL users
+ const res2 = await libIlias.deleteAllUsers()
+ return res.send(res2)
+ })
+ .delete("/api/user/:usr_id", async function (req, res) {
+ const {usr_id} = req.params
+ if (!usr_id || isNaN(Number(usr_id))) {
+ return res.code(500).send({status: "error", msg: "userId error"})
+ }
+ else {
+ const res2 = await libIlias.deleteUser(usr_id)
+ console.log(res2)
+ return res.send(res2)
}
})
@@ -103,6 +140,7 @@
})
/////// Kurs ////////////////////////////////////////////////////////////////
+
.get("/api/kurs", async function (req, res) {
let data = await db.getKurse()
if (data) {
@@ -124,7 +162,7 @@
})
.get("/api/kurs/items/:refId", async function (req, res) {
const {refId} = req.params
- let data = await db.getKursItems(refId)
+ let data = await db.getKursItems2(refId)
if (data) {
return res.send(data)
}
@@ -132,7 +170,7 @@
return res.code(404).send({status: "error", msg: "not found"})
}
})
- .get("/api/kurs/teilnehmer/:refId", async function (req, res) {
+ .get("/api/kurs/:refId/teilnehmer", async function (req, res) {
const {refId} = req.params
let data = await db.getKursTeilnehmer(refId)
if (data) {
@@ -142,16 +180,37 @@
return res.code(404).send({status: "error", msg: "not found"})
}
})
- .get("/api/kurs/teilnehmer/:refId/count", async function (req, res) {
- const {refId} = req.params
- let data = await db.getKursTeilnehmerCount(refId)
- if (data) {
+ // .get("/api/kurs/:refId/teilnehmer/count", async function (req, res) {
+ // const {refId} = req.params
+ // let data = await db.getKursTeilnehmerCount(refId)
+ // if (data) {
+ // return res.send(data)
+ // }
+ // else {
+ // return res.code(404).send({status: "error", msg: "not found"})
+ // }
+ // })
+
+ .delete("/api/kurs/:refId/teilnehmer/:usrId", async function (req, res) {
+ const {refId, usrId} = req.params
+ if (!refId || !usrId) throw {status: "error", msg: "refId and usrId requried"}
+ try {
+ let data = await libIlias.deleteTeilnahme(refId, usrId)
+ if (!data) throw {statusCode: 404, message: "Teilnahme not found"}
return res.send(data)
- }
- else {
- return res.code(404).send({status: "error", msg: "not found"})
+ } catch (ex) {
+ console.error(ex)
+ const msg = ex.msg ?? ex.message ?? ex.toString()
+ if (ex.statusCode) {
+ return res.code(ex.statusCode).send({status: "error", msg})
+ }
+ return res.code(500).send({status: "error", msg})
}
})
+
+
+/////// STATIC / SPA ////////////////////////////////////////////////////////////////
+
fastify.register(require('@fastify/static'), {
root: path.join(__dirname, 'vue/dist'),
@@ -159,13 +218,6 @@
// constraints: { host: 'example.com' } // optional: default {}
})
-
-
-// fastify.get('*', function (req, reply) {
-// console.log("!!!!!!!!! send index")
-// // index.html should never be cached
-// reply.sendFile('dist/index.html', {maxAge: 0, immutable: false})
-// })
const indexFile = fs.readFileSync(path.join(__dirname, "vue/dist", 'index.html'), 'utf8')
fastify.setNotFoundHandler(function (req, res) {
--
Gitblit v1.8.0