fix: occurrence-check command

jesusantguerrero · Nov 11, 2024 · 2c18c17 · 2c18c17
1 parent 66508d1
commit 2c18c17
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 11 deletions.
diff --git a/app/Domains/Imports/ImportConcern.php → ...Domains/AppCore/Imports/ImportConcern.php b/app/Domains/Imports/ImportConcern.php → ...Domains/AppCore/Imports/ImportConcern.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Domains\Imports;
+namespace App\Domains\AppCore\Imports;
 
-use Maatwebsite\Excel\Concerns\Importable;
-use Maatwebsite\Excel\Concerns\SkipsEmptyRows;
 use Maatwebsite\Excel\Concerns\ToModel;
-use Maatwebsite\Excel\Concerns\WithChunkReading;
-use Maatwebsite\Excel\Concerns\WithHeadingRow;
 use Maatwebsite\Excel\Concerns\WithLimit;
+use Maatwebsite\Excel\Concerns\Importable;
 use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\SkipsEmptyRows;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithChunkReading;
 
 abstract class ImportConcern implements SkipsEmptyRows, ToModel, WithChunkReading, WithHeadingRow, WithLimit, WithMapping
 {

diff --git a/app/Domains/Budget/Imports/BudgetImport.php b/app/Domains/Budget/Imports/BudgetImport.php
@@ -2,10 +2,10 @@
 
 namespace App\Domains\Budget\Imports;
 
-use App\Domains\Budget\Models\BudgetMonth;
-use App\Domains\Imports\ImportConcern;
 use Carbon\Carbon;
 use Insane\Journal\Models\Core\Category;
+use App\Domains\Budget\Models\BudgetMonth;
+use App\Domains\AppCore\Imports\ImportConcern;
 
 class BudgetImport extends ImportConcern
 {

diff --git a/app/Domains/Housing/Imports/OccurrenceImport.php b/app/Domains/Housing/Imports/OccurrenceImport.php
@@ -3,7 +3,7 @@
 namespace App\Domains\Housing\Imports;
 
 use App\Models\User;
-use App\Domains\Imports\ImportConcern;
+use App\Domains\AppCore\Imports\ImportConcern;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use App\Domains\Housing\Data\OccurrenceData;
 use App\Domains\Housing\Actions\RegisterOccurrence;

diff --git a/app/Domains/Transaction/Actions/SearchTransactions.php b/app/Domains/Transaction/Actions/SearchTransactions.php
@@ -2,6 +2,10 @@
 
 namespace App\Domains\Transaction\Actions;
 
+use Exception;
+use function Illuminate\Log\log;
+use Illuminate\Support\Facades\Log;
+
 use App\Domains\Transaction\Models\Transaction;
 use App\Domains\Transaction\Models\TransactionLine;
 
@@ -33,11 +37,17 @@ public function hasValidConditions($conditions) {
             if (!$condition) {
                 continue;
             }
+            try {
             foreach ($condition as $param) {
-                if ($param && $param['operator'] &&  $param['value']) {
+                    if ($param && $param['operator'] &&  $param['value']) {
                         return true;
-                }
+                    }
 
+                }
+            } catch (Exception $e) {
+                print_r($param);
+                Log::error($e);
+                continue;
             }
         }
     }

diff --git a/app/Domains/Transaction/Imports/TransactionsImport.php b/app/Domains/Transaction/Imports/TransactionsImport.php
@@ -2,7 +2,7 @@
 
 namespace App\Domains\Transaction\Imports;
 
-use App\Domains\Imports\ImportConcern;
+use App\Domains\AppCore\Imports\ImportConcern;
 use App\Domains\Transaction\Actions\MapYnabToLoger;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Insane\Journal\Models\Core\Transaction;

diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
@@ -11,6 +11,7 @@
 use Insane\Journal\Models\Core\Transaction;
 use App\Domains\Journal\Policies\CategoryPolicy;
 use App\Domains\Journal\Policies\TransactionPolicy;
+use Insane\Journal\Models\Accounting\Reconciliation;
 use App\Domains\AppCore\Policies\FinanceAccountPolicy;
 use App\Domains\Transaction\Policies\ReconciliationPolicy;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;