From aa6770ff4a9442f666cc81a6e39f7b6f2a013024 Mon Sep 17 00:00:00 2001
From: alex <alex@alexloehr.net>
Date: Mon, 16 Jun 2025 11:59:20 +0000
Subject: [PATCH] GS-2160
---
app.js | 145 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 116 insertions(+), 29 deletions(-)
diff --git a/app.js b/app.js
index 03ff46e..3b298c8 100644
--- a/app.js
+++ b/app.js
@@ -3,54 +3,79 @@
logger: true
})
const _ = require("lodash")
-const db = require("./lib/db")
+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")
/////////////////////////////////////////////////////////////////////////
-fastify.register(require('@fastify/static'), {
- root: path.join(__dirname, 'vue/dist'),
- prefix: '/ui/', // optional: default '/'
- // constraints: { host: 'example.com' } // optional: default {}
-})
+// Compress
+let compress = require('@fastify/compress')
+// fastify.register(compress, { global: true })
+fastify.register(compress)
// AUTH
fastify.addHook("onRequest", async (req, res) => {
console.log(req.url)
const token = req.query.token
+ console.log(req.url)
if (token !== settings.authtoken && !req.url.startsWith("/ui/")) {
console.error("# AUTH ERROR #", token)
await promiseDelay(500) // delay response to avoid denial of service attacks
res.code(403)
return res.send({status: "error", error: "access denied"})
}
- else {}
+ else {
+ 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('/users', async function (req, res) {
- const {offset, limit} = req.query
- const users = await db.getUsers(offset, limit)
+ .get('/api/users', async function (req, res) {
+ const {offset, limit, search} = req.query
+ const users = await db.getUsers(offset, limit, search)
return res.send(users)
})
- .get("/users/count", async function (req, res) {
+ .get("/api/users/count", async function (req, res) {
const count = await db.getUserCount()
return res.send(count)
})
- .get("/user/login/:login", async function (req, res) {
+ .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"})
}
})
- .get("/user/userid/:userid", async function (req, res) {
+ .get("/api/user/userid/:userid", async function (req, res) {
const {userid} = req.params
+ if (!userid || isNaN(Number(userid))) {
+ return res.code(500).send({status: "error", msg: "userid error"})
+ }
const user = await db.getUserByUserId(userid)
if (user) {
return res.send(user)
@@ -59,10 +84,37 @@
return res.code(404).send({status: "error", msg: "not found"})
}
})
+ .get("/api/user/teilnahmen/:userId", async function (req, res) {
+ 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)
+ if (tn) {
+ return res.send(tn)
+ }
+ else {
+ return res.code(404).send({status: "error", msg: "not found"})
+ }
+ })
+
+ .delete("/api/user/:usr_id", 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 = libIlias.deleteUser(usr_id)
+ console.log(res2)
+ return res.send(res2)
+ }
+
+ })
/////// ref_id / obj_id ////////////////////////////////////////////////////////////////
- .get("/ref_id/:ref_id", async function (req, res) {
+ .get("/api/ref_id/:ref_id", async function (req, res) {
const {ref_id} = req.params
const data = await db.getObjIdFromRefId(ref_id)
if (data) {
@@ -72,7 +124,7 @@
return res.code(404).send({status: "error", msg: "not found"})
}
})
- .get("/obj_id/:obj_id", async function (req, res) {
+ .get("/api/obj_id/:obj_id", async function (req, res) {
const {obj_id} = req.params
let data = await db.getRefIdFromObjId(obj_id)
if (data) {
@@ -84,7 +136,8 @@
})
/////// Kurs ////////////////////////////////////////////////////////////////
- .get("/kurs", async function (req, res) {
+
+ .get("/api/kurs", async function (req, res) {
let data = await db.getKurse()
if (data) {
return res.send(data)
@@ -93,7 +146,7 @@
return res.code(404).send({status: "error", msg: "not found"})
}
})
- .get("/kurs/:refId", async function (req, res) {
+ .get("/api/kurs/:refId", async function (req, res) {
const {refId} = req.params
let data = await db.getKurs(refId)
if (data) {
@@ -103,9 +156,9 @@
return res.code(404).send({status: "error", msg: "not found"})
}
})
- .get("/kurs/items/:refId", async function (req, res) {
+ .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)
}
@@ -113,7 +166,7 @@
return res.code(404).send({status: "error", msg: "not found"})
}
})
- .get("/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) {
@@ -123,18 +176,52 @@
return res.code(404).send({status: "error", msg: "not found"})
}
})
- .get("/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'),
+ prefix: '/ui/', // optional: default '/'
+
+ // constraints: { host: 'example.com' } // optional: default {}
+})
+
+const indexFile = fs.readFileSync(path.join(__dirname, "vue/dist", 'index.html'), 'utf8')
+fastify.setNotFoundHandler(function (req, res) {
+ console.log("!!!")
+ // res.sendFile("vue/dist/index.html")
+ res.type("text/html").send(indexFile)
+})
+
/////////////////////////////////////////////////////////////////////////
--
Gitblit v1.8.0