Have getIdForCurrentUser method return null if FMCS enabled, user is not super admin, and does not have company

Author: marcusmoore

app/Models/Company.php

@@ -116,7 +116,7 @@ public static function getIdForCurrentUser($unescaped_input)
                 if ($current_user->company_id != null) {
                     return $current_user->company_id;
                 } else {
-                    return static::getIdFromInput($unescaped_input);
+                    return null;
                 }
             }
         }

tests/Unit/Models/Company/GetIdForCurrentUserTest.php

@@ -4,8 +4,10 @@
 
 use App\Models\Company;
 use App\Models\User;
+use PHPUnit\Framework\Attributes\Group;
 use Tests\TestCase;
 
+#[Group('focus')]
 class GetIdForCurrentUserTest extends TestCase
 {
     public function testReturnsProvidedValueWhenFullCompanySupportDisabled()
@@ -32,11 +34,11 @@ public function testReturnsNonSuperUsersCompanyIdWhenFullCompanySupportEnabled()
         $this->assertEquals(2000, Company::getIdForCurrentUser(1000));
     }
 
-    public function testReturnsProvidedValueForNonSuperUserWithoutCompanyIdWhenFullCompanySupportEnabled()
+    public function testReturnsNullForNonSuperUserWithoutCompanyIdWhenFullCompanySupportEnabled()
     {
         $this->settings->enableMultipleFullCompanySupport();
 
         $this->actingAs(User::factory()->create(['company_id' => null]));
-        $this->assertEquals(1000, Company::getIdForCurrentUser(1000));
+        $this->assertNull(Company::getIdForCurrentUser(1000));
     }
 }