bristol-su / assign-roles

app/CompletionConditions/RequiredPositionsFilled.php

Indentation +8 added lines, -8 removed lines

@@ -45,17 +45,17 @@ 
             $remainingPositions = $this->positionsStillToFill($settings, $activityInstance, $moduleInstance);
         } catch (SettingRetrievalException $e) {
             Log::debug(
-              sprintf(
+                sprintf(
                 'Setting could not be found for activity instance %d and module instance %d',
                 $activityInstance->id,
                 $moduleInstance->id()
-              )
+                )
             );
             return false;
         }
        
         Log::info('Result is ' . (count($remainingPositions) === 0 ? 'true' : 'false'));
-       return count($remainingPositions) === 0;
+        return count($remainingPositions) === 0;
     }
     
     public function percentage($settings, ActivityInstance $activityInstance, ModuleInstance $moduleInstance): int
@@ -93,7 +93,7 @@ 
         
         Log::info('Roles to be used: ' . json_encode($roles->map(function($role) {
             return $role->id();
-          })));
+            })));
         
         Log::info('Required positions ' . (string) collect($this->getRequiredPositions($settings, $group)));
         return collect($this->getRequiredPositions($settings, $group))->filter(function(int $positionId) use ($roles) {
@@ -183,8 +183,8 @@ 
     {
         $roles = $group->roles();
         Log::info('Roles through group pre logic filtering: ' . json_encode($roles->map(function($role) {
-              return $role->id();
-          })));
+                return $role->id();
+            })));
         if($this->logicGroupId($moduleInstance) !== null) {
             $logicGroup = app(LogicRepository::class)->getById($this->logicGroupId($moduleInstance));
             return $roles->filter(function(\BristolSU\ControlDB\Contracts\Models\Role $role) use ($moduleInstance, $logicGroup) {
@@ -193,8 +193,8 @@ 
         }
 
         Log::info('Roles through group post logic filtering: ' . json_encode($roles->map(function($role) {
-              return $role->id();
-          })));
+                return $role->id();
+            })));
         
         return $roles;
     }

Spacing +12 added lines, -12 removed lines

@@ -54,7 +54,7 @@ 
             return false;
         }
        
-        Log::info('Result is ' . (count($remainingPositions) === 0 ? 'true' : 'false'));
+        Log::info('Result is '.(count($remainingPositions) === 0 ? 'true' : 'false'));
        return count($remainingPositions) === 0;
     }
     
@@ -69,15 +69,15 @@ 
             return false;
         }
         
-        if(count($requiredPositions) === 0) {
+        if (count($requiredPositions) === 0) {
             return 100;
         }
         
         $filled = count($requiredPositions) - count($remainingPositions);
         
-        $percentage = (int) round(($filled/count($requiredPositions)) * 100, 0);
+        $percentage = (int) round(($filled / count($requiredPositions)) * 100, 0);
 
-        if($percentage > 100) {
+        if ($percentage > 100) {
             return 100;
         }
         return $percentage;
@@ -86,16 +86,16 @@ 
     protected function positionsStillToFill($settings, ActivityInstance $activityInstance, ModuleInstance $moduleInstance)
     {
         $group = $this->getGroup($activityInstance);
-        Log::info('Using group ' . $group->id());
+        Log::info('Using group '.$group->id());
         $roles = $this->rolesThroughGroup($group, $moduleInstance)->filter(function(Role $role) {
             return $role->users()->count() > 0;
         });
         
-        Log::info('Roles to be used: ' . json_encode($roles->map(function($role) {
+        Log::info('Roles to be used: '.json_encode($roles->map(function($role) {
             return $role->id();
           })));
         
-        Log::info('Required positions ' . (string) collect($this->getRequiredPositions($settings, $group)));
+        Log::info('Required positions '.(string) collect($this->getRequiredPositions($settings, $group)));
         return collect($this->getRequiredPositions($settings, $group))->filter(function(int $positionId) use ($roles) {
             return $roles->filter(function(Role $role) use ($positionId) {
                 return $role->positionId() === $positionId;
@@ -168,7 +168,7 @@ 
      */
     private function getGroup(ActivityInstance $activityInstance)
     {
-        if($activityInstance->resource_type === 'group') {
+        if ($activityInstance->resource_type === 'group') {
             return $activityInstance->participant();
         }
         return $activityInstance->participant()->group();
@@ -182,17 +182,17 @@ 
     private function rolesThroughGroup(Group $group, ModuleInstance $moduleInstance)
     {
         $roles = $group->roles();
-        Log::info('Roles through group pre logic filtering: ' . json_encode($roles->map(function($role) {
+        Log::info('Roles through group pre logic filtering: '.json_encode($roles->map(function($role) {
               return $role->id();
           })));
-        if($this->logicGroupId($moduleInstance) !== null) {
+        if ($this->logicGroupId($moduleInstance) !== null) {
             $logicGroup = app(LogicRepository::class)->getById($this->logicGroupId($moduleInstance));
             return $roles->filter(function(\BristolSU\ControlDB\Contracts\Models\Role $role) use ($moduleInstance, $logicGroup) {
                 return LogicTester::evaluate($logicGroup, null, $role->group(), $role);
             })->values();
         }
 
-        Log::info('Roles through group post logic filtering: ' . json_encode($roles->map(function($role) {
+        Log::info('Roles through group post logic filtering: '.json_encode($roles->map(function($role) {
               return $role->id();
           })));
         
@@ -202,7 +202,7 @@ 
     private function logicGroupId(ModuleInstance $moduleInstance)
     {
         $id = $moduleInstance->setting('logic_group', null);
-        if($id === null) {
+        if ($id === null) {
             return null;
         }
         return (int) $id;