Merge pull request #59 from me-shaon/refactor-directory-structure

Refactor directory structure to align with Laravel conventions

Author: me-shaon

routes/api.php

@@ -1,7 +1,7 @@
 <?php
 
 use Illuminate\Support\Facades\Route;
-use MeShaon\RequestAnalytics\Controllers\Api\AnalyticsApiController;
+use MeShaon\RequestAnalytics\Http\Controllers\Api\AnalyticsApiController;
 
 Route::middleware(config('request-analytics.middleware.api'))
     ->prefix('api/v1/analytics')

routes/web.php

@@ -1,7 +1,7 @@
 <?php
 
 use Illuminate\Support\Facades\Route;
-use MeShaon\RequestAnalytics\Controllers\RequestAnalyticsController;
+use MeShaon\RequestAnalytics\Http\Controllers\RequestAnalyticsController;
 
 Route::middleware(config('request-analytics.middleware.web'))
     ->get(config('request-analytics.route.pathname'), [RequestAnalyticsController::class, 'show'])

src/Traits/CaptureRequest.php src/Concern/CaptureRequest.phpsrc/Traits/CaptureRequest.php renamed to src/Concern/CaptureRequest.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace MeShaon\RequestAnalytics\Traits;
+namespace MeShaon\RequestAnalytics\Concern;
 
 use Illuminate\Http\Request;
-use MeShaon\RequestAnalytics\Http\DTO\RequestDataDTO;
+use MeShaon\RequestAnalytics\DTO\RequestDataDTO;
 use MeShaon\RequestAnalytics\Services\BotDetectionService;
 use MeShaon\RequestAnalytics\Services\GeolocationService;
 use MeShaon\RequestAnalytics\Services\VisitorTrackingService;
@@ -325,4 +325,9 @@ protected function extractDomainFromUrl(string $url): string
 
         return $host;
     }
+
+    protected function ipInCidrRange(string $ip, string $cidr): bool
+    {
+        return IpUtils::checkIp($ip, $cidr);
+    }
 }

src/Http/DTO/RequestDataDTO.php src/DTO/RequestDataDTO.phpsrc/Http/DTO/RequestDataDTO.php renamed to src/DTO/RequestDataDTO.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace MeShaon\RequestAnalytics\Http\DTO;
+namespace MeShaon\RequestAnalytics\DTO;
 
 class RequestDataDTO
 {

…ntrollers/Api/AnalyticsApiController.php …ntrollers/Api/AnalyticsApiController.phpsrc/Controllers/Api/AnalyticsApiController.php renamed to src/Http/Controllers/Api/AnalyticsApiController.php src/Controllers/Api/AnalyticsApiController.php renamed to src/Http/Controllers/Api/AnalyticsApiController.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MeShaon\RequestAnalytics\Controllers\Api;
+namespace MeShaon\RequestAnalytics\Http\Controllers\Api;
 
 use Illuminate\Http\JsonResponse;
 use Illuminate\Routing\Controller as BaseController;

…ntrollers/RequestAnalyticsController.php …ntrollers/RequestAnalyticsController.phpsrc/Controllers/RequestAnalyticsController.php renamed to src/Http/Controllers/RequestAnalyticsController.php src/Controllers/RequestAnalyticsController.php renamed to src/Http/Controllers/RequestAnalyticsController.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace MeShaon\RequestAnalytics\Controllers;
+namespace MeShaon\RequestAnalytics\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller as BaseController;

src/Http/Middleware/APIRequestCapture.php

@@ -8,9 +8,9 @@
 use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
-use MeShaon\RequestAnalytics\Http\DTO\RequestDataDTO;
-use MeShaon\RequestAnalytics\Http\Jobs\ProcessData;
-use MeShaon\RequestAnalytics\Traits\CaptureRequest;
+use MeShaon\RequestAnalytics\Concern\CaptureRequest;
+use MeShaon\RequestAnalytics\DTO\RequestDataDTO;
+use MeShaon\RequestAnalytics\Jobs\ProcessData;
 use Symfony\Component\HttpFoundation\Response;
 
 class APIRequestCapture

src/Http/Middleware/WebRequestCapture.php

@@ -8,9 +8,9 @@
 use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
-use MeShaon\RequestAnalytics\Http\DTO\RequestDataDTO;
-use MeShaon\RequestAnalytics\Http\Jobs\ProcessData;
-use MeShaon\RequestAnalytics\Traits\CaptureRequest;
+use MeShaon\RequestAnalytics\Concern\CaptureRequest;
+use MeShaon\RequestAnalytics\DTO\RequestDataDTO;
+use MeShaon\RequestAnalytics\Jobs\ProcessData;
 use Symfony\Component\HttpFoundation\Response;
 
 class WebRequestCapture

src/Http/Jobs/ProcessData.php src/Jobs/ProcessData.phpsrc/Http/Jobs/ProcessData.php renamed to src/Jobs/ProcessData.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace MeShaon\RequestAnalytics\Http\Jobs;
+namespace MeShaon\RequestAnalytics\Jobs;
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use MeShaon\RequestAnalytics\Http\DTO\RequestDataDTO;
+use MeShaon\RequestAnalytics\DTO\RequestDataDTO;
 use MeShaon\RequestAnalytics\Services\RequestAnalyticsService;
 
 class ProcessData implements ShouldQueue

src/Services/RequestAnalyticsService.php

@@ -3,8 +3,8 @@
 namespace MeShaon\RequestAnalytics\Services;
 
 use Illuminate\Support\Facades\Auth;
+use MeShaon\RequestAnalytics\DTO\RequestDataDTO;
 use MeShaon\RequestAnalytics\Exceptions\RequestAnalyticsStorageException;
-use MeShaon\RequestAnalytics\Http\DTO\RequestDataDTO;
 use MeShaon\RequestAnalytics\Models\RequestAnalytics;
 
 class RequestAnalyticsService