#63 added router/projects/remove-user & add-user & fix projects/my

planner-api/src/routers/members.ts

+import express,{Router, Request, Response} from 'express';
+import {myDataSource} from '../app-data-source';
 import { Member } from "../models/Member";
+
+const router:Router = express.Router();
+const dataSource = myDataSource;
+
+

planner-api/src/routers/projects.ts

@@ -26,20 +26,35 @@ router.get('/my',async (req:Request, res:Response): Promise<Response>=> {
     if(!user) return res.status(404).send({Message:'user not found'})
 
 
-    const projects = await dataSource
+    const rawProjects = await dataSource
     .createQueryBuilder()
     .from(Project, "project")
-    .select("project")
+    .select(["project.id"])
     .leftJoinAndSelect('project.members', 'member')
     .loadRelationCountAndMap('project.tasks', 'project.tasks')
     .leftJoinAndSelect('member.user', 'user' )
-    .addSelect('member')
     .where('member.userId = :userId',{userId:user.id})
     // .where("project.id = :id", { id: req.params.id })
     // .select(["*","members"])
     // .select("*") 
     .getMany()
-
+    const projectIds = []
+    if (rawProjects.length>0){
+        for(let project of rawProjects){
+            projectIds.push(project.id
+                )
+        }
+    }
+    console.log('projectIds', projectIds)
+    const projects = await dataSource
+    .createQueryBuilder()
+    .from(Project, "project")
+    .select(["project"])
+    .leftJoinAndSelect('project.members', 'member')
+    .loadRelationCountAndMap('project.tasks', 'project.tasks')
+    .leftJoinAndSelect('member.user', 'user')
+    .where('project.id IN(:...projectIds)', {projectIds})
+    .getMany()
     // const projects:Project[] = await dataSource.manager.find(Project)
     return res.send({projects})
 })
@@ -120,4 +135,62 @@ router.get('/user/:userId', async (req : Request, res : Response): Promise<Respo
     return res.send({userProjects})
 })
 
+
+/** Add user to specific project  */
+
+router.post('/add-user/', async (req: Request, res: Response):Promise<Response>=>{
+    const {userId, projectId, roleProject} = req.body;
+    const newMember:Member = new Member();
+    try{
+    newMember.user= userId;
+    newMember.project=projectId
+    newMember.roleProject=roleProject
+    await newMember.save()
+    return res.send({newMember})
+    } catch(e){
+        return res.send({message:"add user to project failed" })
+    }
+    
+})
+
+
+/** Remove user from specific project  */
+
+router.post('/remove-user', async (req: Request, res: Response):Promise<Response>=> {
+    console.log('in delete user')
+    const token = req.get('Authorization');
+    console.log('token ', token)
+    const {userId, projectId} = req.body;
+    console.log('req.body', req.body )
+    const adminOfProject =  await dataSource
+    .createQueryBuilder()
+    .select("user")
+    .from(User, "user")
+    .leftJoinAndSelect("user.membership","member")
+    .leftJoinAndSelect('member.project', 'project' )
+    .where("user.token = :token", { token })
+    .andWhere('project.id=:projectId',{projectId})
+    .andWhere('member.roleProject=:roleProject',{roleProject:'admin'})
+    .getOne()
+    if (!adminOfProject){
+        return res.send({message:'User is not authorized'})
+    } 
+    // return res.send({adminOfProject})
+    
+    console.log('adminOfProject', adminOfProject)
+    try{
+        await dataSource
+        .createQueryBuilder()
+        .delete()
+        .from(Member)
+        .where("user = :userId", { userId })
+        .andWhere("project=:projectId",{projectId})
+        .execute()
+    return res.send({message:"User removed from project successfully" })
+    } catch(e){
+        return res.send({message:'Failed to remove user from project'})
+    }
+}) 
+
+
 export default router;