Merge branch 'main' of https://git.tempo.co.mz/nala/Investidor-V2 into front

app/Http/Controllers/Api/V1/OpportunityController.php

@@ -4,6 +4,9 @@ namespace App\Http\Controllers\Api\V1;
 
 use App\Http\Controllers\Controller;
 use App\Models\Opportunity;
+use App\Services\InvestmentCatalogue;
+use App\Services\OpportunityMaturity;
+use App\Services\SectorOrganization;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
@@ -15,6 +18,11 @@ class OpportunityController extends Controller
             'q' => ['nullable', 'string', 'max:120'],
             'sector' => ['nullable', 'string', 'max:80'],
             'province' => ['nullable', 'string', 'max:80'],
+            'province_id' => ['nullable', 'uuid'],
+            'district_id' => ['nullable', 'uuid'],
+            'admin_post_id' => ['nullable', 'uuid'],
+            'locality_id' => ['nullable', 'uuid'],
+            'geo_location_id' => ['nullable', 'uuid'],
             'maturity_level' => ['nullable', 'integer', 'between:1,6'],
             'per_page' => ['nullable', 'integer', 'min:1', 'max:50'],
             'min_amount' => ['nullable', 'numeric', 'min:0', 'max:999999999999'],
@@ -47,22 +55,24 @@ class OpportunityController extends Controller
 
         if (! empty($validated['sector'])) {
             $sector = $validated['sector'];
-            \App\Services\SectorOrganization::constrain($query, $sector);
+            SectorOrganization::constrain($query, $sector);
         }
 
-        if (! empty($validated['province'])) {
-            $query->where('province', $validated['province']);
+        $territory = array_intersect_key($validated, array_flip(['province', 'province_id', 'district_id', 'admin_post_id', 'locality_id', 'geo_location_id']));
+        if (array_filter($territory, fn ($value) => $value !== null && $value !== '') !== []) {
+            // Keep the legacy search's sorting and non-territorial filters while sharing the public territorial contract.
+            $query->whereIn('opportunities.id', app(InvestmentCatalogue::class)->query($territory)->reorder()->select('opportunities.id'));
         }
 
         if (! empty($validated['maturity_level'])) {
-            \App\Services\OpportunityMaturity::constrainSearch($query, 'historical:'.$validated['maturity_level']);
+            OpportunityMaturity::constrainSearch($query, 'historical:'.$validated['maturity_level']);
         }
 
         $results = $query->orderByDesc('is_featured')
             ->orderByDesc('published_at')
             ->paginate($validated['per_page'] ?? 12);
 
-        return response()->json($results);
+        return response()->json($results->withQueryString()->through(fn ($record) => app(InvestmentCatalogue::class)->presentLocation($record)));
     }
 
     public function show(string $slug): JsonResponse

app/Http/Controllers/ClusterCompetitivenessController.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\EconomicCluster;
+use App\Services\ClusterCompetitiveness;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+final class ClusterCompetitivenessController extends Controller
+{
+    public function show(EconomicCluster $cluster, ClusterCompetitiveness $service): JsonResponse
+    {
+        return response()->json($service->management($cluster->id))->header('Cache-Control', 'private, no-store');
+    }
+
+    public function change(Request $request, EconomicCluster $cluster, string $action, ClusterCompetitiveness $service): JsonResponse
+    {
+        $data = $request->validate(['expected_version' => 'required|integer|min:0',
+            'draft' => $action === 'saved' ? 'required|array:version,clusterId,sector,region,forces' : 'prohibited',
+            'revision' => $action === 'restored' ? 'required|integer|min:1' : 'prohibited',
+            'reason' => in_array($action, ['approved', 'withdrawn'], true) ? 'required|string|min:10|max:3000' : 'nullable|string|max:3000']);
+
+        return response()->json($service->change($cluster, $request->user()->id, (int) $data['expected_version'], $action, $data))
+            ->header('Cache-Control', 'private, no-store');
+    }
+}

app/Http/Controllers/InvestmentDiscoveryController.php

