review users (#290)

code4romania · Sep 21, 2023 · accb8eb · accb8eb
1 parent 0762f80
commit accb8eb
Show file tree

Hide file tree

Showing 109 changed files with 1,568 additions and 1,452 deletions.
diff --git a/app/Concerns/BelongsToOrganization.php b/app/Concerns/BelongsToOrganization.php
@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Concerns;
+
+use App\Models\Organization;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+trait BelongsToOrganization
+{
+    public function initializeBelongsToOrganization(): void
+    {
+        $this->fillable[] = 'organization_id';
+    }
+
+    public function organization(): BelongsTo
+    {
+        return $this->belongsTo(Organization::class);
+    }
+
+    public function belongsToOrganization(?Organization $organization = null): bool
+    {
+        if ($organization === null) {
+            return $this->organization_id !== null;
+        }
+
+        return $this->organization_id === $organization->getKey();
+    }
+
+    public function scopeWhereBelongsToOrganization(Builder $query, ?Organization $organization = null): Builder
+    {
+        if ($organization === null) {
+            return $query->whereNotNull('organization_id');
+        }
+
+        return $query->whereBelongsTo($organization);
+    }
+}
diff --git a/app/Concerns/ArrayableEnum.php → app/Concerns/Enums/Arrayable.php b/app/Concerns/ArrayableEnum.php → app/Concerns/Enums/Arrayable.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace App\Concerns;
+namespace App\Concerns\Enums;
 
-trait ArrayableEnum
+trait Arrayable
 {
     public static function names(): array
     {
@@ -28,18 +28,4 @@ public static function options(): array
             ])
             ->all();
     }
-
-    public function label(): string
-    {
-        $label = collect([$this->translationKeyPrefix(), $this->value])
-            ->filter()
-            ->implode('.');
-
-        return __($label);
-    }
-
-    protected function translationKeyPrefix(): ?string
-    {
-        return null;
-    }
 }
diff --git a/app/Concerns/Enums/Comparable.php b/app/Concerns/Enums/Comparable.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Concerns\Enums;
+
+trait Comparable
+{
+    /**
+     * Check if this enum matches the given enum instance or value.
+     */
+    public function is(mixed $enum): bool
+    {
+        if ($enum instanceof static) {
+            return $this->value === $enum->value;
+        }
+
+        return $this->value === $enum;
+    }
+}
diff --git a/app/Concerns/Enums/HasLabel.php b/app/Concerns/Enums/HasLabel.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Concerns\Enums;
+
+trait HasLabel
+{
+    protected function labelKeyPrefix(): ?string
+    {
+        return null;
+    }
+
+    public function label(): string
+    {
+        $label = collect([$this->labelKeyPrefix(), $this->value])
+            ->filter()
+            ->implode('.');
+
+        return __($label);
+    }
+}
diff --git a/app/Concerns/HasRole.php b/app/Concerns/HasRole.php
@@ -0,0 +1,83 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Concerns;
+
+use App\Enums\UserRole;
+use App\Models\Organization;
+use Illuminate\Database\Eloquent\Builder;
+
+trait HasRole
+{
+    public function initializeHasRole(): void
+    {
+        $this->casts['role'] = UserRole::class;
+    }
+
+    private function hasRole(UserRole $role): bool
+    {
+        return $this->role === $role;
+    }
+
+    public function isSuperUser(): bool
+    {
+        return $this->isSuperAdmin() || $this->isSuperManager();
+    }
+
+    public function isSuperAdmin(): bool
+    {
+        return $this->hasRole(UserRole::SUPERADMIN);
+    }
+
+    public function isSuperManager(): bool
+    {
+        return $this->hasRole(UserRole::SUPERMANAGER);
+    }
+
+    public function isOrganizationAdmin(?Organization $organization = null): bool
+    {
+        return $this->hasRole(UserRole::ADMIN) && $this->belongsToOrganization($organization);
+    }
+
+    public function isOrganizationManager(?Organization $organization = null): bool
+    {
+        return $this->hasRole(UserRole::USER) && $this->belongsToOrganization($organization);
+    }
+
+    // ========================================== //
+    public function scopeOnlySuperUsers(Builder $query): Builder
+    {
+        return $query->whereIn('role', [UserRole::SUPERADMIN, UserRole::SUPERMANAGER]);
+    }
+
+    public function scopeOnlySuperAdmins(Builder $query): Builder
+    {
+        return $query->where('role', UserRole::SUPERADMIN);
+    }
+
+    public function scopeOnlySuperManagers(Builder $query): Builder
+    {
+        return $query->where('role', UserRole::SUPERMANAGER);
+    }
+
+    public function scopeWithoutSuperUsers(Builder $query): Builder
+    {
+        return $query->whereNotIn('role', [UserRole::SUPERADMIN, UserRole::SUPERMANAGER]);
+    }
+
+    // ========================================== //
+
+    public function scopeOnlyOrganizationAdmins(Builder $query, ?Organization $organization = null): Builder
+    {
+        return $query->where('role', UserRole::ADMIN)
+            ->whereBelongsToOrganization($organization);
+    }
+
+    // ========================================== //
+
+    public function isDonor(): bool
+    {
+        return $this->role === UserRole::donor;
+    }
+}
diff --git a/app/Concerns/LogsActivityForApproval.php b/app/Concerns/LogsActivityForApproval.php
@@ -59,7 +59,7 @@ public function tapActivity(Activity $activity, string $eventName)
             return;
         }
 
