mirror of
https://gitlab.com/MrFry/mrfrys-node-server
synced 2025-04-01 20:24:18 +02:00
Logging fixes / imporvements, voteTodo api
This commit is contained in:
parent
4e34267d44
commit
865e97a754
6 changed files with 66 additions and 38 deletions
|
@ -274,7 +274,7 @@ function GetApp(): ModuleType {
|
|||
)
|
||||
})
|
||||
|
||||
app.get('/updateTodo', (req: any, res: any) => {
|
||||
app.get('/voteTodo', (req: any, res: any) => {
|
||||
logger.LogReq(req)
|
||||
const userId = req.session.user.id
|
||||
const id = req.query.id
|
||||
|
@ -1028,28 +1028,41 @@ function GetApp(): ModuleType {
|
|||
if (req.query.q && req.query.data) {
|
||||
const subj = req.query.subj || ''
|
||||
const question = req.query.q
|
||||
let recData: any = {}
|
||||
try {
|
||||
recData = JSON.parse(req.query.data)
|
||||
} catch (error) {
|
||||
logger.Log(
|
||||
`Unable to parse recieved question data! '${req.query.data}'`,
|
||||
logger.GetColor('redbg')
|
||||
)
|
||||
}
|
||||
const recData: any = req.query.data
|
||||
|
||||
searchDatas(questionDbs, question, subj, recData)
|
||||
.then((result) => {
|
||||
res.json({
|
||||
result: result,
|
||||
success: true,
|
||||
})
|
||||
logger.DebugLog(
|
||||
`Question result length: ${result.length}`,
|
||||
'ask',
|
||||
1
|
||||
)
|
||||
logger.DebugLog(result, 'ask', 2)
|
||||
try {
|
||||
const mergedResult = result.reduce((acc, dbRes) => {
|
||||
return [...acc, ...dbRes.result]
|
||||
}, [])
|
||||
const sortedResult = mergedResult.sort((q1, q2) => {
|
||||
if (q1.match < q2.match) {
|
||||
return 1
|
||||
} else if (q1.match > q2.match) {
|
||||
return -1
|
||||
} else {
|
||||
return 0
|
||||
}
|
||||
})
|
||||
|
||||
res.json({
|
||||
result: sortedResult,
|
||||
success: true,
|
||||
})
|
||||
logger.DebugLog(
|
||||
`Question result length: ${result.length}`,
|
||||
'ask',
|
||||
1
|
||||
)
|
||||
logger.DebugLog(result, 'ask', 2)
|
||||
} catch (err) {
|
||||
console.error(err)
|
||||
logger.Log(
|
||||
'Error while sending ask results',
|
||||
logger.GetColor('redbg')
|
||||
)
|
||||
}
|
||||
})
|
||||
.catch((err) => {
|
||||
logger.Log('Search Data error!', logger.GetColor('redbg'))
|
||||
|
@ -1099,12 +1112,15 @@ function GetApp(): ModuleType {
|
|||
|
||||
function getDetailedRes() {
|
||||
return questionDbs.map((qdb) => {
|
||||
return qdb.data.map((subj) => {
|
||||
return {
|
||||
name: subj.Name,
|
||||
count: subj.Questions.length,
|
||||
}
|
||||
})
|
||||
return {
|
||||
dbName: qdb.name,
|
||||
subjs: qdb.data.map((subj) => {
|
||||
return {
|
||||
name: subj.Name,
|
||||
count: subj.Questions.length,
|
||||
}
|
||||
}),
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue