From 933036a4d83bbe2b73897fdac2c31473f2f3d8d5 Mon Sep 17 00:00:00 2001
From: Abhishek Pandey <abhishekpandey3188@gmail.com>
Date: Tue, 22 Aug 2023 03:58:18 +0530
Subject: [PATCH 1/3] Feed tutorials set for following users

---
 src/components/HomePage/index.jsx             | 20 ++++--
 .../TutorialPage/components/UserDetails.jsx   | 21 ++++++-
 src/store/actions/profileActions.js           |  2 +-
 src/store/actions/tutorialPageActions.js      | 61 ++++++++++++++++++-
 src/store/actions/tutorialsActions.js         |  1 +
 5 files changed, 95 insertions(+), 10 deletions(-)

diff --git a/src/components/HomePage/index.jsx b/src/components/HomePage/index.jsx
index 8ab6c8db..e8190e6b 100644
--- a/src/components/HomePage/index.jsx
+++ b/src/components/HomePage/index.jsx
@@ -33,7 +33,10 @@ import useWindowSize from "../../helpers/customHooks/useWindowSize";
 import NewTutorial from "../Tutorials/NewTutorial";
 import { useDispatch, useSelector } from "react-redux";
 import { useFirebase, useFirestore } from "react-redux-firebase";
-import { getTutorialFeedData } from "../../store/actions/tutorialPageActions";
+import {
+  getTutorialFeedData,
+  getTutorialFeedIdArray
+} from "../../store/actions/tutorialPageActions";
 
 function HomePage({ background = "white", textColor = "black" }) {
   const classes = useStyles();
@@ -161,10 +164,17 @@ function HomePage({ background = "white", textColor = "black" }) {
     }
   ]);
 
