dsd-meetme / backend

app/Company.php

Spacing +9 added lines, -9 removed lines

@@ -48,14 +48,14 @@ 
      *
      * @var array
      */
-    protected $fillable = ['name', 'email', 'password'];
+    protected $fillable = [ 'name', 'email', 'password' ];
 
     /**
      * The attributes excluded from the model's JSON form.
      *
      * @var array
      */
-    protected $hidden = ['password', 'remember_token'];
+    protected $hidden = [ 'password', 'remember_token' ];
 
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
@@ -120,8 +120,8 @@ 
             ->where('calendars.enabled', '=', '1')
             ->where('timeslots.time_start', '>=', $from)
             ->where('timeslots.time_end', '<=', $to)
-            ->where('employees.company_id','=', $this->id)
-            ->select('employees.id','timeslots.time_start','timeslots.time_end')
+            ->where('employees.company_id', '=', $this->id)
+            ->select('employees.id', 'timeslots.time_start', 'timeslots.time_end')
             ->get();
     }
 
@@ -137,9 +137,9 @@ 
             ->join('meeting_timeslots', 'meetings.id', '=', 'meeting_timeslots.meeting_id')
             ->where('meeting_timeslots.time_start', '>=', $from)
             ->where('meeting_timeslots.time_end', '<=', $to)
-            ->where('groups.company_id','=', $this->id)
-            ->where('meetings.start_time','=', NULL)
-            ->select('meetings.id', 'meetings.duration','meeting_timeslots.time_start','meeting_timeslots.time_end')
+            ->where('groups.company_id', '=', $this->id)
+            ->where('meetings.start_time', '=', NULL)
+            ->select('meetings.id', 'meetings.duration', 'meeting_timeslots.time_start', 'meeting_timeslots.time_end')
             ->get();
     }
 
@@ -151,8 +151,8 @@ 
             ->join('employees', 'employee_group.employee_id', '=', 'employees.id')
             ->whereIn('employees.id', $users)
             ->whereIn('meetings.id', $meetings)
-            ->where('groups.company_id','=', $this->id) //this is not needed
-            ->where('employees.company_id','=', $this->id) //this is not needed
+            ->where('groups.company_id', '=', $this->id) //this is not needed
+            ->where('employees.company_id', '=', $this->id) //this is not needed
             ->select('employees.id as employee_id', 'meetings.id as meeting_id')
             ->get();
     }

app/Console/Commands/Optimise/Solver.php

Spacing +46 added lines, -46 removed lines

@@ -112,7 +112,7 @@ 
      */
     static private function checkGlpsol()
     {
-        if(!(`which glpsol`))
+        if (!(`which glpsol`))
             throw new OptimiseException('glpsol is not installed');
     }
 
