Merge pull request #309 from orbiting/questionnaire-improvements

Questionnaire improvements

Author: patte

packages/dataloader/index.js

@@ -43,6 +43,7 @@ module.exports = (loader, options = {}, find = defaultFind) =>
     ,
     {
       cacheKeyFn: getCacheKey,
+      maxBatchSize: 1000,
       ...options
     }
   )

packages/migrations/migrations/20190907043631-questionnaire-improvements.js

@@ -0,0 +1,10 @@
+const run = require('../run.js')
+
+const dir = 'packages/voting/migrations/sqls/'
+const file = '20190907043631-questionnaire-improvements'
+
+exports.up = (db) =>
+  run(db, dir, `${file}-up.sql`)
+
+exports.down = (db) =>
+  run(db, dir, `${file}-down.sql`)

packages/translate/translations.json

@@ -1619,4 +1619,4 @@
       "value": "Ihr Profil ist im Moment einer Kandidatur zugeordnet und kann im Moment nicht zurückgenommen werden."
     }
   ]
-}
+}

packages/voting/graphql/resolvers/Election.js

@@ -16,11 +16,13 @@ module.exports = {
   async userIsEligible (entity, args, { pgdb, user: me }) {
     return isEligible(me && me.id, entity, pgdb)
   },
-  async userHasSubmitted (entity, args, { pgdb, user: me }) {
-    return userHasSubmitted(entity.id, me && me.id, pgdb)
+  async userHasSubmitted (entity, args, context) {
+    const { user: me } = context
+    return userHasSubmitted(entity.id, me && me.id, context)
   },
-  async userSubmitDate (entity, args, { pgdb, user: me }) {
-    return userSubmitDate(entity.id, me && me.id, pgdb)
+  async userSubmitDate (entity, args, context) {
+    const { user: me } = context
+    return userSubmitDate(entity.id, me && me.id, context)
   },
   async turnout (election, args, { pgdb }) {
     if (election.result && election.result.turnout) { // after counting

packages/voting/graphql/resolvers/QuestionInterface.js

@@ -4,14 +4,14 @@ module.exports = {
   __resolveType (question) {
     return `QuestionType${question.type}`
   },
-  userAnswer: (question, args, { req, user: me, pgdb, t }) => {
+  userAnswer: (question, args, { req, user: me, pgdb, t, loaders }) => {
     if (!me) {
       return null
     }
     if (question.userAnswer !== undefined) {
       return question.userAnswer
     }
-    return pgdb.public.answers.findOne({
+    return loaders.Answer.byKeyObj.load({
       questionId: question.id,
       userId: me.id
     })

packages/voting/graphql/resolvers/Questionnaire.js

@@ -9,11 +9,13 @@ module.exports = {
   async userIsEligible (entity, args, { pgdb, user: me }) {
     return isEligible(me && me.id, entity, pgdb)
   },
-  async userHasSubmitted (entity, args, { pgdb, user: me }) {
-    return userHasSubmitted(entity.id, me && me.id, pgdb)
+  async userHasSubmitted (entity, args, context) {
+    const { user: me } = context
+    return userHasSubmitted(entity.id, me && me.id, context)
   },
-  async userSubmitDate (entity, args, { pgdb, user: me }) {
-    return userSubmitDate(entity.id, me && me.id, pgdb)
+  async userSubmitDate (entity, args, context) {
+    const { user: me } = context
+    return userSubmitDate(entity.id, me && me.id, context)
   },
   async questions (entity, args, { pgdb, user: me }) {
     return getQuestions(entity, args, pgdb)

packages/voting/graphql/resolvers/Voting.js

@@ -23,11 +23,13 @@ module.exports = {
   async userIsEligible (entity, args, { pgdb, user: me }) {
     return isEligible(me && me.id, entity, pgdb)
   },
-  async userHasSubmitted (entity, args, { pgdb, user: me }) {
-    return userHasSubmitted(entity.id, me && me.id, pgdb)
+  async userHasSubmitted (entity, args, context) {
+    const { user: me } = context
+    return userHasSubmitted(entity.id, me && me.id, context)
   },
-  async userSubmitDate (entity, args, { pgdb, user: me }) {
-    return userSubmitDate(entity.id, me && me.id, pgdb)
+  async userSubmitDate (entity, args, context) {
+    const { user: me } = context
+    return userSubmitDate(entity.id, me && me.id, context)
   },
   async turnout (voting, args, { pgdb }) {
     if (voting.result && voting.result.turnout) { // after counting

packages/voting/graphql/resolvers/_mutations/anonymizeUserAnswers.js

@@ -0,0 +1,47 @@
+const { ensureSignedIn } = require('@orbiting/backend-modules-auth')
+const {
+  findById,
+  ensureReadyToSubmit
+} = require('../../../lib/Questionnaire')
+const uuid = require('uuid/v4')
+
+module.exports = async (_, { questionnaireId }, context) => {
+  const { pgdb, user: me, t, req, loaders } = context
+  ensureSignedIn(req, t)
+
+  const transaction = await pgdb.transactionBegin()
+  try {
+    const now = new Date()
+
+    const questionnaire = await findById(questionnaireId, transaction)
+    await ensureReadyToSubmit(questionnaire, me.id, now, { ...context, pgdb: transaction })
+
+    await transaction.public.questionnaireSubmissions.insert({
+      questionnaireId,
+      userId: me.id
+    })
+
+    await loaders.QuestionnaireSubmissions.byKeyObj.clear({
+      userId: me.id,
+      questionnaireId
+    })
+
+    await transaction.public.answers.update(
+      {
+        userId: me.id,
+        questionnaireId: questionnaire.id
+      },
+      {
+        userId: null,
+        pseudonym: uuid()
+      }
+    )
+
+    await transaction.transactionCommit()
+
+    return questionnaire
+  } catch (e) {
+    await transaction.transactionRollback()
+    throw e
+  }
+}

packages/voting/graphql/resolvers/_mutations/resetQuestionnaire.js

@@ -13,11 +13,13 @@ module.exports = async (_, { id: questionnaireId }, context) => {
     const now = new Date()
 
     const questionnaire = await findById(questionnaireId, transaction)
-    await ensureReadyToSubmit(questionnaire, me.id, now, transaction, t)
+
+    await ensureReadyToSubmit(questionnaire, me.id, now, { ...context, pgdb: transaction })
 
     await pgdb.public.answers.delete({
       questionnaireId,
-      userId: me.id
+      userId: me.id,
+      submitted: false
     })
 
     await transaction.transactionCommit()

packages/voting/graphql/resolvers/_mutations/submitAnswer.js

@@ -2,16 +2,19 @@ const { ensureSignedIn } = require('@orbiting/backend-modules-auth')
 const {
   findById,
   ensureReadyToSubmit,
-  transformQuestion
+  transformQuestion,
+  updateResultIncrementally
 } = require('../../../lib/Questionnaire')
 const {
   validateAnswer
 } = require('../../../lib/Question')
 
-module.exports = async (_, { answer: { id, questionId, payload } }, context) => {
+module.exports = async (_, { answer }, context) => {
   const { pgdb, user: me, t, req } = context
   ensureSignedIn(req, t)
 
+  const { id, questionId, payload } = answer
+
   const transaction = await pgdb.transactionBegin()
   try {
     const now = new Date()
@@ -21,7 +24,7 @@ module.exports = async (_, { answer: { id, questionId, payload } }, context) =>
     }
 
     const questionnaire = await findById(question.questionnaireId, transaction)
-    await ensureReadyToSubmit(questionnaire, me.id, now, transaction, t)
+    await ensureReadyToSubmit(questionnaire, me.id, now, { ...context, pgdb: transaction })
 
     // check client generated ID
     const existingAnswer = await transaction.public.answers.findOne({ id })
@@ -38,6 +41,12 @@ module.exports = async (_, { answer: { id, questionId, payload } }, context) =>
       userId: me.id,
       questionId
     })
+    if (
+      (existingAnswer && existingAnswer.submitted) ||
+      (sameAnswer && sameAnswer.submitted)
+    ) {
+      throw new Error(t('api/questionnaire/answer/immutable'))
+    }
     if (sameAnswer) {
       await transaction.public.answers.deleteOne({ id: sameAnswer.id })
     }
@@ -63,6 +72,19 @@ module.exports = async (_, { answer: { id, questionId, payload } }, context) =>
       )
     }
 
+    if (emptyAnswer && questionnaire.noEmptyAnswers) {
+      throw new Error(t('api/questionnaire/answer/empty'))
+    }
+
+    if (questionnaire.updateResultIncrementally) {
+      await updateResultIncrementally(
+        questionnaire.id,
+        answer,
+        transaction,
+        context
+      )
+    }
+
     // write
     const findQuery = { id }
     if (emptyAnswer) {
@@ -85,7 +107,8 @@ module.exports = async (_, { answer: { id, questionId, payload } }, context) =>
           questionId,
           questionnaireId: questionnaire.id,
           userId: me.id,
-          payload
+          payload,
+          submitted: questionnaire.submitAnswersImmediately
         })
       }
     }