added personal project creation if project not given at all

planner-api/src/models/Project.ts

@@ -4,12 +4,8 @@ import {
     PrimaryGeneratedColumn,
     CreateDateColumn,
     BaseEntity,
-    ManyToOne,
-    ManyToMany,
     OneToMany,
-    JoinTable
   } from 'typeorm';
-  // import {User} from './User';
   import {Task} from './Task';
   import {Member} from './Member';
 

planner-api/src/routers/copyTasks.ts

@@ -2,24 +2,21 @@ import express,{Router, Request, Response } from 'express';
 import {Task} from '../models/Task';
 import {myDataSource} from '../app-data-source';
 import { DateTimeTask } from '../models/DateTimeTask';
-import { auth, authAuthorOrExecutorOfDateTimeTask, authAuthorOrExecutorOfTask,taskFinderById } from '../helpers';
-import { info } from 'console';
+import {  authAuthorOrExecutorOfDateTimeTask, authAuthorOrExecutorOfTask } from '../helpers';
 const router:Router = express.Router();
 const dataSource = myDataSource;
 
 
 /** make copy of task in calendar view */
 router.post("/make-copy",authAuthorOrExecutorOfTask, async(req:Request, res:Response):Promise<Response>=>{
-    const {taskId, dateTimeDue, dateTimeStart} = req.body;
-    const task = await taskFinderById(taskId);
+    const {taskId, dateTimeDue, dateTimeStart, authorStatus, executorStatus, task} = req.body;
     if(!task) return res.status(401).send({message:'task with possible user involved is not found'})
-    const newDateTimeTask = new DateTimeTask();
-    newDateTimeTask.dateTimeStart = dateTimeStart;
-    newDateTimeTask.dateTimeDue = dateTimeDue;
-    newDateTimeTask.task = taskId;
-    await newDateTimeTask.save();
-    return res.send({task})
-
+        const newDateTimeTask = new DateTimeTask();
+        newDateTimeTask.dateTimeStart = dateTimeStart;
+        newDateTimeTask.dateTimeDue = dateTimeDue;
+        newDateTimeTask.task = taskId;
+        await newDateTimeTask.save();
+        return res.send({task, message:"copyTask created!"})
 } )
 
 /** change date time of copy of task in calendar view */

planner-api/src/routers/tasks.ts

@@ -2,10 +2,11 @@ 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 { Member, MemberRole } from '../models/Member';
 import { In } from 'typeorm';
 import { DateTimeTask } from '../models/DateTimeTask';
 import { auth, authAuthorOrExecutorOfTask, taskFinderById } from '../helpers';
+import { Project } from '../models/Project';
 const router:Router = express.Router();
 const dataSource = myDataSource;
 
@@ -29,7 +30,57 @@ router.post('/', auth, async(req:Request, res:Response):Promise<Response>=>{
     const newTask = new Task();
     newTask.title = title;
     newTask.description = description;
+    if (project) {
+
+        const watcherOfProject = await dataSource
+        .getRepository(Project)
+        .findOne({
+            relations:{
+                members:true,
+        }, 
+        where:
+            {
+            id:project.id,
+            members:
+            {
+                user:{id:user.id},
+                roleProject:MemberRole.WATCHER,
+            },
+            
+        }
+    })
+    console.log ('watcherOfProject ', watcherOfProject)
+    if (watcherOfProject) return res.send({message:"watcher could nt make tasks"})
     newTask.project = project;
+} else {
+    const personalProject = await dataSource
+    .getRepository(Project)
+    .findOne({
+        where:{
+            members:{
+                user:{id:user.id},
+            },
+            title:"Личные дела"
+        }
+    })
+    if(personalProject){
+        newTask.project = personalProject;
+    } else {
+        
+        const newPersonalProject = new Project();
+        newPersonalProject.title="Личные дела";
+        newPersonalProject.color="green";
+        await newPersonalProject.save()
+        newTask.project = newPersonalProject;
+        const newMember = new Member();
+        newMember.user= user;
+        newMember.project=newPersonalProject;
+        newMember.roleProject = MemberRole.ADMIN;
+        await newMember.save();
+        console.log ('newPersonalProject ', newPersonalProject)
+    }
+}
+    
     newTask.dateTimeDeadLine=dateTimeDeadLine;
     newTask.author= user;
     newTask.executor= executor;