From e28e53eab6d4e5558a790274e03e49fcf4f8da92 Mon Sep 17 00:00:00 2001
From: Conrad Christian <cchristian5@my.bcit.ca>
Date: Tue, 19 Nov 2024 01:04:44 -0800
Subject: [PATCH] Improve challenge navigation, query optimization, and fix
 delete goal

---
 app/(tabs)/challenges.tsx                | 14 ++++++-----
 app/challenges/[id]/index.tsx            |  5 +---
 app/challenges/create/index.tsx          | 32 +++++++++++++-----------
 app/goals/[goalId]/[goalLogId]/index.tsx |  2 +-
 convex/challengeGoals.ts                 | 16 ++++++++++++
 5 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/app/(tabs)/challenges.tsx b/app/(tabs)/challenges.tsx
index ad3c2458..d53846b5 100644
--- a/app/(tabs)/challenges.tsx
+++ b/app/(tabs)/challenges.tsx
@@ -12,7 +12,7 @@ import {
   isBefore,
   isAfter,
 } from "date-fns";
-import { Link } from "expo-router";
+import { Link, router } from "expo-router";
 
 const getChallengeStatus = (startDate: Date, endDate: Date) => {
   const currentDate = new Date();
@@ -52,11 +52,13 @@ export default function ChallengesScreen() {
         </Text>
 
         {/* TODO: Allow only admin to create challenges */}
-        <Link href="/challenges/create" asChild>
-          <Button size="icon" className="h-14 w-14 rounded-full">
-            <Plus color="#fff" size={30} />
-          </Button>
-        </Link>
+        <Button 
+          size="icon" 
+          className="h-14 w-14 rounded-full"
+          onPress={() => router.push("/challenges/create")}
+        >
+          <Plus color="#fff" size={30} />
+        </Button>
 
         <FlatList
           contentContainerStyle={{
diff --git a/app/challenges/[id]/index.tsx b/app/challenges/[id]/index.tsx
index 447f4378..d150c7a5 100644
--- a/app/challenges/[id]/index.tsx
+++ b/app/challenges/[id]/index.tsx
@@ -37,10 +37,7 @@ export default function ChallengeScreen() {
   const createGoal = useMutation(api.goals.createGoal);
   const deleteGoalAndGoalLogs = useMutation(api.goals.deleteGoalAndGoalLogs);
   const userGoals = useQuery(api.goals.listGoals);
-  const challengeGoals = useQuery(api.challengeGoals.listChallengeGoals);
-  const filteredChallengeGoals = challengeGoals?.filter(
-    (goal) => goal.challengeId === id
-  );
+  const filteredChallengeGoals = useQuery(api.challengeGoals.listChallengeGoalsById, { goalId: id });
   const createGoalLogsFromGoal = useMutation(
     api.goalLogs.createGoalLogsFromGoal
   );
diff --git a/app/challenges/create/index.tsx b/app/challenges/create/index.tsx
index 4e484d41..03a26ef3 100644
--- a/app/challenges/create/index.tsx
+++ b/app/challenges/create/index.tsx
@@ -93,23 +93,25 @@ function CreateChallengeForm() {
 
       <Button
         onPress={async () => {
-          const newChallenge = {
-            name,
-            description,
-            repeat: ["daily"],
-            unitType: "General",
-            unitValue: 1,
-            unit: "times",
-            recurrence: "per day",
-            startDate: startDate.getTime(),
-            endDate: endDate.getTime(),
-            points: points ? parseInt(points) : 0,
-          };
-          const challengeId = await createChallenge(newChallenge);
-          if (!challengeId) {
+          try {
+            const newChallenge = {
+              name,
+              description,
+              repeat: ["daily"],
+              unitType: "General",
+              unitValue: 1,
+              unit: "times",
+              recurrence: "per day",
+              startDate: startDate.getTime(),
+              endDate: endDate.getTime(),
+              points: points ? parseInt(points) : 0,
+            };
+
+            await createChallenge(newChallenge);
+            router.dismiss();
+          } catch (error) {
             throw new Error("Failed to create challenge");
           }
-          router.navigate("/challenges");
         }}
       >
         <Text>Add a sample challenge</Text>
diff --git a/app/goals/[goalId]/[goalLogId]/index.tsx b/app/goals/[goalId]/[goalLogId]/index.tsx
index 15fe9930..974700a6 100644
--- a/app/goals/[goalId]/[goalLogId]/index.tsx
+++ b/app/goals/[goalId]/[goalLogId]/index.tsx
@@ -132,8 +132,8 @@ export default function GoalScreen() {
         {
           text: "Yes",
           onPress: async () => {
+            router.dismiss(); // Dismiss first, page will break if goal does not exist before exit. Read nonexistent data
             await deleteGoalAndGoalLogs({ goalId });
-            router.dismiss();
           },
           style: "destructive",
         },
diff --git a/convex/challengeGoals.ts b/convex/challengeGoals.ts
index c53df58e..b00446cf 100644
--- a/convex/challengeGoals.ts
+++ b/convex/challengeGoals.ts
@@ -47,3 +47,19 @@ export const listChallengeGoals = query({
     return goals;
   },
 });
+
+export const listChallengeGoalsById = query({
+  args: { goalId: v.id("challenges") },
+  handler: async (ctx, { goalId }) => {
+    const userId = await getAuthUserId(ctx);
+    if (userId === null) {
+      return null;
+    }
+    const goals = await ctx.db
+    .query("challengeGoals")
+    .filter((q) => q.eq(q.field("challengeId"), goalId))
+    .collect();
+
+    return goals;
+  },
+});
\ No newline at end of file