dsd-meetme / backend

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

Spacing +6 added lines, -6 removed lines

@@ -11,8 +11,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');
     }
 
@@ -27,10 +27,10 @@ 
         $employee = \Auth::user();
         $meetings = $employee->meetings();
         if ($request->query('current'))
-            $meetings->where(function ($query) { //parenthesis for conditions ...(C1 OR C2)...
-                $query->where('start_time', '=', NULL);//to be planned
+            $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
+                $query->orWhere('start_time', '>=', new \DateTime()); //planned
             });
         return $meetings->get();
     }
@@ -72,7 +72,7 @@ 
 
     private static function getImg(Meeting $meeting)
     {
-        $name = 'meetings/' . $meeting->id;
+        $name = 'meetings/'.$meeting->id;
         if (!\Storage::exists($name))
             return false;
         return \Storage::get($name);

Braces +11 added lines, -7 removed lines

@@ -26,9 +26,11 @@ 
     {
         $employee = \Auth::user();
         $meetings = $employee->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
             });
@@ -63,9 +65,10 @@ 
         $this->authorize($meeting);
         $ret = self::getImg($meeting);
         $blank = storage_path('img/meetings.jpg');
-        if ($ret === false)
-            return (new Response(file_get_contents($blank), 200))
+        if ($ret === false) {
+                    return (new Response(file_get_contents($blank), 200))
                 ->header('Content-Type', 'image/jpeg');
+        }
         return (new Response($ret, 200))
             ->header('Content-Type', 'image/jpeg');
     }
@@ -73,8 +76,9 @@ 
     private static function getImg(Meeting $meeting)
     {
         $name = 'meetings/' . $meeting->id;
-        if (!\Storage::exists($name))
-            return false;
+        if (!\Storage::exists($name)) {
+                    return false;
+        }
         return \Storage::get($name);
     }
 }

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

Spacing +10 added lines, -10 removed lines

@@ -14,8 +14,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');
     }
 
@@ -33,10 +33,10 @@ 
         $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
+            $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
+                $query->orWhere('start_time', '>=', new \DateTime()); //planned
             });
 
         return $meetings->get();
@@ -86,7 +86,7 @@ 
      */
     public function storeImage(Requests\Request $request, $groupId, $meetingId)
     {
-        $this->validate($request, ['data' => 'required|image']);
+        $this->validate($request, [ 'data' => 'required|image' ]);
         $group = Group::findOrFail($groupId);
         $this->authorize($group);
         $meeting = Group::findOrFail($meetingId);
@@ -98,7 +98,7 @@ 
 
     private static function putImg($file, Meeting $meeting)
     {
-        \Storage::put('meetings/' . $meeting->id, \File::get($file));
+        \Storage::put('meetings/'.$meeting->id, \File::get($file));
     }
 
     /**
@@ -125,7 +125,7 @@ 
 
     private static function getImg(Meeting $meeting)
     {
-        $name = 'meetings/' . $meeting->id;
+        $name = 'meetings/'.$meeting->id;
         if (!\Storage::exists($name))
             return false;
         return \Storage::get($name);
@@ -147,8 +147,8 @@ 
         $this->authorize($meeting);
         $input = $request->all();
         //the planner cannot modify the duration of a planed meeting
-        if ($meeting->start_time != NULL && $meeting->duration != $input['duration'])
-            return Response::json(['error' => 'the meeting is already planned, you cannot change the duration'], 422);
+        if ($meeting->start_time != NULL && $meeting->duration != $input[ 'duration' ])
+            return Response::json([ 'error' => 'the meeting is already planned, you cannot change the duration' ], 422);
         $meeting->update($input);
         return $meeting;
     }

Braces +14 added lines, -9 removed lines

@@ -32,9 +32,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
             });
@@ -116,9 +118,10 @@ 
         $this->authorize($meeting);
         $ret = self::getImg($meeting);
         $blank = storage_path('img/meetings.jpg');
-        if ($ret === false)
-            return (new Response(file_get_contents($blank), 200))
+        if ($ret === false) {
+                    return (new Response(file_get_contents($blank), 200))
                 ->header('Content-Type', 'image/jpeg');
+        }
         return (new Response($ret, 200))
             ->header('Content-Type', 'image/jpeg');
     }
@@ -126,8 +129,9 @@ 
     private static function getImg(Meeting $meeting)
     {
         $name = 'meetings/' . $meeting->id;
-        if (!\Storage::exists($name))
-            return false;
+        if (!\Storage::exists($name)) {
+                    return false;
+        }
         return \Storage::get($name);
     }
 
@@ -147,8 +151,9 @@ 
         $this->authorize($meeting);
         $input = $request->all();
         //the planner cannot modify the duration of a planed meeting
-        if ($meeting->start_time != NULL && $meeting->duration != $input['duration'])
-            return Response::json(['error' => 'the meeting is already planned, you cannot change the duration'], 422);
+        if ($meeting->start_time != NULL && $meeting->duration != $input['duration']) {
+                    return Response::json(['error' => 'the meeting is already planned, you cannot change the duration'], 422);
+        }
         $meeting->update($input);
         return $meeting;
     }