From d6a943ae03452bd099fec5b0c066720b68dd72af Mon Sep 17 00:00:00 2001 From: JORGE Date: Thu, 21 Nov 2024 11:40:03 -0400 Subject: [PATCH] [TM-1461] lint --- .../V2/Entities/EntityTypeController.php | 6 +++--- .../V2/Sites/AdminSitesPolygonController.php | 13 ++++++------- .../V2/Sites/AdminSitesPolygonCountController.php | 15 ++++++++------- app/Services/PolygonService.php | 4 ++-- routes/api_v2.php | 10 +++++----- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/app/Http/Controllers/V2/Entities/EntityTypeController.php b/app/Http/Controllers/V2/Entities/EntityTypeController.php index 6eb7c159f..11bf8b901 100644 --- a/app/Http/Controllers/V2/Entities/EntityTypeController.php +++ b/app/Http/Controllers/V2/Entities/EntityTypeController.php @@ -95,13 +95,14 @@ private function handleSiteEntity($uuid, Request $request) ], 500); } } + private function getSitePolygonsWithFiltersAndSorts($sitePolygonsQuery, Request $request) { if ($request->has('status') && $request->input('status')) { $statusValues = explode(',', $request->input('status')); $sitePolygonsQuery->whereIn('site_polygon.status', $statusValues); } - + $sortFields = $request->input('sort', []); foreach ($sortFields as $field => $direction) { if ($field === 'status') { @@ -112,8 +113,7 @@ private function getSitePolygonsWithFiltersAndSorts($sitePolygonsQuery, Request $sitePolygonsQuery->orderBy($field, $direction); } } - + return $sitePolygonsQuery->get(); } - } diff --git a/app/Http/Controllers/V2/Sites/AdminSitesPolygonController.php b/app/Http/Controllers/V2/Sites/AdminSitesPolygonController.php index 1f212831d..ff01c95d1 100644 --- a/app/Http/Controllers/V2/Sites/AdminSitesPolygonController.php +++ b/app/Http/Controllers/V2/Sites/AdminSitesPolygonController.php @@ -4,12 +4,12 @@ use App\Http\Controllers\Controller; use App\Models\V2\Projects\Project; -use Illuminate\Http\JsonResponse; -use Illuminate\Support\Facades\Log; use App\Models\V2\Sites\SitePolygon; use App\Services\PolygonService; +use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Support\Facades\App; +use Illuminate\Support\Facades\Log; class AdminSitesPolygonController extends Controller { @@ -24,11 +24,11 @@ public function __invoke(Request $request): JsonResponse if ($type === 'projects') { - $project = Project::where('uuid', $uuid)->firstOrFail(); - $finalEntityQuery = App::make(PolygonService::class)->getSitePolygonsWithFiltersAndSorts($project->sitePolygons(), $request); + $project = Project::where('uuid', $uuid)->firstOrFail(); + $finalEntityQuery = App::make(PolygonService::class)->getSitePolygonsWithFiltersAndSorts($project->sitePolygons(), $request); } elseif ($type === 'sites') { - $sitePolygonsQuery = SitePolygon::active()->where('site_id', $uuid); - $finalEntityQuery = App::make(PolygonService::class)->getSitePolygonsWithFiltersAndSorts($sitePolygonsQuery, $request); + $sitePolygonsQuery = SitePolygon::active()->where('site_id', $uuid); + $finalEntityQuery = App::make(PolygonService::class)->getSitePolygonsWithFiltersAndSorts($sitePolygonsQuery, $request); } $sitePolygons = $finalEntityQuery ->offset($offset) @@ -42,5 +42,4 @@ public function __invoke(Request $request): JsonResponse return response()->json(['error' => 'An error occurred while fetching site polygons'], 500); } } - } diff --git a/app/Http/Controllers/V2/Sites/AdminSitesPolygonCountController.php b/app/Http/Controllers/V2/Sites/AdminSitesPolygonCountController.php index 04610487a..cb1f990b9 100644 --- a/app/Http/Controllers/V2/Sites/AdminSitesPolygonCountController.php +++ b/app/Http/Controllers/V2/Sites/AdminSitesPolygonCountController.php @@ -4,12 +4,12 @@ use App\Http\Controllers\Controller; use App\Models\V2\Projects\Project; -use Illuminate\Http\JsonResponse; -use Illuminate\Support\Facades\Log; use App\Models\V2\Sites\SitePolygon; use App\Services\PolygonService; +use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Support\Facades\App; +use Illuminate\Support\Facades\Log; class AdminSitesPolygonCountController extends Controller { @@ -20,16 +20,17 @@ public function __invoke(Request $request): JsonResponse $type = $request->input('type'); $request = request(); if ($type === 'projects') { - $project = Project::where('uuid', $uuid)->firstOrFail(); - $countSitePolygons = App::make(PolygonService::class)->getSitePolygonsWithFiltersAndSorts($project->sitePolygons(), $request); + $project = Project::where('uuid', $uuid)->firstOrFail(); + $countSitePolygons = App::make(PolygonService::class)->getSitePolygonsWithFiltersAndSorts($project->sitePolygons(), $request); } elseif ($type === 'sites') { - $sitePolygonsQuery = SitePolygon::active()->where('site_id', $uuid); - $countSitePolygons = App::make(PolygonService::class)->getSitePolygonsWithFiltersAndSorts($sitePolygonsQuery, $request); + $sitePolygonsQuery = SitePolygon::active()->where('site_id', $uuid); + $countSitePolygons = App::make(PolygonService::class)->getSitePolygonsWithFiltersAndSorts($sitePolygonsQuery, $request); } $totalCount = $countSitePolygons->count(); + return response()->json([ - 'count' => $totalCount + 'count' => $totalCount, ]); } catch (\Exception $e) { Log::error($e->getMessage()); diff --git a/app/Services/PolygonService.php b/app/Services/PolygonService.php index 4daf8799d..eaee1393f 100755 --- a/app/Services/PolygonService.php +++ b/app/Services/PolygonService.php @@ -590,7 +590,7 @@ public function getSitePolygonsWithFiltersAndSorts($sitePolygonsQuery, Request $ $statusValues = explode(',', $request->input('status')); $sitePolygonsQuery->whereIn('site_polygon.status', $statusValues); } - + $sortFields = $request->input('sort', []); foreach ($sortFields as $field => $direction) { if ($field === 'status') { @@ -601,7 +601,7 @@ public function getSitePolygonsWithFiltersAndSorts($sitePolygonsQuery, Request $ $sitePolygonsQuery->orderBy($field, $direction); } } - + return $sitePolygonsQuery; } } diff --git a/routes/api_v2.php b/routes/api_v2.php index 7b39a1e2e..0948201c6 100644 --- a/routes/api_v2.php +++ b/routes/api_v2.php @@ -179,10 +179,10 @@ use App\Http\Controllers\V2\SiteReports\SiteReportsViaSiteController; use App\Http\Controllers\V2\Sites\AdminIndexSitesController; use App\Http\Controllers\V2\Sites\AdminSitesMultiController; -use App\Http\Controllers\V2\Sites\CreateSiteWithFormController; -use App\Http\Controllers\V2\Sites\IndexSitePolygonVersionsController; use App\Http\Controllers\V2\Sites\AdminSitesPolygonController; use App\Http\Controllers\V2\Sites\AdminSitesPolygonCountController; +use App\Http\Controllers\V2\Sites\CreateSiteWithFormController; +use App\Http\Controllers\V2\Sites\IndexSitePolygonVersionsController; use App\Http\Controllers\V2\Sites\Monitoring\AdminCreateSiteMonitoringController; use App\Http\Controllers\V2\Sites\Monitoring\AdminSoftDeleteSiteMonitoringController; use App\Http\Controllers\V2\Sites\Monitoring\AdminUpdateSiteMonitoringController; @@ -584,9 +584,9 @@ Route::get('/bbox', [SitePolygonDataController::class, 'getBboxOfCompleteSite']); Route::get('/check-approve', SiteCheckApproveController::class); }); -Route::prefix('entity')->group(function() { - Route::get('/polygons/count', AdminSitesPolygonCountController::class); - Route::get('/polygons', AdminSitesPolygonController::class); +Route::prefix('entity')->group(function () { + Route::get('/polygons/count', AdminSitesPolygonCountController::class); + Route::get('/polygons', AdminSitesPolygonController::class); }); Route::prefix('geometry')->group(function () {