fix(GAT-8579): NHS SDE approval is wrong (#1556)

Author: calmacx

app/Models/User.php

@@ -4,23 +4,23 @@
 
 // use Laravel\Sanctum\HasApiTokens;
 use App\Http\Traits\WithJwtUser;
-use Laravel\Passport\HasApiTokens;
-use Illuminate\Notifications\Notifiable;
-use Illuminate\Database\Eloquent\SoftDeletes;
-use Illuminate\Database\Eloquent\Relations\HasOne;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Foundation\Auth\User as Authenticatable;
-use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasOne;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Foundation\Auth\User as Authenticatable;
+use Illuminate\Notifications\Notifiable;
+use Laravel\Passport\HasApiTokens;
 
 class User extends Authenticatable
 {
+    use HasApiTokens;
     use HasFactory;
     use Notifiable;
     use SoftDeletes;
     use WithJwtUser;
-    use HasApiTokens;
 
     /**
      * The attributes that are mass assignable.
@@ -75,14 +75,12 @@ class User extends Authenticatable
         'is_nhse_sde_approval' => 'boolean',
     ];
 
-
     public function sector(): BelongsTo
     {
         return $this->belongsTo(Sector::class);
     }
 
-
-    protected $appends = ['rquestroles', 'cohort_discovery_roles'];
+    protected $appends = ['rquestroles', 'cohort_discovery_roles', 'cohort_discovery_nhs_sde'];
 
     public function getCohortDiscoveryRolesAttribute()
     {
@@ -93,12 +91,12 @@ public function getCohortDiscoveryRolesAttribute()
             'request_status' => 'APPROVED',
         ])->first();
 
-        if (!$cohortRequest) {
+        if (! $cohortRequest) {
             return [];
         }
 
         $cohortRequestRoleIds = CohortRequestHasPermission::where([
-            'cohort_request_id' => $cohortRequest->id
+            'cohort_request_id' => $cohortRequest->id,
         ])->pluck('permission_id')->toArray();
 
         $cohortRequestRoles = Permission::whereIn('id', $cohortRequestRoleIds)->pluck('name')->toArray();
@@ -115,19 +113,34 @@ public function getRquestRolesAttribute()
             'request_status' => 'APPROVED',
         ])->first();
 
-        if (!$cohortRequest) {
+        if (! $cohortRequest) {
             return [];
         }
 
         $cohortRequestRoleIds = CohortRequestHasPermission::where([
-            'cohort_request_id' => $cohortRequest->id
+            'cohort_request_id' => $cohortRequest->id,
         ])->pluck('permission_id')->toArray();
 
         $cohortRequestRoles = Permission::whereIn('id', $cohortRequestRoleIds)->pluck('name')->toArray();
 
         return $cohortRequestRoles;
     }
 
+    public function getCohortDiscoveryNhsSdeAttribute()
+    {
+        $id = $this->id;
+
+        $nhsSdeApproved = CohortRequest::where([
+            'user_id' => $id,
+            'request_status' => 'APPROVED',
+            'nhse_sde_request_status' => 'APPROVED',
+        ])
+            ->whereNull('nhse_sde_request_expire_at')
+            ->exists();
+
+        return $nhsSdeApproved;
+    }
+
     /**
      * Get the tool that owns the user
      */