wip

.env.example

@@ -43,6 +43,9 @@ AWS_USE_PATH_STYLE_ENDPOINT=false
 RECAPTCHA_SITE_KEY=
 RECAPTCHA_SECRET_KEY=
 
+NOMINATIM_URL=http://127.0.0.1:8081
+FORWARD_NOMINATIM_PORT=8081
+
 # SCOUT_DRIVER=typesense
 # TYPESENSE_HOST=127.0.0.1
 # TYPESENSE_PORT=8108

app/DataTransferObjects/Location.php

@@ -22,7 +22,6 @@
 
     public function __construct(array $location)
     {
-        // dump($location);
         $this->address = $this->collectAddress($location);
 
         $this->county = $this->firstFromAddress(['county'], 'București');

app/Http/Controllers/MapController.php

@@ -69,6 +69,7 @@ public function suggest(Request $request, MapCoordinates $coordinates): JsonReso
                     ->query(
                         fn (Builder $query) => $query
                             ->with('serviceType:id,slug')
+                            ->with('pointType')
                             ->orderByDistance('location', $coordinates->getCenter())
                     )
                     ->get()

app/Http/Resources/SuggestionResource.php

@@ -29,7 +29,7 @@ public function toArray(Request $request): array
     protected function getPointArray(): array
     {
         return [
-            'name' => $this->name,
+            'name' => $this->business_name ?? $this->pointType->name,
             'description' => $this->address,
             'url' => route('front.map.point', $this),
             'type' => 'point',

database/factories/PointFactory.php

@@ -9,6 +9,8 @@
 use App\Models\City;
 use App\Models\Point;
 use App\Models\PointGroup;
+use App\Models\PointType;
+use App\Models\ServiceType;
 use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Collection;
@@ -34,7 +36,7 @@ public function definition(): array
                 fake()->longitude(min: 20.29, max: 29.61)
             ),
             'address' => fake()->address(),
-            'business_name' => fake()->boolean() ? fake()->company() : null,
+            'business_name' => null,
             'phone' => fake()->phoneNumber(),
             'email' => fake()->email(),
             'website' => fake()->url(),
@@ -51,6 +53,15 @@ public function definition(): array
         ];
     }
 
+    public function withType(ServiceType $serviceType, PointType $pointType): static
+    {
+        return $this->state(fn (array $attributes) => [
+            'business_name' => $serviceType->can_have_business_name ? fake()->company() : null,
+            'service_type_id' => $serviceType->id,
+            'point_type_id' => $pointType->id,
+        ]);
+    }
+
     public function withMaterials(Collection $materials): static
     {
         return $this->afterCreating(function (Point $point) use ($materials) {

database/seeders/DatabaseSeeder.php

@@ -90,12 +90,11 @@ public function run(): void
                     ...Point::factory(500)
                         ->inCity($cities->random())
                         ->withMaterials($materials->random(3))
-                        ->create([
-                            'service_type_id' => $pointType->service_type_id,
-                            'point_type_id' => $pointType->id,
-                        ])
+                        ->withType($serviceType, $pointType)
+                        ->create()
                 );
             }
+
             foreach ($serviceType->issueTypes as $issueType) {
                 $point = $points->random();