#69 fix fixtures

planner-api/src/fixtures.ts

@@ -8,11 +8,12 @@ import { Member, MemberRole } from "./models/Member";
 import { DateTimeTask } from "./models/DateTimeTask";
 
 function randomIntFromInterval(min:number, max:number) { 
-  return Math.floor(Math.random() * (max - min + 1) + min)
+  min = Math.ceil(min);
+  max = Math.floor(max);
+  return Math.floor(Math.random() * (max - min) + min);
 }
-let countUsers = 0
+
 let countMembers =0
-let countProjects = 0
 let countRolesProject=0
 
 const cycleThroughObject=(countKey:number,objectObserve:any):MemberRole=>{
@@ -35,15 +36,6 @@ const cycleArrayOfMembers=(countIndex:number, members:Member[]):Member=>{
 }
 
 
-const cycleArrayOfProjects=(countIndex:number, projects:Project[]):Project=>{
-  let project = projects[countIndex]
-  countIndex++
-  if (countIndex ===projects.length-1){
-    countIndex=0
-  }
-  return project
-}
-
 const loadFixtures = async () => {
   myDataSource
   .initialize()
@@ -86,16 +78,16 @@ const loadFixtures = async () => {
 
     for (let i = 0; i < 20; i++) {
       let dateOfMonth = randomIntFromInterval(20, 30)
-      let deadLineDateOfMonth = randomIntFromInterval(1, 15)
-      let startDateTime = new Date(2022, 11, dateOfMonth, randomIntFromInterval(10, 15), 0, 0);
-      let dueDateTime = new Date(2022, 11, dateOfMonth, randomIntFromInterval(16, 20), 0, 0);
-      let deadLine = new Date(2022, 12, deadLineDateOfMonth, 0, 0, 0);
+      let deadLineDateOfMonth = randomIntFromInterval(1, 10)
+      let startDateTime = new Date(2022, 10, dateOfMonth, randomIntFromInterval(16, 21), 0, 0);
+      let dueDateTime = new Date(2022, 10, dateOfMonth, randomIntFromInterval(22, 22), 0, 0);
+      let deadLine = new Date(2022, 11, deadLineDateOfMonth, 0, 0, 0);
       const newDateTimeTask= new DateTimeTask()
       newDateTimeTask.dateTimeStart=startDateTime;
       newDateTimeTask.dateTimeDue=dueDateTime;
       await newDateTimeTask.save()
       if (i <= 15) {
-        const newTask = new Task();
+        const newTask = new Task(); 
         newTask.title = `Buy ${faker.commerce.productName()}`;
         newTask.description = faker.random.words(4);
         newTask.author = faker.helpers.arrayElement(users);

planner-api/src/routers/projects.ts

@@ -31,7 +31,7 @@ router.get('/my',auth, async (req:Request, res:Response): Promise<Response>=> {
     if (rawProjects.length>0){
         for(let project of rawProjects){
             projectIds.push(project.id
-                )
+                ) 
         }
     }
     const projects = await dataSource

planner-api/src/routers/users.ts

@@ -33,7 +33,7 @@ const users = await dataSource
     .createQueryBuilder("user")
     .getMany()
 return res.send({users})
-})
+}) 
 
 /**create new user*/
 router.post('/', upload.single("avatar"), async (req : Request, res : Response):Promise<object> => {