From c685c797eaa06f2f0a8d932062e6d3c4cfa79e85 Mon Sep 17 00:00:00 2001
From: Regis Freyd <djaiss@users.noreply.github.com>
Date: Sat, 20 Mar 2021 12:04:16 -0400
Subject: [PATCH] fix: fix guess employee game (#639)

---
 .../GuessEmployeeGame/CreateGuessEmployeeGame.php        | 9 +++++----
 resources/js/Pages/Company/Index.vue                     | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/Services/Company/GuessEmployeeGame/CreateGuessEmployeeGame.php b/app/Services/Company/GuessEmployeeGame/CreateGuessEmployeeGame.php
index ebb09f441..272e621b1 100644
--- a/app/Services/Company/GuessEmployeeGame/CreateGuessEmployeeGame.php
+++ b/app/Services/Company/GuessEmployeeGame/CreateGuessEmployeeGame.php
@@ -85,8 +85,9 @@ 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')
@@ -94,15 +95,15 @@ private function createNewGame(): void
             ->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
index b3a06331c..cd07c3c89 100644
--- 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>