dsd-meetme / backend

app/Console/Commands/Optimise/Solver.php

Indentation +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: Claudio Cardinale <cardi@thecsea.it>
- * Date: 07/12/15
- * Time: 21.18
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
+     * Created by PhpStorm.
+     * User: Claudio Cardinale <cardi@thecsea.it>
+     * Date: 07/12/15
+     * Time: 21.18
+     * This program is free software; you can redistribute it and/or
+     * modify it under the terms of the GNU General Public License
+     * as published by the Free Software Foundation; either version 2
+     * of the License, or (at your option) any later version.
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU General Public License for more details.
+     * You should have received a copy of the GNU General Public License
+     * along with this program; if not, write to the Free Software
+     * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+     */
 
 namespace plunner\Console\Commands\Optimise;
 

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));
     }

app/Console/Commands/Optimise/OptimiseCommand.php

Braces +21 added lines, -16 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,12 +75,13 @@ 
         try {
             (new Optimise($company, $this->schedule, $this->laravel))->optimise()->save();
             $this->info('Optimisation ' . $company->id . ' completed');
-        }catch(OptimiseException $e){
-            if($e->isEmpty())
-                $this->warn('Company ' . $company->id . ' has no sufficient data');
-            else
-                $this->error('Error during optimisation of company ' . $company->id .': '. $e->getMessage());
-        }catch(\Exception $e) {
+        } catch(OptimiseException $e){
+            if($e->isEmpty()) {
+                            $this->warn('Company ' . $company->id . ' has no sufficient data');
+            } else {
+                            $this->error('Error during optimisation of company ' . $company->id .': '. $e->getMessage());
+            }
+        } catch(\Exception $e) {
             $this->error('Error during optimisation of company ' . $company->id .': '. $e->getMessage());
         }
     }
@@ -90,13 +92,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);
+        }
     }
 
     /**
@@ -106,7 +110,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);
+        }
     }
 }