provincias

app/Http/Controllers/InvestmentStructureController.php

@@ -82,7 +82,7 @@ class InvestmentStructureController extends Controller
         }
         $data = $request->validate($rules);
         if (! $id && $request->has('province_id')) {
-            $path = app(InvestmentGeography::class)->selection($data);
+            $path = app(InvestmentGeography::class)->selection($data, true);
             $data = array_diff_key($data, InvestmentGeography::FIELDS);
             $data['primary_territory_id'] = $path === [] ? null : $path[array_key_last($path)]->id;
             $data['territory_version'] = $path === [] ? 0 : 1;

app/Http/Controllers/InvestmentTerritoryController.php

@@ -30,13 +30,18 @@ class InvestmentTerritoryController extends Controller
         $query = DB::table('geo_locations')->whereNull('deleted_at')->where('location_type', $data['type'])
             ->whereIn('data_classification', ['public', 'internal']);
         if ($data['type'] !== 'province') {
+            $parentType = ['district' => 'province', 'admin_post' => 'district', 'locality' => 'admin_post'][$data['type']];
+            if (! DB::table('geo_locations')->where('id', $data['parent_id'] ?? '00000000-0000-0000-0000-000000000000')->whereNull('deleted_at')->whereIn('data_classification', ['public', 'internal'])->where('location_type', $parentType)->exists()) {
+                throw ValidationException::withMessages(['parent_id' => 'Seleccione um pai activo do nível anterior.']);
+            }
             $query->where('parent_id', $data['parent_id'] ?? '00000000-0000-0000-0000-000000000000');
         }
         if (! empty($data['q'])) {
-            $query->whereRaw('name ILIKE ?', ['%'.addcslashes($data['q'], '%_\\').'%']);
+            $term = '%'.addcslashes($data['q'], '%_\\').'%';
+            $query->where(fn ($q) => $q->whereRaw('name ILIKE ?', [$term])->orWhereRaw('code ILIKE ?', [$term])->orWhereRaw('source_code ILIKE ?', [$term]));
         }
 
-        return response()->json($query->orderBy('name')->orderBy('id')->paginate(100, ['id', 'name', 'parent_id', 'location_type']));
+        return response()->json($query->orderBy('name')->orderBy('id')->paginate(100, ['id', 'name', 'parent_id', 'location_type', 'source_code']));
     }
 
     public function show(string $kind, string $id): JsonResponse

app/Http/Controllers/InvestmentZoneController.php

@@ -78,7 +78,7 @@ class InvestmentZoneController extends Controller
 
         if (! $id && $request->has('province_id')) {
             $geo = $request->validate(['province_id' => ['nullable', 'uuid'], 'district_id' => ['nullable', 'uuid'], 'admin_post_id' => ['nullable', 'uuid'], 'locality_id' => ['nullable', 'uuid']]);
-            $path = app(InvestmentGeography::class)->selection($geo);
+            $path = app(InvestmentGeography::class)->selection($geo, true);
             $data['primary_territory_id'] = $path === [] ? null : $path[array_key_last($path)]->id;
             $data['territory_version'] = $path === [] ? 0 : 1;
             $data['province'] = $path[0]->name ?? null;

app/Http/Controllers/PortalManagementController.php

@@ -140,10 +140,12 @@ class PortalManagementController extends Controller
     public function edit(string $resource, ?int $id = null): Response
     {
         $model = $resource === 'sectors' ? Sector::class : Opportunity::class;
+        $record = $id ? $model::findOrFail($id) : null;
 
         return Inertia::render('management/editor', [
             'resource' => $resource,
-            'record' => $id ? $model::findOrFail($id) : null,
+            'record' => $record,
+            'territoryPath' => $record instanceof Opportunity ? app(InvestmentGeography::class)->path($record->primary_territory_id, true) : [],
             'sectors' => Sector::orderBy('name')->get(['id', 'name']),
         ]);
     }
@@ -178,20 +180,13 @@ class PortalManagementController extends Controller
             'status' => ['required', Rule::in(['draft', 'published', 'archived'])],
             'is_featured' => ['required', 'boolean'],
         ];
