Merge branch 'develop' into feature/WN-174

LDFOUR\luisd · LDFOUR\luisd · commit 99c3a41f72d6 · 2025-02-10T12:44:28.000-03:00
# Conflicts:
#	app/Classes/Transformers/WhatNowEntityTransformer.php
diff --git a/.env.bitbucket-pipelines b/.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
diff --git a/.env.example b/.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
diff --git a/app/Classes/Feeds/WhatNowFeed.php b/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) {
diff --git a/app/Classes/Repositories/RegionRepository.php b/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)
     {
diff --git a/app/Classes/Repositories/RegionRepositoryInterface.php b/app/Classes/Repositories/RegionRepositoryInterface.php
@@ -4,5 +4,10 @@
 
 interface RegionRepositoryInterface
 {
+    /**
+	 * @param $regionName
+	 * @return mixed
+	 */
+	public function findBySlug($orgId, $slug);
 
 }
diff --git a/app/Classes/Repositories/UsageLogRepository.php b/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');
diff --git a/app/Classes/Repositories/WhatNowRepository.php b/app/Classes/Repositories/WhatNowRepository.php
@@ -148,14 +148,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();
     }
 
diff --git a/app/Classes/Repositories/WhatNowRepositoryInterface.php b/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
diff --git a/app/Classes/Repositories/WhatNowTranslationRepository.php b/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);
     }
 
     /**
diff --git a/app/Classes/Repositories/WhatNowTranslationRepositoryInterface.php b/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
diff --git a/app/Classes/Transformers/WhatNowEntityTransformer.php b/app/Classes/Transformers/WhatNowEntityTransformer.php
@@ -14,6 +14,7 @@ class WhatNowEntityTransformer extends TransformerAbstract
 	 * @var bool
 	 */
 	private $unpublished = false;
+	private $lang = null;
 
 	/**
 	 * @var bool
@@ -38,9 +39,18 @@ function __construct(WhatNowTranslationRepositoryInterface $repo, $configuration
             $this->castDateToBoolean = $configuration['castDateToBoolean'];
         }
 
+		if(isset($configuration['lang'])) {
+			$this->lang = $configuration['lang'];
+		}
+
 		$this->wnTransRepo = $repo;
 	}
 
+	public function setLang($lang)
+	{
+		$this->lang = $lang;
+	}
+
 	/**
 	 * Turn this item object into a generic array
 	 *
@@ -81,7 +91,7 @@ public function transform(WhatNowEntity $model)
 		if ($this->unpublished) {
 			$translations = $this->wnTransRepo->getLatestTranslations($model->id) ?? [];
 		} else {
-			$translations = $this->wnTransRepo->getLatestPublishedTranslations($model->id) ?? [];
+			$translations = $this->wnTransRepo->getLatestPublishedTranslations($model->id, $this->lang);
 		}
 
 		$defaultStages = [];
diff --git a/app/Http/Controllers/WhatNowController.php b/app/Http/Controllers/WhatNowController.php
@@ -4,6 +4,7 @@
 
 use App\Classes\Feeds\WhatNowFeed;
 use App\Classes\Repositories\OrganisationRepositoryInterface;
+use App\Classes\Repositories\RegionRepositoryInterface;
 use App\Classes\Repositories\WhatNowRepositoryInterface;
 use App\Classes\Repositories\WhatNowTranslationRepositoryInterface;
 use App\Classes\Serializers\CustomDataSerializer;
@@ -27,6 +28,11 @@ class WhatNowController extends Controller
      */
     protected $orgRepo;
 
+    /**
+     * @var RegionRepositoryInterface
+     */
+    protected $regionRepo;
+
     /**
      * @var WhatNowRepositoryInterface
      */
@@ -58,12 +64,14 @@ class WhatNowController extends Controller
      */
     public function __construct(
         OrganisationRepositoryInterface $orgRepo,
+        RegionRepositoryInterface $regionRepo,
         WhatNowRepositoryInterface $wnRepo,
         WhatNowTranslationRepositoryInterface $wnTransRepo,
         Request $request,
         Manager $manager
     ) {
         $this->orgRepo = $orgRepo;
+        $this->regionRepo = $regionRepo;
         $this->wnRepo = $wnRepo;
         $this->wnTransRepo = $wnTransRepo;
         $this->request = $request;
@@ -171,29 +179,54 @@ public function deleteById($id)
     public function getFeed(WhatNowFeed $feed, $code)
     {
         try {
-            $org = $this->orgRepo->findByCountryCode(strtoupper($code));
-        } catch (\Exception $e) {
-            Log::error('Organisation not found', ['message' => $e->getMessage()]);
-
-            return response(null, 404);
-        }
-
-        $feed->setOrganisation($org);
+            try {
+                $org = $this->orgRepo->findByCountryCode(strtoupper($code));
+            } catch (\Exception $e) {
+                Log::error('Organisation not found', ['message' => $e->getMessage()]);
+                $this->changeLogStatus(404);
+                return response()->json(['message' => 'Organisation not found'], 404);
+            }
+            $feed->setOrganisation($org);
+
+            $regName = $this->request->query('region', null);
+            if ($regName) {
+                try {
+                    $reg = $this->regionRepo->findBySlug($org->id, $regName);
+                    $feed->setRegion($reg);
+                } catch (\Exception $e) {
+                    Log::error('Region not found', ['message' => $e->getMessage()]);
+                    $this->changeLogStatus(404);
+                    return response()->json(['message' => 'Region not found'], 404);
+                }
+            }
 
-        // @todo lang filter
-        /*$langParam = $this->request->query('language', null);
-        $langHeader = $this->request->header('Accept-Language', null);
+            $langParam = $this->request->query('language', null);
+            $langHeader = $this->request->header('Accept-Language', null);
 
-        if ($langParam) {
-            $feed->setLanguage($this->request->query('language'));
-        } elseif ($langHeader) {
-            $feed->setLanguage(locale_accept_from_http($langHeader));
-        }*/
+            if ($langParam) {
+                $feed->setLanguage($langParam);
+            } elseif ($langHeader) {
+                $feed->setLanguage(locale_accept_from_http($langHeader));
+            }
 
-        $feed->setEventTypeFilter($this->request->query('eventType', null));
-        $feed->loadData();
+            $feed->setEventTypeFilter($this->request->query('eventType', null));
+            $feed->loadData();
+            $data = $feed->getResponseData();
+            if(empty($data)){
+                $this->changeLogStatus(204);
+            }
+            return response()->json(['data' => $data]);
+        }catch(\Exception $e){
+            $this->changeLogStatus(500);
+            return response()->json(['message' => $e], 500);
+        }
+    }
 
