- Add count for cities without country or coordinates (#226)

* Add count for cities without country or coordinates

* cr changes

---------

Co-authored-by: Aleksandra Kozubal <aleksandra.kozubal@studenci.collegiumwitelona.pl>

Author: JakubKermes

app/Http/Controllers/Api/Admin/CityController.php

@@ -7,6 +7,7 @@
 use App\Http\Controllers\Controller;
 use App\Http\Requests\CityRequest;
 use App\Http\Resources\CityResource;
+use App\Http\Resources\CityWithoutAssignedCoordinatesResource;
 use App\Http\Resources\CityWithoutAssignedCountryResource;
 use App\Http\Resources\CountryResource;
 use App\Http\Resources\ProviderResource;
@@ -35,12 +36,19 @@ public function index(): JsonResponse
         $countries = Country::all();
 
         $citiesWithoutAssignedCountry = CityWithoutAssignedCountry::all();
+        $citiesWithoutAssignedCoordinates = City::query()
+            ->whereNull("latitude")
+            ->orWhereNull("longitude")
+            ->get();
 
         return response()->json([
             "cities" => CityResource::collection($cities),
             "providers" => ProviderResource::collection($providers),
             "countries" => CountryResource::collection($countries),
             "citiesWithoutAssignedCountry" => CityWithoutAssignedCountryResource::collection($citiesWithoutAssignedCountry),
+            "citiesWithoutAssignedCountryCount" => $citiesWithoutAssignedCountry->count(),
+            "citiesWithoutAssignedCoordinates" => CityWithoutAssignedCoordinatesResource::collection($citiesWithoutAssignedCoordinates),
+            "citiesWithoutAssignedCoordinatesCount" => $citiesWithoutAssignedCoordinates->count(),
         ]);
     }
 

app/Http/Resources/CityWithoutAssignedCoordinatesResource.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class CityWithoutAssignedCoordinatesResource extends JsonResource
+{
+    public function toArray(Request $request): array
+    {
+        return [
+            "id" => $this->id,
+            "city_name" => $this->city_name,
+            "country_name" => $this->country_name,
+            "latitude" => $this->latitude,
+            "longitude" => $this->longitude,
+        ];
+    }
+}