fix: also push all questions to storage

Author: battlesquid

services/updater/src/index.ts

@@ -10,7 +10,7 @@ import { updateForumStatus } from "./update_forum_status";
 import { updateStorage } from "./update_storage";
 
 const update = async (client: FetchClient<FetchClientResponse>, logger: Logger) => {
-    const status = await updateDatabase(client, logger);
+    await updateDatabase(client, logger);
     await updateStorage(logger);
     await updateForumStatus(client, logger);
 };

services/updater/src/update_storage.ts

@@ -1,15 +1,40 @@
 import { getenv } from "@qnaplus/dotenv";
-import { getAllSeasonQuestions, getMetadata, upload } from "@qnaplus/store";
+import { Question } from "@qnaplus/scraper";
+import { getAllQuestions, getAllSeasonQuestions, getMetadata, upload } from "@qnaplus/store";
 import { trycatch } from "@qnaplus/utils";
 import type { Logger } from "pino";
 
+const update = async (logger: Logger, data: Question[], key: string) => {
+    const json = JSON.stringify(data);
+    const buffer = Buffer.from(json, "utf-8");
+    const [uploadError] = await trycatch(() => upload(key, buffer, logger));
+    if (uploadError) {
+        logger?.error({ error: uploadError }, "Error while updating storage json");
+        return;
+    }
+    logger.info("Successfully completed storage update.");
+}
+
 export const updateStorage = async (_logger: Logger) => {
     const logger = _logger?.child({ label: "doStorageUpdate" });
     logger.info("Starting storage update.");
-    const [questionsError, questions] = await getAllSeasonQuestions();
+
+    // push all questions
+    const [questionsError, questions] = await getAllQuestions();
     if (questionsError) {
         logger?.error(
             { error: questionsError },
+            "An error occurred while retreiving all questions from database.",
+        );
+        return;
+    }
+    await update(logger, questions, `questions-${getenv("NODE_ENV")}.json`);
+
+    // push current season questions
+    const [seasonQuestionsError, seasonQuestions] = await getAllSeasonQuestions();
+    if (seasonQuestionsError) {
+        logger?.error(
+            { error: seasonQuestionsError },
             "An error occurred while retreiving season questions from database.",
         );
         return;
@@ -22,13 +47,7 @@ export const updateStorage = async (_logger: Logger) => {
         );
         return;
     }
-    const json = JSON.stringify(questions);
-    const buffer = Buffer.from(json, "utf-8");
-    const key = `questions-${getenv("NODE_ENV")}.json`; // TODO: break out by season
-    const [uploadError] = await trycatch(() => upload(key, buffer, logger));
-    if (uploadError) {
-        logger?.error({ error: uploadError }, "Error while updating storage json");
-        return;
-    }
+    await update(logger, seasonQuestions, `questions-${getenv("NODE_ENV")}-${meta.currentSeason}.json`);
+
     logger.info("Successfully completed storage update.");
 };