-  const tutorialIdArray = ["9VF7JGNPYmTQe7tdhZfQ"];
-
+  const profileData = useSelector(({ firebase: { profile } }) => profile);
   useEffect(() => {
-    getTutorialFeedData(tutorialIdArray)(firebase, firestore, dispatch);
+    const getFeed = async () => {
+      const tutorialIdArray = await getTutorialFeedIdArray(profileData.uid)(
+        firebase,
+        firestore,
+        dispatch
+      );
+      getTutorialFeedData(tutorialIdArray)(firebase, firestore, dispatch);
+    };
+    getFeed();
   }, []);
   const tutorials = useSelector(
     ({
@@ -174,8 +184,6 @@ function HomePage({ background = "white", textColor = "black" }) {
     }) => homepageFeedArray
   );
 
-  console.log("tutorials array", tutorials);
-
   const notification = () => {};
   const handleChange = (event, newValue) => {
     setValue(newValue);
diff --git a/src/components/TutorialPage/components/UserDetails.jsx b/src/components/TutorialPage/components/UserDetails.jsx
index 88be6a3a..d028eea8 100644
--- a/src/components/TutorialPage/components/UserDetails.jsx
+++ b/src/components/TutorialPage/components/UserDetails.jsx
@@ -5,6 +5,8 @@ import Avatar from "@mui/material/Avatar";
 import { useDispatch, useSelector } from "react-redux";
 import { useFirebase, useFirestore } from "react-redux-firebase";
 import { getUserProfileData } from "../../../store/actions";
+import { isUserFollower } from "../../../store/actions/profileActions";
+import { addUserFollower } from "../../../store/actions";
 const useStyles = makeStyles(() => ({
   container: {
     padding: "20px",
@@ -22,10 +24,13 @@ const User = ({ id, timestamp, showFollowButton, size }) => {
   const dispatch = useDispatch();
   const firebase = useFirebase();
   const firestore = useFirestore();
+  const [isFollowed, setIsFollowed] = useState(true);
   useEffect(() => {
     getUserProfileData(id)(firebase, firestore, dispatch);
   }, [id]);
 
+  const profileData = useSelector(({ firebase: { profile } }) => profile);
+
   const user = useSelector(
     ({
       profile: {
@@ -34,6 +39,19 @@ const User = ({ id, timestamp, showFollowButton, size }) => {
     }) => data
   );
 
+  useEffect(() => {
+    const checkIsFollowed = async () => {
+      const status = await isUserFollower(profileData.uid, user.uid, firestore);
+      setIsFollowed(status);
+      console.log(status);
+    };
+    checkIsFollowed();
+  }, [profileData, user]);
+
+  const followUser = () => {
+    addUserFollower(profileData, user, firestore);
+  };
+
   const getTime = timestamp => {
     return timestamp.toDate().toDateString();
   };
@@ -81,7 +99,8 @@ const User = ({ id, timestamp, showFollowButton, size }) => {
           {showFollowButton && (
             <Button
               variant="contained"
-              disabled
+              onClick={followUser}
+              disabled={isFollowed}
               sx={{
                 borderRadius: "50px",
                 height: "20px",
diff --git a/src/store/actions/profileActions.js b/src/store/actions/profileActions.js
index a1ff6ad9..c3f98a70 100644
--- a/src/store/actions/profileActions.js
+++ b/src/store/actions/profileActions.js
@@ -184,7 +184,7 @@ export const clearUserProfile = () => dispatch => {
   dispatch({ type: actions.CLEAR_USER_PROFILE_DATA_STATE });
 };
 
-const isUserFollower = async (followerId, followingId, firestore) => {
+export const isUserFollower = async (followerId, followingId, firestore) => {
   const followerDoc = await firestore
     .collection("user_followers")
     .doc(`${followingId}_${followerId}`)
diff --git a/src/store/actions/tutorialPageActions.js b/src/store/actions/tutorialPageActions.js
index 0fa0ec24..d8206700 100644
--- a/src/store/actions/tutorialPageActions.js
+++ b/src/store/actions/tutorialPageActions.js
@@ -1,10 +1,67 @@
 import * as actions from "./actionTypes";
 
+export const getTutorialFeedIdArray =
+  uid => async (firebase, firestore, dispatch) => {
+    const followings = await firestore
+      .collection("user_followers")
+      .where("followerId", "==", uid)
+      .get()
+      .then(async docs => {
+        const result = [];
+        for (const doc of docs.docs) {
+          const handle = await firestore
+            .collection("cl_user")
+            .doc(doc.data().followingId)
+            .get()
+            .then(doc => doc.data().handle);
+
+          result.push(handle);
+        }
+        return result;
+      });
+    let followingUsersTutorials = [];
+    if (followings.length > 0) {
+      followingUsersTutorials = await firestore
+        .collection("tutorials")
+        .where("created_by", "in", followings)
+        .orderBy("createdAt", "desc")
+        .limit(50)
+        .get()
+        .then(docs => {
+          const tutorialsArray = [];
+          docs.docs.map(doc => {
+            const tutorialId = doc.id;
+            tutorialsArray.push(tutorialId);
+          });
+          return tutorialsArray;
+        });
+    }
+
+    const newTutorials = await firestore
+      .collection("tutorials")
+      .where("created_by", "not-in", followings)
+      .orderBy("createdAt", "desc")
+      .limit(50)
+      .get()
+      .then(docs => {
+        const tutorialsArray = [];
+        docs.docs.map(doc => {
+          const tutorialId = doc.id;
+          tutorialsArray.push(tutorialId);
+        });
+        return tutorialsArray;
+      });
+
+    const tutorials = followingUsersTutorials + newTutorials;
+
+    return tutorials;
+  };
+
 export const getTutorialFeedData =
-  tutorialIdArray => async (firestore, firebase, dispatch) => {
+  tutorialIdArray => async (firebase, firestore, dispatch) => {
     try {
       dispatch({ type: actions.GET_TUTORIAL_FEED_START });
-      const tutorials = await firebase
+      const tutorials = await firestore
         .collection("tutorials")
         .where("tutorial_id", "in", tutorialIdArray)
         .get();
diff --git a/src/store/actions/tutorialsActions.js b/src/store/actions/tutorialsActions.js
index d69de913..7ab56599 100644
--- a/src/store/actions/tutorialsActions.js
+++ b/src/store/actions/tutorialsActions.js
@@ -137,6 +137,7 @@ export const createTutorial =
           owner,
           summary,
           title,
+          tutorial_id: documentID,
           featured_image: "",
           icon: "",
           url: "",

From 20ac675e43bff42a2446d0583f213d4a1de443bf Mon Sep 17 00:00:00 2001
From: Abhishek Pandey <abhishekpandey3188@gmail.com>
Date: Tue, 22 Aug 2023 04:24:53 +0530
Subject: [PATCH 2/3] Feed tutorials set for following users

---
 src/store/actions/tutorialPageActions.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/store/actions/tutorialPageActions.js b/src/store/actions/tutorialPageActions.js
index d8206700..67060a33 100644
--- a/src/store/actions/tutorialPageActions.js
+++ b/src/store/actions/tutorialPageActions.js
@@ -24,7 +24,6 @@ export const getTutorialFeedIdArray =
       followingUsersTutorials = await firestore
         .collection("tutorials")
         .where("created_by", "in", followings)
-        .orderBy("createdAt", "desc")
         .limit(50)
         .get()
         .then(docs => {
@@ -36,11 +35,11 @@ export const getTutorialFeedIdArray =
           return tutorialsArray;
         });
     }
+    followings.push(uid);
 
     const newTutorials = await firestore
       .collection("tutorials")
       .where("created_by", "not-in", followings)
-      .orderBy("createdAt", "desc")
       .limit(50)
       .get()
       .then(docs => {
@@ -52,7 +51,7 @@ export const getTutorialFeedIdArray =
         return tutorialsArray;
       });
 
-    const tutorials = followingUsersTutorials + newTutorials;
+    const tutorials = followingUsersTutorials.concat(newTutorials);
 
     return tutorials;
   };

From c23d019bd1020f93a420cffbdbd044fbb2150772 Mon Sep 17 00:00:00 2001
From: Abhishek Pandey <abhishekpandey3188@gmail.com>
Date: Thu, 24 Aug 2023 20:24:47 +0530
Subject: [PATCH 3/3] [FIX]:Failing tests

---
 src/store/actions/tutorialPageActions.js | 118 ++++++++++++++---------
 1 file changed, 70 insertions(+), 48 deletions(-)

diff --git a/src/store/actions/tutorialPageActions.js b/src/store/actions/tutorialPageActions.js
index 67060a33..cd993d4b 100644
--- a/src/store/actions/tutorialPageActions.js
+++ b/src/store/actions/tutorialPageActions.js
@@ -2,58 +2,80 @@ import * as actions from "./actionTypes";
 
 export const getTutorialFeedIdArray =
   uid => async (firebase, firestore, dispatch) => {
-    const followings = await firestore
-      .collection("user_followers")
-      .where("followerId", "==", uid)
-      .get()
-      .then(async docs => {
-        const result = [];
-        for (const doc of docs.docs) {
-          const handle = await firestore
-            .collection("cl_user")
-            .doc(doc.data().followingId)
-            .get()
-            .then(doc => doc.data().handle);
+    try {
+      let followings = [];
+      if (uid) {
+        followings = await firestore
+          .collection("user_followers")
+          .where("followerId", "==", uid)
+          .get()
+          .then(async docs => {
+            const result = [];
+            for (const doc of docs.docs) {
+              const handle = await firestore
+                .collection("cl_user")
+                .doc(doc.data().followingId)
+                .get()
+                .then(doc => doc.data().handle);
 
-          result.push(handle);
-        }
-        return result;
-      });
-    let followingUsersTutorials = [];
-    if (followings.length > 0) {
-      followingUsersTutorials = await firestore
-        .collection("tutorials")
-        .where("created_by", "in", followings)
-        .limit(50)
-        .get()
-        .then(docs => {
-          const tutorialsArray = [];
-          docs.docs.map(doc => {
-            const tutorialId = doc.id;
-            tutorialsArray.push(tutorialId);
+              result.push(handle);
+            }
+            return result;
           });
-          return tutorialsArray;
-        });
-    }
-    followings.push(uid);
-
-    const newTutorials = await firestore
-      .collection("tutorials")
-      .where("created_by", "not-in", followings)
-      .limit(50)
-      .get()
-      .then(docs => {
-        const tutorialsArray = [];
-        docs.docs.map(doc => {
-          const tutorialId = doc.id;
-          tutorialsArray.push(tutorialId);
-        });
-        return tutorialsArray;
-      });
+      }
+      let followingUsersTutorials = [];
+      if (followings.length > 0) {
+        followingUsersTutorials = await firestore
+          .collection("tutorials")
+          .where("created_by", "in", followings)
+          .limit(50)
+          .get()
+          .then(docs => {
+            const tutorialsArray = [];
+            docs.docs.map(doc => {
+              const tutorialId = doc.id;
+              tutorialsArray.push(tutorialId);
+            });
+            return tutorialsArray;
+          });
+      }
+      followings.push(uid);
+      let newTutorials = [];
+      if (uid) {
+        newTutorials = await firestore
+          .collection("tutorials")
+          .where("created_by", "not-in", followings)
+          .limit(50)
+          .get()
+          .then(docs => {
+            const tutorialsArray = [];
+            docs.docs.map(doc => {
+              const tutorialId = doc.id;
+              tutorialsArray.push(tutorialId);
+            });
+            return tutorialsArray;
+          });
+      } else {
+        newTutorials = await firestore
+          .collection("tutorials")
+          .limit(50)
+          .get()
+          .then(docs => {
+            const tutorialsArray = [];
+            docs.docs.map(doc => {
+              const tutorialId = doc.id;
+              tutorialsArray.push(tutorialId);
+            });
+            return tutorialsArray;
+          });
+      }
 
-    const tutorials = followingUsersTutorials.concat(newTutorials);
+      const tutorials = followingUsersTutorials.concat(newTutorials);
 
-    return tutorials;
+      return tutorials;
+    } catch (e) {
+      console.log(e);
+    }
   };
 
 export const getTutorialFeedData =