Merge branch 'task-81-fix/put_request_tasks' into 'development'

Task 81 fix/put request tasks

See merge request !52

planner-api/src/helpers.ts

@@ -24,33 +24,39 @@ export const auth = async(req: Request,res: Response, next:NextFunction):Promise
 export const authAuthorOrExecutorOfTask = async(req: Request,res: Response, next:NextFunction):Promise<void | express.Response<Response>>=>{
     const token = req.get('Authorization');
     const {taskId} = req.body
+
     if(!token) return res.status(401).send({Message:'token not exists'})
     req.body={...req.body,executorStatus:false}
     req.body={...req.body,authorStatus:false}
 
-    const executor = await dataSource
-    .createQueryBuilder()
-    .select("user")
-    .from(User, "user")
-    .leftJoinAndSelect("user.tasks", "task")
-    .where("user.token = :token", { token: token })
-    .getOne();
-    console.log('executor', executor)
-    if (executor) {
-        req.body={...req.body,executorStatus:true}
-    } 
-    const author = await dataSource
-    .createQueryBuilder()
-    .select("user")
-    .from(User, "user")
-    .leftJoinAndSelect("user.createdTasks", "task")
-    .where("user.token = :token", { token: token })
-    .getOne();
-    console.log('author', author)
-    if (author) {
+    const task = await dataSource
+    .getRepository(Task)
+    .findOne({
+        relations:{
+            executor:true,
+            author:true,           
+        },
+        where:[
+            {
+            id:taskId,
+            executor:{
+                token:token
+            }
+        },
+        {
+            id:taskId,
+            author:{
+                token:token
+            }
+        },
+    ]})
+    if (!task) return res.status(404).send({message:'task with possible user involved is not found'})
+    if (task?.author?.token === token ) {
         req.body={...req.body,authorStatus:true}
+    } else if(task?.executor?.token === token) {
+        req.body={...req.body,executorStatus:true}
+    } else {
     }
-    if(!author && !executor)return res.status(401).send({Message:'user is not authorized'})
     next()
 };
 

planner-api/src/models/Task.ts

@@ -7,7 +7,8 @@ import {
     ManyToOne,
     OneToOne,
     JoinTable,
-    OneToMany
+    OneToMany,
+    JoinColumn
   } from 'typeorm';
   import {User} from './User';
   import {Project} from './Project';
@@ -28,9 +29,9 @@ import { DateTimeTask } from './DateTimeTask';
     priority: priorityType | null;
     archive:boolean,
     author: User;
+    executor:User;
     project:Project|null;
     dateTimeTasks:DateTimeTask[]|null;
-    executor:User;
   }
 
   @Entity({ name: 'Task' })
@@ -73,8 +74,7 @@ import { DateTimeTask } from './DateTimeTask';
     @ManyToOne(() => User, (user: { tasks: Task[]; }) => user.tasks,{eager : true})
       author!: User;
 
-    @ManyToOne(() =>User, (user: { tasks: Task[]}) => user.tasks,{eager : true,nullable: true, onUpdate:'CASCADE'})
-    @JoinTable()
+    @ManyToOne(() =>User, (user: { tasks: Task[]}) => user.tasks,{nullable: true,cascade: true, onUpdate:'CASCADE', eager : true,})
     executor!: User;
     
     @ManyToOne(()=>Project,(project:{tasks: Task[]}) => project.tasks,{eager : true,nullable: true,onUpdate:'CASCADE'})

planner-api/src/routers/tasks.ts

@@ -25,7 +25,7 @@ router.get('/', async(req:Request, res:Response):Promise<Response> => {
 
 /**create new task */
 router.post('/', auth, async(req:Request, res:Response):Promise<Response>=>{
-    const {user,title,description,project,executor, dateTimeDeadLine,priority} = req.body;
+    const {user,title,description,project,executor,dateTimeStart,dateTimeDue, dateTimeDeadLine,priority} = req.body;
     const newTask = new Task();
     newTask.title = title;
     newTask.description = description;
@@ -35,6 +35,11 @@ router.post('/', auth, async(req:Request, res:Response):Promise<Response>=>{
     newTask.executor= executor;
     newTask.priority = priority;
     await newTask.save(); 
+    const newDateTimeTask = new DateTimeTask();
+        newDateTimeTask.dateTimeStart = dateTimeStart
+        newDateTimeTask.dateTimeDue = dateTimeDue
+        newDateTimeTask.task = newTask
+        await newDateTimeTask.save()
     return res.send({newTask});
 })
 
@@ -153,7 +158,7 @@ router.delete('/:taskId',async (req: Request, res: Response):Promise<Response>=>
 
 /**change of task  by task id */
 router.put('/',authAuthorOrExecutorOfTask,async(req:Request, res:Response)=> {
-    const {authorStatus,executorStatus,taskId,title,description,note, archive,project,dateTimeTaskId,start,due,executor,accomplish,dateTimeDeadLine, dateTimeFactDeadLine,priority} = req.body;
+    const {authorStatus,executorStatus,taskId,title,description,note, archive,project,dateTimeTaskId,dateTimeStart,dateTimeDue,executor,accomplish,dateTimeDeadLine, dateTimeFactDeadLine,priority} = req.body;
     const task = await taskFinderById(taskId)
     if (!task) return res.status(404).send({Message:'task not found'})
     let dateTimeTask = null;
@@ -168,6 +173,12 @@ router.put('/',authAuthorOrExecutorOfTask,async(req:Request, res:Response)=> {
         dateTimeTask = dateTimeTaskData
     }
 
+        if (dateTimeTask!==null) {
+            dateTimeTask.dateTimeStart = dateTimeStart
+            dateTimeTask.dateTimeDue = dateTimeDue
+            await dateTimeTask.save()
+    }   
+    
     if (authorStatus){
         task.title = title
         task.description= description
@@ -177,13 +188,9 @@ router.put('/',authAuthorOrExecutorOfTask,async(req:Request, res:Response)=> {
         task.executor=executor
         task.priority= priority   
     }
-    if(executorStatus && dateTimeTask!==null){
-        dateTimeTask.dateTimeStart = start
-        dateTimeTask.dateTimeDue = due
-        await dateTimeTask.save()
+    if(executorStatus){
         task.note = note
         task.dateTimeFactDeadLine= dateTimeFactDeadLine
-        
     }
     task.accomplish= accomplish
     await task.save()