Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
arsnova-click-v2-backend
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
2
Merge Requests
2
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
ARSnova
arsnova-click-v2-backend
Commits
ac2663ef
Commit
ac2663ef
authored
Aug 25, 2019
by
Christopher Mark Fullarton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes upload of legacy quizzes from arsnova.click v1
parent
79053e9c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
4 deletions
+16
-4
src/db/quiz/QuizDAO.ts
src/db/quiz/QuizDAO.ts
+11
-2
src/routers/rest/QuizRouter.ts
src/routers/rest/QuizRouter.ts
+5
-2
No files found.
src/db/quiz/QuizDAO.ts
View file @
ac2663ef
...
...
@@ -111,11 +111,18 @@ class QuizDAO extends AbstractDAO<Array<IQuizEntity>> {
});
}
public
convertLegacyQuiz
(
legacyQuiz
:
any
):
void
{
public
convertLegacyQuiz
(
legacyQuiz
:
any
):
QuizEntity
{
legacyQuiz
=
this
.
replaceTypeInformationOnLegacyQuiz
(
legacyQuiz
);
if
(
legacyQuiz
.
hasOwnProperty
(
'
configuration
'
))
{
// Detected old v1 arsnova.click quiz
// noinspection TypeScriptUnresolvedVariable
legacyQuiz
.
name
=
legacyQuiz
.
hashtag
;
delete
legacyQuiz
.
hashtag
;
legacyQuiz
.
currentQuestionIndex
=
0
;
legacyQuiz
.
expiry
=
null
;
legacyQuiz
.
currentStartTimestamp
=
-
1
;
legacyQuiz
.
readingConfirmationRequested
=
false
;
legacyQuiz
.
sessionConfig
=
{
music
:
{
titleConfig
:
{
...
...
@@ -149,6 +156,8 @@ class QuizDAO extends AbstractDAO<Array<IQuizEntity>> {
};
delete
legacyQuiz
.
configuration
;
}
return
legacyQuiz
;
}
public
async
addQuiz
(
quizDoc
:
IQuizSerialized
):
Promise
<
IQuizEntity
>
{
...
...
src/routers/rest/QuizRouter.ts
View file @
ac2663ef
...
...
@@ -148,7 +148,7 @@ export class QuizRouter extends AbstractRouter {
uploadedFiles
.
forEach
(
file
=>
{
quizData
.
push
({
fileName
:
file
.
originalname
,
quiz
:
JSON
.
parse
(
file
.
buffer
.
toString
(
'
UTF-8
'
)),
quiz
:
QuizDAO
.
convertLegacyQuiz
(
JSON
.
parse
(
file
.
buffer
.
toString
(
'
UTF-8
'
)
)),
});
});
...
...
@@ -178,7 +178,10 @@ export class QuizRouter extends AbstractRouter {
return
{
status
:
StatusProtocol
.
Success
,
step
:
MessageProtocol
.
UploadFile
,
payload
:
{
duplicateQuizzes
},
payload
:
{
duplicateQuizzes
,
quizData
:
quizData
.
filter
(
insertedQuiz
=>
!
duplicateQuizzes
.
find
(
duplicateQuiz
=>
duplicateQuiz
.
fileName
===
insertedQuiz
.
fileName
)),
},
};
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment