diff --git a/app/Http/Controllers/API/v2/CityController.php b/app/Http/Controllers/API/v2/CityController.php index a048faa..02687db 100644 --- a/app/Http/Controllers/API/v2/CityController.php +++ b/app/Http/Controllers/API/v2/CityController.php @@ -11,6 +11,10 @@ use App\Http\Controllers\Controller; use App\Http\Resources\API\v2\CityResource; use App\Http\Resources\API\v2\CityCollection; +// Dots API +use App\DotsAPI\Fetcher\v2\ApiFetcher; +use App\DotsAPI\API\v2\CityAPI; + class CityController extends Controller { /** @@ -18,6 +22,12 @@ class CityController extends Controller */ public function index(Request $request) { + // Update list of cities + $fetcher = new ApiFetcher(); + $cityAPI = new CityAPI($fetcher); + + $citiesMap = $cityAPI->getMap(); + $cityAPI->saveMap($citiesMap); return new CityCollection(City::all()); } diff --git a/app/Http/Controllers/API/v2/CompanyController.php b/app/Http/Controllers/API/v2/CompanyController.php index e11b9e9..d42c8e3 100644 --- a/app/Http/Controllers/API/v2/CompanyController.php +++ b/app/Http/Controllers/API/v2/CompanyController.php @@ -11,6 +11,10 @@ use App\Http\Controllers\Controller; use App\Http\Resources\API\v2\CompanyResource; use App\Http\Resources\API\v2\CompanyCollection; +// Dots API +use App\DotsAPI\Fetcher\v2\ApiFetcher; +use App\DotsAPI\API\v2\CompanyAPI; + class CompanyController extends Controller { /** @@ -18,6 +22,15 @@ class CompanyController extends Controller */ public function index(Request $request) { + $city_uuid = $request->input('uuid'); + + // Update list of companies + $fetcher = new ApiFetcher(); + $companyAPI = new CompanyAPI($fetcher); + + $companyMap = $companyAPI->getMap($city_uuid); + $companyAPI->saveMap($companyMap); + return new CompanyCollection(Company::all()); } diff --git a/app/Http/Resources/API/v2/CityResource.php b/app/Http/Resources/API/v2/CityResource.php index f0776cc..5ec3189 100644 --- a/app/Http/Resources/API/v2/CityResource.php +++ b/app/Http/Resources/API/v2/CityResource.php @@ -14,7 +14,6 @@ class CityResource extends JsonResource */ public function toArray(Request $request): array { - //return parent::toArray($request); return [ 'id' => $this->id, 'uuid' => $this->uuid,