Skip to content

Commit d988589

Browse files
joseganorajoseganora
authored
Merge pull request #2 from IFRCGo/feature/WN-118
#WN-118# Fixed system of user logs to save the activty. Added fields …
2 parents 662826a + d8b7915 commit d988589

File tree

12 files changed

+98
-79
lines changed

12 files changed

+98
-79
lines changed

‎.env.bitbucket-pipelines‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@ DB_DATABASE=redcross_local
1313
DB_USERNAME=preparecenter
1414
DB_PASSWORD=preparecenter
1515

16-
STATS_DB_HOST=0.0.0.0
17-
STATS_DB_PORT=3307
18-
STATS_DB_DATABASE=redcross_logs
19-
STATS_DB_USERNAME=preparecenter
20-
STATS_DB_PASSWORD=preparecenter
21-
2216
BROADCAST_DRIVER=log
2317
CACHE_DRIVER=file
2418
QUEUE_CONNECTION=sync

‎.env.example‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@ DB_DATABASE=preparecenter
1313
DB_USERNAME=preparecenter
1414
DB_PASSWORD=preparecenter
1515

16-
STATS_DB_HOST=mysql_stats
17-
STATS_DB_PORT=3306
18-
STATS_DB_DATABASE=usage_logs
19-
STATS_DB_USERNAME=preparecenter
20-
STATS_DB_PASSWORD=preparecenter
21-
2216
BROADCAST_DRIVER=log
2317
CACHE_DRIVER=file
2418
QUEUE_CONNECTION=sync

‎app/Classes/Repositories/RegionRepository.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function findBySlug($orgId, $slug)
3333
{
3434
$slug = strtolower($slug);
3535
$slug = str_replace(' ', '-', $slug);
36-
return $this->regModel->where('slug', $slug)->where('organisation_id', $orgId)->first();
36+
return $this->regModel->where('slug', $slug)->where('organisation_id', $orgId)->firstOrFail();
3737
}
3838

3939
public function mapTranslationInput($regionId, $language_code, $data)

‎app/Classes/Repositories/UsageLogRepository.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public function getForEndpoint($endpoint, $fromDate = null, $toDate = null)
8686

8787
public function listByEndpoint($fromDate = null, $toDate = null)
8888
{
89-
$query = DB::connection('stats_mysql')->table('usage_logs')
89+
$query = DB::table('usage_logs')
9090
->select('endpoint', 'application_id', DB::raw('count(*) as hit_count'))
9191
->groupBy('application_id', 'endpoint')
9292
->orderBy('hit_count', 'desc');

‎app/Http/Controllers/WhatNowController.php‎

Lines changed: 41 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -179,37 +179,54 @@ public function deleteById($id)
179179
public function getFeed(WhatNowFeed $feed, $code)
180180
{
181181
try {
182-
$org = $this->orgRepo->findByCountryCode(strtoupper($code));
183-
} catch (\Exception $e) {
184-
Log::error('Organisation not found', ['message' => $e->getMessage()]);
185-
186-
return response(null, 404);
187-
}
188-
$feed->setOrganisation($org);
189-
190-
$regName = $this->request->query('region', null);
191-
if ($regName) {
192182
try {
193-
$reg = $this->regionRepo->findBySlug($org->id, $regName);
194-
$feed->setRegion($reg);
183+
$org = $this->orgRepo->findByCountryCode(strtoupper($code));
195184
} catch (\Exception $e) {
196-
Log::error('Region not found', ['message' => $e->getMessage()]);
185+
Log::error('Organisation not found', ['message' => $e->getMessage()]);
186+
$this->changeLogStatus(404);
187+
return response()->json(['message' => 'Organisation not found'], 404);
188+
}
189+
$feed->setOrganisation($org);
190+
191+
$regName = $this->request->query('region', null);
192+
if ($regName) {
193+
try {
194+
$reg = $this->regionRepo->findBySlug($org->id, $regName);
195+
$feed->setRegion($reg);
196+
} catch (\Exception $e) {
197+
Log::error('Region not found', ['message' => $e->getMessage()]);
198+
$this->changeLogStatus(404);
199+
return response()->json(['message' => 'Region not found'], 404);
200+
}
197201
}
198-
}
199202

200-
$langParam = $this->request->query('language', null);
201-
$langHeader = $this->request->header('Accept-Language', null);
203+
$langParam = $this->request->query('language', null);
204+
$langHeader = $this->request->header('Accept-Language', null);
202205

203-
if ($langParam) {
204-
$feed->setLanguage($langParam);
205-
} elseif ($langHeader) {
206-
$feed->setLanguage(locale_accept_from_http($langHeader));
207-
}
206+
if ($langParam) {
207+
$feed->setLanguage($langParam);
208+
} elseif ($langHeader) {
209+
$feed->setLanguage(locale_accept_from_http($langHeader));
210+
}
208211

209-
$feed->setEventTypeFilter($this->request->query('eventType', null));
210-
$feed->loadData();
212+
$feed->setEventTypeFilter($this->request->query('eventType', null));
213+
$feed->loadData();
214+
$data = $feed->getResponseData();
215+
if(empty($data)){
216+
$this->changeLogStatus(204);
217+
}
218+
return response()->json(['data' => $data]);
219+
}catch(\Exception $e){
220+
$this->changeLogStatus(500);
221+
return response()->json(['message' => $e], 500);
222+
}
223+
}
211224

