Merge pull request #133 from MurakawaTakuya/fix/result-sort

resultのソート順を修正
MurakawaTakuya · Dec 29, 2024 · 1b1d36d · 1b1d36d
2 parents dd7df81 + bf81b93
commit 1b1d36d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
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(

diff --git a/src/Components/Progress/Progress.tsx b/src/Components/Progress/Progress.tsx
@@ -75,8 +75,6 @@ export default function Progress({
       : getUpdatedTime(a) - getUpdatedTime(b); // 最古が上位
   });
 
-  console.log("allResults: ", allResults);
-
   return (
     <>
       {allResults.map((result) => {