fix: fix guess employee game (#639)

officelifehq · Mar 20, 2021 · c685c79 · c685c79
1 parent b9d437b
commit c685c79
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/app/Services/Company/GuessEmployeeGame/CreateGuessEmployeeGame.php b/app/Services/Company/GuessEmployeeGame/CreateGuessEmployeeGame.php
@@ -85,24 +85,25 @@ private function createNewGame(): void
             ->inRandomOrder()
             ->first();
 
-        $allEmployees = $this->employee->company->employees()
+        $twoOtherEmployees = $this->employee->company->employees()
             ->where('locked', false)
+            ->where('id', '!=', $employeeToFind->id)
             ->where('id', '!=', $this->employee->id)
             ->where('pronoun_id', $employeeToFind->pronoun_id)
             ->select('id', 'first_name', 'last_name')
             ->inRandomOrder()
             ->take(2)
             ->get();
 
-        if ($allEmployees->count() != 2) {
+        if ($twoOtherEmployees->count() != 2) {
             throw new OutOfRangeException();
         }
 
         $this->game = GuessEmployeeGame::create([
             'employee_who_played_id' => $this->employee->id,
             'employee_to_find_id' => $employeeToFind->id,
-            'first_other_employee_to_find_id' => $allEmployees->get(0)->id,
-            'second_other_employee_to_find_id' => $allEmployees->get(1)->id,
+            'first_other_employee_to_find_id' => $twoOtherEmployees->get(0)->id,
+            'second_other_employee_to_find_id' => $twoOtherEmployees->get(1)->id,
             'played' => false,
             'found' => false,
         ]);

diff --git a/resources/js/Pages/Company/Index.vue b/resources/js/Pages/Company/Index.vue
@@ -63,12 +63,12 @@
           <new-hires :hires="newHiresThisWeek" />
 
           <recent-skills :skills="latestSkills" />
-
-          <recent-ships :ships="latestShips" />
         </div>
 
         <div class="fl w-third-l w-100 pl4-l">
           <teams :teams="teams" :statistics="statistics" />
+
+          <recent-ships :ships="latestShips" />
         </div>
       </div>
     </div>