resultのソート順を修正

MurakawaTakuya · Dec 29, 2024 · bafab41 · bafab41
1 parent dd7df81
commit bafab41
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/functions/src/routers/resultRouter.ts b/functions/src/routers/resultRouter.ts
@@ -45,18 +45,23 @@ const getResults = async (
     const pendingSnapshot = await baseQuery
       .where("post", "==", null)
       .where("deadline", ">", now)
+      .orderBy("deadline", "asc") // 古いものが先
       .get();
 
     const pendingGoals = await processGoals(pendingSnapshot.docs, userList);
     pendingResults.push(...pendingGoals);
   }
 
   if (onlyFinished || (!onlyPending && !onlyFinished)) {
-    const completedSnapshot = await baseQuery.where("post", "!=", null).get();
+    const completedSnapshot = await baseQuery
+      .where("post", "!=", null)
+      .orderBy("post.submittedAt", "desc") // 新しいものが先
+      .get();
 
     const failedSnapshot = await baseQuery
       .where("post", "==", null)
       .where("deadline", "<=", now)
+      .orderBy("deadline", "desc") // 新しいものが先
       .get();
 
     const completedResults = await processGoals(