@@ -193,7 +193,7 @@ 
      */
     public function setTimeSlots($timeSlots)
     {
-        if(!is_int($timeSlots) || $timeSlots <=0)
+        if (!is_int($timeSlots) || $timeSlots <= 0)
             throw new OptimiseException('$timeSlots is not integer or it is not >0');
 
         $this->timeSlots = $timeSlots;
@@ -215,7 +215,7 @@ 
      */
     public function setMaxTimeSlots($maxTimeSlots)
     {
-        if(!is_int($maxTimeSlots) || $maxTimeSlots <=0)
+        if (!is_int($maxTimeSlots) || $maxTimeSlots <= 0)
             throw new OptimiseException('$maxTimeSlots is not integer or it is not >0');
 
         $this->maxTimeSlots = $maxTimeSlots;
@@ -238,13 +238,13 @@ 
     public function setMeetingsAvailability($meetingsAvailability)
     {
         $meetings = array_keys($meetingsAvailability);
-        if(array_diff($meetings, $this->meetings))
+        if (array_diff($meetings, $this->meetings))
             throw new OptimiseException('meetings different from meetings set');
-        foreach($meetingsAvailability as $key=>$meetingsAvailabilityS) {
+        foreach ($meetingsAvailability as $key=>$meetingsAvailabilityS) {
             $timeSlots = array_keys($meetingsAvailabilityS);
-            if(count($timeSlots) != $this->timeSlots)
+            if (count($timeSlots) != $this->timeSlots)
                 throw new OptimiseException('timeSlots different from timeSlots set');
-            $meetingsAvailability[$key] = self::arrayPad($meetingsAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0);
+            $meetingsAvailability[ $key ] = self::arrayPad($meetingsAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0);
         }
 
         $this->meetingsAvailability = $meetingsAvailability;
@@ -267,13 +267,13 @@ 
     public function setMeetingsDuration($meetingsDuration)
     {
         $meetings = array_keys($meetingsDuration);
-        if(array_diff($meetings, $this->meetings)) {
+        if (array_diff($meetings, $this->meetings)) {
             print "";
             throw new OptimiseException('meetings different from meetings set');
         }
-        foreach($meetingsDuration as $duration) {
+        foreach ($meetingsDuration as $duration) {
             $duration = (int) $duration; //TODO fix this (fix for optimise)
-            if(!is_int($duration) || $duration <=0)
+            if (!is_int($duration) || $duration <= 0)
                 throw new OptimiseException('duration is not integer or it is not >0');
         }
 
@@ -297,14 +297,14 @@ 
     public function setUsersAvailability($usersAvailability)
     {
         $users = array_keys($usersAvailability);
-        if(array_diff($users, $this->users))
+        if (array_diff($users, $this->users))
             throw new OptimiseException('users different from users set');
-        foreach($usersAvailability as $key=>$usersAvailabilityS) {
+        foreach ($usersAvailability as $key=>$usersAvailabilityS) {
             $timeSlots = array_keys($usersAvailabilityS);
-            if(count($timeSlots) != $this->timeSlots)
+            if (count($timeSlots) != $this->timeSlots)
                 throw new OptimiseException('timeSlots different from timeSlots set');
 
-            $usersAvailability[$key] = self::arrayPad($usersAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0);
+            $usersAvailability[ $key ] = self::arrayPad($usersAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0);
         }
 
         $this->usersAvailability = $usersAvailability;
@@ -327,11 +327,11 @@ 
     public function setUsersMeetings($usersMeetings)
     {
         $users = array_keys($usersMeetings);
-        if(array_diff($users, $this->users))
+        if (array_diff($users, $this->users))
             throw new OptimiseException('users different from users set');
-        foreach($usersMeetings as $usersMeetingsS) {
+        foreach ($usersMeetings as $usersMeetingsS) {
             $meetings = array_keys($usersMeetingsS);
-            if(array_diff($meetings, $this->meetings))
+            if (array_diff($meetings, $this->meetings))
                 throw new OptimiseException('meetings different from meetings set');
         }
 
@@ -394,13 +394,13 @@ 
      */
     static private function writeCSVArrayNoKey($file, $data)
     {
-        $f = function ($fp, $data){
+        $f = function($fp, $data) {
             foreach ($data as $field) {
-                fputcsv($fp, [$field]);
+                fputcsv($fp, [ $field ]);
             }
         };
 
-        self::writeCSV($file, $data, ['i'], $f);
+        self::writeCSV($file, $data, [ 'i' ], $f);
     }
 
     /**
@@ -411,13 +411,13 @@ 
      */
     static private function writeCSVArray($file, $data, $name)
     {
-        $f = function ($fp, $data){
+        $f = function($fp, $data) {
             foreach ($data as $key=>$field) {
-                fputcsv($fp, [$key, $field]);
+                fputcsv($fp, [ $key, $field ]);
             }
         };
 
-        self::writeCSV($file, $data, ['i', $name], $f);
+        self::writeCSV($file, $data, [ 'i', $name ], $f);
     }
 
     /**
@@ -428,14 +428,14 @@ 
      */
     static private function writeCSVMatrix($file, $data, $name)
     {
-        $f = function ($fp, $data){
+        $f = function($fp, $data) {
             foreach ($data as $key=>$field) {
                 foreach ($field as $key2=>$field2)
-                    fputcsv($fp, [$key, $key2, $field2]);
+                    fputcsv($fp, [ $key, $key2, $field2 ]);
             }
         };
 
-        self::writeCSV($file, $data, ['i', 'j', $name], $f);
+        self::writeCSV($file, $data, [ 'i', 'j', $name ], $f);
     }
 
     /**
@@ -448,7 +448,7 @@ 
     static private function writeCSV($file, $data, $heading, \Closure $writer)
     {
         $fp = @fopen($file, 'w');
-        if(!$fp)
+        if (!$fp)
             throw new OptimiseException('problem during creation of a file');
 
         fputcsv($fp, $heading);
@@ -468,8 +468,8 @@ 
     {
         $this->writeData();
         $this->writeModelFile();
-        $event = $this->schedule->exec('glpsol --math '.$this->path->getModelPath())->sendOutputTo($this->path->getOutputPath())->after(function () { }); //this just to execute in foreground
-        if($event->isDue($this->laravel))
+        $event = $this->schedule->exec('glpsol --math '.$this->path->getModelPath())->sendOutputTo($this->path->getOutputPath())->after(function() { }); //this just to execute in foreground
+        if ($event->isDue($this->laravel))
             $event->run($this->laravel);
         //TODO catch glpsol errors
         return $this;
@@ -483,9 +483,9 @@ 
         $strReplaceS = array('{USERS_PATH}', '{MEETINGS_PATH}', '{USER_AVAILABILITY_PATH}', '{MEETINGS_AVAILABILITY_PATH}', '{USER_MEETINGS_PATH}', '{MEETINGS_DURATION_PATH}', '{TIME_SLOTS}', '{MAX_TIME_SLOTS}', '{X_OUT_PATH}', '{Y_OUT_PATH}');
         $strReplaceR = array($this->path->getUsersPath(), $this->path->getMeetingsPath(), $this->path->getUsersAvailabilityPath(), $this->path->getMeetingsAvailabilityPath(), $this->path->getUsersMeetingsPath(), $this->path->getMeetingsDurationPath(), $this->timeSlots, $this->maxTimeSlots, $this->path->getXPath(), $this->path->getYPath());
         $f = @fopen($this->path->getModelPath(), "w");
-        if(!$f)
+        if (!$f)
             throw new OptimiseException('problem during creation of a file');
-        fwrite($f, str_replace($strReplaceS, $strReplaceR, file_get_contents(__DIR__ . "/model.stub")));
+        fwrite($f, str_replace($strReplaceS, $strReplaceR, file_get_contents(__DIR__."/model.stub")));
         fclose($f);
     }
 
@@ -513,7 +513,7 @@ 
      */
     public function getOutput()
     {
-        if(!($data = file_get_contents($this->path->getOutputPath())))
+        if (!($data = file_get_contents($this->path->getOutputPath())))
             throw new OptimiseException('problems during reading the file');
         return $data;
     }
@@ -525,22 +525,22 @@ 
      */
     static private function readCSVFile($file)
     {
-        if(!file_exists($file) || !filesize($file))
+        if (!file_exists($file) || !filesize($file))
             throw new OptimiseException('no results file');
 
-        $handle = @fopen($file,"r");
-        if(!$handle)
+        $handle = @fopen($file, "r");
+        if (!$handle)
             throw new OptimiseException('problems during reading the file');
 
-        $ret = [];
+        $ret = [ ];
         fgetcsv($handle); //skip head
         while (($data = fgetcsv($handle)) !== FALSE) {
-            if(count($data) != 3) {
+            if (count($data) != 3) {
                 fclose($handle);
                 throw new OptimiseException('problems during parsing the file');
             }
 
-            $ret[$data[0]][$data[1]] = $data[2];
+            $ret[ $data[ 0 ] ][ $data[ 1 ] ] = $data[ 2 ];
         }
 
         fclose($handle);
@@ -567,8 +567,8 @@ 
      */
     private function checkData()
     {
-        $this->checkArrayProprieties(['users', 'meetings', 'meetingsAvailability', 'meetingsDuration', 'usersAvailability', 'usersMeetings']);
-        $this->checkIntProprieties(['timeSlots', 'maxTimeSlots']);
+        $this->checkArrayProprieties([ 'users', 'meetings', 'meetingsAvailability', 'meetingsDuration', 'usersAvailability', 'usersMeetings' ]);
+        $this->checkIntProprieties([ 'timeSlots', 'maxTimeSlots' ]);
     }
 
     /**
@@ -577,8 +577,8 @@ 
      */
     private function checkArrayProprieties($proprieties)
     {
-        foreach($proprieties as $propriety)
-            if(count($this->$propriety)==0)
+        foreach ($proprieties as $propriety)
+            if (count($this->$propriety) == 0)
                 throw new OptimiseException($propriety.' is not set correctly');
     }
 
@@ -588,8 +588,8 @@ 
      */
     private function checkIntProprieties($proprieties)
     {
-        foreach($proprieties as $propriety)
-            if(!is_int($this->$propriety) || $this->$propriety <= 0)
+        foreach ($proprieties as $propriety)
+            if (!is_int($this->$propriety) || $this->$propriety <= 0)
                 throw new OptimiseException($propriety.' is not set correctly');
     }
 
@@ -602,8 +602,8 @@ 
     static private function arrayPad(array $array, $len, $pad)
     {
         $len = $len - count($array);
-        for($i = 0; $i<$len; $i++)
-            $array[] = $pad;
+        for ($i = 0; $i < $len; $i++)
+            $array[ ] = $pad;
         return $array;
     }
 }
\ No newline at end of file

app/Console/Commands/Optimise/Path.php

Spacing +5 added lines, -5 removed lines

@@ -76,11 +76,11 @@ 
     {
         $path = new Path(tempnam(sys_get_temp_dir(), 'OPT')); //TODO check the return in case of errors this return false on failure
         unlink($path->getPath()); //remove file to create a dir
-        if(file_exists($path->getPath()))
+        if (file_exists($path->getPath()))
             throw new OptimiseException('problem during creation of tmp dir (the directory already exists)');
-        if(!@mkdir($path->getPath()))
-            throw new OptimiseException('problem during creation of tmp dir (mkdir problem)');;
-        if(! is_dir($path->getPath()))
+        if (!@mkdir($path->getPath()))
+            throw new OptimiseException('problem during creation of tmp dir (mkdir problem)'); ;
+        if (!is_dir($path->getPath()))
             throw new OptimiseException('problem during creation of tmp dir (it is not possible to create directory)');
         return $path;
     }
@@ -91,7 +91,7 @@ 
      * @return bool
      */
     private static function delTree($dir) {
-        $files = array_diff(scandir($dir), array('.','..'));
+        $files = array_diff(scandir($dir), array('.', '..'));
         foreach ($files as $file) {
             (is_dir("$dir/$file")) ? delTree("$dir/$file") : unlink("$dir/$file");
         }

app/Listeners/Optimise/OkListener.php

Spacing +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
         self::sendCompanyEmail($event->getCompany()->email);
         //send emails to employees
         $employees = $event->getCompany()->employees()->with('meetings')->get();
-        foreach($employees as $employee)
+        foreach ($employees as $employee)
             self::sendEmployeeEmail($employee->email, $employee->meetings);
     }
 
@@ -42,7 +42,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');
         });
@@ -54,7 +54,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');
         });

app/Listeners/Optimise/ErrorListener.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,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/Http/Controllers/Employees/Auth/AuthController.php

Spacing +15 added lines, -15 removed lines

@@ -43,7 +43,7 @@ 
      * en = employee normal
      * @var array
      */
-    protected $custom = ['mode'=>'en'];
+    protected $custom = [ 'mode'=>'en' ];
 
     /**
      * @var company
@@ -56,8 +56,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 ]);
     }
 
     /**
@@ -84,15 +84,15 @@ 
     protected function create(array $data)
     {
         return $this->company->save(new employee([
-            'name' => $data['name'],
-            'email' => $data['email'],
-            'password' => bcrypt($data['password']),
+            'name' => $data[ 'name' ],
+            'email' => $data[ 'email' ],
+            'password' => bcrypt($data[ 'password' ]),
         ]));
     }
 
     public function postRegister(Request $request)
     {
-        $this->validate($request, ['company' => 'required|exists:companies,name']);
+        $this->validate($request, [ 'company' => 'required|exists:companies,name' ]);
         $this->company = Company::whereName($request->input('company'))->firstOrFail();
         return $this->postRegisterOriginal($request);
     }
@@ -101,18 +101,18 @@ 
     public function postLogin(Request $request)
     {
         //get company ID and impiled it in the request
-        $this->validate($request, ['company' => 'required|exists:companies,name']);
+        $this->validate($request, [ 'company' => 'required|exists:companies,name' ]);
         $this->company = Company::whereName($request->input('company'))->firstOrFail();
-        $request->merge(['company_id' => $this->company->id]);
+        $request->merge([ 'company_id' => $this->company->id ]);
 
         //remember me
-        $this->validate($request, ['remember' => 'boolean']);//TODO insert required
-        if($request->input('remember', false))
+        $this->validate($request, [ 'remember' => 'boolean' ]); //TODO insert required
+        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']);
+            config([ 'jwt.ttl' =>'43200' ]); //30 days
+            $this->custom = array_merge($this->custom, [ 'remember'=>'true' ]);
+        } else
+            $this->custom = array_merge($this->custom, [ 'remember'=>'false' ]);
 
         return $this->postLoginOriginal($request);
     }

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

Spacing +12 added lines, -12 removed lines

@@ -40,7 +40,7 @@ 
      * cn = company normal
      * @var array
      */
-    protected $custom = ['mode'=>'cn'];
+    protected $custom = [ 'mode'=>'cn' ];
 
     /**
      * Create a new authentication controller instance.
@@ -48,8 +48,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 ]);
     }
 
     /**
@@ -76,22 +76,22 @@ 
     protected function create(array $data)
     {
         return Company::create([
-            'name' => $data['name'],
-            'email' => $data['email'],
-            'password' => bcrypt($data['password']),
+            'name' => $data[ 'name' ],
+            'email' => $data[ 'email' ],
+            'password' => bcrypt($data[ 'password' ]),
         ]);
     }
 
     public function postLogin(Request $request)
     {
         //remember me
-        $this->validate($request, ['remember' => 'boolean']);//TODO insert required
-        if($request->input('remember', false))
+        $this->validate($request, [ 'remember' => 'boolean' ]); //TODO insert required
+        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']);
+            config([ 'jwt.ttl' =>'43200' ]); //30 days
+            $this->custom = array_merge($this->custom, [ 'remember'=>'true' ]);
+        } else
+            $this->custom = array_merge($this->custom, [ 'remember'=>'false' ]);
         return $this->postLoginOriginal($request);
     }
 

app/Http/Kernel.php

Spacing +1 added lines, -1 removed lines

@@ -30,6 +30,6 @@
         'auth' => \plunner\Http\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'guest' => \plunner\Http\Middleware\RedirectIfAuthenticated::class,
-        'jwt.authandrefresh' =>  \plunner\Http\Middleware\GetUserAndRefresh::class,//'Tymon\JWTAuth\Middleware\GetUserAndRefresh',
+        'jwt.authandrefresh' =>  \plunner\Http\Middleware\GetUserAndRefresh::class, //'Tymon\JWTAuth\Middleware\GetUserAndRefresh',
     ];
 }

app/Http/Middleware/GetUserAndRefresh.php

Spacing +3 added lines, -3 removed lines

@@ -25,15 +25,15 @@
     public function handle($request, \Closure $next, $custom = '')
     {
         $remember = false;
-        if($this->auth->setRequest($request)->getToken() && ($remember = $this->auth->getPayload()->get('remember')) &&
-                $remember == 'true'){
+        if ($this->auth->setRequest($request)->getToken() && ($remember = $this->auth->getPayload()->get('remember')) &&
+                $remember == 'true') {
             JWTFactory::setTTL(43200);
             //config(['jwt.ttl' =>'43200']); //30 days
         }
 
         //this to add the remember me mode field in the new token, but we have the custom check that is an useless
         //overhead
-        $custom = $custom.';remember-'.$remember=='true'?'true':'false';
+        $custom = $custom.';remember-'.$remember == 'true' ? 'true' : 'false';
         return parent::handle($request, $next, $custom);
     }