Merge pull request #1275 from Ayushmaanagarwal1211/Bugs

mdazfar2 · web-flow · commit ddfbd0736388 · 2024-08-01T16:52:12.000+05:30
Created Backend for adding related users to the question and created a model for that
diff --git a/website3.0/components/forumpage/ForumPost.js b/website3.0/components/forumpage/ForumPost.js
@@ -130,7 +130,7 @@ function ForumPost({theme,id,finalUser,setMsg,setIsPopup}) {
         id:id,
         authorImage:finalUser.image1,
         authorName:finalUser.name,
-        userId:finalUser._id
+        userId:finalUser._id,
       })
     })
     let date=Date.now()
diff --git a/website3.0/pages/ForumPage.js b/website3.0/pages/ForumPage.js
@@ -92,12 +92,19 @@ function ForumPage({ theme,finalUser,setIsPopup,setMsg }) {
   const router = useRouter();
   const [hoveredUser, setHoveredUser] = useState(null);
   const [cursorPosition, setCursorPosition] = useState({ x: 0, y: 0 });
+  let [users,setUsers]=useState([])
   let [top,setTop]=useState([])
   const [isClosed,setIsClosed]=useState(false)
   let [sortedArray,setSortedArray]=useState([])
-  const handleMouseEnter = (event, userImg) => {
+  const handleMouseEnter =async (event, userImg) => {
     setCursorPosition({ x: event.clientX, y: event.clientY });
-    setHoveredUser(userImg);
+    let obj={...userImg}
+    console.log(userImg)
+    let u=await fetch("/api/getuser",{method:"POST",body:JSON.stringify({id:userImg.authorId})})
+    u=await u.json()
+    u=u.msg
+    obj={...obj,count:Object.keys(u.followers).length,questions:u.questions,answers:u.answers}
+    setHoveredUser(obj);
   };
 
   const handleMouseLeave = () => {
@@ -130,29 +137,54 @@ function ForumPage({ theme,finalUser,setIsPopup,setMsg }) {
   useEffect(()=>{
     fetchData()
   },[])
-  async function fetchData(){
-    let data=await fetch("/api/createquestion",{method:"GET"})
-    data=await data.json()
-    data=data.data
-    let arr=data.filter((data)=>data.createdAt!==undefined)
-    arr=arr.sort((a,b)=>a.createdAt-b.createdAt)
-    // data=data.sort((a,b)=>b.dateTime-a.dateTime)
-    setSortedArray([...arr])
-    let arr1=arr.sort((a,b)=>b.views-a.views)
-    setTop([...arr1])
-    console.log(data,'dsjidddddddddddd')
-  data.reverse()
-    setIssues([...data])
-    setOriginalIssues([...data])
-  }
+  useEffect(()=>{
+    console.log(users,'users')
+  },[users])
+  async function fetchData() {
+    try {
+        // Fetch initial data
+        let response = await fetch("/api/createquestion", { method: "GET" });
+        let data = await response.json();
+        data = data.data;
+
+        // Filter out items without 'createdAt'
+        let arr = data.filter(item => item.createdAt !== undefined);
+
+        // Create an empty object to store user messages
+        let obj1 = [];
+
+        // Collect all user IDs to fetch in parallel
+        let userPromises = data.flatMap(item =>
+            item.relatedUser.map(async (userRef) => {
+                console.log(userRef)
+             setUsers(prev=>[...prev,userRef.authorId])
+                
+            })
+          );      
+        // Sort and update state
+        arr = arr.sort((a, b) => a.createdAt - b.createdAt);
+        setSortedArray([...arr]);
+
+        let arr1 = [...arr].sort((a, b) => b.views - a.views);
+        setTop([...arr1]);
+
+        // Reverse the data and update state
+        data.reverse();
+        setIssues([...data]);
+        setOriginalIssues([...data]);
+
+    } catch (error) {
+        console.error("Error fetching data:", error);
+    }
+}
+
   let search=useRef()
 function handleSearch(){
     let arr=originalIssues
     let value=search.current.value
     if(value.length==0){
       setIssues([...originalIssues])
     }
-    console.log(value)
     value=value.toLowerCase()
     arr=arr.filter((data)=>data.title.toLowerCase().includes(value))
     setIssues([...arr])
@@ -509,16 +541,18 @@ const handlePageChange = (page) => {
 
                         <div className="flex max-md:pl-[50px] max-sm:gap-[1rem] max-sm:items-center items-center gap-6 max-sm:mt-2 text-gray-500 flex-wrap">
                           <div className="flex items-center gap-1 hover:gap-2  transition-all duration-500 mt-2 max-sm:mt-0">
-                            {issue?.discussionUsers?.map((userImg, idx) => (
-                              <img
-                                key={idx}
-                                src={userImg}
-                                alt="Discussion User"
-                                className="rounded-full w-5 h-5"
-                                onMouseEnter={(event) => handleMouseEnter(event, userImg)}
-                                onMouseLeave={handleMouseLeave}
-                              />
-                            ))}
+                          {issue?.relatedUser.map((user, idx) => {
+                        return  <img
+                              key={idx} 
+                              onClick={()=>router.push(`/profile?id=${user.authorId}`)}
+                              src={user.authorImage}
+                              id="img"
+                              alt="Discussion User"
+                              className="rounded-full w-5 h-5"
+                              onMouseEnter={(event) => handleMouseEnter(event, user)}
+                              onMouseLeave={handleMouseLeave}
+                            />
+})}
                           </div>
                           <div onClick={(e)=>handleLike(e,issue)} className=" flex items-center gap-2 max-sm:text-[11px]">
                             <FontAwesomeIcon color={`${finalUser&&issue?.likes?.includes(finalUser._id)?"blue":""}`} icon={faHeart} />
@@ -567,16 +601,16 @@ className="flex items-center gap-4">
 
                       <div className="flex max-md:pl-[50px] max-sm:gap-[1rem] max-sm:items-center items-center gap-6 max-sm:mt-2 text-gray-500 flex-wrap">
                         <div className="flex items-center gap-1 hover:gap-2  transition-all duration-500 mt-2 max-sm:mt-0">
-                          {issue?.discussionUsers?.map((userImg, idx) => (
-                            <img
+                          {issue?.relatedUser.map((user, idx) => {
+                        return  <img
                               key={idx}
-                              src={userImg}
+                              src={user.authorImage}
                               alt="Discussion User"
                               className="rounded-full w-5 h-5"
-                              onMouseEnter={(event) => handleMouseEnter(event, userImg)}
+                              onMouseEnter={(event) => handleMouseEnter(event, user)}
                               onMouseLeave={handleMouseLeave}
                             />
-                          ))}
+})}
                         </div>
                         <div onClick={(e)=>handleLike(e,issue)} className=" flex items-center gap-2 max-sm:text-[11px]">
                           <FontAwesomeIcon color={`${finalUser&&issue?.likes?.includes(finalUser._id)?"blue":""}`} icon={faHeart} />
@@ -595,23 +629,26 @@ className="flex items-center gap-4">
                   </div>
                   ))}
                    {hoveredUser && (
+        <label htmlFor="id">
+
         <div
           className={`forummodal ease-out fixed  border  p-4 w-[400px] h-[200px] rounded-lg ${theme?"bg-white border-gray-300": "bg-[#2b2b2b] border-slate-50 border-[1px] text-gray-400"} shadow-lg`}
           style={{ top: cursorPosition.y + 10, left: cursorPosition.x - 400 }}
         >
          <div className="w-[100%] flex gap-4 items-center">
-           <img src={hoveredUser} alt="Hovered User" className="w-20 h-20 rounded-full" />
+           <img src={hoveredUser.authorImage} alt="Hovered User" className="w-20 h-20 rounded-full" />
           <div className="flex w-[100%] items-start gap-2 h-[100%] justify-center flex-col ">
-            <p>User Name</p>
+            <p>{hoveredUser.authorName}</p>
             <button className={`bg-transparent pt-1 pb-1 pl-3 pr-3 rounded-md border-[1px] border-gray-500 `}>Follow</button>
             </div>
           </div>
           <div className="p-[20px] mt-4 flex gap-6 w-[100%] justify-center">
-            <p className="flex flex-col h-[100%] items-center"><h2>Answers</h2><p>40</p></p>
-            <p className="flex h-[100%] flex-col items-center"><h2>Questions</h2><p>40</p></p>
-            <p className="flex h-[100%] items-center flex-col"><h2>Followers</h2><p>40</p></p>
+            <p className="flex flex-col h-[100%] items-center"><h2>Answers</h2><p>{hoveredUser&&hoveredUser.answers}</p></p>
+            <p className="flex h-[100%] flex-col items-center"><h2>Questions</h2><p>{hoveredUser&&hoveredUser.questions}</p></p>
+            <p className="flex h-[100%] items-center flex-col"><h2>Followers</h2><p>{hoveredUser&&hoveredUser.count}</p></p>
           </div>
         </div>
+        </label>
       )}
                 </div>
               </div>
diff --git a/website3.0/src/app/api/addsolution/route.js b/website3.0/src/app/api/addsolution/route.js
@@ -1,6 +1,7 @@
 import Questions from "@utils/models/question";  // Importing Mongoose model for blog collection
 import mongoose from "mongoose";  // Importing Mongoose for MongoDB interactions
 import { NextResponse } from "next/server";  // Importing Next.js server response utility
+import user from "@utils/models/user"; // Importing Mongoose model for newsletter subscription
 
 
 export async function POST(req) {
@@ -13,8 +14,22 @@ export async function POST(req) {
         // Connect to MongoDB using Mongoose
         await mongoose.connect(MONGO_URI);
         let date= Date.now()
+        let users=await user.findById(userId)
+        users.answers+=1
+        await user.findByIdAndUpdate(userId,{
+            $set:users
+        })
         // Create a new instance of Blogs model with the received payload
         let blog = await Questions.findById(id)
+        let isHave=false
+        blog.relatedUser.map((data)=>{
+            if(data.authorName==authorName){
+                isHave=true
+            }
+        })
+        if(!isHave){
+            blog.relatedUser.push({authorImage:authorImage,authorName:authorName,authorId:userId})
+        }
         blog.solutions.push({ans:ans,authorImage:authorImage,authorName:authorName,isAccepted:false,authorId:userId,date:date})
         // Save the new blog record to MongoDB
         const result = await Questions.findByIdAndUpdate(id,{
diff --git a/website3.0/src/app/api/createquestion/route.js b/website3.0/src/app/api/createquestion/route.js
@@ -1,6 +1,7 @@
 import Questions from "@utils/models/question";  // Importing Mongoose model for blog collection
 import mongoose from "mongoose";  // Importing Mongoose for MongoDB interactions
 import { NextResponse } from "next/server";  // Importing Next.js server response utility
+import user from "@utils/models/user"; // Importing Mongoose model for newsletter subscription
 
 export async function GET(req) {
     try {
@@ -32,7 +33,11 @@ export async function POST(req) {
 
         // Create a new instance of Blogs model with the received payload
         let blog = new Questions(payload);
-
+        let users=await user.findById(payload.authorId)
+        users.questions+=1
+        await user.findByIdAndUpdate(payload.authorId,{
+            $set:users
+        })
         // Save the new blog record to MongoDB
         const result = await blog.save();
         console.log(result)
diff --git a/website3.0/utils/models/question.js b/website3.0/utils/models/question.js
@@ -81,6 +81,10 @@ type:String
   solutions:{
     type:Array,
     default:[]
+  },
+  relatedUser:{
+    type:Array,
+    default:[]
   }
 });
 
diff --git a/website3.0/utils/models/user.js b/website3.0/utils/models/user.js
@@ -47,6 +47,14 @@ const newsletterModel = new mongoose.Schema({
     
     type:Array,
     default:[]
+  },
+  answers:{
+    type:Number,
+    default:0
+  },
+  questions:{
+    type:Number,
+    default:0
   }
 }, {
   timestamps: true // Add timestamps (createdAt, updatedAt)