-        return response()->json(['data' => $feed->getResponseData()], 200);
+    protected function changeLogStatus($status){
+        if(isset($this->request->usageLog)){
+            $this->request->usageLog->code_status = $status;
+            $this->request->usageLog->save();
+        }
     }
 
     /**
diff --git a/app/Http/Middleware/ApiAuthMiddleware.php b/app/Http/Middleware/ApiAuthMiddleware.php
@@ -3,6 +3,7 @@
 namespace App\Http\Middleware;
 
 use App\Models\Application;
+use App\Models\UsageLog;
 use Carbon\Carbon;
 use Closure;
 use Illuminate\Support\Facades\Log;
@@ -23,20 +24,17 @@ public function handle($request, Closure $next)
         if (! $application) {
             return parent::handle($request, $next);
         }
-
-        // Configure payload for logging API usage data
-        $event = [
-            'type' => 'APIRequestEvent',
-            'payload' => [
-                'app_id' => $application->id,
-                'endpoint' => $request->path(),
-                'method' => $request->method(),
-                'timestamp' => Carbon::now()->toDateTimeString(),
-            ],
-        ];
-
-        // Log request to CloudWatch
-        Log::channel('cloudwatch_access')->info(json_encode($event));
+        $usageLog = new UsageLog;
+        $usageLog->application_id = $application->id;
+        $usageLog->method = $request->method();
+        $usageLog->endpoint = $request->path();
+        $usageLog->timestamp = Carbon::now()->toDateTimeString();
+        $usageLog->code_status = 200;
+        $usageLog->language = $request->input('language', false) ? $request->input('language', null) : $request->header('Accept-Language', null);
+        $usageLog->region = $request->input('region', null);
+        $usageLog->event_type = $request->input('eventType', null);
+        $usageLog->save();
+        $request->usageLog=$usageLog;
 
         return $next($request);
     }
diff --git a/app/Models/UsageLog.php b/app/Models/UsageLog.php
diff --git a/config/database.php b/config/database.php
diff --git a/database/migrations/2023_01_23_155432_create_usage_logs_table.php b/database/migrations/2023_01_23_155432_create_usage_logs_table.php
diff --git a/database/migrations/2025_02_06_195052_add_code_status_on_usage_logs_table.php b/database/migrations/2025_02_06_195052_add_code_status_on_usage_logs_table.php
diff --git a/database/seeds/UsageLogTableSeeder.php b/database/seeds/UsageLogTableSeeder.php
diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml

Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,10 @@`
`4`	`4`
`5`	`5`	`interface RegionRepositoryInterface`
`6`	`6`	`{`
	`7`	`+ /**`
	`8`	`+ * @param $regionName`
	`9`	`+ * @return mixed`
	`10`	`+ */`
	`11`	`+ public function findBySlug($orgId, $slug);`
`7`	`12`
`8`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public function getForEndpoint($endpoint, $fromDate = null, $toDate = null)`
`86`	`86`
`87`	`87`	`public function listByEndpoint($fromDate = null, $toDate = null)`
`88`	`88`	`{`
`89`		`- $query = DB::connection('stats_mysql')->table('usage_logs')`
	`89`	`+ $query = DB::table('usage_logs')`
`90`	`90`	`->select('endpoint', 'application_id', DB::raw('count(*) as hit_count'))`
`91`	`91`	`->groupBy('application_id', 'endpoint')`
`92`	`92`	`->orderBy('hit_count', 'desc');`
Original file line number	Diff line number	Diff line change
`@@ -148,14 +148,18 @@ public function destroy($id)`
`148`	`148`	`* @param null $lang`
`149`	`149`	`* @param array $eventTypes`
`150`	`150`	`*/`
`151`		`- public function findItemsForOrgId($orgId, $lang = null, array $eventTypes = [])`
	`151`	`+ public function findItemsForOrgId($orgId, $lang = null, array $eventTypes = [], $regId = null)`
`152`	`152`	`{`
`153`	`153`	`$query = $this->whatNowModel->where('org_id', $orgId);`
`154`	`154`
`155`	`155`	`if (count($eventTypes)) {`
`156`	`156`	`$query->whereIn('event_type', $eventTypes);`
`157`	`157`	`}`
`158`	`158`
	`159`	`+ if ($regId) {`
	`160`	`+ $query->where('region_id', $regId);`
	`161`	`+ }`
	`162`	`+`
`159`	`163`	`return $query->get();`
`160`	`164`	`}`
`161`	`165`