#101 fix fetch projects after delete

planner-api/src/routers/projects.ts

@@ -143,17 +143,32 @@ router.post('/add-user/', authAdminProject, async (req: Request, res: Response):
 /** Remove user from specific project by userId  */
 
 router.delete('/remove-user/:userId', authAdminProject,async (req: Request, res: Response):Promise<Response>=> {
-    console.log('req ', req)
-    const {projectId} = req.body.data;
+    console.log('req.body ', req.body)
+    const {projectId} = req.body;
     const {userId }=req.params;
-    try{
-                await dataSource
-                .createQueryBuilder()
-                .delete()
-                .from(Member)
-                .where("user= :userId", { userId })
-                .andWhere("project=:projectId",{projectId})
-                .execute()
+    console.log('projectId ', projectId, 'userId ',userId )
+
+    try{        
+        const projectMember = await dataSource
+                .getRepository(Member)
+                .findOne({
+                    relations:{
+                        user:true,
+                        project:true
+                    },
+                    where:{
+                        user:{
+                            id:userId
+                        },
+                        project:{
+                            id:projectId
+                        }
+                    }
+                })
+                console.log('projectMember ', projectMember)
+                if(!projectMember) return res.status(404).send({message:"this member is not present"})
+                await Member.delete({id:projectMember.id})
+                console.log('projectMember deleted successfully')
             return res.send({message:"User removed from project successfully" })
             } catch(e){
                 return res.send({message:'Failed to remove user from project'})

planner-front/src/store/actions/projectsActions.js

@@ -40,9 +40,9 @@ const deleteMemberRequest = () => {
         dispatch(deleteMemberRequest());
         try {
           const response = await axios.delete(`/projects/remove-user/${memberId}`, { data: { projectId: projectId}});
-          console.log(response.data)
+          console.log("deleteMember ", response.data)
           dispatch(deleteMemberSuccess())
-          dispatch(fetchProject())
+          dispatch(fetchProject(projectId))
         } catch (error) {
           dispatch(deleteMemberFailure(error.response.data));
         }