fix: show total number of questions in question container

Author: drodil

plugins/qeta-backend/src/database/DatabaseQetaStore.ts

@@ -295,12 +295,16 @@ export class DatabaseQetaStore implements QetaStore {
     }
 
     if (options.noAnswers) {
-      query.orderBy('answersCount', 'asc');
+      query.whereNull('answers.questionId');
     }
     if (options.noCorrectAnswer) {
-      query.orderBy('correctAnswers', 'asc');
+      query
+        .where('answers.correct', '!=', true)
+        .orWhereNull('answers.questionId');
     }
 
+    const totalQuery = query.clone();
+
     if (options.random) {
       query.orderByRaw('RANDOM()');
     } else if (options.orderBy) {
@@ -317,14 +321,14 @@ export class DatabaseQetaStore implements QetaStore {
       query.offset(options.offset);
     }
 
-    const rows = (await query) as RawQuestionEntity[];
-    const total = (
-      (await this.db<RawQuestionEntity>('questions')
-        .count('id as CNT')
-        .first()) as any
-    )?.CNT;
+    const results = await Promise.all([
+      query,
+      this.db(totalQuery.as('totalQuery')).count('* as CNT').first(),
+    ]);
+    const rows = results[0] as RawQuestionEntity[];
+    const total = this.mapToInteger((results[1] as any)?.CNT);
 
-    const ret = {
+    return {
       questions: await Promise.all(
         rows.map(async val => {
           return this.mapQuestion(
@@ -337,17 +341,6 @@ export class DatabaseQetaStore implements QetaStore {
       ),
       total,
     };
-
-    // Does not work in postgresql for some reason to have where clause
-    // using count aliases
-    if (options.noAnswers) {
-      ret.questions = ret.questions.filter(q => q.answersCount === 0);
-    }
-    if (options.noCorrectAnswer) {
-      ret.questions = ret.questions.filter(q => !q.correctAnswer);
-    }
-
-    return ret;
   }
 
   async getQuestion(

plugins/qeta/src/components/QuestionsContainer/QuestionsContainer.tsx

@@ -54,7 +54,7 @@ export const QuestionsContainer = (props: QuestionsContainerProps) => {
       <Grid container justifyContent="space-between">
         <Grid item>
           <Typography variant="h6">{`${
-            response?.questions.length ?? 0
+            response?.total ?? 0
           } questions`}</Typography>
         </Grid>
         {(showFilters ?? true) && (