dsd-meetme / backend

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

Spacing +8 added lines, -8 removed lines

@@ -12,8 +12,8 @@ 
 {
     public function __construct()
     {
-        config(['auth.model' => Planner::class]);
-        config(['jwt.user' => Planner::class]);
+        config([ 'auth.model' => Planner::class ]);
+        config([ 'jwt.user' => Planner::class ]);
         $this->middleware('jwt.authandrefresh:mode-en');
     }
 
@@ -32,16 +32,16 @@ 
         $planner = \Auth::user();
         $groups = $planner->groupsManaged();
         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
+            $groups->with([ 'meetings' => function($query) {
+                $query->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
                 });
-            }]);
+            } ]);
         else
             $groups->with('meetings');
-        return $groups->get();//both planed and to be planned
+        return $groups->get(); //both planed and to be planned
     }
 
     /**

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

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use Illuminate\Http\Request;
 
-use plunner\Http\Requests;
 use plunner\Http\Controllers\Controller;
 
 class GroupsController extends Controller

Spacing +5 added lines, -5 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();
     }

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/routes.php

Spacing +39 added lines, -39 removed lines

@@ -19,41 +19,41 @@ 
  * Companies
  */
 
-Route::group(['namespace' => 'Companies', 'prefix' => 'companies'], function () {
+Route::group([ 'namespace' => 'Companies', 'prefix' => 'companies' ], function() {
 
     //\Auth
 
-    Route::group(['namespace' => 'Auth'], function () {
-        Route::group(['prefix' => 'auth'], function () {
+    Route::group([ 'namespace' => 'Auth' ], function() {
+        Route::group([ 'prefix' => 'auth' ], function() {
             // Authentication routes...
-            Route::post('login', ['as' => 'companies.auth.login', 'uses' => 'AuthController@postLogin']);
+            Route::post('login', [ 'as' => 'companies.auth.login', 'uses' => 'AuthController@postLogin' ]);
 
             // Registration routes...
-            Route::post('register', ['as' => 'companies.auth.register', 'uses' => 'AuthController@postRegister']);
+            Route::post('register', [ 'as' => 'companies.auth.register', 'uses' => 'AuthController@postRegister' ]);
 
         });
 
-        Route::group(['prefix' => 'password'], function () {
+        Route::group([ 'prefix' => 'password' ], function() {
             // Password reset link request routes...
-            Route::post('email', ['as' => 'companies.auth.email', 'uses' => 'PasswordController@postEmail']);
+            Route::post('email', [ 'as' => 'companies.auth.email', 'uses' => 'PasswordController@postEmail' ]);
 
             // Password reset routes...
-            Route::post('reset', ['as' => 'companies.auth.reset', 'uses' => 'PasswordController@postReset']);
+            Route::post('reset', [ 'as' => 'companies.auth.reset', 'uses' => 'PasswordController@postReset' ]);
         });
     });
 
-    Route::group(['namespace' => 'Employees'], function () {
-        Route::resource('employees', 'EmployeesController', ['except' => ['create', 'edit']]);
+    Route::group([ 'namespace' => 'Employees' ], function() {
+        Route::resource('employees', 'EmployeesController', [ 'except' => [ 'create', 'edit' ] ]);
     });
 
-    Route::group(['namespace' => 'Groups'], function () {
-        Route::resource('groups', 'GroupsController', ['except' => ['create', 'edit']]);
-        Route::resource('groups.employees', 'EmployeesController', ['only' => ['store', 'index', 'destroy']]);
+    Route::group([ 'namespace' => 'Groups' ], function() {
+        Route::resource('groups', 'GroupsController', [ 'except' => [ 'create', 'edit' ] ]);
+        Route::resource('groups.employees', 'EmployeesController', [ 'only' => [ 'store', 'index', 'destroy' ] ]);
     });
 
-    Route::group(['namespace' => 'Company', 'prefix' => 'company'], function () {
-        Route::get('/', ['as' => 'companies.company.index', 'uses' => 'CompanyController@index']);
-        Route::put('/', ['as' => 'companies.company.update', 'uses' => 'CompanyController@update']);
+    Route::group([ 'namespace' => 'Company', 'prefix' => 'company' ], function() {
+        Route::get('/', [ 'as' => 'companies.company.index', 'uses' => 'CompanyController@index' ]);
+        Route::put('/', [ 'as' => 'companies.company.update', 'uses' => 'CompanyController@update' ]);
     });
 });
 
@@ -61,52 +61,52 @@ 
 /**
  * Employees
  */
-Route::group(['namespace' => 'Employees', 'prefix' => 'employees'], function () {
+Route::group([ 'namespace' => 'Employees', 'prefix' => 'employees' ], function() {
 
     //\Auth
-    Route::group(['namespace' => 'Auth'], function () {
-        Route::group(['prefix' => 'auth'], function () {
+    Route::group([ 'namespace' => 'Auth' ], function() {
+        Route::group([ 'prefix' => 'auth' ], function() {
             // Authentication routes...
-            Route::post('login', ['as' => 'companies.auth.login', 'uses' => 'AuthController@postLogin']);
+            Route::post('login', [ 'as' => 'companies.auth.login', 'uses' => 'AuthController@postLogin' ]);
 
             // Registration routes...
             //Route::post('register', ['as' => 'companies.auth.register', 'uses'=>'AuthController@postRegister']); //the registration is managed by the company
 
         });
 
-        Route::group(['prefix' => 'password'], function () {
+        Route::group([ 'prefix' => 'password' ], function() {
             // Password reset link request routes...
-            Route::post('email', ['as' => 'companies.auth.email', 'uses' => 'PasswordController@postEmail']);
+            Route::post('email', [ 'as' => 'companies.auth.email', 'uses' => 'PasswordController@postEmail' ]);
 
             // Password reset routes...
-            Route::post('reset', ['as' => 'companies.auth.reset', 'uses' => 'PasswordController@postReset']);
+            Route::post('reset', [ 'as' => 'companies.auth.reset', 'uses' => 'PasswordController@postReset' ]);
         });
     });
 
-    Route::group(['namespace' => 'Calendars'], function () {
-        Route::resource('calendars', 'CalendarsController', ['except' => ['create', 'edit']]);
-        Route::post('calendars/caldav', ['as' => 'employees.calendars.caldav', 'uses' => 'CalendarsController@storeCaldav']);
-        Route::post('calendars/calendars', ['as' => 'employees.calendars.calendars', 'uses' => 'CalendarsController@getCalendars']);
-        Route::resource('calendars.timeslots', 'TimeslotsController', ['except' => ['create', 'edit']]);
+    Route::group([ 'namespace' => 'Calendars' ], function() {
+        Route::resource('calendars', 'CalendarsController', [ 'except' => [ 'create', 'edit' ] ]);
+        Route::post('calendars/caldav', [ 'as' => 'employees.calendars.caldav', 'uses' => 'CalendarsController@storeCaldav' ]);
+        Route::post('calendars/calendars', [ 'as' => 'employees.calendars.calendars', 'uses' => 'CalendarsController@getCalendars' ]);
+        Route::resource('calendars.timeslots', 'TimeslotsController', [ 'except' => [ 'create', 'edit' ] ]);
     });
 
-    Route::group(['namespace' => 'Planners', 'prefix' => 'planners'], function () {
-        Route::resource('groups', 'GroupsController', ['only' => ['index', 'show']]);
-        Route::resource('groups.meetings', 'MeetingsController', ['except' => ['create', 'edit']]);
-        Route::resource('groups.meetings.timeslots', 'MeetingTimeslotsController', ['except' => ['create', 'edit']]);
+    Route::group([ 'namespace' => 'Planners', 'prefix' => 'planners' ], function() {
+        Route::resource('groups', 'GroupsController', [ 'only' => [ 'index', 'show' ] ]);
+        Route::resource('groups.meetings', 'MeetingsController', [ 'except' => [ 'create', 'edit' ] ]);
+        Route::resource('groups.meetings.timeslots', 'MeetingTimeslotsController', [ 'except' => [ 'create', 'edit' ] ]);
     });
 
-    Route::group(['namespace' => 'Groups'], function () {
-        Route::resource('groups', 'GroupsController', ['only' => ['index', 'show']]);
+    Route::group([ 'namespace' => 'Groups' ], function() {
+        Route::resource('groups', 'GroupsController', [ 'only' => [ 'index', 'show' ] ]);
     });
 
 
-    Route::group(['namespace' => 'Meetings'], function () {
-        Route::resource('meetings', 'MeetingsController', ['only' => ['index', 'show']]);
+    Route::group([ 'namespace' => 'Meetings' ], function() {
+        Route::resource('meetings', 'MeetingsController', [ 'only' => [ 'index', 'show' ] ]);
     });
 
-    Route::group(['namespace' => 'Employee', 'prefix' => 'employee'], function () {
-        Route::get('/', ['as' => 'employees.employee.index', 'uses' => 'EmployeeController@index']);
-        Route::put('/', ['as' => 'employees.employee.update', 'uses' => 'EmployeeController@update']);
+    Route::group([ 'namespace' => 'Employee', 'prefix' => 'employee' ], function() {
+        Route::get('/', [ 'as' => 'employees.employee.index', 'uses' => 'EmployeeController@index' ]);
+        Route::put('/', [ 'as' => 'employees.employee.update', 'uses' => 'EmployeeController@update' ]);
     });
 });
\ No newline at end of file

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

Spacing +5 added lines, -5 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,9 +36,9 @@ 
     public function update(CompanyRequest $request)
     {
         $company = \Auth::user();
-        $input = $request->only(['name', 'password']);
-        if (isset($input['password']))
-            $input['password'] = bcrypt($input['password']);
+        $input = $request->only([ 'name', 'password' ]);
+        if (isset($input[ 'password' ]))
+            $input[ 'password' ] = bcrypt($input[ 'password' ]);
         $company->update($input);
         return $company;
     }

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/Employees/Employee/EmployeeController.php

Spacing +5 added lines, -5 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,9 +36,9 @@ 
     public function update(EmployeeRequest $request)
     {
         $employee = \Auth::user();
-        $input = $request->only(['name', 'password']);
-        if (isset($input['password']))
-            $input['password'] = bcrypt($input['password']);
+        $input = $request->only([ 'name', 'password' ]);
+        if (isset($input[ 'password' ]))
+            $input[ 'password' ] = bcrypt($input[ 'password' ]);
         $employee->update($input);
         return $employee;
     }

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/OptimiseCommand.php

Spacing +6 added lines, -6 removed lines

@@ -70,17 +70,17 @@ 
      */
     private function makeForeground(Company $company)
     {
-        $this->info('Optimisation company ' . $company->id . ' started');
+        $this->info('Optimisation company '.$company->id.' started');
         try {
             (new Optimise($company, $this->schedule, $this->laravel))->optimise()->save();
-            $this->info('Optimisation ' . $company->id . ' completed');
-        }catch(OptimiseException $e) {
+            $this->info('Optimisation '.$company->id.' completed');
+        } catch (OptimiseException $e) {
             if ($e->isEmpty()) {
-                $mex = 'Company ' . $company->id . ' doesn\'t have sufficient data';
+                $mex = 'Company '.$company->id.' doesn\'t have sufficient data';
                 $this->warn($mex);
                 \Log::info($mex);
             } else {
-                $mex = 'Error during optimisation of company ' . $company->id . ': ' . $e->getMessage();
+                $mex = 'Error during optimisation of company '.$company->id.': '.$e->getMessage();
                 $this->error($mex);
                 //TODO log cause, but don't send it to the user
                 //\Log::error($mex); //already logged in listener
@@ -109,7 +109,7 @@ 
      */
     private function makeBackground(Company $company)
     {
-        $event = $this->schedule->command('optimise:meetings ' . $company->id)->withoutOverlapping();
+        $event = $this->schedule->command('optimise:meetings '.$company->id)->withoutOverlapping();
         if ($event->isDue($this->laravel))
             $event->run($this->laravel);
     }

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/Listeners/Caldav/OkListener.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
     {
         //
         $calendar = $event->getCalendar();
-        \Log::info('caldav (calendar id = ' . $calendar->calendar_id . ') correctly synchronized');
+        \Log::info('caldav (calendar id = '.$calendar->calendar_id.') correctly synchronized');
         //$calendar = $event->getCalendar()->fresh();
         $calendar->sync_errors = '';
         $calendar->save();

app/Listeners/Optimise/ErrorListener.php

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
     public function handle(ErrorEvent $event)
     {
         //
-        \Log::error('problems during optimise (company id = ' . $event->getCompany()->id . '): ' . $event->getError());
+        \Log::error('problems during optimise (company id = '.$event->getCompany()->id.'): '.$event->getError());
         $company = $event->getCompany();
         //$company = $event->getCompany()->fresh();
         self::sendEmail($company->email, $event->getError());
@@ -37,7 +37,7 @@ 
      */
     static private function sendEmail($email, $error)
     {
-        \Mail::queue('emails.optimise.error', ['error' => $error], function ($message) use ($email) {
+        \Mail::queue('emails.optimise.error', [ 'error' => $error ], function($message) use ($email) {
             $message->from(config('mail.from.address'), config('mail.from.name'));
             $message->to($email)->subject('Problems during optimisation');
         });

app/Timeslot.php

Spacing +3 added lines, -3 removed lines

@@ -26,19 +26,19 @@
      *
      * @var array
      */
-    protected $fillable = ['time_start', 'time_end'];
+    protected $fillable = [ 'time_start', 'time_end' ];
 
     /**
      * The attributes excluded from the model's JSON form.
      *
      * @var array
      */
-    protected $hidden = ['pivot', 'calendar'];
+    protected $hidden = [ 'pivot', 'calendar' ];
 
     /**
      * @var array
      */
-    protected $touches = ['calendar'];
+    protected $touches = [ 'calendar' ];
 
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo