add populate on backend to send avatars for messages and normal update avatars

backend/app.js

@@ -113,7 +113,7 @@ app.post('/avatar', async (req, res) =>  {
         file.mv(STATIC_PATH + '\/' + avatarFileName)
         const userFromDb = await getOneUser(user.userName);
         if(userFromDb.avatar){
-            const oldAvatar = userFromDb?.avatar;
+            const oldAvatar = userFromDb.avatar;
             fs.unlinkSync(STATIC_PATH + '\/' + oldAvatar)
         }
         await User.findOneAndUpdate({userName: user.userName},{ $set: {'avatar': avatarFileName}},   {
@@ -181,9 +181,7 @@ io.on("connection", async (socket) => {
          getAllDbUsers(socket); 
     }//sent all users from db to admin
 
-    const messagesToShow = await Message.find({}).sort({ 'createDate': -1 }).limit(20);
-    //console.log(messagesToShow)
-    
+    const messagesToShow = await Message.find({}).sort({ 'createDate': -1 }).limit(20).populate( {path:'user'});   
     socket.emit('allmessages', messagesToShow.reverse());
     socket.on("message", async (data) => {
         const dateNow = Date.now(); // for correct working latest post 
@@ -209,7 +207,6 @@ io.on("connection", async (socket) => {
             });
             try {
                 await message.save();
-                console.log(oneUser)
                 if(!oneUser.messages){
                     await oneUser.update({ $set: {'messages': []}});
                 }
@@ -218,9 +215,9 @@ io.on("connection", async (socket) => {
             } catch (error) {
                 console.log('Message save to db error', error);   
             }
-           // const newMessagesToShow = await Message.find({}).sort({ 'createDate': -1 }).limit(20);
-        //    io.emit('allmessages', messagesToShow.reverse()); // 
-        // }
+            const newMessages = await message.populate( {path:'user'})   
+            io.emit('newmessage', newMessages);        
+            // }
         // } 
     });
     

frontend/src/components/chatPage/messageForm/MessegaForm.jsx

@@ -35,7 +35,7 @@ export const MessageForm = () => {
                         {console.log(item)}
                         <Avatar 
                       
-                           // src= {SERVER_URL + item.userAvatar}
+                            src= {SERVER_URL + item?.user?.avatar}
                             sx={
                                 (item.userName == user.userName)
                                 ? 

frontend/src/reducers/userDataReducer.js

@@ -92,7 +92,7 @@ const getUserDataSlice = createSlice({
             state.responseMessage = 'Something went wrong...'
         })
             .addCase(getUserAvatar.fulfilled, (state, action) => {
-                state.avatar = action.payload.data.avatarUrl
+                state.avatar = action.payload.data?.avatarUrl
                 
         })
             .addCase(getUserAvatar.rejected, (state, action) => {