changes

app/Http/Controllers/ImportController.php

@@ -9,6 +9,8 @@
 use App\Models\ImportEvent;
 use App\Models\ImportTemplate;
 use App\Services\CsvImportService;
+use App\Services\Import\ImportServiceV2;
+use App\Services\Import\ImportSimulationServiceV2;
 use App\Services\ImportProcessor;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
@@ -182,12 +184,27 @@ public function store(Request $request)
     }
 
     // Kick off processing of an import - simple synchronous step for now
-    public function process(Import $import, Request $request, ImportProcessor $processor)
+    public function process(Import $import, Request $request, ImportServiceV2 $processor)
     {
         $import->update(['status' => 'validating', 'started_at' => now()]);
-        $result = $processor->process($import, user: $request->user());
-
-        return response()->json($result);
+        
+        try {
+            $result = $processor->process($import, user: $request->user());
+            return response()->json($result);
+        } catch (\Throwable $e) {
+            \Log::error('Import processing failed', [
+                'import_id' => $import->id,
+                'error' => $e->getMessage(),
+                'trace' => $e->getTraceAsString(),
+            ]);
+            
+            $import->update(['status' => 'failed']);
+            
+            return response()->json([
+                'success' => false,
+                'message' => 'Import processing failed: ' . $e->getMessage(),
+            ], 500);
+        }
     }
 
     // Analyze the uploaded file and return column headers or positional indices
@@ -426,7 +443,7 @@ public function missingContracts(Import $import)
 
         // Query active, non-archived contracts for this client that were not in import
         // Include person full_name (owner of the client case) and aggregate active accounts' balance_amount
-        $contractsQ = \App\Models\Contract::query()
+        $contractsQ = Contract::query()
             ->join('client_cases', 'contracts.client_case_id', '=', 'client_cases.id')
             ->join('person', 'person.id', '=', 'client_cases.person_id')
             ->leftJoin('accounts', function ($join) {
@@ -514,7 +531,7 @@ public function getEvents(Import $import)
     public function missingKeyrefRows(Import $import)
     {
         // Identify row IDs from events. Prefer specific event key, fallback to message pattern
-        $rowIds = \App\Models\ImportEvent::query()
+        $rowIds = ImportEvent::query()
             ->where('import_id', $import->id)
             ->where(function ($q) {
                 $q->where('event', 'contract_keyref_not_found')
@@ -694,6 +711,10 @@ public function simulatePayments(Import $import, Request $request)
      * using the first N rows and current saved mappings. Works for both payments and non-payments
      * templates. For payments templates, payment-specific summaries/entities will be included
      * automatically by the simulation service when mappings contain the payment root.
+     *
+     * @param  Import  $import
+     * @param  Request  $request
+     * @return \Illuminate\Http\JsonResponse
      */
     public function simulate(Import $import, Request $request)
     {
@@ -704,7 +725,7 @@ public function simulate(Import $import, Request $request)
         $limit = (int) ($validated['limit'] ?? 100);
         $verbose = (bool) ($validated['verbose'] ?? false);
 
-        $service = app(\App\Services\ImportSimulationService::class);
+        $service = app(ImportSimulationServiceV2::class);
         $result = $service->simulate($import, $limit, $verbose);
 
         return response()->json($result);