#63 added router/tasks/related adress

planner-api/src/fixtures.ts

@@ -68,8 +68,6 @@ const loadFixtures = async () => {
         newTask.title = `Buy ${faker.commerce.productName()}`;
         newTask.description = faker.random.words(4);
         newTask.executor = faker.helpers.arrayElement(users);
-        // newTask.dateTimeDue = null;
-        // newTask.dateTimeStart = null;
         newTask.author = faker.helpers.arrayElement(users);
         newTask.accomplish = accomplish[0];
         newTask.priority = faker.helpers.arrayElement(priorities);
@@ -93,9 +91,7 @@ const loadFixtures = async () => {
         newProject.title = `Project ${faker.random.words(1)}`;
         newProject.color = faker.random.words(1);
         newProject.members = faker.helpers.arrayElements(members,randomIntFromInterval(1, 3))
-        // newProject.admin = faker.helpers.arrayElement(users);
         newProject.tasks= faker.helpers.arrayElements(tasks, randomIntFromInterval(1, 3));
-        // newProject.workers = faker.helpers.arrayElements(users, randomIntFromInterval(1, 3));
         await newProject.save();
         projects.push(newProject)
     }

planner-api/src/routers/tasks.ts

@@ -2,6 +2,8 @@ import express,{Router, Request, Response} from 'express';
 import {Task} from '../models/Task';
 import {myDataSource} from '../app-data-source';
 import { User } from '../models/User';
+import { Member } from '../models/Member';
+import { In } from 'typeorm';
 const router:Router = express.Router();
 const dataSource = myDataSource;
 
@@ -97,6 +99,61 @@ router.get('/my', async (req: Request, res: Response):Promise<Response>=>{
     return res.send({tasks})
 })
 
+
+router.get('/related', async (req: Request, res: Response):Promise<Response>=>{
+    const token = req.get('Authorization');
+    const user = await dataSource
+    .createQueryBuilder()
+    .select("user")
+    .from(User, "user")
+    .where("user.token = :token", { token: token })
+    .getOne()
+    if(!user) return res.status(404).send({Message:'user not found'})
+
+    const rawMembership = await dataSource
+    .createQueryBuilder()
+    .select("member")
+    .from(Member, "member")
+    .leftJoinAndSelect('member.user', 'user' )
+    .leftJoinAndSelect('member.project', 'project' )
+    .leftJoinAndSelect('project.tasks', 'task' )
+    .where("member.userId = :id", { id: user.id })
+    .getMany()
+     let projectIds:any[] = []
+    if (rawMembership.length>0){
+        for (let member of rawMembership){
+            const projectId = member?.project?.id
+            projectIds.push(projectId)
+        }
+    }
+    let tasks :Task[]= []
+    const projectsIdArray = [...new Set(projectIds)]; 
+    const searchByProjectsIdArray:object[] = []
+    for (let projectId of projectsIdArray){
+        searchByProjectsIdArray.push({id:projectId})
+    }
+    if (projectIds.length>0){
+    tasks = await dataSource
+   .getRepository(Task)
+.find({
+        relations:{
+        author:true,
+        executor:true,
+        project:true    
+        },
+        where:{
+        project:
+            {id:In(
+                projectsIdArray
+            )}
+        }
+    })
+
+}
+    return res.send({tasks})
+})
+
+
 router.delete('/:taskId',async (req: Request, res: Response):Promise<Response>=>{
     const taskId = req.params.taskId;
     await myDataSource
@@ -144,7 +201,6 @@ router.put('/',async(req:Request, res:Response)=> {
 
 router.post('/project',async (req: Request, res: Response):Promise<Response>=>{
     let projectArray :string[]= req.body;
-        console.log('projectArray ', projectArray)
     if (projectArray.length===0) {
         const rawTasks = await
         dataSource