From 846df9e0f36145aae237818362dadff78453a7b9 Mon Sep 17 00:00:00 2001
From: alex <alex@alexloehr.net>
Date: Wed, 17 Sep 2025 17:15:34 +0000
Subject: [PATCH] GS-2308
---
app.js | 75 ++++++++++++++++++++++++++++---------
1 files changed, 57 insertions(+), 18 deletions(-)
diff --git a/app.js b/app.js
index 2ddf06d..2b4a407 100644
--- a/app.js
+++ b/app.js
@@ -1,9 +1,15 @@
const path = require("path")
const fastify = require('fastify')({
- logger: true
+ logger: false,
+ // logger: true
})
const _ = require("lodash")
const fs = require("node:fs")
+const dayjs = require("dayjs")
+
+const log = require("./logger")
+log.info("")
+log.info(`--- STARTUP ${dayjs().format("DD.MM.YYYY HH:mm:ss")} ---`)
const db = require("./lib/db")
const libIlias = require("./lib/libIlias")
@@ -19,39 +25,42 @@
// AUTH
fastify.addHook("onRequest", async (req, res) => {
- console.log(req.url)
+ // custom logging
+ log.info(`${req.method} ${req.url}`);
+ // 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)
+ log.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 {
- console.log("AUTH FOR ", req.url)
+ // log.debug("AUTH FOR ", req.url)
}
})
/////// SEARCH ////////////////////////////////////////////////////////////////
const searchLib = require("./lib/search")
+const {setStatus} = require("./lib/db")
searchLib.doIndex().catch(console.error)
fastify
.get("/api/search/user", async function (req, res) {
- console.log(req.query)
+ log.info(req.query)
const search = req.query?.search
if (!search) {
return res.code(422).send({status: "error", msg: "no search"})
}
else {
- console.log(search)
+ log.info(search)
const data = await searchLib.search(search)
return res.send(data)
}
})
.post("/api/search/reindex", async function (req, res) {
- console.log("REINDEX ++++")
+ log.info("REINDEX ++++")
const start = Date.now()
await searchLib.doIndex().catch(console.error)
return res.send({
@@ -96,7 +105,7 @@
})
.get("/api/user/teilnahmen/:userId", async function (req, res) {
let userId = req.params.userId
- console.log(`--------${userId}-----------`, typeof userId)
+ log.debug(`--------${userId}-----------`, typeof userId)
if (!userId || isNaN(Number(userId))) {
return res.code(500).send({status: "error", msg: "userId error"})
}
@@ -126,7 +135,7 @@
}
else {
const res2 = await libIlias.deleteUser(usr_id)
- console.log(res2)
+ log.info(res2)
return res.send(res2)
}
})
@@ -195,6 +204,27 @@
return res.code(404).send({status: "error", msg: "not found"})
}
})
+ .get("/api/kurs/:refId/teilnehmerByRole", async function (req, res) {
+ const {refId} = req.params
+ const {obj_id} = await db.getObjIdFromRefId(refId)
+ let data = await db.getKursTeilnehmerByRole(obj_id)
+ return res.send(data)
+ })
+ .get("/api/kurs/:refId/roles", async function (req, res) {
+ const {refId} = req.params
+ let data = await db.getKursRoles(refId)
+ return res.send(data)
+ })
+ .get("/api/kurs/:refId/teilnehmer/:userId", async function (req, res) {
+ const {refId, userId} = req.params
+ let data = await db.getSingleKursTeilnehmer(refId, userId)
+ if (data) {
+ return res.send(data)
+ }
+ else {
+ return res.code(404).send({status: "error", msg: "not found"})
+ }
+ })
// .get("/api/kurs/:refId/teilnehmer/count", async function (req, res) {
// const {refId} = req.params
// let data = await db.getKursTeilnehmerCount(refId)
@@ -206,20 +236,26 @@
// }
// })
+ /** set passed and status for a kurs TN */
.post("/api/kurs/:refId/status/:usrId", async function (req, res) {
const {refId, usrId} = req.params
- if (!refId || !usrId) throw {status: "error", msg: "refId and usrId requried"}
+ const {passed, status} = req.body
+ if (!refId || !usrId || _.isNil(passed) || _.isNil(status)) {
+ throw {
+ statusCode: 400,
+ status: "error",
+ msg: "argument error"
+ }
+ }
try {
const {obj_id: course_id} = await db.getObjIdFromRefId(refId)
- // let data = await libIlias.abmelden(usrId, course_id)
- // let data = await libIlias.deleteTeilnahme(refId, usrId)
- if (!data) throw {statusCode: 404, message: "Teilnahme not found"}
+ const data = await setStatus(course_id, usrId, passed, status)
return res.send(data)
} 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(ex.statusCode).send({status: "error", msg, statusCode: ex.statusCode})
}
return res.code(500).send({status: "error", msg})
}
@@ -257,7 +293,7 @@
const indexFile = fs.readFileSync(path.join(__dirname, "vue/dist", 'index.html'), 'utf8')
fastify.setNotFoundHandler(function (req, res) {
- console.log("!!!")
+ log.error("!!! Not found")
// res.sendFile("vue/dist/index.html")
res.type("text/html").send(indexFile)
})
@@ -266,9 +302,11 @@
/////////////////////////////////////////////////////////////////////////
fastify.listen({port: settings.port}, function (err, address) {
- console.log("📡 -=> Listening on", address)
+ console.log(address)
+ log.info(`📡 -=> Listening on ${address}`)
if (err) {
- fastify.log.error(err)
+ // fastify.log.error(err)
+ log.error(err)
process.exit(1)
}
// Server is now listening on ${address}
@@ -279,3 +317,4 @@
async function promiseDelay (ms) {
return new Promise(resolve => setTimeout(resolve, ms))
}
+
--
Gitblit v1.8.0