Development

app/Actions/Permissions/ReadPermissionConfig.php

@@ -16,12 +16,7 @@ class ReadPermissionConfig
      */
     public function execute(string $path): array|null
     {
-        $content = Storage::get($path);
-        if (!$content) {
-            throw new Exception("Error: file storage/app/$path is not found!");
-        }
-
-        $config = Yaml::parse($content);
+        $config = Yaml::parseFile($path);
         // Validate if roles and permissions sections are present
         if (!isset($config['roles'])) {
             throw new Exception('Error: there are no roles specified!');

app/Console/Commands/SyncPermissions.php

@@ -5,6 +5,8 @@
 use App\Actions\Permissions\ReadPermissionConfig;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Storage;
+use Mockery\Exception;
+use Spatie\Permission\Exceptions\PermissionDoesNotExist;
 use Spatie\Permission\Exceptions\RoleDoesNotExist;
 use Spatie\Permission\Models\Permission;
 use Spatie\Permission\Models\Role;
@@ -27,20 +29,31 @@ class SyncPermissions extends Command
     protected $description = 'Synchronizes the permissions';
     protected ReadPermissionConfig $readPermissionConfig;
 
+    private $newRoles = [];
+    private $newPermissions = [];
+
     /**
      * Execute the console command.
      */
     public function handle()
     {
         $this->readPermissionConfig = new ReadPermissionConfig();
-        $config = $this->readPermissionConfig->execute('config/permissions.yml');
+        $config = $this->readPermissionConfig->execute('config/permissions/permissions.yml');
         if (!$config) {
             $this->error("Aborting...");
             return 1;
         }
 
         $this->syncRoles($config['roles']);
         $this->syncPermissions($config['permissions']);
+
+        if (count($this->newRoles) > 0) {
+            $this->info('The added roles: ' . implode(', ', $this->newRoles));
+        }
+        if (count($this->newPermissions) > 0) {
+            $this->info('The added permissions: ' . implode(', ', $this->newPermissions));
+        }
+
         return 0;
     }
 
@@ -61,6 +74,12 @@ private function syncRoles(array|string $input)
             ];
         }
         foreach ($role_data as $role) {
+            try {
+                Role::findByName($role['name']);
+            } catch (RoleDoesNotExist) {
+                $this->newRoles[] = $role['name'];
+            }
+
             Role::updateOrCreate(
                 ['name' => $role['name']],
                 $role
@@ -103,6 +122,13 @@ private function syncPermissions(array $permissions)
         foreach ($permissions as $item) {
             $roles = $item['roles'];
             unset($item['roles']);
+
+            try {
+                Permission::findByName($item['name']);
+            } catch (PermissionDoesNotExist) {
+                $this->newPermissions[] = $item['name'];
+            }
+
             $permission = Permission::updateOrCreate(
                 ['name' => $item['name']],
                 $item

app/Jobs/NotifyCompanyRoles.php

@@ -37,7 +37,7 @@ public function handle(): void
         $users = collect();
         if ($this->receiver == 'crew') {
             $users = User::role(['event organizer', 'assistant organizer'])->get();
-        } else if ($this->receiver == 'company representative') {
+        } elseif ($this->receiver == 'company representative') {
             if ($representative = $this->company->representative) {
                 $users->push($representative);
             }

app/Jobs/NotifyPresentationRoles.php

@@ -37,7 +37,7 @@ public function handle(): void
         $users = collect();
         if ($this->receiver == 'crew') {
             $users = User::role(['event organizer', 'speakers supervisor', 'assistant organizer'])->get();
-        } else if ($this->receiver == 'speaker') {
+        } elseif ($this->receiver == 'speaker') {
             $users = $this->presentation->speakers;
         }
 

app/Livewire/Crew/RolePermissionsInfo.php

@@ -23,7 +23,7 @@ public function mount($role)
     {
         $this->role = Role::find($role);
         $this->readPermissionConfig = new ReadPermissionConfig();
-        $permissionsData = $this->readPermissionConfig->execute('config/permissions.yml');
+        $permissionsData = $this->readPermissionConfig->execute('config/permissions/permissions.yml');
 
         foreach ($permissionsData['permissions'] as $entity => $actions) {
             foreach ($actions as $action => $rolesWithPermission) {

app/Models/User.php

@@ -400,7 +400,7 @@ public function ticketStatus(): Attribute
                             'color' => 'green',
                             'icon' => 'M9 12.75 11.25 15 15 9.75M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z',
                             ];
-                    } else if (optional(Edition::current())->is_final_programme_released) {
+                    } elseif (optional(Edition::current())->is_final_programme_released) {
                         return [
                             'status' => 'Ticket sent',
                             'color' => 'yellow',