-        if ($resource === 'opportunities' && ! $id) {
+        if ($resource === 'opportunities') {
             foreach (InvestmentGeography::FIELDS as $field => $type) {
                 $rules[$field] = ['nullable', 'uuid'];
             }
+            $rules['territory_version'] = [$id && $request->hasAny(array_keys(InvestmentGeography::FIELDS)) ? 'required' : 'nullable', 'integer', 'min:0'];
         }
         $data = $request->validate($rules);
-        if ($resource === 'opportunities' && ! $id && $request->has('province_id')) {
-            $path = app(InvestmentGeography::class)->selection($data);
-            $data = array_diff_key($data, InvestmentGeography::FIELDS);
-            $data['primary_territory_id'] = $path === [] ? null : $path[array_key_last($path)]->id;
-            $data['territory_version'] = $path === [] ? 0 : 1;
-            $data['province'] = $path[0]->name ?? null;
-            $data['district'] = $path[1]->name ?? null;
-        }
         if ($resource === 'opportunities' && $data['status'] === 'published' && $record->exists
             && Schema::hasTable('education_investment_proposals')
             && DB::table('education_investment_proposals')->where('opportunity_id', $record->id)->exists()) {
@@ -205,7 +200,24 @@ class PortalManagementController extends Controller
             $data['maturity_label'] = $labels[$data['maturity_level'] ?? 0] ?? null;
             $data['published_at'] = $data['status'] === 'published' ? ($record->published_at ?? now()) : null;
         }
-        PortalAudit::save($record, $data, $request->user()->id);
+        DB::transaction(function () use ($record, $data, $request, $resource) {
+            if ($resource === 'opportunities' && $request->hasAny(array_keys(InvestmentGeography::FIELDS))) {
+                DB::select('SELECT pg_advisory_xact_lock(280926, 150000)');
+                if ($record->exists) {
+                    $current = Opportunity::whereKey($record->id)->lockForUpdate()->firstOrFail();
+                    abort_unless((int) $current->territory_version === (int) $data['territory_version'], 409, 'Localização alterada. Recarregue a ficha.');
+                }
+                $path = app(InvestmentGeography::class)->selection($data, true);
+                $data = array_diff_key($data, InvestmentGeography::FIELDS);
+                $data['primary_territory_id'] = $path === [] ? null : $path[array_key_last($path)]->id;
+                $data['territory_version'] = (int) ($data['territory_version'] ?? 0) + 1;
+                $data['province'] = $path[0]->name ?? null;
+                $data['district'] = $path[1]->name ?? null;
+            } else {
+                unset($data['territory_version']);
+            }
+            PortalAudit::save($record, $data, $request->user()->id);
+        });
 
         return redirect('/management/'.$resource)->with('success', 'Registo guardado.');
     }

app/Http/Controllers/PublicGeographyController.php

@@ -18,9 +18,10 @@ class PublicGeographyController extends Controller
             $query->where('parent_id', $parent ?? '00000000-0000-0000-0000-000000000000');
         }
         if (! empty($data['q'])) {
-            $query->whereRaw('name ILIKE ?', ['%'.addcslashes($data['q'], '%_\\').'%']);
+            $term = '%'.addcslashes($data['q'], '%_\\').'%';
+            $query->where(fn ($q) => $q->whereRaw('name ILIKE ?', [$term])->orWhereRaw('code ILIKE ?', [$term])->orWhereRaw('source_code ILIKE ?', [$term]));
         }
 
-        return response()->json($query->orderBy('name')->orderBy('id')->paginate(100, ['id', 'name', 'parent_id', 'location_type']));
+        return response()->json($query->orderBy('name')->orderBy('id')->paginate(100, ['id', 'name', 'parent_id', 'location_type', 'source_code']));
     }
 }