dsd-meetme / backend

app/Console/Commands/Optimise/Optimise.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -9,8 +9,8 @@
 namespace plunner\Console\Commands\Optimise;
 
 use Illuminate\Console\Scheduling\Schedule;
-use plunner\company;
 use plunner\Events\Optimise\ErrorEvent;
+use plunner\company;
 
 /**
  * Class Optimise

Doc Comments +6 added lines, -5 removed lines

@@ -278,8 +278,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 integer $timeslotsN
+     * @return string[]
      */
     static private function getAvailabilityArray(\Illuminate\Support\Collection $timeSlots, $timeslotsN, $free = true)
     {
@@ -374,10 +375,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)
     {

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: claudio
- * Date: 12/12/15
- * Time: 15.41
- */
+     * Created by PhpStorm.
+     * User: claudio
+     * Date: 12/12/15
+     * Time: 15.41
+     */
 
 namespace plunner\Console\Commands\Optimise;
 

Spacing +23 added lines, -23 removed lines

@@ -25,7 +25,7 @@ 
     //TODo max timeslots can be an environment var
     const TIME_SLOT_DURATION = 900; //seconds -> 15 minutes
     const DEFAULT_MAX_TIME_SLOTS = 20; //max duration of a meeting in term of timeslots //20
-    const DEFAULT_TIME_SLOTS = 672;  //total amount of timeslots that must be optimised -> one week 4*24*7 = 672
+    const DEFAULT_TIME_SLOTS = 672; //total amount of timeslots that must be optimised -> one week 4*24*7 = 672
 
     private $max_time_slots = self::DEFAULT_MAX_TIME_SLOTS;
     private $time_slots = self::DEFAULT_TIME_SLOTS;
@@ -86,7 +86,7 @@ 
     {
         $this->startTime = clone $startTime;
         $this->endTime = clone $this->startTime;
-        $this->endTime->add(new \DateInterval('PT' . (($this->max_time_slots + $this->time_slots) * self::TIME_SLOT_DURATION) . 'S'));
+        $this->endTime->add(new \DateInterval('PT'.(($this->max_time_slots + $this->time_slots) * self::TIME_SLOT_DURATION).'S'));
     }
 
     /**
@@ -213,7 +213,7 @@ 
          * @var $meetings \Illuminate\Support\Collection
          */
         $meetings = collect($this->company->getMeetingsTimeSlots($this->startTime, $this->endTime));
-        $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())
@@ -227,8 +227,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
         });
@@ -240,7 +240,7 @@ 
      */
     static private function convertDuration($duration)
     {
-        return (int)ceil($duration / self::TIME_SLOT_DURATION);
+        return (int) ceil($duration / self::TIME_SLOT_DURATION);
     }
 
     /**
@@ -249,7 +249,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;
@@ -267,13 +267,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 / self::TIME_SLOT_DURATION) + 1); //TODO can round cause overlaps?
+        return (int) (round($diff / self::TIME_SLOT_DURATION) + 1); //TODO can round cause overlaps?
     }
 
     /**
@@ -283,7 +283,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');
@@ -302,9 +302,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;
     }
@@ -319,7 +319,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;
     }
 
@@ -332,8 +332,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;
@@ -350,7 +350,7 @@ 
          * @var $users \Illuminate\Support\Collection
          */
         $users = collect($this->company->getEmployeesTimeSlots($this->startTime, $this->endTime));
-        $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));
@@ -381,14 +381,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;
                 }
             }
         }
@@ -428,7 +428,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();
         }
