Skip to content

Add caching to questions query #520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
lucianak wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Add caching to questions query #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
582415b
fix: added caching to questions query
lucianak Jul 19, 2023
be88cde
fix: fixed cache library
lucianak Jul 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 18 additions & 12 deletions packages/backend-modules/voting/lib/Questionnaire.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ const { resultForArchive } = require('./Question')
const { resultForValues: rangeResultForValues } = require('./Question/Range')
const finalizeLib = require('./finalize')
const { shuffle } = require('d3-array')
const { getCache } = require('./cache')

const transformQuestion = (q, questionnaire) => ({
...q.typePayload,
Expand Down Expand Up @@ -35,18 +36,23 @@ const getQuestions = async (questionnaire, args = {}, pgdb) => {
...questionnaire,
}

const questions = await pgdb.public.questions
.find(
{
questionnaireId: questionnaire.id,
...(orderFilter ? { order: orderFilter } : {}),
...(includeHidden ? {} : { hidden: false }),
},
{ orderBy: { order: 'asc' } },
)
.then((questions) =>
questions.map((q) => transformQuestion(q, questionnaireWithTurnout)),
)
const questions = getCache(questionnaire.id, {
orderFilter,
includeHidden,
}).cache(async () => {
return pgdb.public.questions
.find(
{
questionnaireId: questionnaire.id,
...(orderFilter ? { order: orderFilter } : {}),
...(includeHidden ? {} : { hidden: false }),
},
{ orderBy: { order: 'asc' } },
)
.then((questions) =>
questions.map((q) => transformQuestion(q, questionnaireWithTurnout)),
)
})

if (args.shuffle) {
// +1 for weights > 0
Expand Down
19 changes: 19 additions & 0 deletions packages/backend-modules/voting/lib/cache.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
const createCache = require('@orbiting/backend-modules-republik-crowdfundings/lib/cache')
const { DISABLE_RESOLVER_USER_CACHE } = process.env

const QUERY_CACHE_TTL_SECONDS = 60 * 60 * 4 // 4 hours

const getCache = (questionnaireId, args) =>
createCache(
{
prefix: `questionnaire:${questionnaireId}`,
key: `questions`,
ttl: QUERY_CACHE_TTL_SECONDS,
disabled: DISABLE_RESOLVER_USER_CACHE,
},
args,
)

module.exports = {
getCache,
}