dsd-meetme / backend

app/Console/Commands/Optimise/Optimise.php

Spacing +30 added lines, -30 removed lines

@@ -85,8 +85,8 @@ 
     {
         $this->startTime = clone $startTime;
         $this->endTime = clone $this->startTime;
-        $this->endTime->add(new \DateInterval('PT' . (($this->max_time_slots + $this->time_slots) *
-                config('app.timeslots.duration')) . 'S'));
+        $this->endTime->add(new \DateInterval('PT'.(($this->max_time_slots + $this->time_slots) *
+                config('app.timeslots.duration')).'S'));
     }
 
     /**
@@ -158,11 +158,11 @@ 
             $solver = $this->setData($solver);
             $solver = $solver->solve();
             $this->solver = $solver;
-        }catch(OptimiseException $e) {
-            if(!$e->isEmpty())
+        } catch (OptimiseException $e) {
+            if (!$e->isEmpty())
                 \Event::fire(new ErrorEvent($this->company, $e->getMessage()));
             throw $e;
-        }catch (\Exception $e) {
+        } catch (\Exception $e) {
             //TODO use the correct exceptions to avoid to share private data
             \Event::fire(new ErrorEvent($this->company, $e->getMessage()));
             throw new OptimiseException('Optimising error', 0, $e);
@@ -207,7 +207,7 @@ 
     {
         //since we consider busy timeslots, we need to get all users
         $users = $this->company->employees->pluck('id')->toArray();
-        if(count($users) == 0)
+        if (count($users) == 0)
             throw ((new OptimiseException("No users for this company"))->withEmpty(true));
         return $solver->setUsers($users);
     }
@@ -223,9 +223,9 @@ 
          * @var $meetings \Illuminate\Support\Collection
          */
         $meetings = collect($this->company->getMeetingsTimeSlots($this->startTime, $this->endTime));
-        if($meetings->count() == 0)
+        if ($meetings->count() == 0)
             throw ((new OptimiseException("No meetings for this week"))->withEmpty(true));
