Remove references to without events

app/Import/Providers/BaseImport.php

@@ -732,9 +732,14 @@ class BaseImport
 
     protected function findUser($user_hash)
     {
+        $user = false;
+
         if(is_numeric($user_hash)) {
         
-            $user = User::query()->find($user_hash);
+            $user = User::query()
+                        ->where('account_id', $this->company->account->id)
+                        ->where('id', $user_hash)
+                        ->first();
 
         }
 

app/Import/Transformer/BaseTransformer.php

@@ -238,7 +238,7 @@ class BaseTransformer
      */
     public function hasClient($name)
     {
-        nlog("has client");
+        
         return Client::query()->where('company_id', $this->company->id)
             ->where('is_deleted', false)
             ->whereRaw("LOWER(REPLACE(`name`, ' ' , '')) = ?", [

tests/Feature/EntityPaidToDateTest.php

@@ -17,7 +17,6 @@ use App\Models\Invoice;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
-// use Illuminate\Foundation\Testing\WithoutEvents;
 use Illuminate\Routing\Middleware\ThrottleRequests;
 use Illuminate\Support\Facades\Session;
 use Tests\MockAccountData;
@@ -31,7 +30,6 @@ class EntityPaidToDateTest extends TestCase
     use MakesHash;
     use DatabaseTransactions;
     use MockAccountData;
-    // use WithoutEvents;
 
     protected function setUp() :void
     {

tests/Feature/InvoiceEmailTest.php

@@ -11,14 +11,15 @@
 
 namespace Tests\Feature;
 
+use Tests\TestCase;
+use Tests\MockAccountData;
 use App\Jobs\Entity\EmailEntity;
+use Illuminate\Support\Facades\Event;
 use App\Utils\Traits\GeneratesCounter;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Session;
-use Tests\MockAccountData;
-use Tests\TestCase;
 use Illuminate\Validation\ValidationException;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
 
 /**
  * @test
@@ -118,7 +119,8 @@ class InvoiceEmailTest extends TestCase
             if ($invitation->contact->send_email && $invitation->contact->email) {
                 EmailEntity::dispatch($invitation, $invitation->company);
 
-                $this->expectsJobs(EmailEntity::class);
+                Event::fake();
+                Event::assertDispatched(EmailEntity::class);
             }
         });
 
@@ -146,7 +148,10 @@ class InvoiceEmailTest extends TestCase
             if ($invitation->contact->send_email && $invitation->contact->email) {
                 EmailEntity::dispatch($invitation, $invitation->company);
 
-                $this->expectsJobs(EmailEntity::class);
+                
+Event::fake();
+Event::assertDispatched(EmailEntity::class);
+
             }
         });
 
@@ -174,7 +179,10 @@ class InvoiceEmailTest extends TestCase
             if ($invitation->contact->send_email && $invitation->contact->email) {
                 EmailEntity::dispatch($invitation, $invitation->company);
 
-                $this->expectsJobs(EmailEntity::class);
+                
+Event::fake();
+Event::assertDispatched(EmailEntity::class);
+
             }
         });
 
@@ -197,7 +205,10 @@ class InvoiceEmailTest extends TestCase
             if ($invitation->contact->send_email && $invitation->contact->email) {
                 EmailEntity::dispatch($invitation, $invitation->company);
 
-                $this->expectsJobs(EmailEntity::class);
+                
+Event::fake();
+Event::assertDispatched(EmailEntity::class);
+
             }
         });
 

tests/Feature/PaymentTest.php

@@ -26,7 +26,6 @@ use App\Models\Payment;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Illuminate\Foundation\Testing\WithoutEvents;
 use Illuminate\Routing\Middleware\ThrottleRequests;
 use Illuminate\Support\Facades\Session;
 use Illuminate\Validation\ValidationException;
@@ -42,7 +41,6 @@ class PaymentTest extends TestCase
     use MakesHash;
     use DatabaseTransactions;
     use MockAccountData;
-    use WithoutEvents;
 
     protected function setUp() :void
     {

tests/Feature/PaymentV2Test.php

@@ -23,7 +23,6 @@ use App\Factory\InvoiceItemFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Session;
 use Illuminate\Validation\ValidationException;
-use Illuminate\Foundation\Testing\WithoutEvents;
 use Illuminate\Routing\Middleware\ThrottleRequests;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 
@@ -36,7 +35,6 @@ class PaymentV2Test extends TestCase
     use MakesHash;
     use DatabaseTransactions;
     use MockAccountData;
-    use WithoutEvents;
 
     public $faker;
     

tests/Feature/Payments/CreditPaymentTest.php

@@ -20,7 +20,6 @@ use App\Models\Payment;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Illuminate\Foundation\Testing\WithoutEvents;
 use Illuminate\Routing\Middleware\ThrottleRequests;
 use Illuminate\Support\Facades\Session;
 use Illuminate\Validation\ValidationException;
@@ -35,7 +34,6 @@ class CreditPaymentTest extends TestCase
     use MakesHash;
     use DatabaseTransactions;
     use MockUnitData;
-    use WithoutEvents;
 
     protected function setUp() :void
     {

tests/Feature/Payments/StorePaymentValidationTest.php

@@ -14,7 +14,6 @@ namespace Tests\Feature\Payments;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Illuminate\Foundation\Testing\WithoutEvents;
 use Illuminate\Routing\Middleware\ThrottleRequests;
 use Illuminate\Support\Facades\Session;
 use Illuminate\Validation\ValidationException;
@@ -29,7 +28,6 @@ class StorePaymentValidationTest extends TestCase
     use MakesHash;
     use DatabaseTransactions;
     use MockAccountData;
-    use WithoutEvents;
 
     protected function setUp() :void
     {

tests/Feature/Payments/UnappliedPaymentDeleteTest.php

@@ -17,7 +17,6 @@ use App\Models\Invoice;
 use App\Models\Payment;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Illuminate\Foundation\Testing\WithoutEvents;
 use Illuminate\Routing\Middleware\ThrottleRequests;
 use Illuminate\Validation\ValidationException;
 use Tests\MockUnitData;
@@ -31,8 +30,7 @@ class UnappliedPaymentDeleteTest extends TestCase
     use MakesHash;
     use DatabaseTransactions;
     use MockUnitData;
-    use WithoutEvents;
-
+    
     protected function setUp() :void
     {
         parent::setUp();

tests/Feature/Payments/UnappliedPaymentRefundTest.php

@@ -14,7 +14,6 @@ namespace Tests\Feature\Payments;
 use App\Models\Payment;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Illuminate\Foundation\Testing\WithoutEvents;
 use Illuminate\Routing\Middleware\ThrottleRequests;
 use Illuminate\Validation\ValidationException;
 use Tests\MockUnitData;
@@ -28,7 +27,6 @@ class UnappliedPaymentRefundTest extends TestCase
     use MakesHash;
     use DatabaseTransactions;
     use MockUnitData;
-    use WithoutEvents;
 
     protected function setUp() :void
     {

tests/Feature/Scheduler/ScheduleEntityTest.php

@@ -21,11 +21,6 @@ use App\Models\RecurringInvoice;
 use App\Factory\SchedulerFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Session;
-use App\DataMapper\Schedule\EmailStatement;
-use App\Services\Scheduler\SchedulerService;
-use Illuminate\Validation\ValidationException;
-use Illuminate\Foundation\Testing\WithoutEvents;
-use App\Services\Scheduler\EmailStatementService;
 use Illuminate\Routing\Middleware\ThrottleRequests;
 
 /**
@@ -36,7 +31,6 @@ class ScheduleEntityTest extends TestCase
 {
     use MakesHash;
     use MockAccountData;
-    use WithoutEvents;
 
     protected function setUp(): void
     {

tests/Feature/Scheduler/SchedulerTest.php

@@ -23,7 +23,6 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Session;
 use App\DataMapper\Schedule\EmailStatement;
 use Illuminate\Validation\ValidationException;
-use Illuminate\Foundation\Testing\WithoutEvents;
 use App\Services\Scheduler\EmailStatementService;
 use App\Services\Scheduler\EmailReport;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
@@ -37,7 +36,6 @@ class SchedulerTest extends TestCase
 {
     use MakesHash;
     use MockAccountData;
-    use WithoutEvents;
     use DatabaseTransactions;
 
     protected $faker;

tests/Feature/UpdatePaymentTest.php

@@ -33,7 +33,6 @@ class UpdatePaymentTest extends TestCase
     use MakesHash;
     use DatabaseTransactions;
     use MockAccountData;
-    use WithoutEvents;
 
     public $faker;
 

tests/Feature/VendorApiTest.php

@@ -15,6 +15,7 @@ use Tests\TestCase;
 use App\Utils\Ninja;
 use Tests\MockAccountData;
 use App\Utils\Traits\MakesHash;
+use Illuminate\Support\Facades\Event;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Session;
 use App\Events\Vendor\VendorContactLoggedIn;
@@ -64,7 +65,9 @@ class VendorApiTest extends TestCase
         
         event(new VendorContactLoggedIn($vc, $this->company, Ninja::eventVars()));
 
-        $this->expectsEvents([VendorContactLoggedIn::class]);
+        Event::fake();
+
+        Event::assertDispatched(VendorContactLoggedIn::class);
         
         // $vc->fresh();
         // $v->fresh();