#WN-118# Fixed system of user logs to save the activty. Added fields …

.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/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/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/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;
+
 }

config/database.php

@@ -63,26 +63,6 @@
             ]) : [],
         ],
 
-        // This connection is used for the stats database
-        'stats_mysql' => [
-            'driver' => 'mysql',
-            'url' => env('STATS_DATABASE_URL'),
-            'host' => env('STATS_DB_HOST', '127.0.0.1'),
-            'port' => env('STATS_DB_PORT', '3306'),
-            'database' => env('STATS_DB_DATABASE', 'forge'),
-            'username' => env('STATS_DB_USERNAME', 'forge'),
-            'password' => env('STATS_DB_PASSWORD', ''),
-            'unix_socket' => env('STATS_DB_SOCKET', ''),
-            'charset' => 'utf8mb4',
-            'collation' => 'utf8mb4_unicode_ci',
-            'prefix' => '',
-            'prefix_indexes' => true,
-            'strict' => true,
-            'engine' => null,
-            'options' => extension_loaded('pdo_mysql') ? array_filter([
-                PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
-            ]) : [],
-        ],
 
         'pgsql' => [
             'driver' => 'pgsql',

database/migrations/2023_01_23_155432_create_usage_logs_table.php

@@ -13,7 +13,7 @@ class CreateUsageLogsTable extends Migration
      */
     public function up()
     {
-        Schema::connection('stats_mysql')->create('usage_logs', function (Blueprint $table) {
+        Schema::create('usage_logs', function (Blueprint $table) {
             $table->increments('id');
             $table->bigInteger('application_id');
             $table->string('method');

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

database/seeds/UsageLogTableSeeder.php

@@ -21,7 +21,7 @@ public function run()
         $file->setFlags(SplFileObject::SKIP_EMPTY | SplFileObject::READ_AHEAD | SplFileObject::DROP_NEW_LINE | SplFileObject::READ_CSV);
 
         foreach ($file as $row) {
-            DB::connection('stats_mysql')->table('usage_logs')->insert([
+            DB::table('usage_logs')->insert([
                 'id' => $row[0],
                 'method' => $row[1],
                 'application_id' => $row[2],

helm-chart/values.yaml

@@ -55,10 +55,6 @@ secrets:
       DB_DATABASE: DB_DATABASE
       DB_USERNAME: DB_USERNAME
       DB_PASSWORD: DB_PASSWORD
-      STATS_DB_HOST: STATS_DB_HOST
-      STATS_DB_DATABASE: STATS_DB_DATABASE
-      STATS_DB_USERNAME: STATS_DB_USERNAME
-      STATS_DB_PASSWORD: STATS_DB_PASSWORD
       APP_KEY: APP_KEY
 
 # Ingress (if using)