small fixes

e-motion-apps · Mar 21, 2024 · f9fe3d6 · f9fe3d6
1 parent 0e7d1e7
commit f9fe3d6
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 3 deletions.
diff --git a/app/Http/Controllers/RulesController.php b/app/Http/Controllers/RulesController.php
@@ -47,4 +47,10 @@ public function getRules($country, $city): array
 
         return $data;
     }
+
+    public function importRules(bool $force): void
+    {
+        $importer = new OpenAIService();
+        $importer->importRulesForAllCities($force);
+    }
 }
diff --git a/app/Jobs/ImportCityRulesJob.php b/app/Jobs/ImportCityRulesJob.php
@@ -5,6 +5,7 @@
 namespace App\Jobs;
 
 use App\Services\OpenAIService;
+use Illuminate\Bus\Batchable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
@@ -15,6 +16,7 @@ class ImportCityRulesJob implements ShouldQueue
     use Dispatchable;
     use InteractsWithQueue;
     use SerializesModels;
+    use Batchable;
 
     public function __construct(
         private array $cityData,

diff --git a/app/Services/OpenAIService.php b/app/Services/OpenAIService.php
@@ -6,8 +6,11 @@
 
 use App\Jobs\ImportCityRulesJob;
 use App\Models\City;
+use App\Models\ImportInfo;
 use App\Models\Rules;
+use Exception;
 use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Support\Facades\Bus;
 use OpenAI;
 
 class OpenAIService implements ShouldQueue
@@ -17,7 +20,11 @@ class OpenAIService implements ShouldQueue
 
     public function __construct()
     {
-        $this->client = OpenAI::client(env("OPENAI_API_KEY"));
+        try {
+            $this->client = OpenAI::client(env("OPENAI_API_KEY"));
+        } catch (Exception $e) {
+            throw new Exception("OpenAI API key is not set");
+        }
         $this->countriesKnownToHaveUniformRules = [
             "Poland", "Germany", "France", "Spain", "Italy", "Portugal", "Austria", "Czech Republic", "Slovakia", "Hungary",
             "Romania", "Bulgaria", "Greece", "Sweden", "Finland", "Norway", "Denmark", "Netherlands", "Belgium", "Switzerland",
@@ -50,15 +57,27 @@ public function importRulesForAllCities(bool $force): void
     {
         $cities = City::query()->whereHas("cityProviders")->orderBy("country_id")->get();
 
+        $importInfo = ImportInfo::query()->create([
+            "who_runs_it" => "admin",
+            "status" => "running",
+        ]);
+        $jobs = [];
+
         foreach ($cities as $city) {
             $cityData = [
                 "city_id" => $city->id,
                 "country_id" => $city->country_id,
                 "city_name" => $city->name,
                 "country_name" => $city->country->name,
             ];
+            $jobs[] = new ImportCityRulesJob($cityData, $force);
             ImportCityRulesJob::dispatch($cityData, $force);
         }
+        Bus::batch($jobs)->finally(function () use ($importInfo): void {
+            ImportInfo::query()->where("id", $importInfo->id)->update([
+                "status" => "finished",
+            ]);
+        })->dispatch();
     }
 
     public function importRulesForCity(array $cityData, bool $force): array

diff --git a/routes/web.php b/routes/web.php
@@ -14,7 +14,7 @@
 use App\Http\Controllers\CityWithoutAssignedCountryController;
 use App\Http\Controllers\DashboardController;
 use App\Http\Controllers\FavoritesController;
-use App\Services\OpenAIService;
+use App\Http\Controllers\RulesController;
 use Illuminate\Support\Facades\Route;
 
 Route::middleware("guest")->group(function (): void {
@@ -48,7 +48,7 @@
         Route::delete("/delete-city-without-assigned-country/{city}", [CityWithoutAssignedCountryController::class, "destroy"]);
         Route::post("/delete-all-cities-without-assigned-country", [CityWithoutAssignedCountryController::class, "destroyAll"]);
 
-        Route::get("/import-rules/{force}", [OpenAIService::class, "importRulesForAllCities"]);
+        Route::get("/import-rules/{force}", [RulesController::class, "importRules"]);
     });
 });