@@ -441,7 +441,7 @@ 
     private function toDateTime($timeslot)
     {
         $ret = clone $this->startTime;
-        return $ret->add(new \DateInterval('PT' . (($timeslot - 1) * self::TIME_SLOT_DURATION) . 'S'));
+        return $ret->add(new \DateInterval('PT'.(($timeslot - 1) * self::TIME_SLOT_DURATION).'S'));
     }
 
     /**
@@ -453,7 +453,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 +9 added lines, -6 removed lines

@@ -302,8 +302,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;
@@ -318,8 +319,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;
     }
 
@@ -332,8 +334,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;

app/Console/Commands/Optimise/OptimiseException.php

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: Claudio Cardinale <cardi@thecsea.it>
- * Date: 07/12/15
- * Time: 21.24
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
+     * Created by PhpStorm.
+     * User: Claudio Cardinale <cardi@thecsea.it>
+     * Date: 07/12/15
+     * Time: 21.24
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 2
+     * of the License, or (at your option) any later version.
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+     */
 
 namespace plunner\Console\Commands\Optimise;
 

app/Events/Optimise/OkEvent.php

Spacing +1 added lines, -1 removed lines

@@ -39,6 +39,6 @@
      */
     public function broadcastOn()
     {
-        return [];
+        return [ ];
     }
 }

app/Events/Optimise/ErrorEvent.php

Spacing +1 added lines, -1 removed lines

@@ -39,6 +39,6 @@
      */
     public function broadcastOn()
     {
-        return [];
+        return [ ];
     }
 }

app/Http/Middleware/GetUserAndRefresh.php

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: Claudio Cardinale <cardi@thecsea.it>
- * Date: 24/12/15
- * Time: 22.53
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
+     * Created by PhpStorm.
+     * User: Claudio Cardinale <cardi@thecsea.it>
+     * Date: 24/12/15
+     * Time: 22.53
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 2
+     * of the License, or (at your option) any later version.
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+     */
 
 namespace plunner\Http\Middleware;
 

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 
         //this to add the remember me mode field in the new token, but we have the custom check that is an useless
         //overhead
-        $custom = $custom . ';remember-' . $remember == 'true' ? 'true' : 'false';
+        $custom = $custom.';remember-'.$remember == 'true' ? 'true' : 'false';
         return parent::handle($request, $next, $custom);
     }
 

app/Http/Controllers/Companies/Company/CompanyController.php

Spacing +3 added lines, -3 removed lines