-        if (auth()->user()->isBbAdmin() || auth()->user()->isBbManager()) {
+        if (auth()->user()->isSuperUser()) {
             activity()->disableLogging();
 
             if (! $activity->description) {

diff --git a/app/Concerns/MustSetInitialPassword.php b/app/Concerns/MustSetInitialPassword.php
@@ -4,9 +4,8 @@
 
 namespace App\Concerns;
 
-use App\Enums\UserRole;
-use App\Notifications\Admin\WelcomeNotification as AdminWelcomeNotification;
-use App\Notifications\Ngo\WelcomeNotification;
+use App\Notifications\Admin;
+use App\Notifications\Ngo;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
 
@@ -21,10 +20,8 @@ protected static function bootMustSetInitialPassword(): void
         });
 
         static::created(function (self $user) {
-            if (! app()->runningInConsole()) {
-                if (! empty($user->created_by)) {
-                    $user->sendWelcomeNotification();
-                }
+            if (filled($user->created_by)) {
+                $user->sendWelcomeNotification();
             }
         });
     }
@@ -45,11 +42,10 @@ public function setPassword(string $password): bool
 
     public function sendWelcomeNotification(): void
     {
-        if ($this->role === UserRole::ngo_admin) {
-            $this->notify(new WelcomeNotification());
-
-            return;
-        }
-        $this->notify(new AdminWelcomeNotification());
+        $this->notify(
+            $this->isSuperUser()
+                ? new Admin\WelcomeNotification
+                : new Ngo\WelcomeNotification
+        );
     }
 }
diff --git a/app/Enums/ActivityDomain.php b/app/Enums/ActivityDomain.php
@@ -4,11 +4,12 @@
 
 namespace App\Enums;
 
-use App\Concerns\ArrayableEnum;
+use App\Concerns\Enums\Arrayable;
 
 enum ActivityDomain: string
 {
-    use ArrayableEnum;
+    use Arrayable;
+
     case environmental_protection = 'Protecția mediului';
     case education = 'Educație';
     case healthcare = 'Sănătate';

diff --git a/app/Enums/OrganizationStatus.php b/app/Enums/OrganizationStatus.php
@@ -4,18 +4,23 @@
 
 namespace App\Enums;
 
-use App\Concerns\ArrayableEnum;
+use App\Concerns\Enums\Arrayable;
+use App\Concerns\Enums\Comparable;
+use App\Concerns\Enums\HasLabel;
 
 enum OrganizationStatus: string
 {
-    use ArrayableEnum;
+    use Arrayable;
+    use Comparable;
+    use HasLabel;
+
     case draft = 'draft';
     case pending = 'pending';
     case approved = 'active';
     case rejected = 'disabled';
     case pending_changes = 'pending_changes';
 
-    protected function translationKeyPrefix(): ?string
+    protected function labelKeyPrefix(): ?string
     {
         return 'organization.status_arr';
     }

diff --git a/app/Enums/ProjectStatus.php b/app/Enums/ProjectStatus.php
@@ -4,11 +4,16 @@
 
 namespace App\Enums;
 
-use App\Concerns\ArrayableEnum;
+use App\Concerns\Enums\Arrayable;
+use App\Concerns\Enums\Comparable;
+use App\Concerns\Enums\HasLabel;
 
 enum ProjectStatus: string
 {
-    use ArrayableEnum;
+    use Arrayable;
+    use Comparable;
+    use HasLabel;
+
     case draft = 'draft';
     case pending = 'pending';
     case change_request = 'change_request';
@@ -17,7 +22,7 @@ enum ProjectStatus: string
     case active = 'active';
     case disabled = 'disabled';
 
-    protected function translationKeyPrefix(): ?string
+    protected function labelKeyPrefix(): ?string
     {
         return 'project.status_arr';
     }

diff --git a/app/Enums/UserRole.php b/app/Enums/UserRole.php
@@ -4,17 +4,24 @@
 
 namespace App\Enums;
 
-use App\Concerns\ArrayableEnum;
+use App\Concerns\Enums\Arrayable;
+use App\Concerns\Enums\Comparable;
+use App\Concerns\Enums\HasLabel;
 
 enum UserRole: string
 {
-    use ArrayableEnum;
+    use Arrayable;
+    use Comparable;
+    use HasLabel;
+
+    case SUPERADMIN = 'superadmin';
+    case SUPERMANAGER = 'supermanager';
+    case ADMIN = 'admin';
+    case USER = 'user';
+
     case donor = 'donor';
-    case ngo_admin = 'ngo-admin';
-    case bb_manager = 'bb-manager';
-    case bb_admin = 'bb-admin';
 
-    public function translationKeyPrefix(): string
+    public function labelKeyPrefix(): string
     {
         return 'user.roles';
     }

diff --git a/app/Enums/VolunteerStatus.php b/app/Enums/VolunteerStatus.php
@@ -4,15 +4,21 @@
 
 namespace App\Enums;
 
-use App\Concerns\ArrayableEnum;
+use App\Concerns\Enums\Arrayable;
+use App\Concerns\Enums\Comparable;
+use App\Concerns\Enums\HasLabel;
 
 enum VolunteerStatus: string
 {
-    use ArrayableEnum;
+    use Arrayable;
+    use Comparable;
+    use HasLabel;
+
     case PENDING = 'pending';
     case APPROVED = 'approved';
     case REJECTED = 'rejected';
-    public function translationKeyPrefix(): string
+
+    public function labelKeyPrefix(): string
     {
         return 'volunteer.statuses';
     }

diff --git a/app/Filament/Resources/OrganizationResource/Actions/Tables/ExportAction.php b/app/Filament/Resources/OrganizationResource/Actions/Tables/ExportAction.php
@@ -45,7 +45,6 @@ protected function setUp(): void
                         ->with([
                             'activityDomains',
                             'counties',
-                            'users' => fn ($q) => $q->onlyNGOAdmins(),
                             'projects' => fn ($q) => $q->select('id', 'organization_id', 'status')
                                 ->withCount('donations'),
                         ])