From edabb8858a92677a2a42d9348ba1f014e3c0c88d Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 21 Aug 2023 15:25:46 +1000 Subject: [PATCH] Remove references to without events --- app/Import/Providers/BaseImport.php | 7 +++++- app/Import/Transformer/BaseTransformer.php | 2 +- tests/Feature/EntityPaidToDateTest.php | 2 -- tests/Feature/InvoiceEmailTest.php | 25 +++++++++++++------ tests/Feature/PaymentTest.php | 2 -- tests/Feature/PaymentV2Test.php | 2 -- tests/Feature/Payments/CreditPaymentTest.php | 2 -- .../Payments/StorePaymentValidationTest.php | 2 -- .../Payments/UnappliedPaymentDeleteTest.php | 4 +-- .../Payments/UnappliedPaymentRefundTest.php | 2 -- .../Feature/Scheduler/ScheduleEntityTest.php | 6 ----- tests/Feature/Scheduler/SchedulerTest.php | 2 -- tests/Feature/UpdatePaymentTest.php | 1 - tests/Feature/VendorApiTest.php | 5 +++- 14 files changed, 30 insertions(+), 34 deletions(-) diff --git a/app/Import/Providers/BaseImport.php b/app/Import/Providers/BaseImport.php index d0f4ee68f5da..2568213db695 100644 --- a/app/Import/Providers/BaseImport.php +++ b/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(); } diff --git a/app/Import/Transformer/BaseTransformer.php b/app/Import/Transformer/BaseTransformer.php index 1ae726605d57..56a5415fc423 100644 --- a/app/Import/Transformer/BaseTransformer.php +++ b/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`, ' ' , '')) = ?", [ diff --git a/tests/Feature/EntityPaidToDateTest.php b/tests/Feature/EntityPaidToDateTest.php index d706a53619e9..912617e6c787 100644 --- a/tests/Feature/EntityPaidToDateTest.php +++ b/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 { diff --git a/tests/Feature/InvoiceEmailTest.php b/tests/Feature/InvoiceEmailTest.php index 9609840e8ae2..a2af7cda9a1e 100644 --- a/tests/Feature/InvoiceEmailTest.php +++ b/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); + } }); diff --git a/tests/Feature/PaymentTest.php b/tests/Feature/PaymentTest.php index 48c10689645d..7a69e0b0a3ab 100644 --- a/tests/Feature/PaymentTest.php +++ b/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 { diff --git a/tests/Feature/PaymentV2Test.php b/tests/Feature/PaymentV2Test.php index 3365b42adf3f..22a5b83919e5 100644 --- a/tests/Feature/PaymentV2Test.php +++ b/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; diff --git a/tests/Feature/Payments/CreditPaymentTest.php b/tests/Feature/Payments/CreditPaymentTest.php index 2e25dfebe1d3..465a3d7f0cc6 100644 --- a/tests/Feature/Payments/CreditPaymentTest.php +++ b/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 { diff --git a/tests/Feature/Payments/StorePaymentValidationTest.php b/tests/Feature/Payments/StorePaymentValidationTest.php index 72613a0680db..f4de6e935ed6 100644 --- a/tests/Feature/Payments/StorePaymentValidationTest.php +++ b/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 { diff --git a/tests/Feature/Payments/UnappliedPaymentDeleteTest.php b/tests/Feature/Payments/UnappliedPaymentDeleteTest.php index 1803279c9951..b68934fb18ba 100644 --- a/tests/Feature/Payments/UnappliedPaymentDeleteTest.php +++ b/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(); diff --git a/tests/Feature/Payments/UnappliedPaymentRefundTest.php b/tests/Feature/Payments/UnappliedPaymentRefundTest.php index 04f4cb63bc13..b710be70fec2 100644 --- a/tests/Feature/Payments/UnappliedPaymentRefundTest.php +++ b/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 { diff --git a/tests/Feature/Scheduler/ScheduleEntityTest.php b/tests/Feature/Scheduler/ScheduleEntityTest.php index f60a71ea1b47..3bb8e36d8140 100644 --- a/tests/Feature/Scheduler/ScheduleEntityTest.php +++ b/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 { diff --git a/tests/Feature/Scheduler/SchedulerTest.php b/tests/Feature/Scheduler/SchedulerTest.php index 6cafea26ef54..82796c7a18af 100644 --- a/tests/Feature/Scheduler/SchedulerTest.php +++ b/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; diff --git a/tests/Feature/UpdatePaymentTest.php b/tests/Feature/UpdatePaymentTest.php index 7c89e86afcb6..9b7054b7f563 100644 --- a/tests/Feature/UpdatePaymentTest.php +++ b/tests/Feature/UpdatePaymentTest.php @@ -33,7 +33,6 @@ class UpdatePaymentTest extends TestCase use MakesHash; use DatabaseTransactions; use MockAccountData; - use WithoutEvents; public $faker; diff --git a/tests/Feature/VendorApiTest.php b/tests/Feature/VendorApiTest.php index d103afc5c1b8..7ef7db016350 100644 --- a/tests/Feature/VendorApiTest.php +++ b/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();