mirror of
https://gitlab.com/MrFry/mrfrys-node-server
synced 2025-04-01 20:24:18 +02:00
worker db edit/update refactor
This commit is contained in:
parent
e2c15f8445
commit
a6ee415c5b
4 changed files with 428 additions and 215 deletions
|
@ -53,8 +53,10 @@ export interface RecievedData {
|
|||
}
|
||||
|
||||
export interface Result {
|
||||
qdbIndex: number
|
||||
qdbName: string
|
||||
newQuestions: number
|
||||
subjName: string
|
||||
newQuestions: Array<Question>
|
||||
}
|
||||
|
||||
export function logResult(
|
||||
|
@ -84,9 +86,9 @@ export function logResult(
|
|||
const allQLength = recievedData.quiz.length
|
||||
let msg = `${res.qdbName}: `
|
||||
let color = logger.GetColor('green')
|
||||
if (res.newQuestions > 0) {
|
||||
if (res.newQuestions.length > 0) {
|
||||
color = logger.GetColor('blue')
|
||||
msg += `New questions: ${res.newQuestions} ( All: ${allQLength} )`
|
||||
msg += `New questions: ${res.newQuestions.length} ( All: ${allQLength} )`
|
||||
} else {
|
||||
msg += `No new data ( ${allQLength} )`
|
||||
}
|
||||
|
@ -241,7 +243,9 @@ function processIncomingRequestUsingDb(
|
|||
|
||||
logger.DebugLog('ProcessIncomingRequest done', 'isadding', 1)
|
||||
resolve({
|
||||
newQuestions: allQuestions.length,
|
||||
newQuestions: allQuestions,
|
||||
subjName: recievedData.subj,
|
||||
qdbIndex: qdb.index,
|
||||
qdbName: qdb.name,
|
||||
})
|
||||
} catch (error) {
|
||||
|
@ -439,3 +443,288 @@ export function backupData(questionDbs: Array<QuestionDb>): void {
|
|||
}
|
||||
})
|
||||
}
|
||||
|
||||
function deleteFromDb(
|
||||
questionDb: QuestionDb,
|
||||
edits: {
|
||||
index: number
|
||||
subjName: string
|
||||
type: string
|
||||
selectedDb: { path: string; name: string }
|
||||
}
|
||||
): {
|
||||
success: Boolean
|
||||
msg: string
|
||||
deletedQuestion?: Question
|
||||
resultDb?: QuestionDb
|
||||
} {
|
||||
// {
|
||||
// "index": 0,
|
||||
// "subjName": "VHDL programozás",
|
||||
// "type": "delete",
|
||||
// "selectedDb": {
|
||||
// "path": "questionDbs/elearning.uni-obuda.hu.json",
|
||||
// "name": "elearning.uni-obuda.hu"
|
||||
// }
|
||||
// }
|
||||
const { index, subjName } = edits
|
||||
let deletedQuestion
|
||||
if (isNaN(index) || !subjName) {
|
||||
return {
|
||||
success: false,
|
||||
msg: 'No .index or .subjName !',
|
||||
}
|
||||
}
|
||||
|
||||
questionDb.data = questionDb.data.map((subj) => {
|
||||
if (subj.Name !== subjName) {
|
||||
return subj
|
||||
} else {
|
||||
return {
|
||||
...subj,
|
||||
Questions: subj.Questions.filter((question, i) => {
|
||||
if (index === i) {
|
||||
deletedQuestion = question
|
||||
return false
|
||||
} else {
|
||||
return true
|
||||
}
|
||||
}),
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
return {
|
||||
success: true,
|
||||
msg: 'Delete successfull',
|
||||
deletedQuestion: deletedQuestion,
|
||||
resultDb: questionDb,
|
||||
}
|
||||
}
|
||||
|
||||
function editQuestionInDb(
|
||||
questionDb: QuestionDb,
|
||||
edits: {
|
||||
index: number
|
||||
subjName: string
|
||||
type: string
|
||||
selectedDb: { path: string; name: string }
|
||||
newVal?: Question
|
||||
}
|
||||
): {
|
||||
success: Boolean
|
||||
msg: string
|
||||
newVal?: Question
|
||||
oldVal?: Question
|
||||
resultDb?: QuestionDb
|
||||
} {
|
||||
// {
|
||||
// "index": 0,
|
||||
// "subjName": "Elektronika",
|
||||
// "type": "edit",
|
||||
// "newVal": {
|
||||
// "Q": "Analóg műszer esetén az érzékenység az a legkisebb mennyiség, amely a műszer kijelzőjén meghatározott mértékű változást okoz.",
|
||||
// "A": "Igaz",
|
||||
// "data": {
|
||||
// "type": "simple",
|
||||
// "possibleAnswers": [
|
||||
// "Igaz"
|
||||
// ]
|
||||
// },
|
||||
// "possibleAnswers": [
|
||||
// "Igaz"
|
||||
// ]
|
||||
// },
|
||||
// "selectedDb": {
|
||||
// "path": "questionDbs/elearning.uni-obuda.hu.json",
|
||||
// "name": "elearning.uni-obuda.hu"
|
||||
// }
|
||||
// }
|
||||
const { index, subjName, newVal } = edits
|
||||
let oldVal
|
||||
if (isNaN(index) || !subjName) {
|
||||
return {
|
||||
success: false,
|
||||
msg: 'No .index or .subjName !',
|
||||
}
|
||||
}
|
||||
if (!isQuestionValid(newVal)) {
|
||||
return {
|
||||
success: false,
|
||||
msg: 'edited question is not valid',
|
||||
}
|
||||
}
|
||||
|
||||
questionDb.data = questionDb.data.map((subj) => {
|
||||
if (subj.Name !== subjName) {
|
||||
return subj
|
||||
} else {
|
||||
return {
|
||||
...subj,
|
||||
Questions: subj.Questions.map((question, i) => {
|
||||
if (index === i) {
|
||||
oldVal = question
|
||||
return createQuestion(newVal)
|
||||
} else {
|
||||
return question
|
||||
}
|
||||
}),
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
return {
|
||||
success: true,
|
||||
msg: 'Edit successfull',
|
||||
oldVal: oldVal,
|
||||
newVal: newVal,
|
||||
resultDb: questionDb,
|
||||
}
|
||||
}
|
||||
|
||||
function editSubjInDb(
|
||||
questionDb: QuestionDb,
|
||||
edits: {
|
||||
index: number
|
||||
subjName: string
|
||||
type: string
|
||||
selectedDb: { path: string; name: string }
|
||||
deletedQuestions?: Array<number>
|
||||
changedQuestions?: Array<{
|
||||
index: number
|
||||
value: Question
|
||||
}>
|
||||
}
|
||||
): {
|
||||
success: Boolean
|
||||
msg: string
|
||||
deletedQuestions?: Array<Question>
|
||||
changedQuestions?: Array<Question>
|
||||
resultDb?: QuestionDb
|
||||
} {
|
||||
// {
|
||||
// "subjName": "Elektronika",
|
||||
// "changedQuestions": [
|
||||
// {
|
||||
// "index": 1,
|
||||
// "value": {
|
||||
// "Q": "A műszer pontosságát a hibájával fejezzük ki, melyet az osztályjel (osztálypontosság ) mutat meg.",
|
||||
// "A": "Hamis",
|
||||
// "data": {
|
||||
// "type": "simple",
|
||||
// "possibleAnswers": [
|
||||
// "Igaz",
|
||||
// "Hamis"
|
||||
// ]
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// ],
|
||||
// "deletedQuestions": [
|
||||
// 0
|
||||
// ],
|
||||
// "type": "subjEdit",
|
||||
// "selectedDb": {
|
||||
// "path": "questionDbs/elearning.uni-obuda.hu.json",
|
||||
// "name": "elearning.uni-obuda.hu"
|
||||
// }
|
||||
// }
|
||||
const { subjName, changedQuestions, deletedQuestions } = edits
|
||||
const deletedQuestionsToWrite = []
|
||||
const changedQuestionsToWrite = []
|
||||
if (!Array.isArray(changedQuestions) || !Array.isArray(deletedQuestions)) {
|
||||
return {
|
||||
success: false,
|
||||
msg: 'no changedQuestions or deletedQuestions!',
|
||||
}
|
||||
}
|
||||
|
||||
// processing changed questions
|
||||
questionDb.data = questionDb.data.map((subj) => {
|
||||
if (subj.Name !== subjName) {
|
||||
return subj
|
||||
} else {
|
||||
return {
|
||||
...subj,
|
||||
Questions: subj.Questions.map((question, i) => {
|
||||
const changedTo = changedQuestions.find((cq) => {
|
||||
return cq.index === i
|
||||
})
|
||||
if (changedTo) {
|
||||
changedQuestionsToWrite.push({
|
||||
oldVal: question,
|
||||
newVal: changedTo.value,
|
||||
})
|
||||
return createQuestion(changedTo.value)
|
||||
} else {
|
||||
return question
|
||||
}
|
||||
}),
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
// processing deletedQuestions
|
||||
questionDb.data = questionDb.data.map((subj) => {
|
||||
if (subj.Name !== subjName) {
|
||||
return subj
|
||||
} else {
|
||||
return {
|
||||
...subj,
|
||||
Questions: subj.Questions.filter((question, i) => {
|
||||
const isDeleted = deletedQuestions.includes(i)
|
||||
if (isDeleted) {
|
||||
deletedQuestionsToWrite.push(question)
|
||||
return false
|
||||
} else {
|
||||
return true
|
||||
}
|
||||
}),
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
return {
|
||||
success: true,
|
||||
msg: 'subj edit successfull',
|
||||
deletedQuestions: deletedQuestionsToWrite,
|
||||
changedQuestions: changedQuestionsToWrite,
|
||||
resultDb: questionDb,
|
||||
}
|
||||
}
|
||||
|
||||
export function editDb(
|
||||
questionDb: QuestionDb,
|
||||
edits: {
|
||||
index: number
|
||||
subjName: string
|
||||
selectedDb: { path: string; name: string }
|
||||
type: string
|
||||
newVal?: Question
|
||||
deletedQuestion?: Array<number>
|
||||
changedQuestions?: Array<{
|
||||
index: number
|
||||
value: Question
|
||||
}>
|
||||
}
|
||||
): {
|
||||
success: Boolean
|
||||
msg: string
|
||||
resultDb?: QuestionDb
|
||||
deletedQuestion?: Question
|
||||
newVal?: Question
|
||||
oldVal?: Question
|
||||
deletedQuestions?: Array<Question>
|
||||
changedQuestions?: Array<Question>
|
||||
} {
|
||||
if (edits.type === 'delete') {
|
||||
return deleteFromDb(questionDb, edits)
|
||||
}
|
||||
if (edits.type === 'edit') {
|
||||
return editQuestionInDb(questionDb, edits)
|
||||
}
|
||||
|
||||
if (edits.type === 'subjEdit') {
|
||||
return editSubjInDb(questionDb, edits)
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue