dsd-meetme / backend

app/Console/Commands/Optimise/Optimise.php

Doc Comments +6 added lines, -5 removed lines

@@ -303,10 +303,10 @@ 
     }
 
     /**
-     * @param array $users
-     * @param array $meetings
+     * @param string[] $users
+     * @param string[] $meetings
      * @param \Illuminate\Support\Collection $usersMeetings
-     * @return array
+     * @return \string[]
      */
     static private function getUsersMeetingsArray($users, $meetings, \Illuminate\Support\Collection $usersMeetings)
     {
@@ -338,8 +338,9 @@ 
 
     /**
      * @param \Illuminate\Support\Collection $timeSlots
-     * @param bool|true $free if true the array is filled with 1 for timeslots values else with 0 for timeslots values
-     * @return array
+     * @param boolean $free if true the array is filled with 1 for timeslots values else with 0 for timeslots values
+     * @param integer $timeslotsN
+     * @return \string[]
      */
     static private function getAvailabilityArray(\Illuminate\Support\Collection $timeSlots, $timeslotsN, $free=true)
     {

Braces +10 added lines, -7 removed lines

@@ -317,7 +317,7 @@ 
             foreach($meetings as $meeting){
                 if($usersMeetingsTmp->contains('meeting_id', $meeting)){
                     $ret[$user][$meeting] = 1;
-                }else{
+                } else{
                     $ret[$user][$meeting] = 0;
                 }
             }
@@ -363,8 +363,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;
@@ -379,8 +380,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;
@@ -395,8 +397,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;
     }
 

app/Console/Commands/Optimise/Solver.php

Doc Comments +15 added lines, -13 removed lines

@@ -119,7 +119,7 @@ 
 
     /**
      * remove a no empty dir
-     * @param $dir
+     * @param string $dir
      * @return bool
      */
     private static function delTree($dir) {
@@ -173,7 +173,7 @@ 
     }
 
     /**
-     * @return \string[]
+     * @return string[]
      */
     public function getUsers()
     {
@@ -191,7 +191,7 @@ 
     }
 
     /**
-     * @return \string[]
+     * @return string[]
      */
     public function getMeetings()
     {
@@ -253,7 +253,7 @@ 
     }
 
     /**
-     * @return \string[]
+     * @return string[]
      */
     public function getMeetingsAvailability()
     {
@@ -282,7 +282,7 @@ 
     }
 
     /**
-     * @return \string[]
+     * @return string[]
      */
     public function getMeetingsDuration()
     {
@@ -312,7 +312,7 @@ 
     }
 
     /**
-     * @return \string[]
+     * @return string[]
      */
     public function getUsersAvailability()
     {
@@ -342,7 +342,7 @@ 
     }
 
     /**
-     * @return \string[]
+     * @return string[]
      */
     public function getUsersMeetings()
     {
@@ -419,7 +419,7 @@ 
 
     /**
      * @param string $file
-     * @param array $data
+     * @param string[] $data
      * @throws OptimiseException
      */
     static private function writeCSVArrayNoKey($file, $data)
@@ -435,7 +435,7 @@ 
 
     /**
      * @param string $file
-     * @param array $data
+     * @param string[] $data
      * @param string $name
      * @throws OptimiseException
      */
@@ -452,7 +452,7 @@ 
 
     /**
      * @param string $file
-     * @param array $data
+     * @param string[] $data
      * @param string $name
      * @throws OptimiseException
      */
@@ -471,7 +471,7 @@ 
     /**
      * @param string $file
      * @param array $data
-     * @param array $heading
+     * @param string[] $heading
      * @param \Closure $writer
      * @throws OptimiseException
      */
@@ -682,7 +682,7 @@ 
     }
 
     /**
-     * @param $proprieties
+     * @param string[] $proprieties
      * @throws OptimiseException
      */
     private function checkArrayProprieties($proprieties)
@@ -693,7 +693,7 @@ 
     }
 
     /**
-     * @param $proprieties
+     * @param string[] $proprieties
      * @throws OptimiseException
      */
     private function checkIntProprieties($proprieties)
@@ -707,6 +707,8 @@ 
      * implementation of arraypad that doesn't change original keys<br/>
      * <strong>CAUTION: Only positive $len</strong>
      * @param array $array
+     * @param integer $len
+     * @param integer $pad
      * @return array
      */
     static private function arrayPad(array $array, $len, $pad)

Braces +73 added lines, -48 removed lines

