Fix more bugs with collaboration both fe and be

Author: jmsandiegoo

backend/gateway-service/src/modules/collaboration/collaborationws.controller.ts

@@ -105,7 +105,7 @@ export class CollaborationGateway implements OnGatewayDisconnect {
       this.server.to(sessionId).emit(SESSION_JOINED, {
         userId, // the user who recently joined
         sessionId,
-        messages, // chat messages
+        sessionMessages: messages, // chat messages
         language: existingLanguage || 'python3', // default language
         sessionUserProfiles, // returns the all session member profiles
       });

frontend/src/app/collaboration/_components/Editor/CollaborativeEditor/CollaborativeEditorTab.tsx

@@ -5,7 +5,7 @@ import { useSessionContext } from "@/contexts/SessionContext";
 export default function CollaborativeEditorTab() {
   const {sessionId, userProfile} = useSessionContext();
 
-  const socketUrl = process.env.NEXT_PUBLIC_Y_WEBSOCKET_URL || "ws://localhost:4001";
+  const socketUrl = process.env.PUBLIC_Y_WEBSOCKET_URL || "ws://localhost:4001";
 
   if (!userProfile) {
     return <div>Loading user profile...</div>;

frontend/src/contexts/SessionContext.tsx

@@ -179,23 +179,25 @@ export const SessionProvider: React.FC<SessionProviderProps> = ({
     ({
       userId,
       language,
+      sessionMessages,
       sessionUserProfiles,
     }: {
       userId: string;
       language: string;
-      messages: ChatMessages;
+      sessionMessages: ChatMessages;
       sessionUserProfiles: SessionUserProfiles;
     }) => {
       console.log("sessionJoined occured");
       try {
         if (userProfile.id === userId) {
           setConnectionStatus("connected");
           const currentMessages = ChatMessagesSchema.parse(
-            messages.map((message: ChatMessage) => ({
+            sessionMessages.map((message: ChatMessage) => ({
               ...message,
               status: ChatMessageStatusEnum.enum.sent,
             }))
           );
+
           setMessages([...currentMessages]);
         }
 
@@ -207,11 +209,12 @@ export const SessionProvider: React.FC<SessionProviderProps> = ({
         console.log(e);
       }
     },
-    [messages, userProfile.id]
+    [userProfile.id]
   );
 
   const onChatReceiveMessage = useCallback(
     (newMessage: ChatMessage) => {
+      console.log("chatReceiveMessage occured");
       try {
         newMessage["status"] = ChatMessageStatusEnum.enum.sent;
         const messageParsed = ChatMessageSchema.parse(newMessage);
@@ -375,7 +378,7 @@ export const SessionProvider: React.FC<SessionProviderProps> = ({
         setConnectionStatus("failed");
       }
 
-      if (event === "chatReceiveMessage") {
+      if (event === "chatSendMessage") {
         setMessages((prev) =>
           prev.map((message) => {
             if (message.id !== data?.id) return message;