refactor: generalize query key for tasks

paolojulian · Jul 29, 2024 · 9f60111 · 9f60111
1 parent b376d65
commit 9f60111
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 42 deletions.
diff --git a/hooks/services/task/task.types.ts b/hooks/services/task/task.types.ts
@@ -18,6 +18,7 @@ export interface Task {
 }
 
 export enum TaskQueryKeys {
+  task = 'task',
   list = 'task-list',
   overview = 'task-overview',
   priority = 'task-priority',

diff --git a/hooks/services/task/useCompleteTask.ts b/hooks/services/task/useCompleteTask.ts
@@ -14,19 +14,7 @@ export function useCompleteTask() {
     },
     onSuccess: async response => {
       queryClient.invalidateQueries({
-        predicate: query => {
-          const firstQueryKey = query.queryKey[0];
-          if (typeof firstQueryKey !== 'string') {
-            return false;
-          }
-
-          const invalidateQueries: string[] = [
-            TaskQueryKeys.list,
-            TaskQueryKeys.priority,
-            TaskQueryKeys.overview,
-          ];
-          return invalidateQueries.includes(firstQueryKey);
-        },
+        predicate: query => query.queryKey[0] === TaskQueryKeys.task,
       });
 
       return response;

diff --git a/hooks/services/task/useCreateTask.ts b/hooks/services/task/useCreateTask.ts
@@ -32,19 +32,7 @@ export const useCreateTask = () => {
     mutationFn: setup,
     onSuccess: response => {
       queryClient.invalidateQueries({
-        predicate(query) {
-          const firstQueryKey = query.queryKey[0];
-          if (typeof firstQueryKey !== 'string') {
-            return false;
-          }
-
-          const invalidateQueries: string[] = [
-            TaskQueryKeys.list,
-            TaskQueryKeys.overview,
-            TaskQueryKeys.priority,
-          ];
-          return invalidateQueries.includes(firstQueryKey);
-        },
+        predicate: query => query.queryKey[0] === TaskQueryKeys.task,
       });
 
       return response;

diff --git a/hooks/services/task/usePriorityTasks.ts b/hooks/services/task/usePriorityTasks.ts
@@ -13,7 +13,7 @@ export function usePriorityTasks() {
   }
 
   return useQuery({
-    queryKey: [TaskQueryKeys.priority],
+    queryKey: [TaskQueryKeys.task, TaskQueryKeys.priority],
     queryFn: setup,
   });
 }

diff --git a/hooks/services/task/useTaskOverview.ts b/hooks/services/task/useTaskOverview.ts
@@ -16,7 +16,7 @@ export default function useTaskOverview() {
   };
 
   const { data, isLoading } = useQuery({
-    queryKey: [TaskQueryKeys.overview],
+    queryKey: [TaskQueryKeys.task, TaskQueryKeys.overview],
     queryFn: setup,
     initialData: { totalTasks: 0, dueToday: 0, overdue: 0 },
   });

diff --git a/hooks/services/task/useTasks.ts b/hooks/services/task/useTasks.ts
@@ -16,7 +16,7 @@ const useTasks = (filters: TaskQueryFilters) => {
   }
 
   return useQuery({
-    queryKey: [TaskQueryKeys.list, filters.filterType],
+    queryKey: [TaskQueryKeys.task, TaskQueryKeys.list, filters.filterType],
     queryFn: setup,
   });
 };

diff --git a/hooks/services/task/useUncompleteTask.ts b/hooks/services/task/useUncompleteTask.ts
@@ -14,19 +14,7 @@ export function useUncompleteTask() {
     },
     onSuccess: async response => {
       queryClient.invalidateQueries({
-        predicate: query => {
-          const firstQueryKey = query.queryKey[0];
-          if (typeof firstQueryKey !== 'string') {
-            return false;
-          }
-
-          const invalidateQueries: string[] = [
-            TaskQueryKeys.list,
-            TaskQueryKeys.priority,
-            TaskQueryKeys.overview,
-          ];
-          return invalidateQueries.includes(firstQueryKey);
-        },
+        predicate: query => query.queryKey[0] === TaskQueryKeys.task,
       });
 
       return response;