dsd-meetme / backend

app/Http/Requests/Companies/Employees/EmployeeRequest.php

Spacing +2 added lines, -2 removed lines

@@ -32,8 +32,8 @@
     {
         return [
             'name' => 'required|min:1|max:255',
-            'email' => 'required|email|max:255|unique:employees,email,' . $this->route('employees') . ',id,company_id,' . $this->user()->id,
-            'password' => ((\Route::current()->getName() == 'companies.employees.store') ? '' : 'sometimes|') . 'required|confirmed|min:6',
+            'email' => 'required|email|max:255|unique:employees,email,'.$this->route('employees').',id,company_id,'.$this->user()->id,
+            'password' => ((\Route::current()->getName() == 'companies.employees.store') ? '' : 'sometimes|').'required|confirmed|min:6',
         ];
     }
 }

app/Http/Requests/Companies/Groups/EmployeeRequest.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
     public function rules()
     {
         return [
-            'id' => 'required|array|exists:employees,id,company_id,' . $this->user()->id,
+            'id' => 'required|array|exists:employees,id,company_id,'.$this->user()->id,
         ];
     }
 }

app/Http/Requests/Companies/Groups/GroupRequest.php

Spacing +2 added lines, -2 removed lines

@@ -31,9 +31,9 @@
     public function rules()
     {
         return [
-            'name' => 'required|max:255|unique:groups,name,' . $this->route('groups') . ',id,company_id,' . $this->user()->id,
+            'name' => 'required|max:255|unique:groups,name,'.$this->route('groups').',id,company_id,'.$this->user()->id,
             'description' => 'sometimes|required|max:255',
-            'planner_id' => 'required|exists:employees,id,company_id,' . $this->user()->id,
+            'planner_id' => 'required|exists:employees,id,company_id,'.$this->user()->id,
         ];
     }
 }

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']); //TODO it's correct post? or not
-        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' ]); //TODO it's correct post? or not
+        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/Listeners/Caldav/ErrorListener.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
     public function handle(ErrorEvent $event)
     {
         //
-        \Log::info('problems during caldav (calendar id = ' . $event->getCalendar()->calendar_id . ') sync: ' . $event->getError());
+        \Log::info('problems during caldav (calendar id = '.$event->getCalendar()->calendar_id.') sync: '.$event->getError());
         $calendar = $event->getCalendar();
         //$calendar = $event->getCalendar()->fresh();
         $calendar->sync_errors = $event->getError();

app/Listeners/Optimise/ErrorListener.php

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
     public function handle(ErrorEvent $event)
     {
         //
-        \Log::info('problems during optimise (company id = ' . $event->getCompany()->id . '): ' . $event->getError());
+        \Log::info('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/Listeners/Optimise/OkListener.php

Spacing +3 added lines, -3 removed lines

@@ -25,7 +25,7 @@ 
     public function handle(OkEvent $event)
     {
         //
-        \Log::info('Meeting correctly optimised (company id = ' . $event->getCompany()->id . ')');
+        \Log::info('Meeting correctly optimised (company id = '.$event->getCompany()->id.')');
         $company = $event->getCompany()->fresh();
         //send email to company
         self::sendCompanyEmail($company->email);
@@ -40,7 +40,7 @@ 
      */
     static private function sendCompanyEmail($email)
     {
-        \Mail::queue('emails.optimise.ok.company', [], function ($message) use ($email) {
+        \Mail::queue('emails.optimise.ok.company', [ ], function($message) use ($email) {
             $message->from(config('mail.from.address'), config('mail.from.name'));
             $message->to($email)->subject('Meetings optimised');
         });
@@ -52,7 +52,7 @@ 
      */
     static private function sendEmployeeEmail($email, $meetings)
     {
-        \Mail::queue('emails.optimise.ok.employee', ['meetings' => $meetings], function ($message) use ($email) {
+        \Mail::queue('emails.optimise.ok.employee', [ 'meetings' => $meetings ], function($message) use ($email) {
             $message->from(config('mail.from.address'), config('mail.from.name'));
             $message->to($email)->subject('Meetings of next week');
         });

Braces +3 added lines, -2 removed lines

@@ -31,8 +31,9 @@
         self::sendCompanyEmail($company->email);
         //send emails to employees
         $employees = $company->employees()->with('meetings')->get();
-        foreach ($employees as $employee)
-            self::sendEmployeeEmail($employee->email, $employee->meetings);
+        foreach ($employees as $employee) {
+                    self::sendEmployeeEmail($employee->email, $employee->meetings);
+        }
     }
 
     /**

app/Planner.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
      */
     public function verifyEmployee(Employee $employee)
     {
-        $group = $this->groupsManaged()->whereHas('employees', function ($query) use ($employee) {
+        $group = $this->groupsManaged()->whereHas('employees', function($query) use ($employee) {
             $query->where('employees.id', $employee->id);
         })->first();