Merge pull request #72 from IFRCGo/staging

Staging

Author: joseganora

app/Classes/Repositories/ApplicationRepository.php

@@ -54,6 +54,11 @@ public function findIn($ids = [], $columns = ['*'])
     public function create(array $attributes)
     {
         $attributes['key'] = Application::generateKey();
+        $attributes['rules'] = array_merge([
+            'can_access_legacy_whatnow' => true,
+            'can_access_preparedness_v2' => false,
+            'allowed_country_code' => [],
+        ], $attributes['rules'] ?? []);
 
         return $this->applicationModel->create($attributes);
     }

app/Classes/Repositories/WhatNowRepository.php

@@ -14,7 +14,7 @@ class WhatNowRepository implements WhatNowRepositoryInterface
         'recover',
         'anticipated',
         'assess_and_plan',
-        'mitigate_risks',
+        'mitigate_risk',
         'prepare_to_respond',
 
 

app/Http/Middleware/ApiAuthMiddleware.php

@@ -44,7 +44,10 @@ public function handle($request, Closure $next)
                 return response()->json(['error' => 'Application is not allowed to access this API version'], 403);
             }
 
-            $canAccessOrganisation = $this->canAccessOrganisation($request->path(), (array) $application->rules);
+            $canAccessOrganisation = true;
+            if (strpos($request->path(), 'v2/') === 0) {
+                $canAccessOrganisation = $this->canAccessOrganisation($request->path(), (array) $application->rules);
+            }
 
             if (!$canAccessOrganisation) {
                 return response()->json(['error' => 'Application is not allowed to access this organisation'], 403);

database/migrations/2026_04_20_000000_change_mitigate_risks_to_mitigate_risk_in_whatnow_entity_stages_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+class ChangeMitigateRisksToMitigateRiskInWhatnowEntityStagesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        DB::statement("ALTER TABLE whatnow_entity_stages MODIFY COLUMN stage ENUM('immediate', 'warning', 'anticipated', 'assess_and_plan', 'mitigate_risks', 'mitigate_risk', 'prepare_to_respond', 'recover') NOT NULL");
+        DB::statement("UPDATE whatnow_entity_stages SET stage = 'mitigate_risk' WHERE stage = 'mitigate_risks'");
+        DB::statement("ALTER TABLE whatnow_entity_stages MODIFY COLUMN stage ENUM('immediate', 'warning', 'anticipated', 'assess_and_plan', 'mitigate_risk', 'prepare_to_respond', 'recover') NOT NULL");
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        DB::statement("ALTER TABLE whatnow_entity_stages MODIFY COLUMN stage ENUM('immediate', 'warning', 'anticipated', 'assess_and_plan', 'mitigate_risks', 'mitigate_risk', 'prepare_to_respond', 'recover') NOT NULL");
+        DB::statement("UPDATE whatnow_entity_stages SET stage = 'mitigate_risks' WHERE stage = 'mitigate_risk'");
+        DB::statement("ALTER TABLE whatnow_entity_stages MODIFY COLUMN stage ENUM('immediate', 'warning', 'anticipated', 'assess_and_plan', 'mitigate_risks', 'prepare_to_respond', 'recover') NOT NULL");
+    }
+}
+