accessibility-exchange · greatislander · May 2, 2025 · Mar 19, 2025 · Mar 19, 2025 · Mar 19, 2025
diff --git a/app/Actions/Fortify/CreateNewUser.php b/app/Actions/Fortify/CreateNewUser.php
@@ -41,6 +41,10 @@ public function create(array $input): User
             }
         }
 
+        if ($input['context'] === UserContext::Individual->value) {
+            $input['notification_settings'] = ['engagements' => '1'];
+        }
+
         Validator::make(
             $input,
             [
@@ -63,6 +67,7 @@ public function create(array $input): User
                 'locale' => ['required', Rule::in(config('locales.supported'))],
                 'accepted_privacy_policy' => 'accepted',
                 'accepted_terms_of_service' => 'accepted',
+                'notification_settings.engagements' => 'nullable|boolean',
             ],
             [
                 'accepted_privacy_policy.accepted' => __('You must agree to the privacy policy.'),
@@ -88,6 +93,7 @@ public function create(array $input): User
             'extra_attributes' => $input['extra_attributes'] ?? null,
             'accepted_privacy_policy_at' => now(),
             'accepted_terms_of_service_at' => now(),
+            'notification_settings' => $input['notification_settings'] ?? null,
         ]);
     }
 }
diff --git a/app/Console/Commands/MigrateSettingsData.php b/app/Console/Commands/MigrateSettingsData.php
@@ -0,0 +1,150 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Organization;
+use App\Models\User;
+use Exception;
+use Illuminate\Console\Command;
+use Illuminate\Contracts\Console\Isolatable;
+
+use function Termwind\render;
+
+class MigrateSettingsData extends Command implements Isolatable
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'app:migrate-settings-data
+                            {--list : lists out available migrations}
+                            {--from=1.6.0 : when running all migrations, indicate which version the application is being migrated from. Previous migrations will be skipped.}
+                            {--migration= : a specific migration to run}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Migrates settings data that is not performed by database migrations; such as modifying the contents of database fields.';
+
+    protected $migrations = [
+        'EnableEngagementNotifications' => [
+            'version' => '1.7.0',
+            'handler' => 'enableEngagementNotificationsMigration',
+            'description' => 'Replaces older format of notifications_settings with only ["engagements" => "1"]. Setting the engagement notifications on be default. If the notifications_settings contains a valid engagements setting, then no changes are made.',
+        ],
+    ];
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        $verbose = $this->options()['verbose'];
+
+        if ($this->options()['list']) {
+
+            $this->listMigrations($this->migrations);
+
+            return 0;
+        }
+
+        if ($this->options()['migration']) {
+            try {
+                $migration = $this->migrations[$this->options()['migration']];
+            } catch (Exception $e) {
+                $this->fail('Could not find migration: '.$this->options()['migration']);
+            }
+
+            if (isset($migration)) {
+                $handler = $migration['handler'];
+                $this->$handler();
+
+                return 0;
+            }
+        }
+
+        $this->runMigrations($this->migrations, $this->options()['from'], $verbose);
+    }
+
+    public function listMigrations($migrations)
+    {
+        $definitions = '';
+
+        foreach ($migrations as $name => $migration) {
+            $version = $migration['version'];
+            $description = $migration['description'];
+            $definitions .= "<dt>$name</dt><dd>Version added: $version</dd><dd class=\"pb-1\">$description</dd>";
+        }
+
+        render(<<<HTML
+            <dl>
+                $definitions
+            </dl>
+        HTML);
+    }
+
+    public function runMigrations($migrations, $from = '1.6.0', $verbose = false)
+    {
+        $from = str_starts_with($from, 'v') || str_starts_with($from, 'V') ? substr($from, 1) : $from;
+        $migrationRunCount = 0;
+
+        foreach ($migrations as $name => $migration) {
+            if (version_compare($from, $migration['version'], '<')) {
+                if ($verbose) {
+                    $this->line("<fg=cyan>Run migration - $name</>");
+                }
+                $handler = $migration['handler'];
+                $this->$handler($verbose);
+                $migrationRunCount++;
+            } elseif ($verbose) {
+                $this->comment("Skipped migration - $name");
+            }
+
+            if ($verbose) {
+                $this->newLine();
+            }
+        }
+
+        $this->line('<options=bold;fg=green>Completed '.$migrationRunCount.'</>');
+        $this->line('<options=bold;fg=yellow>Skipped   '.(count($migrations) - $migrationRunCount).'</>');
+    }
+
+    // Migrations
+
+    public function enableEngagementNotificationsMigration($verbose = false)
+    {
+        $updatedNotificationSettings = ['engagements' => '1'];
+
+        if ($verbose) {
+            $this->info('  - Migrating engagement notifications for users');
+        }
+
+        $users = User::where('context', 'individual')->whereNull('notification_settings->engagements')
+            ->get();
+
+        $users->each(function ($user) use ($updatedNotificationSettings) {
+            $user->notification_settings = $updatedNotificationSettings;
+            $user->save();
+        });
+
+        if ($verbose) {
+            $this->info('    - Migrated '.$users->count().' users');
+            $this->info('  - Migrating engagement notification settings for Organizations');
+        }
+
+        $orgs = Organization::whereNull('notification_settings->engagements')
+            ->get();
+
+        $orgs->each(function ($organization) use ($updatedNotificationSettings) {
+            $organization->notification_settings = $updatedNotificationSettings;
+            $organization->save();
+        });
+
+        if ($verbose) {
+            $this->info('    - Migrated '.$orgs->count().' Organizations');
+        }
+    }
+}
diff --git a/app/Enums/YesNo.php b/app/Enums/YesNo.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Enums;
+
+enum YesNo: string
+{
+    case Yes = '1';
+    case No = '0';
+
+    public static function labels(): array
+    {
+        return [
+            '1' => __('Yes'),
+            '0' => __('No'),
+        ];
+    }
+}
diff --git a/app/Http/Controllers/EngagementController.php b/app/Http/Controllers/EngagementController.php
@@ -31,6 +31,7 @@
 use App\Models\Project;
 use App\Models\User;
 use App\Notifications\AccessNeedsFacilitationRequested;