@@ -29,7 +29,7 @@ class InvestmentDiscoveryController extends Controller
             'corridorGroups' => ($filters['view'] ?? '') === 'corridors' ? app(\App\Services\OpportunityCorridorExplorer::class)->groups($filters) : [],
             'territorySelection' => app(InvestmentGeography::class)->selection($filters),
             'guides' => app(\App\Services\SectorInvestment::class)->guides(\App\Models\Sector::where('slug', $filters['sector'] ?? '')->where('is_active', true)->whereNotNull('published_at')->first()),
-            'results' => $catalogue->query($filters)->paginate(12)->withQueryString(),
+            'results' => $catalogue->query($filters)->paginate(12)->withQueryString()->through(fn ($record) => $catalogue->presentLocation($record)),
             'favourites' => $request->user() ? DB::table('opportunity_favourites')->where('user_id', $request->user()->id)->pluck('opportunity_id') : [],
             'territorial' => $this->territorial($filters)]);
     }
@@ -74,7 +74,7 @@ class InvestmentDiscoveryController extends Controller
 
     public function search(Request $request, InvestmentCatalogue $catalogue): JsonResponse
     {
-        return response()->json($catalogue->query($catalogue->filters($request))->paginate($request->integer('per_page', 12))->withQueryString());
+        return response()->json($catalogue->query($catalogue->filters($request))->paginate($request->integer('per_page', 12))->withQueryString()->through(fn ($record) => $catalogue->presentLocation($record)));
     }
 
     public function references(Request $request, InvestmentCatalogue $catalogue): JsonResponse

app/Http/Controllers/InvestmentPortfolioController.php

@@ -140,6 +140,7 @@ class InvestmentPortfolioController extends Controller
 
         return Inertia::render('portfolio/show', ['complements' => $management ? [] : app(\App\Services\InvestmentComplements::class)->options('portfolio:'.$record->id), 'record' => $record, 'related' => $related, 'management' => $management, 'zones' => $zones,
             'anchorProject' => $anchorProject, 'existingSubmissions' => $existingSubmissions,
+            'competitiveness' => $record->cluster_id ? app(\App\Services\ClusterCompetitiveness::class)->publicData($record->cluster_id) : null,
             'geography' => app(InvestmentRelations::class)->dossier($record, $management),
             'origin' => $origin ? ['id' => $origin->id, 'title' => $origin->title] : null, 'opportunities' => $opportunities, 'chains' => $chains]);
     }

app/Http/Controllers/InvestmentStructureController.php

@@ -50,6 +50,7 @@ class InvestmentStructureController extends Controller
                 ->whereNull('origins.deleted_at')->whereNull('destinations.deleted_at')->whereNull('value_chain_links.deleted_at')
                 ->orderBy('origins.code')->orderBy('destinations.code')
                 ->get(['value_chain_links.id', 'origins.name as origin', 'destinations.name as destination', 'link_type']) : [],
+            'competitiveness' => $structure === 'clusters' && $id ? app(\App\Services\ClusterCompetitiveness::class)->management($id) : null,
             'viewerId' => $request->user()->id,
             'memberships' => $structure === 'clusters' && $id ? DB::table('cluster_projects')
                 ->join('projects', 'projects.id', '=', 'cluster_projects.project_id')

app/Http/Controllers/ProactiveSupplyController.php

@@ -0,0 +1,17 @@
+<?php
+namespace App\Http\Controllers;
+
+use App\Models\Opportunity;
+use App\Services\ProactiveSupply;
+use Illuminate\Http\Request;
+use Illuminate\Http\JsonResponse;
+
+final class ProactiveSupplyController extends Controller
+{
+    public function index(Request $request,ProactiveSupply $service): JsonResponse
+    {
+        $v=$request->validate(['record_id'=>'nullable|integer|min:1']);
+        $record=isset($v['record_id'])?Opportunity::findOrFail($v['record_id']):null;
+        return response()->json($service->search($request->user(),$request->all(),$record))->header('Cache-Control','private, no-store');
+    }
+}