Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
milwad-dev committed Jul 31, 2023
1 parent d26d35b commit 04769d9
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
use Illuminate\Support\Facades\DB;
use Jenssegers\Agent\Agent;

class MonitorVisitMiddleware
class VisitMonitoringMiddleware
{
/**
* Handle.
Expand Down
6 changes: 3 additions & 3 deletions src/Providers/LaravelUserMonitoringServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace Binafy\LaravelUserMonitoring\Providers;

use Binafy\LaravelUserMonitoring\Commands\RemoveVisitMonitoringRecordsCommand;
use Binafy\LaravelUserMonitoring\Middlewares\MonitorVisitMiddleware;
use Binafy\LaravelUserMonitoring\Middlewares\VisitMonitoringMiddleware;
use Illuminate\Support\Facades\Route;
use Illuminate\Support\ServiceProvider;

Expand All @@ -21,11 +21,11 @@ public function register()
$this->mergeConfigFrom(__DIR__ . '/../../config/user-monitoring.php', 'user-monitoring');
$this->commands(RemoveVisitMonitoringRecordsCommand::class);

$this->app['router']->aliasMiddleware('monitor-visit-middleware', MonitorVisitMiddleware::class);
$this->app['router']->aliasMiddleware('monitor-visit-middleware', VisitMonitoringMiddleware::class);
$this->app->register(LaravelUserMonitoringEventServiceProvider::class);

Route::middleware('web')
->middleware(MonitorVisitMiddleware::class)
->middleware(VisitMonitoringMiddleware::class)
->group(__DIR__ . '/../../routes/web.php');
}

Expand Down
40 changes: 39 additions & 1 deletion tests/Feature/DeleteVisitMonitoringRecordsTest.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,46 @@
<?php

use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Facades\DB;
use function Pest\Laravel\artisan;
use function Pest\Laravel\assertDatabaseCount;
use function Pest\Laravel\assertDatabaseMissing;

/*
* Use `RefreshDatabase` for delete migration data for each test.
*/
uses(RefreshDatabase::class);
uses(RefreshDatabase::class);

test('rows are delete by 1 days', function () {
// Set delete days
config(['user-monitoring.visit_monitoring.delete_days', 1]);

// Store old records for 1 day age
$user = createUser();

DB::table(config('user-monitoring.visit_monitoring.table'))->insert([
[
'user_id' => $user->id,
'browser_name' => 'Chrome',
'platform' => 'Windows',
'device' => 'WebKit',
'ip' => '127.0.0.1',
'page' => 'http://localhost:8000',
'created_at' => now()->subDays(2),
],
[
'user_id' => $user->id,
'browser_name' => 'Firefox',
'platform' => 'Linux',
'device' => 'WebKit',
'ip' => '123.12.531.11',
'page' => 'http://localhost:8000/milwad',
'created_at' => now()->subDays(2),
]
]);

artisan('laravel-user-monitoring:remove-visit-monitoring-records');

// DB Assertions
assertDatabaseCount(config('user-monitoring.visit_monitoring.table'), 0);
});
4 changes: 2 additions & 2 deletions tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Tests;

use Binafy\LaravelUserMonitoring\Middlewares\MonitorVisitMiddleware;
use Binafy\LaravelUserMonitoring\Middlewares\VisitMonitoringMiddleware;
use Binafy\LaravelUserMonitoring\Providers\LaravelUserMonitoringServiceProvider;
use Illuminate\Encryption\Encrypter;
use Illuminate\Support\Facades\Route;
Expand Down Expand Up @@ -56,7 +56,7 @@ protected function setUp(): void
{
parent::setUp();

Route::middleware([MonitorVisitMiddleware::class, 'web'])->group(__DIR__ . '/SetUp/Routes/web_tests.php');
Route::middleware([VisitMonitoringMiddleware::class, 'web'])->group(__DIR__ . '/SetUp/Routes/web_tests.php');

$this->loadMigrationsFrom(__DIR__.'/SetUp/Migrations');
}
Expand Down

0 comments on commit 04769d9

Please sign in to comment.