Merge pull request #125 from AET-DevOps25/feature/dietary-preferences

Feature/dietary preferences

Author: esadakcam

client/src/hooks/useAuth.tsx

@@ -1,12 +1,11 @@
-import { useState } from "react";
 import { useAuth as useOAuth } from "react-oidc-context";
 import { useNavigate } from "react-router-dom";
+import { useUserInfo } from "./useUserInfo";
 
 export const useAuth = () => {
   const auth = useOAuth();
   const navigate = useNavigate();
-  const [user, setUser] = useState<User | null>(null);
-
+  const { user } = useUserInfo();
   if (auth.isLoading) {
     return { user, isLoading: auth.isLoading, signout: auth.signoutRedirect };
   }
@@ -15,26 +14,5 @@ export const useAuth = () => {
     navigate("/login");
   }
 
-  if (auth.user?.access_token && !user) {
-    fetch("https://gitlab.lrz.de/api/v4/user", {
-      method: "GET",
-      headers: {
-        Authorization: `Bearer ${auth.user.access_token}`,
-      },
-    })
-      .then((response) => {
-        if (!response.ok) {
-          throw new Error(`Error: ${response.status} ${response.statusText}`);
-        }
-        return response.json();
-      })
-      .then((userData) => {
-        setUser({ ...userData, token: auth.user?.access_token });
-      })
-      .catch((error) => {
-        console.error("Failed to fetch user data:", error);
-      });
-  }
-
   return { user, isLoading: auth.isLoading, signout: auth.signoutRedirect };
 };

client/src/hooks/useUserInfo.tsx

@@ -0,0 +1,25 @@
+import { useQuery } from "@tanstack/react-query";
+import { useAuth as useOAuth } from "react-oidc-context";
+import { getUserInfo } from "../services/userService";
+
+export const useUserInfo = () => {
+  const auth = useOAuth();
+
+  const { isLoading, isError, data, error } = useQuery({
+    queryKey: ["userInfo", auth.user?.access_token],
+    queryFn: () => {
+      if (!auth.user?.access_token) {
+        throw new Error("No access token available");
+      }
+      return getUserInfo(auth.user.access_token);
+    },
+    enabled: !!auth.user?.access_token,
+  });
+
+  return {
+    isLoading,
+    isError,
+    user: data ?? null,
+    error,
+  };
+};

client/src/hooks/useUserPreferencesUpdate.tsx

@@ -0,0 +1,35 @@
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { useUser } from "../contexts/userContext";
+import { updateUserPreferences } from "../services/userService";
+
+interface UseUserPreferencesUpdate {
+  onSuccess?: () => void;
+  onError?: (error: Error) => void;
+}
+
+export const useUserPreferencesUpdate = ({
+  onSuccess,
+  onError,
+}: UseUserPreferencesUpdate) => {
+  const { user } = useUser();
+  const queryClient = useQueryClient();
+  const { mutate, isError, error } = useMutation({
+    mutationKey: ["userPreferenceUpdate", user?.id],
+    mutationFn: ({ preferences }: { preferences: DietaryPreference[] }) =>
+      updateUserPreferences(user!.token, preferences),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ["userInfo"] });
+      if (onSuccess) {
+        onSuccess();
+      }
+    },
+    onError: (error: Error) => {
+      console.error("Error updating user preferences:", error);
+      if (onError) {
+        onError(error);
+      }
+    },
+  });
+
+  return { updateUserPreferences: mutate, isError, error };
+};

client/src/pages/PreferencesPage.tsx