212-
return response()->json(['data' => $feed->getResponseData()], 200);
225+
protected function changeLogStatus($status){
226+
if(isset($this->request->usageLog)){
227+
$this->request->usageLog->code_status = $status;
228+
$this->request->usageLog->save();
229+
}
213230
}
214231

215232
/**

‎app/Http/Middleware/ApiAuthMiddleware.php‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace App\Http\Middleware;
44

55
use App\Models\Application;
6+
use App\Models\UsageLog;
67
use Carbon\Carbon;
78
use Closure;
89
use Illuminate\Support\Facades\Log;
@@ -23,20 +24,17 @@ public function handle($request, Closure $next)
2324
if (! $application) {
2425
return parent::handle($request, $next);
2526
}
26-
27-
// Configure payload for logging API usage data
28-
$event = [
29-
'type' => 'APIRequestEvent',
30-
'payload' => [
31-
'app_id' => $application->id,
32-
'endpoint' => $request->path(),
33-
'method' => $request->method(),
34-
'timestamp' => Carbon::now()->toDateTimeString(),
35-
],
36-
];
37-
38-
// Log request to CloudWatch
39-
Log::channel('cloudwatch_access')->info(json_encode($event));
27+
$usageLog = new UsageLog;
28+
$usageLog->application_id = $application->id;
29+
$usageLog->method = $request->method();
30+
$usageLog->endpoint = $request->path();
31+
$usageLog->timestamp = Carbon::now()->toDateTimeString();
32+
$usageLog->code_status = 200;
33+
$usageLog->language = $request->input('language', false) ? $request->input('language', null) : $request->header('Accept-Language', null);
34+
$usageLog->region = $request->input('region', null);
35+
$usageLog->event_type = $request->input('eventType', null);
36+
$usageLog->save();
37+
$request->usageLog=$usageLog;
4038

4139
return $next($request);
4240
}

‎app/Models/UsageLog.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66

77
class UsageLog extends Model
88
{
9-
protected $connection = 'stats_mysql'; // This model uses a different database connection for the stats DB
109

1110
protected $table = 'usage_logs';
11+
12+
public $timestamps = false;
13+
1214
}

‎config/database.php‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -63,26 +63,6 @@
6363
]) : [],
6464
],
6565

66-
// This connection is used for the stats database
67-
'stats_mysql' => [
68-
'driver' => 'mysql',
69-
'url' => env('STATS_DATABASE_URL'),
70-
'host' => env('STATS_DB_HOST', '127.0.0.1'),
71-
'port' => env('STATS_DB_PORT', '3306'),
72-
'database' => env('STATS_DB_DATABASE', 'forge'),
73-
'username' => env('STATS_DB_USERNAME', 'forge'),
74-
'password' => env('STATS_DB_PASSWORD', ''),
75-
'unix_socket' => env('STATS_DB_SOCKET', ''),
76-
'charset' => 'utf8mb4',
77-
'collation' => 'utf8mb4_unicode_ci',
78-
'prefix' => '',
79-
'prefix_indexes' => true,
80-
'strict' => true,
81-
'engine' => null,
82-
'options' => extension_loaded('pdo_mysql') ? array_filter([
83-
PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
84-
]) : [],
85-
],
8666

8767
'pgsql' => [
8868
'driver' => 'pgsql',

‎database/migrations/2023_01_23_155432_create_usage_logs_table.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class CreateUsageLogsTable extends Migration
1313
*/
1414
public function up()
1515
{
16-
Schema::connection('stats_mysql')->create('usage_logs', function (Blueprint $table) {
16+
Schema::create('usage_logs', function (Blueprint $table) {
1717
$table->increments('id');
1818
$table->bigInteger('application_id');
1919
$table->string('method');

‎database/migrations/2025_02_06_195052_add_code_status_on_usage_logs_table.php‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?php
2+
3+
use Illuminate\Database\Migrations\Migration;
4+
use Illuminate\Database\Schema\Blueprint;
5+
use Illuminate\Support\Facades\Schema;
6+
7+
class AddCodeStatusOnUsageLogsTable extends Migration
8+
{
9+
/**
10+
* Run the migrations.
11+
*
12+
* @return void
13+
*/
14+
public function up()
15+
{
16+
Schema::table('usage_logs', function (Blueprint $table) {
17+
$table->integer('code_status')->nullable();
18+
$table->string('language',10)->nullable();
19+
$table->string('region',45)->nullable();
20+
$table->string('event_type',45)->nullable();
21+
});
22+
}
23+
24+
/**
25+
* Reverse the migrations.
26+
*
27+
* @return void
28+
*/
29+
public function down()
30+
{
31+
Schema::table('usage_logs', function (Blueprint $table) {
32+
$table->dropColumn('code_status');
33+
$table->dropColumn('language');
34+
$table->dropColumn('region');
35+
$table->dropColumn('event_type');
36+
});
37+
}
38+
}

0 commit comments

Comments
 (0)