Merge pull request #831 from Sim-sat/fix-energy

fix: query invalidation for daily progress

Author: CodeWithCJ

SparkyFitnessFrontend/src/api/Diary/dailyProgressService.ts

@@ -11,10 +11,10 @@ export const settingsKeys = {
 
 export const userKeys = {
   all: ['users'] as const,
-
   list: (filters: { searchTerm: string; sortBy: string; sortOrder: string }) =>
     [...userKeys.all, filters] as const,
   profile: (userId: string) => [...userKeys.all, 'profile', userId] as const,
+  avatar: (url: string) => [...userKeys.all, 'profile', 'avatar', url] as const,
 };
 
 export const aiServiceKeys = {

SparkyFitnessFrontend/src/api/keys/admin.ts

@@ -13,6 +13,8 @@ export const checkInKeys = {
     [...checkInKeys.all, 'mostRecent', type] as const,
   customEntries: (categoryId: string, userId?: string) =>
     [...checkInKeys.all, 'customEntries', categoryId, userId] as const,
+  rawStressData: (userId: string, categoryId: string) =>
+    [...checkInKeys.all, 'rawStressData', userId, categoryId] as const,
 };
 
 export const moodKeys = {

SparkyFitnessFrontend/src/api/keys/checkin.ts

@@ -5,10 +5,7 @@ export const mealTypeKeys = {
 
 export const dailyProgressKeys = {
   all: ['dailyProgress'] as const,
-  goals: (date: string) => [...dailyProgressKeys.all, 'goals', date] as const,
   steps: (date: string) => [...dailyProgressKeys.all, 'steps', date] as const,
-  exercises: (date: string) =>
-    [...dailyProgressKeys.all, 'exercises', date] as const,
   measurements: {
     mostRecent: (type: string) =>
       [...dailyProgressKeys.all, 'measurements', 'recent', type] as const,
@@ -20,6 +17,8 @@ export const dailyProgressKeys = {
 export const foodEntryKeys = {
   all: ['foodEntries'] as const,
   byDate: (date: string) => [...foodEntryKeys.all, 'date', date] as const,
+  foodIntake: (date: string) =>
+    [...foodEntryKeys.all, 'foodIntake', date] as const,
 };
 
 export const foodEntryMealKeys = {

SparkyFitnessFrontend/src/api/keys/diary.ts

@@ -109,6 +109,8 @@ export const exerciseEntryKeys = {
       entryId,
       providerName,
     ] as const,
+  dailyStats: (date: string) =>
+    [...exerciseEntryKeys.all, 'dailyStats', date] as const,
 };
 export const suggestedExercisesKeys = {
   all: ['exercises', 'suggested'] as const,

SparkyFitnessFrontend/src/api/keys/exercises.ts

@@ -33,7 +33,8 @@ export const providerKeys = {
 };
 
 export const mealPlanKeys = {
-  all: (userId: string) => [userId, 'mealplan'] as const,
+  all: ['mealPlans'] as const,
+  byUser: (userId: string) => [...mealPlanKeys.all, userId] as const,
 };
 
 export const customNutrientsKeys = {

SparkyFitnessFrontend/src/api/keys/meals.ts

@@ -3,11 +3,6 @@ export const externalProviderKeys = {
   lists: () => [...externalProviderKeys.all, 'list'] as const,
 };
 
-export const customCategoryKeys = {
-  all: ['customCategories'] as const,
-  lists: () => [...customCategoryKeys.all, 'list'] as const,
-};
-
 export const familyAccessKeys = {
   all: ['familyAccess'] as const,
   lists: () => [...familyAccessKeys.all, 'list'] as const,
@@ -31,11 +26,6 @@ export const apiKeyKeys = {
   lists: () => [...apiKeyKeys.all, 'list'] as const,
 };
 
-export const profileKeys = {
-  all: ['profile'] as const,
-  avatar: (url: string) => [...profileKeys.all, 'avatar', url] as const,
-};
-
 export const preferencesKeys = {
   all: ['preferences'] as const,
   user: () => [...preferencesKeys.all, 'user'] as const,

SparkyFitnessFrontend/src/api/keys/settings.ts

@@ -14,6 +14,7 @@ import {
   getMostRecentMeasurement,
 } from '@/api/CheckIn/checkInService';
 import { checkInKeys } from '@/api/keys/checkin';
+import { dailyProgressKeys } from '@/api/keys/diary';
 
 export const useCustomCategories = (userId?: string) => {
   return useQuery({
@@ -102,7 +103,8 @@ export const useDeleteCustomMeasurementMutation = () => {
   return useMutation({
     mutationFn: (id: string) => deleteCustomMeasurement(id),
     onSuccess: () => {
-      return queryClient.invalidateQueries({ queryKey: checkInKeys.all });
+      queryClient.invalidateQueries({ queryKey: checkInKeys.all });
+      queryClient.invalidateQueries({ queryKey: dailyProgressKeys.all });
     },
     meta: {
       errorMessage: t(
@@ -123,7 +125,8 @@ export const useUpdateCheckInMeasurementFieldMutation = () => {
   return useMutation({
     mutationFn: updateCheckInMeasurementField,
     onSuccess: () => {
-      return queryClient.invalidateQueries({ queryKey: checkInKeys.all });
+      queryClient.invalidateQueries({ queryKey: checkInKeys.all });
+      queryClient.invalidateQueries({ queryKey: dailyProgressKeys.all });
     },
     meta: {
       errorMessage: t(
@@ -144,7 +147,8 @@ export const useSaveCheckInMeasurementsMutation = () => {
   return useMutation({
     mutationFn: saveCheckInMeasurements,
     onSuccess: () => {
-      return queryClient.invalidateQueries({ queryKey: checkInKeys.all });
+      queryClient.invalidateQueries({ queryKey: checkInKeys.all });
+      queryClient.invalidateQueries({ queryKey: dailyProgressKeys.all });
     },
     meta: {
       errorMessage: t(

SparkyFitnessFrontend/src/hooks/CheckIn/useCheckIn.ts

@@ -9,16 +9,17 @@ import {
   convertStepsToCalories,
 } from '@/utils/nutritionCalculations';
 import { getExerciseEntriesForDate } from '@/api/Exercises/exerciseEntryService';
-import {
-  getCheckInMeasurementsForDate,
-  getFoodEntriesForDate,
-  getGoalsForDate,
-} from '@/api/Diary/dailyProgressService';
 import { userManagementService } from '@/api/Admin/userManagementService';
-import { getMostRecentMeasurement } from '@/api/CheckIn/checkInService';
+import {
+  getMostRecentMeasurement,
+  loadExistingCheckInMeasurements,
+} from '@/api/CheckIn/checkInService';
 import { adaptiveTdeeService } from '@/api/Settings/adaptiveTdeeService';
 import { calculateBmr, BmrAlgorithm } from '@/services/bmrService';
 import { GroupedExerciseEntry } from '@/types/exercises';
+import { userKeys } from '@/api/keys/admin';
+import { exerciseEntryKeys } from '@/api/keys/exercises';
+import { loadFoodEntries } from '@/api/Diary/foodEntryService';
 
 export const useAdaptiveTdee = (date: string) => {
   return useQuery({
@@ -28,26 +29,11 @@ export const useAdaptiveTdee = (date: string) => {
   });
 };
 
-export const useDailyGoals = (date: string) => {
-  const { t } = useTranslation();
-  return useQuery({
-    queryKey: dailyProgressKeys.goals(date),
-    queryFn: () => getGoalsForDate(date),
-    enabled: !!date,
-    meta: {
-      errorMessage: t(
-        'dailyProgress.goalsLoadError',
-        'Failed to load daily goals.'
-      ),
-    },
-  });
-};
-
 export const useDailyFoodIntake = (date: string) => {
   const { t } = useTranslation();
   return useQuery({
-    queryKey: foodEntryKeys.byDate(date),
-    queryFn: () => getFoodEntriesForDate(date),
+    queryKey: foodEntryKeys.foodIntake(date),
+    queryFn: () => loadFoodEntries(date),
     enabled: !!date,
     select: (entries: FoodEntry[]) => {
       const totals = entries.reduce(
@@ -86,7 +72,7 @@ export const useDailyFoodIntake = (date: string) => {
 export const useDailyExerciseStats = (date: string) => {
   const { t } = useTranslation();
   return useQuery({
-    queryKey: dailyProgressKeys.exercises(date),
+    queryKey: exerciseEntryKeys.dailyStats(date),
     queryFn: () => getExerciseEntriesForDate(date),
     enabled: !!date,
     select: (data: GroupedExerciseEntry[]) => {
@@ -129,7 +115,7 @@ export const useDailyExerciseStats = (date: string) => {
 export const useDailySteps = (date: string) => {
   return useQuery({
     queryKey: dailyProgressKeys.steps(date),
-    queryFn: () => getCheckInMeasurementsForDate(date),
+    queryFn: () => loadExistingCheckInMeasurements(date),
     enabled: !!date,
     select: (data) => {
       const steps = data?.steps || 0;
@@ -176,7 +162,7 @@ export const useCalculatedBMR = () => {
   const { bmrAlgorithm, includeBmrInNetCalories } = usePreferences();
 
   const { data: userProfile } = useQuery({
-    queryKey: ['user', 'profile', user?.id],
+    queryKey: userKeys.profile(user?.id),
     queryFn: () => userManagementService.getUserProfile(user!.id),
     enabled: !!user?.id,
   });

SparkyFitnessFrontend/src/hooks/Diary/useDailyProgress.ts

@@ -23,7 +23,11 @@ import {
 } from '@/api/Diary/foodEntryService';
 
 import { goalKeys } from '@/api/keys/goals';
-import { foodEntryKeys, foodEntryMealKeys } from '@/api/keys/diary';
+import {
+  dailyProgressKeys,
+  foodEntryKeys,
+  foodEntryMealKeys,
+} from '@/api/keys/diary';
 import i18n from '@/i18n';
 
 export const useFoodEntries = (date: string) => {
@@ -81,10 +85,10 @@ export const useCreateFoodEntryMutation = () => {
 
   return useMutation({
     mutationFn: createFoodEntry,
-    onSuccess: (_, variables) => {
-      queryClient.invalidateQueries({
-        queryKey: foodEntryKeys.byDate(variables.entry_date),
-      });
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: foodEntryMealKeys.all });
+      queryClient.invalidateQueries({ queryKey: foodEntryKeys.all });
+      queryClient.invalidateQueries({ queryKey: dailyProgressKeys.all });
     },
     meta: {
       successMessage: t('diary.addSuccess', 'Food added successfully.'),
@@ -102,6 +106,8 @@ export const useUpdateFoodEntryMutation = () => {
       updateFoodEntry(id, data),
     onSuccess: () => {
       queryClient.invalidateQueries({ queryKey: foodEntryKeys.all });
+      queryClient.invalidateQueries({ queryKey: dailyProgressKeys.all });
+      queryClient.invalidateQueries({ queryKey: foodEntryMealKeys.all });
     },
     meta: {
       successMessage: t('diary.updateSuccess', 'Entry updated.'),
@@ -118,6 +124,7 @@ export const useDeleteFoodEntryMutation = () => {
     mutationFn: removeFoodEntry,
     onSuccess: () => {
       queryClient.invalidateQueries({ queryKey: foodEntryKeys.all });
+      queryClient.invalidateQueries({ queryKey: dailyProgressKeys.all });
     },
     meta: {
       successMessage: t('diary.deleteSuccess', 'Entry deleted.'),
@@ -147,6 +154,7 @@ export const useCopyFoodEntriesMutation = () => {
       queryClient.invalidateQueries({
         queryKey: foodEntryKeys.byDate(variables.targetDate),
       });
+      queryClient.invalidateQueries({ queryKey: dailyProgressKeys.all });
     },
     meta: {
       successMessage: t('diary.copySuccess', 'Entries copied successfully.'),
@@ -171,6 +179,7 @@ export const useCopyFoodEntriesFromYesterdayMutation = () => {
       queryClient.invalidateQueries({
         queryKey: foodEntryKeys.byDate(variables.targetDate),
       });
+      queryClient.invalidateQueries({ queryKey: dailyProgressKeys.all });
     },
     meta: {
       successMessage: t('diary.copySuccess', 'Entries copied from yesterday.'),
@@ -192,6 +201,7 @@ export const useCreateFoodEntryMealMutation = () => {
       queryClient.invalidateQueries({
         queryKey: foodEntryKeys.byDate(variables.entry_date),
       });
+      queryClient.invalidateQueries({ queryKey: dailyProgressKeys.all });
     },
     meta: {
       successMessage: t('diary.mealAddSuccess', 'Meal added successfully.'),
@@ -210,6 +220,7 @@ export const useUpdateFoodEntryMealMutation = () => {
     onSuccess: () => {
       queryClient.invalidateQueries({ queryKey: foodEntryMealKeys.all });
       queryClient.invalidateQueries({ queryKey: foodEntryKeys.all });
+      queryClient.invalidateQueries({ queryKey: dailyProgressKeys.all });
     },
     meta: {
       successMessage: t(
@@ -230,6 +241,7 @@ export const useDeleteFoodEntryMealMutation = () => {
     onSuccess: () => {
       queryClient.invalidateQueries({ queryKey: foodEntryMealKeys.all });
       queryClient.invalidateQueries({ queryKey: foodEntryKeys.all });
+      queryClient.invalidateQueries({ queryKey: dailyProgressKeys.all });
     },
     meta: {
       successMessage: t('diary.mealDeleteSuccess', 'Meal deleted.'),