Skip to content

Commit

Permalink
[TM-1461] lint
Browse files Browse the repository at this point in the history
  • Loading branch information
egrojMonroy committed Nov 21, 2024
1 parent ae9a1d5 commit d6a943a
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 24 deletions.
6 changes: 3 additions & 3 deletions app/Http/Controllers/V2/Entities/EntityTypeController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand All @@ -112,8 +113,7 @@ private function getSitePolygonsWithFiltersAndSorts($sitePolygonsQuery, Request
$sitePolygonsQuery->orderBy($field, $direction);
}
}

return $sitePolygonsQuery->get();
}

}
13 changes: 6 additions & 7 deletions app/Http/Controllers/V2/Sites/AdminSitesPolygonController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -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)
Expand All @@ -42,5 +42,4 @@ public function __invoke(Request $request): JsonResponse
return response()->json(['error' => 'An error occurred while fetching site polygons'], 500);
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -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());
Expand Down
4 changes: 2 additions & 2 deletions app/Services/PolygonService.php
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand All @@ -601,7 +601,7 @@ public function getSitePolygonsWithFiltersAndSorts($sitePolygonsQuery, Request $
$sitePolygonsQuery->orderBy($field, $direction);
}
}

return $sitePolygonsQuery;
}
}
10 changes: 5 additions & 5 deletions routes/api_v2.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 () {
Expand Down

0 comments on commit d6a943a

Please sign in to comment.