Merge remote-tracking branch 'origin/feature/WN-174' into feature/WN-174

# Conflicts:
#	app/Classes/Repositories/WhatNowRepository.php
#	app/Models/WhatNowEntityStage.php
#	database/migrations/2023_01_20_094214_create_key_messages_table.php
#	database/migrations/2025_02_10_002000_update_enum_stage_in_whatnow_entity_stages_table.php
#	database/seeds/WhatNowTableSeeder.php

Author: jajaramillo24

.env.bitbucket-pipelines

@@ -13,12 +13,6 @@ DB_DATABASE=redcross_local
 DB_USERNAME=preparecenter
 DB_PASSWORD=preparecenter
 
-STATS_DB_HOST=0.0.0.0
-STATS_DB_PORT=3307
-STATS_DB_DATABASE=redcross_logs
-STATS_DB_USERNAME=preparecenter
-STATS_DB_PASSWORD=preparecenter
-
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
 QUEUE_CONNECTION=sync

.env.example

@@ -13,12 +13,6 @@ DB_DATABASE=preparecenter
 DB_USERNAME=preparecenter
 DB_PASSWORD=preparecenter
 
-STATS_DB_HOST=mysql_stats
-STATS_DB_PORT=3306
-STATS_DB_DATABASE=usage_logs
-STATS_DB_USERNAME=preparecenter
-STATS_DB_PASSWORD=preparecenter
-
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
 QUEUE_CONNECTION=sync

app/Classes/Feeds/WhatNowFeed.php

@@ -9,6 +9,7 @@
 use App\Classes\Serializers\CustomDataSerializer;
 use App\Classes\Transformers\WhatNowEntityTransformer;
 use App\Models\Organisation;
+use App\Models\Region;
 use App\Models\WhatNowEntity;
 
 class WhatNowFeed implements JsonFeedInterface
@@ -18,6 +19,11 @@ class WhatNowFeed implements JsonFeedInterface
 	 */
 	protected $language;
 
+	/**
+	 * @var Region
+	 */
+	protected $region;
+
 	/**
 	 * @var Organisation
 	 */
@@ -85,14 +91,23 @@ public function setOrganisation(Organisation $org)
 	}
 
 	/**
-	 * @param string $lang
+	 * @param null $region
 	 * @return $this
 	 */
-	public function setLanguage($lang = 'en_US')
+	public function setRegion(Region $region = null)
 	{
-		// @todo validate locale
-		$this->language = $lang;
+		$this->region = $region;
+		return $this;
+	}
 
+	/**
+	 * @param string $lang
+	 * @return $this
+	 */
+	public function setLanguage($lang = null)
+	{
+		$this->language = $lang ? substr($lang, 0, 2) : null;
+		$this->transformer->setLang($this->language);
 		return $this;
 	}
 
