dsd-meetme / backend

app/MeetingTimeslot.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
      *
      * @var array
      */
-    protected $fillable = ['time_start', 'time_end'];
+    protected $fillable = [ 'time_start', 'time_end' ];
 
     public function employees()
     {

app/Http/Controllers/Employees/Calendars/CalendarsController.php

Spacing +11 added lines, -11 removed lines

@@ -17,8 +17,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');
     }
 
@@ -66,8 +66,8 @@ 
         $employee = \Auth::user();
         $input = $request->all();
         $calendar = $employee->calendars()->create($input);
-        if(isset($input['password']))
-            $input['password'] = \Crypt::encrypt($input['password']);
+        if (isset($input[ 'password' ]))
+            $input[ 'password' ] = \Crypt::encrypt($input[ 'password' ]);
         $calendar->caldav()->create($input);
         //TODO test
         //TODO validator
@@ -104,17 +104,17 @@ 
         $this->authorize($calendar);
         $input = $request->all();
         $caldav = $calendar->caldav;
-        if($caldav){
+        if ($caldav) {
             $this->validateCaldav($request);
         }
-        if(isset($input['password']))
-            $input['password'] = \Crypt::encrypt($input['password']);
+        if (isset($input[ 'password' ]))
+            $input[ 'password' ] = \Crypt::encrypt($input[ 'password' ]);
         $calendar->update($input);
         //TODO test
         //TODO validator
         //TODO check if caldav exists?
 
-        if($caldav)
+        if ($caldav)
             $caldav->update($input);
         return $calendar;
     }
@@ -148,9 +148,9 @@ 
             $caldavClient->connect($request->input('url'), $request->input('username'), $request->input('password'));
             $calendars = $caldavClient->findCalendars();
             return array_keys($calendars);
-        }catch (\it\thecsea\caldav_client_adapter\CaldavException $e)
+        } catch (\it\thecsea\caldav_client_adapter\CaldavException $e)
         {
-            return Response::json(['error' => $e->getMessage()],422);
+            return Response::json([ 'error' => $e->getMessage() ], 422);
         }
     }
 
@@ -162,7 +162,7 @@ 
         $this->validate($request, [
             'url' => 'required|max:255',
             'username' => 'required|max:255',
-            'password' => ((\Route::current()->getName() == 'companies.calendars.caldav')?'required':''),
+            'password' => ((\Route::current()->getName() == 'companies.calendars.caldav') ? 'required' : ''),
             'calendar_name' => 'required|max:255',
         ]);
     }

app/Employee.php

Spacing +8 added lines, -8 removed lines

@@ -50,14 +50,14 @@ 
      *
      * @var array
      */
-    protected $fillable = ['name', 'email', 'password'];
+    protected $fillable = [ 'name', 'email', 'password' ];
 
     /**
      * The attributes excluded from the model's JSON form.
      *
      * @var array
      */
-    protected $hidden = ['password', 'remember_token', 'pivot'];
+    protected $hidden = [ 'password', 'remember_token', 'pivot' ];
 
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
@@ -88,7 +88,7 @@ 
      * to get all meetings where the user can go user groups with meetings
      * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
      */
