dsd-meetme / backend

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

Braces +8 added lines, -5 removed lines

@@ -31,16 +31,19 @@
          */
         $planner = \Auth::user();
         $groups = $planner->groupsManaged();
-        if ($request->query('current'))
-            $groups->with(['meetings' => function ($query) {
+        if ($request->query('current')) {
+                    $groups->with(['meetings' => function ($query) {
                 $query->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)...
-                    $query->where('start_time', '=', NULL);//to be planned
+                    $query->where('start_time', '=', NULL);
+        }
+        //to be planned
                     //datetime to consider timezone, don't use mysql NOW()
                     $query->orWhere('start_time', '>=', new \DateTime());//planned
                 });
             }]);
-        else
-            $groups->with('meetings');
+        else {
+                    $groups->with('meetings');
+        }
         return $groups->get();//both planed and to be planned
     }
 

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

Braces +3 added lines, -2 removed lines

@@ -36,8 +36,9 @@
         $calendar = Calendar::findOrFail($calendarId);
         $this->authorize($calendar);
         $timeslots = $calendar->timeslots();
-        if ($request->query('current'))
-            $timeslots->where('time_start', '>=', new \DateTime());
+        if ($request->query('current')) {
+                    $timeslots->where('time_start', '>=', new \DateTime());
+        }
         return $timeslots->get();
     }
 

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

Braces +15 added lines, -10 removed lines

@@ -33,8 +33,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);
     }
 
@@ -55,8 +56,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);
     }
 
@@ -72,8 +74,9 @@ 
         $this->authorize($group);
         $meeting = Meeting::findOrFail($meetingId);
         $this->authorize($meeting);
-        if ($meeting->start_time != NULL)
-            return Response::json(['error' => 'the meeting is already planned'], 422);
+        if ($meeting->start_time != NULL) {
+                    return Response::json(['error' => 'the meeting is already planned'], 422);
+        }
 
         $input = $request->all();
 
@@ -96,8 +99,9 @@ 
         $this->authorize($group);
         $meeting = Meeting::findOrFail($meetingId);
         $this->authorize($meeting);
-        if ($meeting->start_time != NULL)
-            return Response::json(['error' => 'the meeting is already planned'], 422);
+        if ($meeting->start_time != NULL) {
+                    return Response::json(['error' => 'the meeting is already planned'], 422);
+        }
         $timeslot = MeetingTimeslot::findOrFail($timeslotId);
         $this->authorize($timeslot);
 
@@ -124,8 +128,9 @@ 
         $this->authorize($group);
         $meeting = Meeting::findOrFail($meetingId);
         $this->authorize($meeting);
-        if ($meeting->start_time != NULL)
-            return Response::json(['error' => 'the meeting is already planned'], 422);
+        if ($meeting->start_time != NULL) {
+                    return Response::json(['error' => 'the meeting is already planned'], 422);
+        }
         $timeslot = MeetingTimeslot::findOrFail($timeslotId);
         $this->authorize($timeslot);
 

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

Braces +3 added lines, -2 removed lines

@@ -37,8 +37,9 @@
     {
         $employee = \Auth::user();
         $input = $request->only(['name', 'password']);
-        if (isset($input['password']))
-            $input['password'] = bcrypt($input['password']);
+        if (isset($input['password'])) {
+                    $input['password'] = bcrypt($input['password']);
+        }
         $employee->update($input);
         return $employee;
     }

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

Braces +3 added lines, -2 removed lines

@@ -37,8 +37,9 @@
     {
         $employee = \Auth::user();
         $input = $request->only(['name', 'password']);
-        if (isset($input['password']))
-            $input['password'] = bcrypt($input['password']);
+        if (isset($input['password'])) {
+                    $input['password'] = bcrypt($input['password']);
+        }
         $employee->update($input);
         return $employee;
     }

app/Console/Commands/SyncCaldav/Sync.php

Braces +21 added lines, -16 removed lines

@@ -90,10 +90,11 @@ 
 
         //insert new timeslots
         foreach ($events as $event) {
-            if (!($event = $this->parseEvent($event)))
-                \Event::fire(new ErrorEvent($this->calendar, 'problem during the parsing an event'));
-            else
-                $calendarMain->timeslots()->create($event);
+            if (!($event = $this->parseEvent($event))) {
+                            \Event::fire(new ErrorEvent($this->calendar, 'problem during the parsing an event'));
+            } else {
+                            $calendarMain->timeslots()->create($event);
+            }
         }
         \Event::fire(new OkEvent($this->calendar));
     }
@@ -110,8 +111,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]))
-            throw new CaldavException("calendar inserted doesn't exist");
+        if(!isset($calendars[$this->calendar->calendar_name])) {
+                    throw new CaldavException("calendar inserted doesn't exist");
+        }
         $caldavClient->setCalendar($calendars[$this->calendar->calendar_name]);//TODO error if the calendar name is wrong
         /**
          * 26 hours before to avoid tiemezone problems and dst problems
@@ -128,17 +130,20 @@ 
     {
         $pattern = "/^((DTSTART;)|(DTEND;))(.*)\$/m";
         if (preg_match_all($pattern, $event->getData(), $matches)) {
-            if (!isset($matches[4]) || count($matches[4]) != 2)
-                return null;
+            if (!isset($matches[4]) || count($matches[4]) != 2) {
+                            return null;
+            }
             $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;
-            else
-                return null;
+            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;
+            } else {
+                            return null;
+            }
             return $ret;
         }
         return null;

app/Console/Commands/Optimise/OptimiseCommand.php

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/Http/Middleware/GetUserAndRefresh.php

Braces +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
                 \JWTFactory::setTTL(43200);
                 //config(['jwt.ttl' =>'43200']); //30 days
             }
-        }catch(JWTException $e)
+        } catch(JWTException $e)
         {}
 
         //this to add the remember me mode field in the new token, but we have the custom check that is an useless

app/Console/Commands/Optimise/Optimise.php

Braces +29 added lines, -19 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));
     }
@@ -464,8 +472,10 @@ 
     {
         $ret = clone $this->startTime;
         //TODO check, because the meetings cannot have this date available -> this to avoid errors if we don't have a date for a meeting
-        if ($timeslot <= 1) //false == 0
+        if ($timeslot <= 1) {
+            //false == 0
             return $ret;
+        }
         return $ret->add(new \DateInterval('PT' . (($timeslot - 1) * config('app.timeslots.duration')) . 'S'));
     }