@@ -118,7 +133,8 @@ public function loadData()
 		$data = $this->whatNowRepo->findItemsForOrgId(
 			$this->organisation->id,
 			$this->language,
-			$this->filterEventTypes
+			$this->filterEventTypes,
+			$this->region->id ?? null
 		);
 
 		if ($data instanceof Collection) {

app/Classes/Repositories/RegionRepository.php

@@ -1,9 +1,40 @@
 <?php
-
 namespace App\Classes\Repositories;
 
+use App\Models\Region;
+
+
 class RegionRepository implements RegionRepositoryInterface
 {
+    /**
+     * @var Region
+     */
+    protected $regModel;
+
+    /**
+     * @param Region $regionModel
+     */
+    public function __construct(Region $regModel)
+    {
+        $this->regModel = $regModel;
+    }
+
+    /**
+     * @param array $attributes
+     * @return static
+     */
+    public function newInstance(array $attributes = [])
+    {
+        return $this->regModel->newInstance($attributes);
+    }
+
+
+    public function findBySlug($orgId, $slug)
+    {
+        $slug = strtolower($slug);
+        $slug = str_replace(' ', '-', $slug);
+        return $this->regModel->where('slug', $slug)->where('organisation_id', $orgId)->firstOrFail();
+    }
 
     public function mapTranslationInput($regionId, $language_code, $data)
     {

app/Classes/Repositories/RegionRepositoryInterface.php

@@ -4,5 +4,10 @@
 
 interface RegionRepositoryInterface
 {
+    /**
+	 * @param $regionName
+	 * @return mixed
+	 */
+	public function findBySlug($orgId, $slug);
 
 }

app/Classes/Repositories/UsageLogRepository.php

@@ -86,7 +86,7 @@ public function getForEndpoint($endpoint, $fromDate = null, $toDate = null)
 
     public function listByEndpoint($fromDate = null, $toDate = null)
     {
-        $query = DB::connection('stats_mysql')->table('usage_logs')
+        $query = DB::table('usage_logs')
             ->select('endpoint', 'application_id', DB::raw('count(*) as hit_count'))
             ->groupBy('application_id', 'endpoint')
             ->orderBy('hit_count', 'desc');

app/Classes/Repositories/WhatNowRepository.php

@@ -9,13 +9,15 @@
 class WhatNowRepository implements WhatNowRepositoryInterface
 {
     public const EVENT_STAGES = [
-        'immediate',
         'warning',
+        'immediate',
+        'recover',
         'anticipated',
         'assess_and_plan',
         'mitigate_risks',
         'prepare_to_respond',
-        'recover'
+
+        
     ];
 
     /**
@@ -54,7 +56,7 @@ public function all($columns = ['*'])
         return $this->whatNowModel->all($columns);
     }
 
-      /**
+    /**
      * @param array $attributes
      * @return WhatNowEntity
      */
@@ -149,14 +151,18 @@ public function destroy($id)
      * @param null $lang
      * @param array $eventTypes
      */
-    public function findItemsForOrgId($orgId, $lang = null, array $eventTypes = [])
+    public function findItemsForOrgId($orgId, $lang = null, array $eventTypes = [], $regId = null)
     {
         $query = $this->whatNowModel->where('org_id', $orgId);
 
         if (count($eventTypes)) {
             $query->whereIn('event_type', $eventTypes);
         }
 
+        if ($regId) {
+            $query->where('region_id', $regId);
+        }
+
         return $query->get();
     }
 

app/Classes/Repositories/WhatNowRepositoryInterface.php

@@ -9,7 +9,7 @@ interface WhatNowRepositoryInterface extends RepositoryInterface
      * @param null $lang
      * @param array $eventTypes
      */
-    public function findItemsForOrgId($orgId, $lang = null, array $eventTypes = []);
+    public function findItemsForOrgId($orgId, $lang = null, array $eventTypes = [], $regionName = null);
 
     /**
      * @param $orgId

app/Classes/Repositories/WhatNowTranslationRepository.php

@@ -152,14 +152,23 @@ public function getLatestTranslations($id)
      * @param $id
      * @return \Illuminate\Database\Eloquent\Collection
      */
-    public function getLatestPublishedTranslations($id)
+    public function getLatestPublishedTranslations($id, $lang = null)
     {
         $model = $this->whatNowTranslationModel;
 
-        return $model::fromQuery(DB::raw('SELECT wet1.*
-FROM whatnow_entity_translations wet1
-LEFT JOIN whatnow_entity_translations wet2 ON wet1.entity_id = wet2.entity_id AND wet1.language_code = wet2.language_code AND wet1.published_at < wet2.published_at
-WHERE wet2.published_at IS NULL AND wet1.entity_id = :entityId AND wet1.published_at IS NOT NULL'), ['entityId' => $id]);
+        $query = 'SELECT wet1.*
+              FROM whatnow_entity_translations wet1
+              LEFT JOIN whatnow_entity_translations wet2 ON wet1.entity_id = wet2.entity_id AND wet1.language_code = wet2.language_code AND wet1.published_at < wet2.published_at
+              WHERE wet2.published_at IS NULL AND wet1.entity_id = :entityId AND wet1.published_at IS NOT NULL';
+        
+        $bindings = ['entityId' => $id];
+
+        if ($lang !== null) {
+            $query .= ' AND wet1.language_code = :lang';
+            $bindings['lang'] = $lang;
+        }
+
+        return $model::fromQuery(DB::raw($query), $bindings);
     }
 
     /**

app/Classes/Repositories/WhatNowTranslationRepositoryInterface.php

@@ -23,7 +23,7 @@ public function getLatestTranslations($id);
 	 * @param $id
 	 * @return \Illuminate\Database\Eloquent\Collection
 	 */
-	public function getLatestPublishedTranslations($id);
+	public function getLatestPublishedTranslations($id, $lang = null);
 
 	/**
 	 * @param array $ids