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 |   93 +++++++++++++++++++++++++++++-----------------
 1 files changed, 59 insertions(+), 34 deletions(-)

diff --git a/app.js b/app.js
index 7b99446..3b298c8 100644
--- a/app.js
+++ b/app.js
@@ -6,6 +6,7 @@
 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")
 
@@ -32,11 +33,28 @@
    }
 })
 
+/////// 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)
+      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) {
@@ -79,6 +97,19 @@
       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  ////////////////////////////////////////////////////////////////
@@ -135,7 +166,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) {
@@ -145,35 +176,36 @@
          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})
       }
    })
 
-/////// 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)
-   }
-})
-
-/////// STATIC ////////////////////////////////////////////////////////////////
+/////// STATIC / SPA ////////////////////////////////////////////////////////////////
 
 
 fastify.register(require('@fastify/static'), {
@@ -182,13 +214,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