From bddd27475c599a774b8aa4e37e6351dffb2f297f Mon Sep 17 00:00:00 2001
From: "sosuke.iwabuchi" <sosuke.iwabuchi@satellite-tech.co.jp>
Date: Thu, 22 Jun 2023 10:51:16 +0900
Subject: [PATCH] =?UTF-8?q?=E6=A8=A9=E9=99=90=E5=91=A8=E3=82=8A=E3=80=80?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/Ex/LoginUser.php | 2 +-
 app/Models/User.php         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Models/Ex/LoginUser.php b/app/Models/Ex/LoginUser.php
index 8d373eb..a6f273b 100644
--- a/app/Models/Ex/LoginUser.php
+++ b/app/Models/Ex/LoginUser.php
@@ -52,7 +52,7 @@ class LoginUser
     public function setCurrentContractId(?string $contractId)
     {
         $user = $this->user();
-        if ($user && Auth::user()->role !== UserRole::SUPER_ADMIN) {
+        if ($user && Auth::user()->role !== UserRole::SUPER_ADMIN && $contractId !== null) {
             throw new LogicException("スーパー管理者以外の成り代わりを検知");
         }
         Session::put(self::SESSION_KEY_CURERNT_CONTRACT_ID, $contractId);
diff --git a/app/Models/User.php b/app/Models/User.php
index 838d8ef..29c4af5 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -10,6 +10,7 @@ use App\Models\Feature\ContractFeature;
 use App\Models\Feature\IModelFeature;
 use Illuminate\Database\Eloquent\Concerns\HasUuids;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Query\Builder;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
@@ -18,7 +19,7 @@ use Laravel\Sanctum\HasApiTokens;
 
 class User extends Authenticatable implements IModelFeature
 {
-    use HasApiTokens, HasFactory, Notifiable, HasUuids, ContractFeature;
+    use HasApiTokens, HasFactory, Notifiable, HasUuids, SoftDeletes, ContractFeature;
 
     const COL_NAME_ID = 'id';
     const COL_NAME_ROLE = 'role';