FS: added two-way-match

Abhinav-Bhattarai · Jan 17, 2021 · 3280db7 · 3280db7
1 parent 21b7d57
commit 3280db7
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 9 deletions.
diff --git a/client/src/Components/NotificationCard/notification-card.scss b/client/src/Components/NotificationCard/notification-card.scss
@@ -16,6 +16,7 @@
     div{
         display: flex;
         flex-direction: column;
+        margin-left: 4%;
 
         header{
             font-weight: 500;

diff --git a/client/src/Containers/MainPage/mainPage.jsx b/client/src/Containers/MainPage/mainPage.jsx
@@ -180,13 +180,43 @@ const MainPage = ({ authenticate, history }) => {
         SetJoinedRoom( null );
     }
 
-    const SendMatchRequest = (friend_name)=>{
+    const TwoWayMatchHandler = (context)=>{
+        RemoveRequestData(context.FriendName);
+        AddToMatchesBackend(context.FriendName, context.FriendProfile);
+        RemoveRequestSectionBackend(context.FriendName);
+    }
+
+    const OneWayMatchHandler = (context)=>{
+        axios.put('http://localhost:8000/friend-requests', context);
+    }
+
+    const MatchTypeCheck = (username)=>{
+        const dummy = [...requests];
+        if(dummy.length >= 1){
+            const index = dummy.findIndex((element)=>{
+                return element.sender === username;
+            })
+            if(index !== -1){
+                return true;
+            }
+            return false;
+        }
+        return false;
+    }
+
+    const SendMatchRequest = (friend_name, friend_profile)=>{
         const context = {
             YourName: localStorage.getItem('Username'),
             YourProfile: my_profile_pic,
             FriendName: friend_name,
+            FriendProfile: friend_profile
         };
-        axios.put('http://localhost:8000/friend-requests', context);
+
+        if( MatchTypeCheck(friend_name) ){
+            TwoWayMatchHandler(context);
+        }else{
+            OneWayMatchHandler(context);
+        }
     };
 
     const FetchNewPost = ()=>{
@@ -244,6 +274,7 @@ const MainPage = ({ authenticate, history }) => {
         const dummy = [...post_list];
         // realtime request
         const FriendName = dummy[0].Username;
+        const FriendProfile = dummy[0].ProfilePicture;
         const MyName = localStorage.getItem('Username');
         socket.emit('Send-Friend-Request', FriendName, MyName, my_profile_pic);
 
@@ -254,7 +285,7 @@ const MainPage = ({ authenticate, history }) => {
         }
         dummy.splice(0, 1);
         SetPostList(dummy);
-        SendMatchRequest(FriendName);
+        SendMatchRequest(FriendName, FriendProfile);
         SetReactionBackend(FriendName);
     };
 
@@ -263,6 +294,7 @@ const MainPage = ({ authenticate, history }) => {
         const dummy = [...post_list];
         // realtime request
         const FriendName = dummy[0].Username;
+        const FriendProfile = dummy[0].ProfilePicture;
         const MyName = localStorage.getItem('Username');
         socket.emit('Send-Friend-Request', FriendName, MyName, my_profile_pic);
 
@@ -274,7 +306,7 @@ const MainPage = ({ authenticate, history }) => {
 
         dummy.splice(0, 1);
         SetPostList(dummy);
-        SendMatchRequest(FriendName);
+        SendMatchRequest(FriendName, FriendProfile);
         SetReactionBackend(FriendName);
 
     };
@@ -399,10 +431,10 @@ const MainPage = ({ authenticate, history }) => {
     const AddNotification = (sender, profile)=>{
         if(notification_list){
             const dummy = [...notification_list];
-            dummy.push({sender, profile});
+            dummy.push({sender, ProfilePicture: profile});
             SetNotificationList(dummy);
         }else{
-            SetNotificationList([{sender, profile}]);
+            SetNotificationList([{sender, ProfilePicture: cprofile}]);
         }
         if(current_request_bar_value === 0){
             SetNotificationAlert(true);

diff --git a/server/Middleware/redis-notification-cache.js b/server/Middleware/redis-notification-cache.js
@@ -0,0 +1,15 @@
+import redis from 'redis';
+
+const cache = redis.createClient();
+
+const NotificationCache = (req, res, next)=>{
+    cache.get(`notification/${req.params.Username}`, (err, reply)=>{
+        if(!err && reply){
+            const data = JSON.parse(reply);
+            return res.json(data);
+        }
+        next();
+    });
+}
+
+export default NotificationCache;
diff --git a/server/Routes/notifications.js b/server/Routes/notifications.js
@@ -1,13 +1,18 @@
 import express from 'express';
 import RegistrationModel from '../Models/register-model.js';
+import redis from 'redis';
+import NotificationCache from '../Middleware/redis-notification-cache.js';
 
+const cache = redis.createClient();
 const router = express.Router();
 
-router.get('/:Username', (req, res)=>{
+router.get('/:Username', NotificationCache, (req, res)=>{
     const Username = req.params.Username;
     RegistrationModel.findOne({Username}).exec().then((response)=>{
         if(response){
-            return res.json(response.Notification);
+            cache.set(`notification/${Username}`, JSON.stringify(response.Notification), ()=>{
+                return res.json(response.Notification);
+            })
         }
     })
 })
@@ -22,7 +27,9 @@ router.put('/', (req, res)=>{
             dummy.push({sender: Sender, ProfilePicture});
             response.Notification = dummy;
             response.save().then(()=>{
-                return res.json({ notification_added: true });
+                cache.set(`notification/${Username}`, JSON.stringify(dummy), ()=>{
+                    return res.json({ notification_added: true });
+                })
             })
         }else{
             return res.json({ no_username: true });