-    public function meetings(){
+    public function meetings() {
         //TODO durign the inserting chek if the meeting is of a group of the user
         return $this->belongsToMany(Meeting::class);
     }
@@ -104,16 +104,16 @@ 
     public function getEmailForPasswordReset()
     {
         list(, $caller) = debug_backtrace(false);
-        if(isset($caller['class']))
-            $caller = explode('\\', $caller['class']);
+        if (isset($caller[ 'class' ]))
+            $caller = explode('\\', $caller[ 'class' ]);
         else
             $caller = '';
 
         //check if this function is called by email sender
-        if ((count($caller) && $caller[count($caller) - 1] == 'PasswordBroker') || (defined('HHVM_VERSION') && $caller == ''))
+        if ((count($caller) && $caller[ count($caller) - 1 ] == 'PasswordBroker') || (defined('HHVM_VERSION') && $caller == ''))
             return $this->email;
         //return unique identify for token repository
-        return $this->email . $this->company->id;
+        return $this->email.$this->company->id;
     }
 
     /**
@@ -123,7 +123,7 @@ 
     public function belongsToGroup(Group $group)
     {
         $group = $this->groups()->where('id', $group->id)->first();
-        if(is_object($group) && $group->exists)
+        if (is_object($group) && $group->exists)
             return true;
         return false;
     }

app/Meeting.php

Spacing +2 added lines, -2 removed lines

@@ -46,14 +46,14 @@
      *
      * @var array
      */
-    protected $fillable = ['title', 'description', 'duration'];
+    protected $fillable = [ 'title', 'description', 'duration' ];
 
     /**
      * The attributes excluded from the model's JSON form.
      *
      * @var array
      */
-    protected $hidden = ['pivot'];
+    protected $hidden = [ 'pivot' ];
 
 
     /**

app/Events/Caldav/OkEvent.php

Spacing +1 added lines, -1 removed lines

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

app/Console/Commands/Optimise/OptimiseCommand.php

Spacing +7 added lines, -7 removed lines

@@ -62,7 +62,7 @@ 
 
         //TODO try...catch with destruct
         $companyId = $this->argument('companyId');
-        if(is_numeric($companyId))
+        if (is_numeric($companyId))
             $this->makeForeground(Company::findOrFail($companyId));
         else
             $this->syncAll();
@@ -71,15 +71,15 @@ 
     private function syncAll()
     {
         $calendars = Caldav::all();
-        if($this->option('background')) {
+        if ($this->option('background')) {
             \Log::debug(self::BACKGROUND_MOD_MEX);
             $this->info(self::BACKGROUND_MOD_MEX);
             foreach ($calendars as $calendar)
                 $this->makeBackground($calendar);
             \Log::debug(self::BACKGROUND_COMPLETED_MEX);
             $this->info(self::BACKGROUND_COMPLETED_MEX);
-        }else
-            foreach($calendars as $calendar)
+        } else
+            foreach ($calendars as $calendar)
                 $this->makeForeground($calendar);
     }
 
@@ -90,7 +90,7 @@ 
     private function makeBackground(Company $company)
     {
         $event = $this->schedule->command('optimise:meetings '.$company->id)->withoutOverlapping();
-        if($event->isDue($this->laravel))
+        if ($event->isDue($this->laravel))
             $event->run($this->laravel);
     }
 
@@ -100,8 +100,8 @@ 
      */
     private function makeForeground(Company $company)
     {
-        $this->info('Optimisation company '. $company->id.' started');
+        $this->info('Optimisation company '.$company->id.' started');
         (new Optimise($company))->optimise()->save();
-        $this->info('Optimisation '. $company->id.' completed');
+        $this->info('Optimisation '.$company->id.' completed');
     }
 }

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/Console/Commands/Optimise/Optimise.php

Spacing +38 added lines, -38 removed lines

