#WN-118# Fixed system of user logs to save the activty. Added fields on the user logs. Code status, language, region and event type.

Author: Jose Ganora

app/Classes/Repositories/RegionRepository.php

@@ -33,7 +33,7 @@ public function findBySlug($orgId, $slug)
     {
         $slug = strtolower($slug);
         $slug = str_replace(' ', '-', $slug);
-        return $this->regModel->where('slug', $slug)->where('organisation_id', $orgId)->first();
+        return $this->regModel->where('slug', $slug)->where('organisation_id', $orgId)->firstOrFail();;
     }
 
     public function mapTranslationInput($regionId, $language_code, $data)

app/Http/Controllers/WhatNowController.php

@@ -179,37 +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);
-
-        $regName = $this->request->query('region', null);
-        if ($regName) {
             try {
-                $reg = $this->regionRepo->findBySlug($org->id, $regName);
-                $feed->setRegion($reg);
+                $org = $this->orgRepo->findByCountryCode(strtoupper($code));
             } catch (\Exception $e) {
-                Log::error('Region not found', ['message' => $e->getMessage()]);
+                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);
+                }
             }
-        }
 
-        $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($langParam);
-        } 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();
+        }
     }
 
     /**

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);
     }

app/Models/UsageLog.php

@@ -6,7 +6,9 @@
 
 class UsageLog extends Model
 {
-    protected $connection = 'stats_mysql'; // This model uses a different database connection for the stats DB
 
     protected $table = 'usage_logs';
+
+    public $timestamps = false;
+
 }

database/migrations/2025_02_06_195052_add_code_status_on_usage_logs_table.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddCodeStatusOnUsageLogsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('usage_logs', function (Blueprint $table) {
+            $table->integer('code_status')->nullable();
+            $table->string('language',10)->nullable();
+            $table->string('region',45)->nullable();
+            $table->string('event_type',45)->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('usage_logs', function (Blueprint $table) {
+            $table->dropColumn('code_status');
+            $table->dropColumn('language');
+            $table->dropColumn('region');
+            $table->dropColumn('event_type');
+        });
+    }
+}