From e6b083fb7441ebdf65230517509af3c55c0c808c Mon Sep 17 00:00:00 2001
From: alex <alex@alexloehr.net>
Date: Fri, 06 Jun 2025 17:03:02 +0000
Subject: [PATCH] GS-2147
---
app.js | 45 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/app.js b/app.js
index cc1bd5b..92b42ee 100644
--- a/app.js
+++ b/app.js
@@ -3,10 +3,11 @@
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 settings = require("./settings")
+const search = require("./lib/search.js")
/////////////////////////////////////////////////////////////////////////
@@ -27,15 +28,32 @@
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)
+ 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) {
@@ -45,8 +63,8 @@
.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 +72,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)
@@ -68,7 +86,7 @@
.get("/api/user/teilnahmen/:userId", async function (req, res) {
let userId = req.params.userId
console.log(`--------${userId}-----------`, typeof userId)
- if(!userId || isNaN(Number(userId))) {
+ if (!userId || isNaN(Number(userId))) {
return res.code(500).send({status: "error", msg: "userId error"})
}
const tn = await db.getUserTeilnahmen(userId)
@@ -104,6 +122,7 @@
})
/////// Kurs ////////////////////////////////////////////////////////////////
+
.get("/api/kurs", async function (req, res) {
let data = await db.getKurse()
if (data) {
@@ -125,7 +144,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)
}
@@ -154,6 +173,10 @@
}
})
+
+/////// STATIC ////////////////////////////////////////////////////////////////
+
+
fastify.register(require('@fastify/static'), {
root: path.join(__dirname, 'vue/dist'),
prefix: '/ui/', // optional: default '/'
--
Gitblit v1.8.0