-        $timeslots = $meetings->groupBy('id')->map(function ($item) { //convert timeslots
+        $timeslots = $meetings->groupBy('id')->map(function($item) { //convert timeslots
             return $this->durationConverter($this->timeSlotsConverter($item));
         });
         return $solver->setMeetings($timeslots->keys()->toArray())
@@ -239,8 +239,8 @@ 
      */
     private function durationConverter($item)
     {
-        return $item->each(function ($item2) {
-            $item2->duration = $this->convertDuration((int)$item2->duration);
+        return $item->each(function($item2) {
+            $item2->duration = $this->convertDuration((int) $item2->duration);
             return $item2;
             //TODO try catch
         });
@@ -252,7 +252,7 @@ 
      */
     static private function convertDuration($duration)
     {
-        return (int)ceil($duration / config('app.timeslots.duration'));
+        return (int) ceil($duration / config('app.timeslots.duration'));
     }
 
     /**
@@ -261,7 +261,7 @@ 
      */
     private function timeSlotsConverter($item)
     {
-        return $item->each(function ($item2) {
+        return $item->each(function($item2) {
             $item2->time_start = $this->toTimeSlot($item2->time_start);
             $item2->time_end = $this->toTimeSlot($item2->time_end);
             return $item2;
@@ -279,13 +279,13 @@ 
         $dateTime = new \DateTime($time);
         $diff = $dateTime->diff($this->startTime);
         $diff = explode(':', $diff->format('%R:%d:%h:%i:%s'));
-        $diff = $diff[1] * 86400 + $diff[2] * 3600 + $diff[3] * 60 + $diff[4];
+        $diff = $diff[ 1 ] * 86400 + $diff[ 2 ] * 3600 + $diff[ 3 ] * 60 + $diff[ 4 ];
         //if($diff[0] != '-' && $diff != 0)
         //  throw new OptimiseException('timeslot time <= startTime');
         //TODO fix check
         //TODO check if diff makes sense
         //TODO check upper limit
-        return (int)(round($diff / config('app.timeslots.duration')) + 1); //TODO can round cause overlaps?
+        return (int) (round($diff / config('app.timeslots.duration')) + 1); //TODO can round cause overlaps?
     }
 
     /**
@@ -295,7 +295,7 @@ 
      */
     static private function getAvailabilityArray(\Illuminate\Support\Collection $timeSlots, $timeslotsN, $free = true)
     {
-        $ret = [];
+        $ret = [ ];
         foreach ($timeSlots as $id => $timeSlots2) {
             $ret = self::fillTimeSlots($ret, $id, $timeSlots2, $free ? '1' : '0');
             $ret = self::fillRow($ret, $id, $timeslotsN, $free ? '0' : '1');
@@ -314,9 +314,9 @@ 
     static private function fillTimeSlots(array $array, $id, \Illuminate\Support\Collection $timeSlots, $fill = '0')
     {
         foreach ($timeSlots as $timeSlot) {
-            if (!isset($array[$id]))
-                $array[$id] = [];
-            $array[$id] = self::arrayPadInterval($array[$id], $timeSlot->time_start, $timeSlot->time_end, $fill);
+            if (!isset($array[ $id ]))
+                $array[ $id ] = [ ];
+            $array[ $id ] = self::arrayPadInterval($array[ $id ], $timeSlot->time_start, $timeSlot->time_end, $fill);
         }
         return $array;
     }
@@ -331,7 +331,7 @@ 
     static private function arrayPadInterval(array $array, $from, $to, $pad = '0')
     {
         for ($i = $from; $i < $to; $i++)
-            $array[$i] = $pad;
+            $array[ $i ] = $pad;
         return $array;
     }
 
@@ -344,8 +344,8 @@ 
     static private function fillRow(array $array, $id, $until, $fill = '0')
     {
         for ($i = 1; $i <= $until; $i++) {
-            if (!isset($array[$id][$i]))
-                $array[$id][$i] = $fill;
+            if (!isset($array[ $id ][ $i ]))
+                $array[ $id ][ $i ] = $fill;
         }
 
         return $array;
@@ -362,9 +362,9 @@ 
          * @var $users \Illuminate\Support\Collection
          */
         $users = collect($this->company->getEmployeesTimeSlots($this->startTime, $this->endTime));
-        if($users->count() == 0)
+        if ($users->count() == 0)
             throw ((new OptimiseException("No users for this company"))->withEmpty(true));
-        $timeslots = $users->groupBy('id')->map(function ($item) { //convert timeslots
+        $timeslots = $users->groupBy('id')->map(function($item) { //convert timeslots
             return $this->timeSlotsConverter($item);
         });
         return $solver->setUsersAvailability(self::getAvailabilityArray($timeslots, $this->time_slots, false));
@@ -383,7 +383,7 @@ 
          * @var $usersMeetings \Illuminate\Support\Collection
          */
         $usersMeetings = collect($this->company->getUsersMeetings($users, $meetings))->groupBy('employee_id');
-        if($usersMeetings->count() == 0)
+        if ($usersMeetings->count() == 0)
             throw ((new OptimiseException("No users for any meeting"))->withEmpty(true));
 
         return $solver->setUsersMeetings(self::getUsersMeetingsArray($users, $meetings, $usersMeetings));
@@ -397,14 +397,14 @@ 
      */
     static private function getUsersMeetingsArray($users, $meetings, \Illuminate\Support\Collection $usersMeetings)
     {
-        $ret = [];
+        $ret = [ ];
         foreach ($users as $user) {
             $usersMeetingsTmp = $usersMeetings->get($user);
             foreach ($meetings as $meeting) {
                 if ($usersMeetingsTmp->contains('meeting_id', $meeting)) {
-                    $ret[$user][$meeting] = 1;
+                    $ret[ $user ][ $meeting ] = 1;
                 } else {
-                    $ret[$user][$meeting] = 0;
+                    $ret[ $user ][ $meeting ] = 0;
                 }
             }
         }
@@ -446,7 +446,7 @@ 
     {
         $meetings = $solver->getYResults();
         foreach ($meetings as $id => $meeting) {
-            $meetingO = \plunner\Meeting::findOrFail($id);//TODO catch error
+            $meetingO = \plunner\Meeting::findOrFail($id); //TODO catch error
             $meetingO->start_time = $this->toDateTime(array_search('1', $meeting));
             $meetingO->save();
         }
@@ -459,7 +459,7 @@ 
     private function toDateTime($timeslot)
     {
         $ret = clone $this->startTime;
-        return $ret->add(new \DateInterval('PT' . (($timeslot - 1) * config('app.timeslots.duration')) . 'S'));
+        return $ret->add(new \DateInterval('PT'.(($timeslot - 1) * config('app.timeslots.duration')).'S'));
     }
 
     /**
@@ -471,7 +471,7 @@ 
         foreach ($employeesMeetings as $eId => $employeeMeetings) {
             $employee = \plunner\Employee::findOrFail($eId);
             $employeeMeetings = collect($employeeMeetings);
-            $employeeMeetings = $employeeMeetings->filter(function ($item) {
+            $employeeMeetings = $employeeMeetings->filter(function($item) {
                 return $item == 1;
             });
             $employee->meetings()->attach($employeeMeetings->keys()->toArray());

Braces +26 added lines, -18 removed lines

@@ -158,11 +158,12 @@ 
             $solver = $this->setData($solver);
             $solver = $solver->solve();
             $this->solver = $solver;
-        }catch(OptimiseException $e) {
-            if(!$e->isEmpty())
-                \Event::fire(new ErrorEvent($this->company, $e->getMessage()));
+        } catch(OptimiseException $e) {
+            if(!$e->isEmpty()) {
+                            \Event::fire(new ErrorEvent($this->company, $e->getMessage()));
+            }
             throw $e;
-        }catch (\Exception $e) {
+        } catch (\Exception $e) {
             //TODO use the correct exceptions to avoid to share private data
             \Event::fire(new ErrorEvent($this->company, $e->getMessage()));
             throw new OptimiseException('Optimising error', 0, $e);
@@ -207,8 +208,9 @@ 
     {
         //since we consider busy timeslots, we need to get all users
         $users = $this->company->employees->pluck('id')->toArray();
-        if(count($users) == 0)
-            throw ((new OptimiseException("No users for this company"))->withEmpty(true));
+        if(count($users) == 0) {
+                    throw ((new OptimiseException("No users for this company"))->withEmpty(true));
+        }
         return $solver->setUsers($users);
     }
 
@@ -223,8 +225,9 @@ 
          * @var $meetings \Illuminate\Support\Collection
          */
         $meetings = collect($this->company->getMeetingsTimeSlots($this->startTime, $this->endTime));
-        if($meetings->count() == 0)
-            throw ((new OptimiseException("No meetings for this week"))->withEmpty(true));
+        if($meetings->count() == 0) {
+                    throw ((new OptimiseException("No meetings for this week"))->withEmpty(true));
+        }
         $timeslots = $meetings->groupBy('id')->map(function ($item) { //convert timeslots
             return $this->durationConverter($this->timeSlotsConverter($item));
         });
@@ -314,8 +317,9 @@ 
     static private function fillTimeSlots(array $array, $id, \Illuminate\Support\Collection $timeSlots, $fill = '0')
     {
         foreach ($timeSlots as $timeSlot) {
-            if (!isset($array[$id]))
-                $array[$id] = [];
+            if (!isset($array[$id])) {
+                            $array[$id] = [];
+            }
             $array[$id] = self::arrayPadInterval($array[$id], $timeSlot->time_start, $timeSlot->time_end, $fill);
         }
         return $array;
@@ -330,8 +334,9 @@ 
      */
     static private function arrayPadInterval(array $array, $from, $to, $pad = '0')
     {
-        for ($i = $from; $i < $to; $i++)
-            $array[$i] = $pad;
+        for ($i = $from; $i < $to; $i++) {
+                    $array[$i] = $pad;
+        }
         return $array;
     }
 
@@ -344,8 +349,9 @@ 
     static private function fillRow(array $array, $id, $until, $fill = '0')
     {
         for ($i = 1; $i <= $until; $i++) {
-            if (!isset($array[$id][$i]))
-                $array[$id][$i] = $fill;
+            if (!isset($array[$id][$i])) {
+                            $array[$id][$i] = $fill;
+            }
         }
 
         return $array;
@@ -362,8 +368,9 @@ 
          * @var $users \Illuminate\Support\Collection
          */
         $users = collect($this->company->getEmployeesTimeSlots($this->startTime, $this->endTime));
-        if($users->count() == 0)
-            throw ((new OptimiseException("No users for this company"))->withEmpty(true));
+        if($users->count() == 0) {
+                    throw ((new OptimiseException("No users for this company"))->withEmpty(true));
+        }
         $timeslots = $users->groupBy('id')->map(function ($item) { //convert timeslots
             return $this->timeSlotsConverter($item);
         });
@@ -383,8 +390,9 @@ 
          * @var $usersMeetings \Illuminate\Support\Collection
          */
         $usersMeetings = collect($this->company->getUsersMeetings($users, $meetings))->groupBy('employee_id');
-        if($usersMeetings->count() == 0)
-            throw ((new OptimiseException("No users for any meeting"))->withEmpty(true));
+        if($usersMeetings->count() == 0) {
+                    throw ((new OptimiseException("No users for any meeting"))->withEmpty(true));
+        }
 
         return $solver->setUsersMeetings(self::getUsersMeetingsArray($users, $meetings, $usersMeetings));
     }

app/Console/Commands/Optimise/OptimiseCommand.php

Spacing +6 added lines, -6 removed lines

@@ -70,17 +70,17 @@ 
      */
     private function makeForeground(Company $company)
     {
-        $this->info('Optimisation company ' . $company->id . ' started');
+        $this->info('Optimisation company '.$company->id.' started');
         try {
             (new Optimise($company, $this->schedule, $this->laravel))->optimise()->save();
-            $this->info('Optimisation ' . $company->id . ' completed');
-        }catch(OptimiseException $e) {
+            $this->info('Optimisation '.$company->id.' completed');
+        } catch (OptimiseException $e) {
             if ($e->isEmpty()) {
-                $mex = 'Company ' . $company->id . ' doesn\'t have sufficient data';
+                $mex = 'Company '.$company->id.' doesn\'t have sufficient data';
                 $this->warn($mex);
                 \Log::info($mex);
             } else {
-                $mex = 'Error during optimisation of company ' . $company->id . ': ' . $e->getMessage();
+                $mex = 'Error during optimisation of company '.$company->id.': '.$e->getMessage();
                 $this->error($mex);
                 //TODO log cause, but don't send it to the user
                 //\Log::error($mex); //already logged in listener
@@ -109,7 +109,7 @@ 
      */
     private function makeBackground(Company $company)
     {
-        $event = $this->schedule->command('optimise:meetings ' . $company->id)->withoutOverlapping();
+        $event = $this->schedule->command('optimise:meetings '.$company->id)->withoutOverlapping();
         if ($event->isDue($this->laravel))
             $event->run($this->laravel);
     }

Braces +15 added lines, -11 removed lines

@@ -58,10 +58,11 @@ 
         //TODO insert a timeout
         //TODO try...catch with destruct
         $companyId = $this->argument('companyId');
-        if (is_numeric($companyId))
-            $this->makeForeground(Company::findOrFail($companyId));
-        else
-            $this->syncAll();
+        if (is_numeric($companyId)) {
+                    $this->makeForeground(Company::findOrFail($companyId));
+        } else {
+                    $this->syncAll();
+        }
     }
 
     /**
@@ -74,7 +75,7 @@ 
         try {
             (new Optimise($company, $this->schedule, $this->laravel))->optimise()->save();
             $this->info('Optimisation ' . $company->id . ' completed');
-        }catch(OptimiseException $e) {
+        } catch(OptimiseException $e) {
             if ($e->isEmpty()) {
                 $mex = 'Company ' . $company->id . ' doesn\'t have sufficient data';
                 $this->warn($mex);
@@ -94,13 +95,15 @@ 
         if ($this->option('background')) {
             \Log::debug(self::BACKGROUND_MOD_MEX);
             $this->info(self::BACKGROUND_MOD_MEX);
-            foreach ($companies as $company)
-                $this->makeBackground($company);
+            foreach ($companies as $company) {
+                            $this->makeBackground($company);
+            }
             \Log::debug(self::BACKGROUND_COMPLETED_MEX);
             $this->info(self::BACKGROUND_COMPLETED_MEX);
-        } else
-            foreach ($companies as $company)
+        } else {
+                    foreach ($companies as $company)
                 $this->makeForeground($company);
+        }
     }
 
     /**
@@ -110,7 +113,8 @@ 
     private function makeBackground(Company $company)
     {
         $event = $this->schedule->command('optimise:meetings ' . $company->id)->withoutOverlapping();
-        if ($event->isDue($this->laravel))
-            $event->run($this->laravel);
+        if ($event->isDue($this->laravel)) {
+                    $event->run($this->laravel);
+        }
     }
 }

app/Console/Commands/SyncCaldav/Sync.php

Spacing +12 added lines, -12 removed lines

@@ -110,9 +110,9 @@ 
         $caldavClient = new SimpleCaldavAdapter();
         $caldavClient->connect($this->calendar->url, $this->calendar->username, \Crypt::decrypt($this->calendar->password));
         $calendars = $caldavClient->findCalendars();
-        if(!isset($calendars[$this->calendar->calendar_name]))
+        if (!isset($calendars[ $this->calendar->calendar_name ]))
             throw new CaldavException("calendar inserted doesn't exist");
-        $caldavClient->setCalendar($calendars[$this->calendar->calendar_name]);
+        $caldavClient->setCalendar($calendars[ $this->calendar->calendar_name ]);
         /**
          * 26 hours before to avoid tiemezone problems and dst problems
          * 30 days after
@@ -128,15 +128,15 @@ 
     {
         $pattern = "/^((DTSTART;)|(DTEND;))(.*)\$/m";
         if (preg_match_all($pattern, $event->getData(), $matches)) {
-            if (!isset($matches[4]) || count($matches[4]) != 2)
+            if (!isset($matches[ 4 ]) || count($matches[ 4 ]) != 2)
                 return null;
-            $ret = [];
-            if ($tmp = $this->parseDate($matches[4][0]))
-                $ret['time_start'] = $tmp;
+            $ret = [ ];
+            if ($tmp = $this->parseDate($matches[ 4 ][ 0 ]))
+                $ret[ 'time_start' ] = $tmp;
             else
                 return null;
-            if ($tmp = $this->parseDate($matches[4][1]))
-                $ret['time_end'] = $tmp;
+            if ($tmp = $this->parseDate($matches[ 4 ][ 1 ]))
+                $ret[ 'time_end' ] = $tmp;
             else
                 return null;
             return $ret;
@@ -152,10 +152,10 @@ 
     {
         $pattern = "/^((TZID=)|(VALUE=))(.*):(.*)\$/m";
         if (preg_match_all($pattern, $date, $matches)) {
-            if ($matches[1][0] == 'TZID=') {
-                return \DateTime::createFromFormat('Ymd\THis', $matches[5][0], new \DateTimeZone($matches[4][0]));
-            } else if ($matches[1][0] == 'VALUE=' && $matches[4][0] == 'DATE') {
-                return \DateTime::createFromFormat('Ymd\THis', $matches[5][0] . 'T000000');
+            if ($matches[ 1 ][ 0 ] == 'TZID=') {
+                return \DateTime::createFromFormat('Ymd\THis', $matches[ 5 ][ 0 ], new \DateTimeZone($matches[ 4 ][ 0 ]));
+            } else if ($matches[ 1 ][ 0 ] == 'VALUE=' && $matches[ 4 ][ 0 ] == 'DATE') {
+                return \DateTime::createFromFormat('Ymd\THis', $matches[ 5 ][ 0 ].'T000000');
             }
         }
         return null;

app/Listeners/Caldav/OkListener.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
     {
         //
         $calendar = $event->getCalendar();
-        \Log::info('caldav (calendar id = ' . $calendar->calendar_id . ') correctly synchronized');
+        \Log::info('caldav (calendar id = '.$calendar->calendar_id.') correctly synchronized');
         //$calendar = $event->getCalendar()->fresh();
         $calendar->sync_errors = '';
         $calendar->save();

app/Listeners/Optimise/ErrorListener.php

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
     public function handle(ErrorEvent $event)
     {
         //
-        \Log::error('problems during optimise (company id = ' . $event->getCompany()->id . '): ' . $event->getError());
+        \Log::error('problems during optimise (company id = '.$event->getCompany()->id.'): '.$event->getError());
         $company = $event->getCompany();
         //$company = $event->getCompany()->fresh();
         self::sendEmail($company->email, $event->getError());
@@ -37,7 +37,7 @@ 
      */
     static private function sendEmail($email, $error)
     {
-        \Mail::queue('emails.optimise.error', ['error' => $error], function ($message) use ($email) {
+        \Mail::queue('emails.optimise.error', [ 'error' => $error ], function($message) use ($email) {
             $message->from(config('mail.from.address'), config('mail.from.name'));
             $message->to($email)->subject('Problems during optimisation');
         });

app/Listeners/Optimise/OkListener.php

Spacing +5 added lines, -5 removed lines

@@ -25,14 +25,14 @@ 
     public function handle(OkEvent $event)
     {
         //
-        \Log::info('Meeting correctly optimised (company id = ' . $event->getCompany()->id . ')');
+        \Log::info('Meeting correctly optimised (company id = '.$event->getCompany()->id.')');
         $company = $event->getCompany()->fresh();
         //send email to company
         self::sendCompanyEmail($company->email);
         //send emails to employees
-        $employees = $company->employees()->with(['meetings'=>function($query){
+        $employees = $company->employees()->with([ 'meetings'=>function($query) {
             $query->where('start_time', '>=', new \DateTime());
-        }])->get();
+        } ])->get();
         foreach ($employees as $employee)
             self::sendEmployeeEmail($employee->email, $employee->meetings);
     }
@@ -42,7 +42,7 @@ 
      */
     static private function sendCompanyEmail($email)
     {
-        \Mail::queue('emails.optimise.ok.company', [], function ($message) use ($email) {
+        \Mail::queue('emails.optimise.ok.company', [ ], function($message) use ($email) {
             $message->from(config('mail.from.address'), config('mail.from.name'));
             $message->to($email)->subject('Meetings optimised');
         });
@@ -54,7 +54,7 @@ 
      */
     static private function sendEmployeeEmail($email, $meetings)
     {
-        \Mail::queue('emails.optimise.ok.employee', ['meetings' => $meetings], function ($message) use ($email) {
+        \Mail::queue('emails.optimise.ok.employee', [ 'meetings' => $meetings ], function($message) use ($email) {
             $message->from(config('mail.from.address'), config('mail.from.name'));
             $message->to($email)->subject('Meetings of next week');
         });