@@ -104,8 +104,9 @@ 
      */
     function __destruct()
     {
-        if ($this->path && is_dir($this->path) && !self::delTree($this->path))
-            throw new OptimiseException('problems during removing of path directory');
+        if ($this->path && is_dir($this->path) && !self::delTree($this->path)) {
+                    throw new OptimiseException('problems during removing of path directory');
+        }
     }
 
     /**
@@ -113,8 +114,9 @@ 
      */
     static private function checkGlpsol()
     {
-        if(!(`which glpsol`))
-            throw new OptimiseException('glpsol is not installed');
+        if(!(`which glpsol`)) {
+                    throw new OptimiseException('glpsol is not installed');
+        }
     }
 
     /**
@@ -138,12 +140,16 @@ 
     {
         $this->path = tempnam(sys_get_temp_dir(), 'OPT'); //TODO check the return in case of errors this return false on failure
         unlink($this->path); //remove file to create a dir
-        if(file_exists($this->path))
-            throw new OptimiseException('problem during creation of tmp dir (the directory already exists)');
-        if(!@mkdir($this->path))
-            throw new OptimiseException('problem during creation of tmp dir (mkdir problem)');;
-        if(! is_dir($this->path))
-            throw new OptimiseException('problem during creation of tmp dir (it is not possible to create directory)');
+        if(file_exists($this->path)) {
+                    throw new OptimiseException('problem during creation of tmp dir (the directory already exists)');
+        }
+        if(!@mkdir($this->path)) {
+                    throw new OptimiseException('problem during creation of tmp dir (mkdir problem)');
+        }
+        ;
+        if(! is_dir($this->path)) {
+                    throw new OptimiseException('problem during creation of tmp dir (it is not possible to create directory)');
+        }
     }
 
     /**
@@ -223,8 +229,9 @@ 
      */
     public function setTimeSlots($timeSlots)
     {
-        if(!is_int($timeSlots) || $timeSlots <=0)
-            throw new OptimiseException('$timeSlots is not integer or it is not >0');
+        if(!is_int($timeSlots) || $timeSlots <=0) {
+                    throw new OptimiseException('$timeSlots is not integer or it is not >0');
+        }
 
         $this->timeSlots = $timeSlots;
         return $this;
@@ -245,8 +252,9 @@ 
      */
     public function setMaxTimeSlots($maxTimeSlots)
     {
-        if(!is_int($maxTimeSlots) || $maxTimeSlots <=0)
-            throw new OptimiseException('$maxTimeSlots is not integer or it is not >0');
+        if(!is_int($maxTimeSlots) || $maxTimeSlots <=0) {
+                    throw new OptimiseException('$maxTimeSlots is not integer or it is not >0');
+        }
 
         $this->maxTimeSlots = $maxTimeSlots;
         return $this;
@@ -268,12 +276,14 @@ 
     public function setMeetingsAvailability($meetingsAvailability)
     {
         $meetings = array_keys($meetingsAvailability);
-        if(array_diff($meetings, $this->meetings))
-            throw new OptimiseException('meetings different from meetings set');
+        if(array_diff($meetings, $this->meetings)) {
+                    throw new OptimiseException('meetings different from meetings set');
+        }
         foreach($meetingsAvailability as $key=>$meetingsAvailabilityS) {
             $timeSlots = array_keys($meetingsAvailabilityS);
-            if(count($timeSlots) != $this->timeSlots)
-                throw new OptimiseException('timeSlots different from timeSlots set');
+            if(count($timeSlots) != $this->timeSlots) {
+                            throw new OptimiseException('timeSlots different from timeSlots set');
+            }
             $meetingsAvailability[$key] = self::arrayPad($meetingsAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0);
         }
 
@@ -303,8 +313,9 @@ 
         }
         foreach($meetingsDuration as $duration) {
             $duration = (int) $duration; //TODO fix this (fix for optimise)
-            if(!is_int($duration) || $duration <=0)
-                throw new OptimiseException('duration is not integer or it is not >0');
+            if(!is_int($duration) || $duration <=0) {
+                            throw new OptimiseException('duration is not integer or it is not >0');
+            }
         }
 
         $this->meetingsDuration = $meetingsDuration;
@@ -327,12 +338,14 @@ 
     public function setUsersAvailability($usersAvailability)
     {
         $users = array_keys($usersAvailability);
-        if(array_diff($users, $this->users))
-            throw new OptimiseException('users different from users set');
+        if(array_diff($users, $this->users)) {
+                    throw new OptimiseException('users different from users set');
+        }
         foreach($usersAvailability as $key=>$usersAvailabilityS) {
             $timeSlots = array_keys($usersAvailabilityS);
-            if(count($timeSlots) != $this->timeSlots)
-                throw new OptimiseException('timeSlots different from timeSlots set');
+            if(count($timeSlots) != $this->timeSlots) {
+                            throw new OptimiseException('timeSlots different from timeSlots set');
+            }
 
             $usersAvailability[$key] = self::arrayPad($usersAvailabilityS, $this->timeSlots + $this->maxTimeSlots, 0);
         }
@@ -357,12 +370,14 @@ 
     public function setUsersMeetings($usersMeetings)
     {
         $users = array_keys($usersMeetings);
-        if(array_diff($users, $this->users))
-            throw new OptimiseException('users different from users set');
+        if(array_diff($users, $this->users)) {
+                    throw new OptimiseException('users different from users set');
+        }
         foreach($usersMeetings as $usersMeetingsS) {
             $meetings = array_keys($usersMeetingsS);
-            if(array_diff($meetings, $this->meetings))
-                throw new OptimiseException('meetings different from meetings set');
+            if(array_diff($meetings, $this->meetings)) {
+                            throw new OptimiseException('meetings different from meetings set');
+            }
         }
 
         $this->usersMeetings = $usersMeetings;
@@ -460,8 +475,9 @@ 
     {
         $f = function ($fp, $data){
             foreach ($data as $key=>$field) {
-                foreach ($field as $key2=>$field2)
-                    fputcsv($fp, [$key, $key2, $field2]);
+                foreach ($field as $key2=>$field2) {
+                                    fputcsv($fp, [$key, $key2, $field2]);
+                }
             }
         };
 
@@ -478,8 +494,9 @@ 
     static private function writeCSV($file, $data, $heading, \Closure $writer)
     {
         $fp = @fopen($file, 'w');
-        if(!$fp)
-            throw new OptimiseException('problem during creation of a file');
+        if(!$fp) {
+                    throw new OptimiseException('problem during creation of a file');
+        }
 
         fputcsv($fp, $heading);
 
@@ -499,8 +516,9 @@ 
         $this->writeData();
         $this->writeModelFile();
         $event = $this->schedule->exec('glpsol --math '.$this->getModelPath())->sendOutputTo($this->getOutputPath())->after(function () { }); //this just to execute in foreground
-        if($event->isDue($this->laravel))
-            $event->run($this->laravel);
+        if($event->isDue($this->laravel)) {
+                    $event->run($this->laravel);
+        }
         //TODO catch glpsol errors
         return $this;
     }
@@ -513,8 +531,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->getUsersPath(), $this->getMeetingsPath(), $this->getUsersAvailabilityPath(), $this->getMeetingsAvailabilityPath(), $this->getUsersMeetingsPath(), $this->getMeetingsDurationPath(), $this->timeSlots, $this->maxTimeSlots, $this->getXPath(), $this->getYPath());
         $f = @fopen($this->getModelPath(), "w");
-        if(!$f)
-            throw new OptimiseException('problem during creation of a file');
+        if(!$f) {
+                    throw new OptimiseException('problem during creation of a file');
+        }
         fwrite($f, str_replace($strReplaceS, $strReplaceR, file_get_contents(__DIR__ . "/model.stub")));
         fclose($f);
     }
@@ -543,8 +562,9 @@ 
      */
     public function getOutput()
     {
-        if(!($data = file_get_contents($this->getOutputPath())))
-            throw new OptimiseException('problems during reading the file');
+        if(!($data = file_get_contents($this->getOutputPath()))) {
+                    throw new OptimiseException('problems during reading the file');
+        }
         return $data;
     }
 
@@ -555,12 +575,14 @@ 
      */
     static private function readCSVFile($file)
     {
-        if(!file_exists($file) || !filesize($file))
-            throw new OptimiseException('no results file');
+        if(!file_exists($file) || !filesize($file)) {
+                    throw new OptimiseException('no results file');
+        }
 
         $handle = @fopen($file,"r");
-        if(!$handle)
-            throw new OptimiseException('problems during reading the file');
+        if(!$handle) {
+                    throw new OptimiseException('problems during reading the file');
+        }
 
         $ret = [];
         fgetcsv($handle); //skip head
@@ -687,9 +709,10 @@ 
      */
     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');
+        }
     }
 
     /**
@@ -698,9 +721,10 @@ 
      */
     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');
+        }
     }
 
     /**
@@ -712,8 +736,9 @@ 
     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/OptimiseCommand.php

Braces +14 added lines, -10 removed lines

@@ -62,10 +62,11 @@ 
 
         //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();
+        }
     }
 
     private function syncAll()
@@ -74,13 +75,15 @@ 
         if($this->option('background')) {
             \Log::debug(self::BACKGROUND_MOD_MEX);
             $this->info(self::BACKGROUND_MOD_MEX);
-            foreach ($calendars as $calendar)
-                $this->makeBackground($calendar);
+            foreach ($calendars as $calendar) {
+                            $this->makeBackground($calendar);
+            }
             \Log::debug(self::BACKGROUND_COMPLETED_MEX);
             $this->info(self::BACKGROUND_COMPLETED_MEX);
-        }else
-            foreach($calendars as $calendar)
+        } else {
+                    foreach($calendars as $calendar)
                 $this->makeForeground($calendar);
+        }
     }
 
     /**
@@ -90,8 +93,9 @@ 
     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);
+        }
     }
 
     /**