albert/mrfrys-node-server
1
0
Fork 0
mirror of https://gitlab.com/MrFry/mrfrys-node-server synced 2025-04-01 20:24:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Questions without cache in db fix

Browse source
This commit is contained in:
mrfry 2021-03-29 14:59:05 +02:00
parent 070defecb6
commit 2d81a76ef0
3 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/modules/api/api.ts
View file

@ -42,7 +42,11 @@ import {
} from '../../utils/actions' } from '../../utils/actions'
import dbtools from '../../utils/dbtools' import dbtools from '../../utils/dbtools'
import auth from '../../middlewares/auth.middleware' import auth from '../../middlewares/auth.middleware'
import { dataToString, getSubjNameWithoutYear } from '../../utils/classes' import {
dataToString,
getSubjNameWithoutYear,
createQuestion,
} from '../../utils/classes'
import { import {
initWorkerPool, initWorkerPool,
doALongTask, doALongTask,
@ -1625,7 +1629,7 @@ function GetApp(): ModuleType {
logger.Log( logger.Log(
`User #${user.id} deleted '${file}' from subject '${subj}'`, `User #${user.id} deleted '${file}' from subject '${subj}'`,
logger.GetColor('cyanbg') logger.GetColor('cyan')
) )
res.json({ res.json({
res: 'ok', res: 'ok',
@ -1710,7 +1714,7 @@ function GetApp(): ModuleType {
logger.Log( logger.Log(
`User #${user.id} deleted a question from '${subjName}'`, `User #${user.id} deleted a question from '${subjName}'`,
logger.GetColor('cyanbg') logger.GetColor('cyan')
) )
utils.AppendToFile( utils.AppendToFile(
`${date}: User ${user.id} deleted a question from '${subjName}' (index: ${index})`, `${date}: User ${user.id} deleted a question from '${subjName}' (index: ${index})`,
@ -1770,7 +1774,7 @@ function GetApp(): ModuleType {
Questions: subj.Questions.map((question, i) => { Questions: subj.Questions.map((question, i) => {
if (index === i) { if (index === i) {
oldVal = question oldVal = question
return newVal return createQuestion(newVal)
} else { } else {
return question return question
} }
@ -1781,7 +1785,7 @@ function GetApp(): ModuleType {
logger.Log( logger.Log(
`User #${user.id} edited a question in '${subjName}'`, `User #${user.id} edited a question in '${subjName}'`,
logger.GetColor('cyanbg') logger.GetColor('cyan')
) )
utils.AppendToFile( utils.AppendToFile(
`${date}: User ${user.id} edited a question in '${subjName}' (index: ${index})`, `${date}: User ${user.id} edited a question in '${subjName}' (index: ${index})`,
@ -1859,7 +1863,7 @@ function GetApp(): ModuleType {
oldVal: question, oldVal: question,
newVal: changedTo.value, newVal: changedTo.value,
}) })
return changedTo.value return createQuestion(changedTo.value)
} else { } else {
return question return question
} }
@ -1890,7 +1894,7 @@ function GetApp(): ModuleType {
logger.Log( logger.Log(
`User #${user.id} modified '${subjName}'. Edited: ${deletedQuestionsToWrite.length}, deleted: ${deletedQuestionsToWrite.length}`, `User #${user.id} modified '${subjName}'. Edited: ${deletedQuestionsToWrite.length}, deleted: ${deletedQuestionsToWrite.length}`,
logger.GetColor('cyanbg') logger.GetColor('cyan')
) )
utils.AppendToFile( utils.AppendToFile(
`${date} User #${user.id} modified '${subjName}'. Edited: ${deletedQuestionsToWrite.length}, deleted: ${deletedQuestionsToWrite.length}`, `${date} User #${user.id} modified '${subjName}'. Edited: ${deletedQuestionsToWrite.length}, deleted: ${deletedQuestionsToWrite.length}`,

8
src/server.ts
View file

@ -44,6 +44,9 @@ const extraModulesFile = '.src/extraModules/extraModules.json'
const statExcludeFile = './data/statExclude.json' const statExcludeFile = './data/statExclude.json'
const modulesFile = './src/modules.json' const modulesFile = './src/modules.json'
const usersDBPath = './data/dbs/users.db' const usersDBPath = './data/dbs/users.db'
const logFile = logger.logDir + logger.logFileName
const vlogFile = logger.vlogDir + logger.logFileName
idStats.Load() idStats.Load()
logger.Load() logger.Load()
@ -78,6 +81,8 @@ let modules: Modules = utils.ReadJSON(modulesFile)
const debugLevel = parseInt(process.env.NS_LOGLEVEL) || 0 const debugLevel = parseInt(process.env.NS_LOGLEVEL) || 0
logger.Log('Loglevel is: ' + debugLevel) logger.Log('Loglevel is: ' + debugLevel)
logger.Log(`Log path: ${logFile}`)
logger.Log(`vLog path: ${vlogFile}`)
try { try {
if (utils.FileExists(extraModulesFile)) { if (utils.FileExists(extraModulesFile)) {
@ -275,9 +280,6 @@ function rotateLog() {
':' + ':' +
('0' + date.getSeconds()).slice(-2) ('0' + date.getSeconds()).slice(-2)
const logFile = logger.logDir + logger.logFileName
const vlogFile = logger.vlogDir + logger.logFileName
if (utils.FileExists(logFile)) { if (utils.FileExists(logFile)) {
utils.CopyFile(logFile, logger.logDir + fname) utils.CopyFile(logFile, logger.logDir + fname)
} }

2
submodules/qmining-page

@ -1 +1 @@
Subproject commit e311b88508f0c77d6b97a4273e57aa5d656a1a64 Subproject commit 47a2227f87f4f2ca726c16328006de174fa04aac