+use App\Notifications\EngagementAdded;
 use App\Notifications\JoinedEngagement;
 use App\Notifications\LeftEngagement;
 use App\Notifications\OrganizationAddedToEngagement;
@@ -47,6 +48,7 @@
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Facades\Notification as FacadesNotification;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
 use Notification;
@@ -422,6 +424,21 @@ public function update(UpdateEngagementRequest $request, Engagement $engagement)
             if ($engagement->fresh()->isPublishable()) {
                 $engagement->update(['published_at' => now()]);
                 flash(__('Your engagement has been published.'), 'success|'.__('Your engagement has been published.', [], 'en'));
+
+                if ($engagement->recruitment === EngagementRecruitment::OpenCall->value) {
+                    $users = User::where('context', 'individual')->withNotificationSettings('engagements', '1')->get();
+                    FacadesNotification::send($users, new EngagementAdded($engagement));
+                }
+
+                $projectable = $engagement->project->projectable;
+
+                $otherOrgs = Organization::when($projectable instanceof Organization, fn ($query) => $query->whereNot(fn ($query) => $query->where('id', $projectable->id)))
+                    ->withNotificationSettings('engagements', '1')
+                    ->get();
+
+                if ($otherOrgs->count()) {
+                    FacadesNotification::send($otherOrgs, new EngagementAdded($engagement));
+                }
             }
         } else {
             flash(__('Your engagement has been updated.'), 'success|'.__('Your engagement has been updated.', [], 'en'));

diff --git a/app/Http/Controllers/IndividualController.php b/app/Http/Controllers/IndividualController.php
@@ -10,6 +10,7 @@
 use App\Enums\IndividualRole;
 use App\Enums\MeetingType;
 use App\Enums\ProvinceOrTerritory;
+use App\Enums\YesNo;
 use App\Http\Requests\DestroyIndividualRequest;
 use App\Http\Requests\SaveIndividualRolesRequest;
 use App\Http\Requests\UpdateIndividualCommunicationAndConsultationPreferencesRequest;
@@ -137,10 +138,7 @@ public function edit(Individual $individual): View
             'indigenousIdentities' => Options::forModels(Identity::query()->whereJsonContains('clusters', IdentityCluster::Indigenous))->toArray(),
             'languages' => Options::forArray(get_available_languages(true))->nullable(__('Choose a language…'))->toArray(),
             'livedExperiences' => Options::forModels(Identity::query()->whereJsonContains('clusters', IdentityCluster::LivedExperience)->withoutGlobalScope(ReachableIdentityScope::class))->toArray(),
-            'yesNoOptions' => Options::forArray([
-                '1' => __('Yes'),
-                '0' => __('No'),
-            ])->toArray(),
+            'yesNoOptions' => Options::forEnum(YesNo::class)->toArray(),
             'communityConnectorHasLivedExperience' => Options::forEnum(CommunityConnectorHasLivedExperience::class)->toArray(),
             'contactPeople' => Options::forEnum(ContactPerson::class)->toArray(),
             'meetingTypes' => Options::forEnum(MeetingType::class)->toArray(),

diff --git a/app/Http/Controllers/OrganizationController.php b/app/Http/Controllers/OrganizationController.php
@@ -10,6 +10,7 @@
 use App\Enums\ProvinceOrTerritory;
 use App\Enums\StaffHaveLivedExperience;
 use App\Enums\TeamRole;
+use App\Enums\YesNo;
 use App\Http\Requests\DestroyOrganizationRequest;
 use App\Http\Requests\SaveOrganizationRolesRequest;
 use App\Http\Requests\StoreOrganizationLanguagesRequest;
@@ -82,6 +83,8 @@ public function store(StoreOrganizationRequest $request): RedirectResponse
 
         $data['languages'] = get_supported_locales(false);
 
+        $data['notification_settings'] = ['engagements' => '1'];
+
         $organization = Organization::create($data);
 
         session()->forget('type');
@@ -183,10 +186,7 @@ public function edit(Organization $organization): View
             'indigenousIdentities' => Options::forModels(Identity::query()->whereJsonContains('clusters', IdentityCluster::Indigenous))->toArray(),
             'languages' => Options::forArray(get_available_languages(true))->nullable(__('Choose a language…'))->toArray(),
             'livedExperiences' => Options::forModels(Identity::query()->whereJsonContains('clusters', IdentityCluster::LivedExperience)->withoutGlobalScope(ReachableIdentityScope::class))->toArray(),
-            'yesNoOptions' => Options::forArray([
-                '1' => __('Yes'),
-                '0' => __('No'),
-            ])->toArray(),
+            'yesNoOptions' => Options::forEnum(YesNo::class)->toArray(),
             'staffHaveLivedExperience' => Options::forEnum(StaffHaveLivedExperience::class)->toArray(),
         ]);
     }

diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
@@ -11,6 +11,7 @@
 use App\Enums\ProvinceOrTerritory;
 use App\Enums\TeamRole;
 use App\Enums\Theme;
+use App\Enums\YesNo;
 use App\Http\Requests\UpdateAccessNeedsRequest;
 use App\Http\Requests\UpdateAreasOfInterestRequest;
 use App\Http\Requests\UpdateCommunicationAndConsultationPreferencesRequest;
@@ -357,6 +358,7 @@ public function editNotificationPreferences(): View
             'organizationNotificationChannels' => Options::forEnum(OrganizationNotificationChannel::class)->toArray(),
             'projectNotificationTypes' => Options::forArray($projectNotificationTypes)->toArray(),
             'engagementNotificationTypes' => Options::forArray($engagementNotificationTypes)->toArray(),
+            'yesNoOptions' => Options::forEnum(YesNo::class)->toArray(),
         ]);
     }