@@ -10,8 +10,8 @@ 
 {
     public function __construct()
     {
-        config(['auth.model' => \plunner\Company::class]);
-        config(['jwt.user' => \plunner\Company::class]);
+        config([ 'auth.model' => \plunner\Company::class ]);
+        config([ 'jwt.user' => \plunner\Company::class ]);
         $this->middleware('jwt.authandrefresh:mode-cn');
     }
 
@@ -36,7 +36,7 @@ 
     public function update(CompanyRequest $request)
     {
         $company = \Auth::user();
-        $input = $request->only(['name', 'password']);
+        $input = $request->only([ 'name', 'password' ]);
         $company->update($input);
         return $company;
     }

app/Http/Controllers/Employees/Employee/EmployeeController.php

Spacing +3 added lines, -3 removed lines

@@ -10,8 +10,8 @@ 
 {
     public function __construct()
     {
-        config(['auth.model' => \plunner\Employee::class]);
-        config(['jwt.user' => \plunner\Employee::class]);
+        config([ 'auth.model' => \plunner\Employee::class ]);
+        config([ 'jwt.user' => \plunner\Employee::class ]);
         $this->middleware('jwt.authandrefresh:mode-en');
     }
 
@@ -36,7 +36,7 @@ 
     public function update(EmployeeRequest $request)
     {
         $employee = \Auth::user();
-        $input = $request->only(['name', 'password']);
+        $input = $request->only([ 'name', 'password' ]);
         $employee->update($input);
         return $employee;
     }

app/Http/Controllers/Employees/Planners/MeetingsController.php

Spacing +2 added lines, -2 removed lines

@@ -17,8 +17,8 @@
      */
     public function __construct()
     {
-        config(['auth.model' => \plunner\Planner::class]);
-        config(['jwt.user' => \plunner\Planner::class]);
+        config([ 'auth.model' => \plunner\Planner::class ]);
+        config([ 'jwt.user' => \plunner\Planner::class ]);
         $this->middleware('jwt.authandrefresh:mode-en');
     }
 

Unused Use Statements -2 removed lines

@@ -2,11 +2,9 @@
 
 namespace plunner\Http\Controllers\Employees\Planners;
 
-use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Response;
 use plunner\Group;
 use plunner\Http\Controllers\Controller;
-use plunner\Http\Requests;
 use plunner\Http\Requests\Employees\Meeting\MeetingTimeslotRequest;
 use plunner\Meeting;
 use plunner\MeetingTimeslot;

app/Http/Controllers/Employees/Planners/MeetingTimeslotsController.php

Spacing +7 added lines, -7 removed lines

@@ -20,8 +20,8 @@ 
      */
     public function __construct()
     {
-        config(['auth.model' => \plunner\Planner::class]);
-        config(['jwt.user' => \plunner\Planner::class]);
+        config([ 'auth.model' => \plunner\Planner::class ]);
+        config([ 'jwt.user' => \plunner\Planner::class ]);
         $this->middleware('jwt.authandrefresh:mode-en');
     }
 
@@ -39,7 +39,7 @@ 
 
         if ($meeting->group_id == $groupId)
             return $meeting->timeslots;
-        return Response::json(['error' => 'meeting->group_id <> groupId'], 403);
+        return Response::json([ 'error' => 'meeting->group_id <> groupId' ], 403);
     }
 
     /**
@@ -61,7 +61,7 @@ 
 
         if ($meeting->group_id == $groupId && $timeslot->meeting_id == $meetingId)
             return $timeslot;
-        return Response::json(['error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId'], 403);
+        return Response::json([ 'error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId' ], 403);
     }
 
     /**
@@ -83,7 +83,7 @@ 
             $timeslot = $meeting->timeslots()->create($input);
             return $timeslot;
         }
-        return Response::json(['error' => 'meeting->group_id <> groupId'], 403);
+        return Response::json([ 'error' => 'meeting->group_id <> groupId' ], 403);
     }
 
     /**
@@ -107,7 +107,7 @@ 
             $timeslot->update($input);
             return $timeslot;
         }
-        return Response::json(['error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId'], 403);
+        return Response::json([ 'error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId' ], 403);
     }
 
     /**
@@ -131,6 +131,6 @@ 
             $timeslot->delete();
             return $timeslot;
         }
-        return Response::json(['error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId'], 403);
+        return Response::json([ 'error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId' ], 403);
     }
 }

Braces +6 added lines, -4 removed lines

@@ -37,8 +37,9 @@ 
         $meeting = Meeting::findOrFail($meetingId);
         $this->authorize($meeting);
 
-        if ($meeting->group_id == $groupId)
-            return $meeting->timeslots;
+        if ($meeting->group_id == $groupId) {
+                    return $meeting->timeslots;
+        }
         return Response::json(['error' => 'meeting->group_id <> groupId'], 403);
     }
 
@@ -59,8 +60,9 @@ 
         $timeslot = MeetingTimeslot::findOrFail($timeslotId);
         $this->authorize($timeslot);
 
-        if ($meeting->group_id == $groupId && $timeslot->meeting_id == $meetingId)
-            return $timeslot;
+        if ($meeting->group_id == $groupId && $timeslot->meeting_id == $meetingId) {
+                    return $timeslot;
+        }
         return Response::json(['error' => 'meeting->group_id <> groupId || timeslot->meeting_id <> meetingId'], 403);
     }
 

Unused Use Statements -2 removed lines

@@ -2,11 +2,9 @@
 
 namespace plunner\Http\Controllers\Employees\Planners;
 
-use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Response;
 use plunner\Group;
 use plunner\Http\Controllers\Controller;
-use plunner\Http\Requests;
 use plunner\Http\Requests\Employees\Meeting\MeetingTimeslotRequest;
 use plunner\Meeting;
 use plunner\MeetingTimeslot;