@@ -24,7 +24,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;
@@ -85,7 +85,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'));
     }
 
     /**
@@ -156,7 +156,7 @@ 
             $solver = $this->setData($solver);
             $solver = $solver->solve();
             $this->solver = $solver;
-        }catch(\Exception $e)
+        } catch (\Exception $e)
         {
             \Event::fire(new ErrorEvent($this->company, $e->getMessage()));
             throw new OptimiseException('Optimising error', 0, $e);
@@ -170,7 +170,7 @@ 
      */
     public function save()
     {
-        if(!($this->solver instanceof Solver)) {
+        if (!($this->solver instanceof Solver)) {
             \Event::fire(new ErrorEvent($this->company, 'solver is not an instace of Solver'));
             throw new OptimiseException('solver is not an instance of Solver');
             return;
@@ -180,7 +180,7 @@ 
         try {
             $this->saveMeetings($this->solver);
             $this->saveEmployeesMeetings($this->solver);
-        }catch(\Exception $e)
+        } catch (\Exception $e)
         {
             \Event::fire(new ErrorEvent($this->company, $e->getMessage()));
             throw new OptimiseException('Optimising error', 0, $e);
@@ -197,8 +197,8 @@ 
     private function saveMeetings(Solver $solver)
     {
         $meetings = $solver->getYResults();
-        foreach($meetings as $id=>$meeting){
-            $meetingO = \plunner\Meeting::findOrFail($id);//TODO catch error
+        foreach ($meetings as $id=>$meeting) {
+            $meetingO = \plunner\Meeting::findOrFail($id); //TODO catch error
             $meetingO->start_time = $this->toDateTime(array_search('1', $meeting));
             $meetingO->save();
         }
@@ -210,11 +210,11 @@ 
     private function saveEmployeesMeetings(Solver $solver)
     {
         $employeesMeetings = $solver->getXResults();
-        foreach($employeesMeetings as $eId =>$employeeMeetings)
+        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());
@@ -272,7 +272,7 @@ 
                 return $this->durationConverter($this->timeSlotsConverter($item));
             });
         return $solver->setMeetings($timeslots->keys()->toArray())
-            ->setMeetingsDuration($meetings->pluck('duration','id')->toArray())
+            ->setMeetingsDuration($meetings->pluck('duration', 'id')->toArray())
             ->setMeetingsAvailability(self::getAvailabilityArray($timeslots, $this->time_slots));
     }
 
@@ -318,15 +318,15 @@ 
      */
     static private function getUsersMeetingsArray($users, $meetings, \Illuminate\Support\Collection $usersMeetings)
     {
-        $ret = [];
-        foreach($users as $user)
+        $ret = [ ];
+        foreach ($users as $user)
         {
             $usersMeetingsTmp = $usersMeetings->get($user);
-            foreach($meetings as $meeting){
-                if($usersMeetingsTmp->contains('meeting_id', $meeting)){
-                    $ret[$user][$meeting] = 1;
-                }else{
-                    $ret[$user][$meeting] = 0;
+            foreach ($meetings as $meeting) {
+                if ($usersMeetingsTmp->contains('meeting_id', $meeting)) {
+                    $ret[ $user ][ $meeting ] = 1;
+                } else {
+                    $ret[ $user ][ $meeting ] = 0;
                 }
             }
         }
@@ -340,7 +340,7 @@ 
      */
     private function durationConverter($item)
     {
-        return $item->each(function($item2){
+        return $item->each(function($item2) {
             $item2->duration = $this->convertDuration((int) $item2->duration);
             return $item2;
             //TODO try catch
@@ -353,7 +353,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;
@@ -366,13 +366,13 @@ 
      * @param bool|true $free if true the array is filled with 1 for timeslots values else with 0 for timeslots values
      * @return array
      */
-    static private function getAvailabilityArray(\Illuminate\Support\Collection $timeSlots, $timeslotsN, $free=true)
+    static private function getAvailabilityArray(\Illuminate\Support\Collection $timeSlots, $timeslotsN, $free = true)
     {
-        $ret = [];
-        foreach($timeSlots as $id=>$timeSlots2)
+        $ret = [ ];
+        foreach ($timeSlots as $id=>$timeSlots2)
         {
-            $ret = self::fillTimeSlots($ret, $id, $timeSlots2, $free?'1':'0');
-            $ret = self::fillRow($ret, $id, $timeslotsN, $free?'0':'1');
+            $ret = self::fillTimeSlots($ret, $id, $timeSlots2, $free ? '1' : '0');
+            $ret = self::fillRow($ret, $id, $timeslotsN, $free ? '0' : '1');
         }
 
         return $ret;
@@ -387,10 +387,10 @@ 
      */
     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);
+        foreach ($timeSlots as $timeSlot) {
+            if (!isset($array[ $id ]))
+                $array[ $id ] = [ ];
+            $array[ $id ] = self::arrayPadInterval($array[ $id ], $timeSlot->time_start, $timeSlot->time_end, $fill);
         }
         return $array;
     }
@@ -403,9 +403,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;
+        for ($i = 1; $i <= $until; $i++) {
+            if (!isset($array[ $id ][ $i ]))
+                $array[ $id ][ $i ] = $fill;
         }
 
         return $array;
@@ -420,8 +420,8 @@ 
      */
     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;
     }
 
@@ -435,14 +435,14 @@ 
     {
         $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 = explode(':', $diff->format('%R:%d:%h:%i:%s'));
+        $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?
     }
 
     /**
@@ -452,7 +452,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'));
     }
 
     /**
@@ -461,6 +461,6 @@ 
      */
     static private function convertDuration($duration)
     {
-        return (int)ceil($duration/self::TIME_SLOT_DURATION);
+        return (int) ceil($duration / self::TIME_SLOT_DURATION);
     }
 }
\ No newline at end of file