#58 tasks/user/:userId resolved

planner-api/src/routers/projects.ts

@@ -3,6 +3,9 @@ import {Project} from '../models/Project';
 import {myDataSource} from '../app-data-source';
 import { User } from '../models/User';
 import { Member, MemberRole } from '../models/Member';
+import { userInfo } from 'os';
+import { Task } from '../models/Task';
+import { getRepository } from 'typeorm';
 
 const router:Router = express.Router();
 const dataSource = myDataSource;
@@ -58,14 +61,28 @@ router.get("/:id",async (req:Request, res:Response): Promise<Response> => {
     .from(Project, "project")
     .leftJoinAndSelect('project.members', 'member')
     .leftJoinAndSelect('member.user', 'user' )
-    .leftJoinAndSelect('project.tasks','task')
     .where("project.id = :id", { id: req.params.id })
     .getOne()
     if (!project) return res.status(404).send({Message:'no info on this project'})
-    return res.send({project})
+    const tasks = await dataSource.getRepository('Task')
+    .find(
+        {
+            relations:{
+                executor:true,
+                author:true,
+            },
+            where:{
+                project:{
+                    id:req.params.id
+                }
+            }
+        }
+    )
+    return res.send({project, tasks})
 })
 
-router.get('/userId/:userId', async (req : Request, res : Response): Promise<Response>=>{
+
+router.get('/user/:userId', async (req : Request, res : Response): Promise<Response>=>{
     const userId:string = req.params.userId
     const userProjects = await dataSource
     .createQueryBuilder()

planner-api/src/routers/tasks.ts

@@ -2,8 +2,6 @@ import express,{Router, Request, Response} from 'express';
 import {Task} from '../models/Task';
 import {myDataSource} from '../app-data-source';
 import { User } from '../models/User';
-import { Project } from '../models/Project';
-import { Member } from '../models/Member';
 const router:Router = express.Router();
 const dataSource = myDataSource;
 
@@ -11,14 +9,18 @@ const dataSource = myDataSource;
 router.get('/', async(req:Request, res:Response):Promise<Response> => {
     const tasks = await dataSource
 .getRepository(Task)
-.find()
+.find({
+    relations:{
+        executor:true,
+        author:true,
+    }})
     return res.send({tasks})
 })
 
 router.post('/', async(req:Request, res:Response):Promise<Response>=>{
     const token = req.get('Authorization');
     const newTask = new Task();
-    const {title,description,project,executors,dateTimeDue,dateTimeStart,accomplish,priority} = req.body;
+    const {title,description,project,dateTimeDue,dateTimeStart,accomplish,priority} = req.body;
     const user = await dataSource
     .createQueryBuilder()
     .select("user")
@@ -29,7 +31,6 @@ router.post('/', async(req:Request, res:Response):Promise<Response>=>{
     newTask.title = title;
     newTask.description = description;
     newTask.project = project;
-    // newTask.executors = executors;
     newTask.dateTimeDue = dateTimeDue;
     newTask.dateTimeStart = dateTimeStart;
     newTask.author= user;
@@ -41,22 +42,26 @@ router.post('/', async(req:Request, res:Response):Promise<Response>=>{
 
 router.get('/user/:userId', async (req: Request, res: Response):Promise<Response>=>{   
     const userId = req.params.userId;
-    // const tasks = await dataSource
-    // .getRepository(Task)
-    // .createQueryBuilder('task')
-    // .innerJoinAndSelect('task.executors', 'user')
-    // .where('user.id = :userId',   {userId :userId})
-    // .getMany()
-    // return res.send({tasks})
     const tasks = await dataSource
-    .getRepository(Member)
-    .createQueryBuilder('member')
-    .innerJoinAndSelect('member.project','project')
-    .innerJoinAndSelect('project.tasks','task')
-    .where('member.user.id = :userId')
-    .andWhere('member.project.id= task.project.id')
-    .select('task.*')
-    .getMany()
+    .getRepository(Task)
+    .find({
+        relations:{
+            executor:true,
+            author:true,
+        },
+    where:[
+        {
+        executor:{
+            id:userId
+        }
+    },
+    {
+        author:{
+            id:userId
+        }
+    },
+]
+})
     return res.send({tasks})
 })
 
@@ -71,10 +76,24 @@ router.get('/my', async (req: Request, res: Response):Promise<Response>=>{
     if(!user) return res.status(404).send({Message:'user not found'})
     const tasks = await dataSource
     .getRepository(Task)
-    .createQueryBuilder('task')
-    .innerJoinAndSelect('task.executors', 'user')
-    .where('user.id = :userId',   {userId :user.id})
-    .getMany()
+    .find({
+        relations:{
+            executor:true,
+            author:true,
+        },
+    where:[
+        {
+        executor:{
+            id:user.id
+        }
+    },
+    {
+        author:{
+            id:user.id
+        }
+    },
+]
+})
     return res.send({tasks})
 })
 
@@ -152,24 +171,4 @@ router.post('/project',async (req: Request, res: Response):Promise<Response>=>{
 
 
 
-// router.post('/projects',async (req: Request, res: Response):Promise<Response>=>{
-//     let projectArray :string[]= req.body;
-//         console.log('projectArray ', projectArray)
-//     if (projectArray.length===0) {
-//         const tasks = await
-//         dataSource
-//        .getRepository(Task)
-//        .createQueryBuilder('task')
-//     //    .innerJoinAndSelect('task.executors', 'user')
-//         .innerJoinAndSelect('task.executors AND task.author', 'user')
-//        .where('task.project IS NULL')
-//        .getMany()
-//        return res.send({tasks})
-//     } 
-
-//     ///ssome code 
-//     return res.send({message:"some other staff"})
-// })
-
-
 export default router;