@@ -1,20 +1,55 @@
-import React, { useState } from "react";
+import { useEffect, useState } from "react";
+import { useUser } from "../contexts/userContext";
+import { useUserPreferencesUpdate } from "../hooks/useUserPreferencesUpdate";
+import { DIETARY_PREFERENCES } from "../types/enums";
+
+const defaultPreferences = {
+  vegetarian: false,
+  vegan: false,
+  glutenFree: false,
+  dairyFree: false,
+  nutFree: false,
+  spicyFood: false,
+};
+
+const getPreferenceMap = (list: DietaryPreference[]) => ({
+  vegetarian: list.includes(DIETARY_PREFERENCES.VEGETARIAN),
+  vegan: list.includes(DIETARY_PREFERENCES.VEGAN),
+  glutenFree: list.includes(DIETARY_PREFERENCES.GLUTEN_FREE),
+  dairyFree: list.includes(DIETARY_PREFERENCES.DAIRY_FREE),
+  nutFree: list.includes(DIETARY_PREFERENCES.NUT_FREE),
+  spicyFood: list.includes(DIETARY_PREFERENCES.SPICY_FOOD),
+});
+
+const getPreferenceList = (preferences: typeof defaultPreferences) => {
+  const list: DietaryPreference[] = [];
+  if (preferences.vegetarian) list.push(DIETARY_PREFERENCES.VEGETARIAN);
+  if (preferences.vegan) list.push(DIETARY_PREFERENCES.VEGAN);
+  if (preferences.glutenFree) list.push(DIETARY_PREFERENCES.GLUTEN_FREE);
+  if (preferences.dairyFree) list.push(DIETARY_PREFERENCES.DAIRY_FREE);
+  if (preferences.nutFree) list.push(DIETARY_PREFERENCES.NUT_FREE);
+  if (preferences.spicyFood) list.push(DIETARY_PREFERENCES.SPICY_FOOD);
+  return list;
+};
 
 const PreferencesPage: React.FC = () => {
-  const [preferences, setPreferences] = useState({
-    vegetarian: false,
-    vegan: false,
-    glutenFree: false,
-    dairyFree: false,
-    nutFree: false,
-    spicyFood: false,
-  });
+  const { user } = useUser();
+  const { updateUserPreferences } = useUserPreferencesUpdate({});
+  const [preferences, setPreferences] = useState(defaultPreferences);
+
+  useEffect(() => {
+    setPreferences(
+      user?.dietaryPreferences
+        ? getPreferenceMap(user.dietaryPreferences)
+        : defaultPreferences
+    );
+  }, [user?.dietaryPreferences]);
 
   const handleToggle = (key: keyof typeof preferences) => {
-    setPreferences((prev) => ({
-      ...prev,
-      [key]: !prev[key],
-    }));
+    const updatedPreferences = { ...preferences, [key]: !preferences[key] };
+    setPreferences(updatedPreferences);
+    const updatedPreferenceList = getPreferenceList(updatedPreferences);
+    updateUserPreferences({ preferences: updatedPreferenceList });
   };
 
   return (

client/src/services/userService.ts

@@ -0,0 +1,43 @@
+export const getUserInfo = async (token: string): Promise<User> => {
+  try {
+    const response = await fetch("/api/user/info", {
+      method: "GET",
+      headers: {
+        Authorization: `Bearer ${token}`,
+      },
+    });
+
+    if (!response.ok) {
+      throw new Error(`Error: ${response.status} ${response.statusText}`);
+    }
+
+    const userData = await response.json();
+    return { ...userData, token };
+  } catch (error) {
+    console.error("Failed to fetch user data:", error);
+    throw error;
+  }
+};
+
+export const updateUserPreferences = async (
+  token: string,
+  preferences: DietaryPreference[]
+): Promise<void> => {
+  try {
+    const response = await fetch("/api/user/preferences", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${token}`,
+      },
+      body: JSON.stringify({ dietaryPreferences: preferences }),
+    });
+
+    if (!response.ok) {
+      throw new Error(`Error: ${response.status} ${response.statusText}`);
+    }
+  } catch (error) {
+    console.error("Failed to update user preferences:", error);
+    throw error;
+  }
+};

client/src/types/enums.ts

@@ -0,0 +1,8 @@
+export const DIETARY_PREFERENCES = {
+  VEGETARIAN: "VEGETARIAN",
+  VEGAN: "VEGAN",
+  GLUTEN_FREE: "GLUTEN_FREE",
+  DAIRY_FREE: "DAIRY_FREE",
+  NUT_FREE: "NUT_FREE",
+  SPICY_FOOD: "SPICY_FOOD",
+};

client/src/types/global.d.ts

@@ -1,3 +1,5 @@
+import { DIETARY_PREFERENCES } from "./enums";
+
 export {};
 declare global {
   type Message = {
@@ -17,8 +19,10 @@ declare global {
   type User = {
     id: number;
     username: string;
-    name: string;
-    email: string;
+    dietaryPreferences: DIETARY_PREFERENCES[];
     token: string; //bearer token
   };
+
+  type DietaryPreference =
+    (typeof DIETARY_PREFERENCES)[keyof typeof DIETARY_PREFERENCES];
 }

docker-compose.yml

@@ -74,7 +74,7 @@ services:
     image: mongo-express:latest
     container_name: mongo-express
     ports:
-      - "8083:8083"
+      - "8083:8081"
     environment:
       - ME_CONFIG_MONGODB_ADMINUSERNAME=admin
       - ME_CONFIG_MONGODB_ADMINPASSWORD=admin

recipai-chart/templates/server/user-deployment.yml

@@ -21,6 +21,14 @@ spec:
         ports:
           - containerPort:  {{ .Values.ports.server.user }}
             name: user-api
+        env:
+          - name: MONGODB_USERNAME
+            value: {{ .Values.db.adminUsername }}
+          - name: MONGODB_PASSWORD
+            valueFrom:
+              secretKeyRef:
+                name: server-secret
+                key: mongodb-password
         resources:
           limits:
             cpu: {{ .Values.resources.limits.cpu }}

server/chat/src/main/java/com/continiousdisappointment/chat/controller/ChatController.java

@@ -3,7 +3,6 @@
 import com.continiousdisappointment.chat.domain.User;
 import com.continiousdisappointment.chat.domain.chat.Chat;
 import com.continiousdisappointment.chat.domain.chat.Message;
-import com.continiousdisappointment.chat.domain.chat.Role;
 import com.continiousdisappointment.chat.dto.AddMessageToChatDto;
 import com.continiousdisappointment.chat.dto.CreateChatDto;
 import com.continiousdisappointment.chat.service.ChatService;
@@ -55,6 +54,6 @@ public ResponseEntity<Message> addMessage(
             @PathVariable("chatId") String chatId,
             @RequestBody AddMessageToChatDto dto,
             @RequestAttribute("user") User user) {
-        return ResponseEntity.ok(chatService.addMessageToChat(user.id(), chatId, dto.content(), Role.USER));
+        return ResponseEntity.ok(chatService.addMessageToChat(user, chatId, dto.content()));
     }
 }