dsd-meetme / backend

app/Http/Controllers/Companies/Auth/AuthController.php

Braces +3 added lines, -2 removed lines

@@ -79,8 +79,9 @@
         if ($request->input('remember', false)) {
             config(['jwt.ttl' => '43200']); //30 days
             $this->custom = array_merge($this->custom, ['remember' => 'true']);
-        } else
-            $this->custom = array_merge($this->custom, ['remember' => 'false']);
+        } else {
+                    $this->custom = array_merge($this->custom, ['remember' => 'false']);
+        }
 
         return $this->postLoginOriginal($request);
     }

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

Braces +5 added lines, -3 removed lines

@@ -31,9 +31,11 @@
         $group = Group::findOrFail($groupId);
         $this->authorize($group);
         $meetings = $group->meetings();
-        if ($request->query('current'))
-            $meetings->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)...
-                $query->where('start_time', '=', NULL);//to be planned
+        if ($request->query('current')) {
+                    $meetings->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)...
+                $query->where('start_time', '=', NULL);
+        }
+        //to be planned
                 //datetime to consider timezone, don't use mysql NOW()
                 $query->orWhere('start_time', '>=', new \DateTime());//planned
             });

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/Meetings/MeetingsController.php

Braces +5 added lines, -3 removed lines

@@ -31,9 +31,11 @@
         $group = Group::findOrFail($groupId);
         $this->authorize($group);
         $meetings = $group->meetings();
-        if ($request->query('current'))
-            $meetings->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)...
-                $query->where('start_time', '=', NULL);//to be planned
+        if ($request->query('current')) {
+                    $meetings->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)...
+                $query->where('start_time', '=', NULL);
+        }
+        //to be planned
                 //datetime to consider timezone, don't use mysql NOW()
                 $query->orWhere('start_time', '>=', new \DateTime());//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/Optimise/Optimise.php

Braces +23 added lines, -16 removed lines

@@ -158,9 +158,9 @@ 
             $solver = $this->setData($solver);
             $solver = $solver->solve();
             $this->solver = $solver;
-        }catch(OptimiseException $e) {
+        } catch(OptimiseException $e) {
             throw $e;
-        }catch (\Exception $e) {
+        } catch (\Exception $e) {
             \Event::fire(new ErrorEvent($this->company, $e->getMessage()));
             throw new OptimiseException('Optimising error', 0, $e);
             //TODO catch specif exception
@@ -204,8 +204,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);
     }
 
@@ -220,8 +221,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));
         });
@@ -311,8 +313,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;
@@ -327,8 +330,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;
     }
 
@@ -341,8 +345,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;
@@ -359,8 +364,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);
         });
@@ -380,8 +386,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));
     }