dsd-meetme / backend

app/Console/Commands/Optimise/Optimise.php

Doc Comments +6 added lines, -5 removed lines

@@ -291,8 +291,9 @@ 
 
     /**
      * @param \Illuminate\Support\Collection $timeSlots
-     * @param bool|true $free if true the array is filled with 1 for timeslots values else with 0 for timeslots values
-     * @return array
+     * @param boolean $free if true the array is filled with 1 for timeslots values else with 0 for timeslots values
+     * @param string[] $ids
+     * @return string[]
      */
     static private function getAvailabilityArray(\Illuminate\Support\Collection $timeSlots, $timeslotsN, $ids, $free = true)
     {
@@ -393,10 +394,10 @@ 
     }
 
     /**
-     * @param array $users
-     * @param array $meetings
+     * @param string[] $users
+     * @param string[] $meetings
      * @param \Illuminate\Support\Collection $usersMeetings
-     * @return array
+     * @return string[]
      */
     static private function getUsersMeetingsArray($users, $meetings, \Illuminate\Support\Collection $usersMeetings)
     {

Spacing +31 added lines, -31 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())
@@ -240,8 +240,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
         });
@@ -253,7 +253,7 @@ 
      */
     static private function convertDuration($duration)
     {
-        return (int)ceil($duration / config('app.timeslots.duration'));
+        return (int) ceil($duration / config('app.timeslots.duration'));
     }
 
     /**
@@ -262,7 +262,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;
@@ -280,13 +280,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?
     }
 
     /**
@@ -296,10 +296,10 @@ 
      */
     static private function getAvailabilityArray(\Illuminate\Support\Collection $timeSlots, $timeslotsN, $ids, $free = true)
     {
-        $ret = [];
+        $ret = [ ];
         foreach ($ids as $id) {
-            if(isset($timeSlots[$id]))
-                $ret = self::fillTimeSlots($ret, $id, $timeSlots[$id], $free ? '1' : '0');
+            if (isset($timeSlots[ $id ]))
+                $ret = self::fillTimeSlots($ret, $id, $timeSlots[ $id ], $free ? '1' : '0');
             $ret = self::fillRow($ret, $id, $timeslotsN, $free ? '0' : '1');
         }
 
@@ -316,9 +316,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;
     }
@@ -333,7 +333,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;
     }
 
@@ -346,8 +346,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;
@@ -366,7 +366,7 @@ 
         $users = collect($this->company->getEmployeesTimeSlots($this->startTime, $this->endTime));
         //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, $solver->getUsers(),
@@ -386,7 +386,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));
@@ -400,14 +400,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;
                 }
             }
         }
@@ -449,7 +449,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();
         }
@@ -462,7 +462,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'));
     }
 
     /**
@@ -474,7 +474,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));
         });
@@ -298,8 +301,9 @@ 
     {
         $ret = [];
         foreach ($ids as $id) {
-            if(isset($timeSlots[$id]))
-                $ret = self::fillTimeSlots($ret, $id, $timeSlots[$id], $free ? '1' : '0');
+            if(isset($timeSlots[$id])) {
+                            $ret = self::fillTimeSlots($ret, $id, $timeSlots[$id], $free ? '1' : '0');
+            }
             $ret = self::fillRow($ret, $id, $timeslotsN, $free ? '0' : '1');
         }
 
@@ -316,8 +320,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;
@@ -332,8 +337,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;
     }
 
@@ -346,8 +352,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;
@@ -386,8 +393,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));
     }