my request not getting more than one bugfix

ElyasMehraein · Apr 30, 2024 · 79faac3 · 79faac3
1 parent ffa2fee
commit 79faac3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/.../requests/acceptOrAskForMoreInfo/route.js → app/api/requests/acceptRequest/route.js b/.../requests/acceptOrAskForMoreInfo/route.js → app/api/requests/acceptRequest/route.js
@@ -7,7 +7,7 @@ import { GET } from "@/app/api/auth/me/route"
 export async function POST(req) {
     const response = await GET(req)
     const user = await response.json()
-    const { MyAnswer, requestID } = await req.json()
+    const { requestID } = await req.json()
 
     const userPrimeJobBusiness = await BusinessModel.findOne({ _id: user.primeJob })
 
@@ -22,8 +22,10 @@ export async function POST(req) {
                 { message: "you are not business Agent" },
                 { status: 406 })
         }
-        const update = MyAnswer === 'accept' ? { acceptedBy: user.primeJob } : { needMoreInfo: user.primeJob };
-        await RequestModel.findOneAndUpdate({ _id: requestID }, update)
+        const Request = await RequestModel.findOne({ _id: requestID })
+        Request.acceptedBy.addToSet(user.primeJob)
+        await Request.save();
+
         return Response.json(
             { message: "your answer added to the Request" },
             { status: 201 }

diff --git a/components/templates/index/Requests/MyRequestFrame.jsx b/components/templates/index/Requests/MyRequestFrame.jsx
@@ -83,21 +83,20 @@ const MyRequestFrame = ({ request }) => {
             </AccordionSummary>
             {
                 < AccordionDetails >
-                    {request.acceptedBy?.map((acceptor) => {
-                        return (
+                    {request.acceptedBy?.map((acceptor) => (
                             <Box key={acceptor._id}>
-                                <ListItemButton  onClick={() => router.push(`/${acceptor.businessName}`)}>
+                                <ListItemButton onClick={() => router.push(`/${acceptor.businessName}`)}>
                                     <ListItemAvatar >
                                         <Avatar sx={{ width: 40, height: 40 }}>
                                             <ItsAvatar isAvatar={acceptor.isAvatar} userCodeOrBusinessBrand={acceptor.businessName} alt="workers avatar" />
                                         </Avatar>
                                     </ListItemAvatar>
-                                    <ListItemText align='right' primary={request.requesterBusiness.businessName} secondary={request.requesterBusiness.businessBrand} />
+                                    <ListItemText align='right' primary={acceptor.businessName} secondary={acceptor.businessBrand} />
+                                    <Typography sx={{ color: 'text.secondary' }}>{acceptor.bio}</Typography>
                                 </ListItemButton>
-                                <Typography sx={{ color: 'text.secondary' }}>{request.requesterBusiness.bio}</Typography>
                             </Box>
-                        )
-                    })}
+                    ))}
+
                 </AccordionDetails>
             }
         </Accordion>

diff --git a/components/templates/index/Requests/OthersRequest.jsx b/components/templates/index/Requests/OthersRequest.jsx
@@ -46,10 +46,10 @@ export default function OthersRequest({ user, distinctGuilds }) {
   const userNonPrimeJobBusinesses = user.businesses.filter(
     (business) => business._id !== user.primeJob
   );
-  
+
   const userPrimeJobBusinessGuild = userPrimeJobBusinesses.map((business) => business.guildname)
   const userNonPrimeJobBusinessesGuilds = userNonPrimeJobBusinesses.map((business) => business.guildname)
-  const userBusinessesGuilds = [...userPrimeJobBusinessGuild,...userNonPrimeJobBusinessesGuilds]
+  const userBusinessesGuilds = [...userPrimeJobBusinessGuild, ...userNonPrimeJobBusinessesGuilds]
 
   useEffect(() => {
     const getRequests = async () => {
@@ -77,11 +77,11 @@ export default function OthersRequest({ user, distinctGuilds }) {
     return Number(business.agentCode) === user.code
   })
 
-  async function acceptOrAskForMoreInfo(MyAnswer, requestID) {
-    const res = await fetch('api/requests/acceptOrAskForMoreInfo', {
+  async function acceptRequest(requestID) {
+    const res = await fetch('api/requests/acceptRequest', {
       method: "POST",
       headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ MyAnswer, requestID })
+      body: JSON.stringify({ requestID })
     })
     if (res.status === 500) {
       console.log("server error", res);
@@ -98,15 +98,15 @@ export default function OthersRequest({ user, distinctGuilds }) {
     const uniqueGuilds = [...new Set(requests.map((request) => request.guild))];
     return uniqueGuilds.map((guild) => (
       <Box key={guild}>
-        <Divider sx={{ mb: 1, fontSize: '12px' ,fontWeight: 'bold'}} className={"text-extrabold"} textAlign="left">
+        <Divider sx={{ mb: 1, fontSize: '12px', fontWeight: 'bold' }} className={"text-extrabold"} textAlign="left">
           {guild}
         </Divider>
         {requests.filter((request) => request.guild === guild).map((request) => {
           const isAlredyAccepted = request.acceptedBy.some((acceptor) => {
             return acceptor === user.primeJob
           })
           return (
-            <Accordion key={request._id} sx={{bgcolor : blue[50]}} >
+            <Accordion key={request._id} sx={{ bgcolor: blue[50] }} >
               <AccordionSummary
                 expandIcon={<ExpandMoreIcon />}
                 aria-controls="panel3-content"
@@ -136,7 +136,7 @@ export default function OthersRequest({ user, distinctGuilds }) {
               <AccordionActions>
                 {isUserAreBusinessAgent &&
                   <>
-                    <Button disabled={isAlredyAccepted} onClick={() => acceptOrAskForMoreInfo("accept", request._id)} variant="outlined">تایید درخواست</Button>
+                    <Button disabled={isAlredyAccepted} onClick={() => acceptRequest(request._id)} variant="outlined">تایید درخواست</Button>
                   </>
 
                 }