From e27a52c59df7df4d43daea887e2028c7f3d519b5 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 30 Jun 2020 09:41:03 +1000 Subject: [PATCH] Set DB on listeners --- app/Listeners/Activity/CreatedClientActivity.php | 4 ++++ app/Listeners/Activity/PaymentCreatedActivity.php | 13 ++++++++----- app/Listeners/Activity/PaymentDeletedActivity.php | 14 +++++++++----- app/Listeners/Activity/PaymentRefundedActivity.php | 3 +++ app/Listeners/Activity/PaymentVoidedActivity.php | 4 ++++ app/Listeners/Contact/UpdateContactLastLogin.php | 3 +++ app/Listeners/Credit/CreateCreditInvitation.php | 3 +++ app/Listeners/Document/DeleteCompanyDocuments.php | 6 +++++- app/Listeners/Invoice/CreateInvoiceActivity.php | 3 +++ app/Listeners/Invoice/CreateInvoiceInvitation.php | 3 +++ app/Listeners/Invoice/CreateInvoicePdf.php | 4 ++++ app/Listeners/Invoice/InvoiceCancelledActivity.php | 6 +++++- app/Listeners/Invoice/InvoiceDeletedActivity.php | 4 ++++ app/Listeners/Invoice/InvoiceEmailActivity.php | 3 +++ .../Invoice/InvoiceEmailFailedActivity.php | 3 +++ .../Invoice/InvoiceEmailedNotification.php | 4 +++- app/Listeners/Invoice/InvoiceReversedActivity.php | 3 +++ app/Listeners/Invoice/UpdateInvoiceInvitations.php | 3 +++ app/Listeners/Misc/InvitationViewedListener.php | 5 ++++- app/Listeners/Payment/PaymentNotification.php | 5 ++++- app/Listeners/Quote/CreateQuoteInvitation.php | 3 +++ app/Listeners/Quote/ReachWorkflowSettings.php | 3 +++ app/Listeners/User/ArchivedUserActivity.php | 3 +++ app/Listeners/User/CreatedUserActivity.php | 3 +++ app/Listeners/User/DeletedUserActivity.php | 5 ++++- app/Listeners/User/RestoredUserActivity.php | 3 +++ app/Listeners/User/UpdateUserLastLogin.php | 7 +++++-- app/Listeners/User/UpdatedUserActivity.php | 3 +++ 28 files changed, 108 insertions(+), 18 deletions(-) diff --git a/app/Listeners/Activity/CreatedClientActivity.php b/app/Listeners/Activity/CreatedClientActivity.php index e12d29f5cdcf..932aabfe5440 100644 --- a/app/Listeners/Activity/CreatedClientActivity.php +++ b/app/Listeners/Activity/CreatedClientActivity.php @@ -11,6 +11,7 @@ namespace App\Listeners\Activity; +use App\Libraries\MultiDB; use App\Models\Activity; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; @@ -19,6 +20,7 @@ use Illuminate\Queue\InteractsWithQueue; class CreatedClientActivity implements ShouldQueue { protected $activity_repo; + /** * Create the event listener. * @@ -37,6 +39,8 @@ class CreatedClientActivity implements ShouldQueue */ public function handle($event) { + MultiDB::setDb($event->company->db); + $fields = new \stdClass; $fields->client_id = $event->client->id; diff --git a/app/Listeners/Activity/PaymentCreatedActivity.php b/app/Listeners/Activity/PaymentCreatedActivity.php index 68f0b939e771..fb1d4e4e38a3 100644 --- a/app/Listeners/Activity/PaymentCreatedActivity.php +++ b/app/Listeners/Activity/PaymentCreatedActivity.php @@ -12,6 +12,7 @@ namespace App\Listeners\Activity; use App\Jobs\Invoice\InvoiceWorkflowSettings; +use App\Libraries\MultiDB; use App\Models\Activity; use App\Models\Invoice; use App\Models\Payment; @@ -21,15 +22,15 @@ use Illuminate\Queue\InteractsWithQueue; class PaymentCreatedActivity implements ShouldQueue { - protected $activityRepo; + protected $activity_repo; /** * Create the event listener. * * @return void */ - public function __construct(ActivityRepository $activityRepo) + public function __construct(ActivityRepository $activity_repo) { - $this->activityRepo = $activityRepo; + $this->activity_repo = $activity_repo; } /** @@ -40,6 +41,8 @@ class PaymentCreatedActivity implements ShouldQueue */ public function handle($event) { + MultiDB::setDb($event->company->db); + $payment = $event->payment; $invoices = $payment->invoices; @@ -57,11 +60,11 @@ class PaymentCreatedActivity implements ShouldQueue InvoiceWorkflowSettings::dispatchNow($invoice); - $this->activityRepo->save($fields, $invoice); + $this->activity_repo->save($fields, $invoice); } if (count($invoices) == 0) { - $this->activityRepo->save($fields, $payment); + $this->activity_repo->save($fields, $payment); } } } diff --git a/app/Listeners/Activity/PaymentDeletedActivity.php b/app/Listeners/Activity/PaymentDeletedActivity.php index b37b05ffa21e..9655eb672efa 100644 --- a/app/Listeners/Activity/PaymentDeletedActivity.php +++ b/app/Listeners/Activity/PaymentDeletedActivity.php @@ -11,6 +11,7 @@ namespace App\Listeners\Activity; +use App\Libraries\MultiDB; use App\Models\Activity; use App\Models\Invoice; use App\Models\Payment; @@ -20,15 +21,16 @@ use Illuminate\Queue\InteractsWithQueue; class PaymentDeletedActivity implements ShouldQueue { - protected $activityRepo; + protected $activity_repo; + /** * Create the event listener. * * @return void */ - public function __construct(ActivityRepository $activityRepo) + public function __construct(ActivityRepository $activity_repo) { - $this->activityRepo = $activityRepo; + $this->activity_repo = $activity_repo; } /** @@ -39,6 +41,8 @@ class PaymentDeletedActivity implements ShouldQueue */ public function handle($event) { + MultiDB::setDb($event->company->db); + $payment = $event->payment; $invoices = $payment->invoices; @@ -54,11 +58,11 @@ class PaymentDeletedActivity implements ShouldQueue foreach ($invoices as $invoice) { //todo we may need to add additional logic if in the future we apply payments to other entity Types, not just invoices $fields->invoice_id = $invoice->id; - $this->activityRepo->save($fields, $invoice); + $this->activity_repo->save($fields, $invoice); } if (count($invoices) == 0) { - $this->activityRepo->save($fields, $payment); + $this->activity_repo->save($fields, $payment); } } } diff --git a/app/Listeners/Activity/PaymentRefundedActivity.php b/app/Listeners/Activity/PaymentRefundedActivity.php index 660461887c8a..be19507a4ead 100644 --- a/app/Listeners/Activity/PaymentRefundedActivity.php +++ b/app/Listeners/Activity/PaymentRefundedActivity.php @@ -11,6 +11,7 @@ namespace App\Listeners\Activity; +use App\Libraries\MultiDB; use App\Models\Activity; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; @@ -37,6 +38,8 @@ class PaymentRefundedActivity implements ShouldQueue */ public function handle($event) { + MultiDB::setDb($event->company->db); + $fields = new \stdClass; $fields->client_id = $event->payment->id; diff --git a/app/Listeners/Activity/PaymentVoidedActivity.php b/app/Listeners/Activity/PaymentVoidedActivity.php index 1dd6e56f4c76..e82ab32148bb 100644 --- a/app/Listeners/Activity/PaymentVoidedActivity.php +++ b/app/Listeners/Activity/PaymentVoidedActivity.php @@ -11,6 +11,7 @@ namespace App\Listeners\Activity; +use App\Libraries\MultiDB; use App\Models\Activity; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; @@ -19,6 +20,7 @@ use Illuminate\Queue\InteractsWithQueue; class PaymentVoidedActivity implements ShouldQueue { protected $activity_repo; + /** * Create the event listener. * @@ -37,6 +39,8 @@ class PaymentVoidedActivity implements ShouldQueue */ public function handle($event) { + MultiDB::setDb($event->company->db); + $fields = new \stdClass; $fields->client_id = $event->payment->id; diff --git a/app/Listeners/Contact/UpdateContactLastLogin.php b/app/Listeners/Contact/UpdateContactLastLogin.php index 66cd422b9bc5..16002cc6afc1 100644 --- a/app/Listeners/Contact/UpdateContactLastLogin.php +++ b/app/Listeners/Contact/UpdateContactLastLogin.php @@ -11,6 +11,7 @@ namespace App\Listeners\Contact; +use App\Libraries\MultiDB; use App\Models\Activity; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; @@ -35,6 +36,8 @@ class UpdateContactLastLogin implements ShouldQueue */ public function handle($event) { + MultiDB::setDb($event->company->db); + $client_contact = $event->client_contact; $client_contact->last_login = now(); diff --git a/app/Listeners/Credit/CreateCreditInvitation.php b/app/Listeners/Credit/CreateCreditInvitation.php index cafeb182869a..8a3a0d5504d5 100644 --- a/app/Listeners/Credit/CreateCreditInvitation.php +++ b/app/Listeners/Credit/CreateCreditInvitation.php @@ -13,6 +13,7 @@ namespace App\Listeners\Credit; use App\Factory\CreditInvitationFactory; use App\Factory\InvoiceInvitationFactory; +use App\Libraries\MultiDB; use App\Models\CreditInvitation; use App\Models\InvoiceInvitation; use App\Utils\Traits\MakesHash; @@ -34,6 +35,8 @@ class CreateCreditInvitation implements ShouldQueue */ public function handle($event) { + MultiDB::setDb($event->company->db); + $credit = $event->credit; $contacts = $credit->client->contacts; diff --git a/app/Listeners/Document/DeleteCompanyDocuments.php b/app/Listeners/Document/DeleteCompanyDocuments.php index e8c4d701bace..1e81d3627c0d 100644 --- a/app/Listeners/Document/DeleteCompanyDocuments.php +++ b/app/Listeners/Document/DeleteCompanyDocuments.php @@ -3,6 +3,7 @@ namespace App\Listeners\Document; use App\Events\Company\CompanyWasDeleted; +use App\Libraries\MultiDB; use App\Models\Document; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Filesystem\Filesystem; @@ -29,7 +30,10 @@ class DeleteCompanyDocuments */ public function handle(CompanyWasDeleted $event) { - $path = sprintf('%s/%s', storage_path('app/public'), $event->company->company_key); + + MultiDB::setDb($event->company->db); + + $path = sprintf('%s/%s', storage_path('app/public'), $event->company->company_key); // Remove all files & folders, under company's path. // This will delete directory itself, as well. diff --git a/app/Listeners/Invoice/CreateInvoiceActivity.php b/app/Listeners/Invoice/CreateInvoiceActivity.php index 18cfe2f0601e..ed5f56cc8f00 100644 --- a/app/Listeners/Invoice/CreateInvoiceActivity.php +++ b/app/Listeners/Invoice/CreateInvoiceActivity.php @@ -11,6 +11,7 @@ namespace App\Listeners\Invoice; +use App\Libraries\MultiDB; use App\Models\Activity; use App\Models\ClientContact; use App\Models\InvoiceInvitation; @@ -41,6 +42,8 @@ class CreateInvoiceActivity implements ShouldQueue */ public function handle($event) { + MultiDB::setDb($event->company->db); + $fields = new \stdClass; $fields->invoice_id = $event->invoice->id; diff --git a/app/Listeners/Invoice/CreateInvoiceInvitation.php b/app/Listeners/Invoice/CreateInvoiceInvitation.php index a489a6679e3f..5fa64e389fa7 100644 --- a/app/Listeners/Invoice/CreateInvoiceInvitation.php +++ b/app/Listeners/Invoice/CreateInvoiceInvitation.php @@ -12,6 +12,7 @@ namespace App\Listeners\Invoice; use App\Factory\InvoiceInvitationFactory; +use App\Libraries\MultiDB; use App\Models\InvoiceInvitation; use App\Utils\Traits\MakesHash; use Illuminate\Contracts\Queue\ShouldQueue; @@ -32,6 +33,8 @@ class CreateInvoiceInvitation implements ShouldQueue */ public function handle($event) { + MultiDB::setDb($event->company->db); + $invoice = $event->invoice; $contacts = $invoice->client->contacts; diff --git a/app/Listeners/Invoice/CreateInvoicePdf.php b/app/Listeners/Invoice/CreateInvoicePdf.php index b7ca4eeb33ea..3654f2e39ba6 100644 --- a/app/Listeners/Invoice/CreateInvoicePdf.php +++ b/app/Listeners/Invoice/CreateInvoicePdf.php @@ -12,6 +12,7 @@ namespace App\Listeners\Invoice; use App\Jobs\Invoice\CreateInvoicePdf as PdfCreator; +use App\Libraries\MultiDB; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Queue\InteractsWithQueue; @@ -35,6 +36,9 @@ class CreateInvoicePdf implements ShouldQueue */ public function handle($event) { + + MultiDB::setDb($event->company->db); + $event->invoice->invitations->each(function ($invitation) { PdfCreator::dispatch($invitation); diff --git a/app/Listeners/Invoice/InvoiceCancelledActivity.php b/app/Listeners/Invoice/InvoiceCancelledActivity.php index 3836f1c5ba9e..3c267a1c2342 100644 --- a/app/Listeners/Invoice/InvoiceCancelledActivity.php +++ b/app/Listeners/Invoice/InvoiceCancelledActivity.php @@ -11,6 +11,7 @@ namespace App\Listeners\Invoice; +use App\Libraries\MultiDB; use App\Models\Activity; use App\Models\ClientContact; use App\Models\InvoiceInvitation; @@ -41,7 +42,10 @@ class InvoiceCancelledActivity implements ShouldQueue */ public function handle($event) { - $fields = new \stdClass; + + MultiDB::setDb($event->company->db); + + $fields = new \stdClass; $fields->invoice_id = $event->invoice->id; $fields->user_id = $event->invoice->user_id; diff --git a/app/Listeners/Invoice/InvoiceDeletedActivity.php b/app/Listeners/Invoice/InvoiceDeletedActivity.php index ee7ad683df5f..f304d55c3afd 100644 --- a/app/Listeners/Invoice/InvoiceDeletedActivity.php +++ b/app/Listeners/Invoice/InvoiceDeletedActivity.php @@ -11,6 +11,7 @@ namespace App\Listeners\Invoice; +use App\Libraries\MultiDB; use App\Models\Activity; use App\Models\ClientContact; use App\Models\InvoiceInvitation; @@ -41,6 +42,9 @@ class InvoiceDeletedActivity implements ShouldQueue */ public function handle($event) { + + MultiDB::setDb($event->company->db); + $fields = new \stdClass; $fields->invoice_id = $event->invoice->id; diff --git a/app/Listeners/Invoice/InvoiceEmailActivity.php b/app/Listeners/Invoice/InvoiceEmailActivity.php index f0ca3d408676..0d583e3a858d 100644 --- a/app/Listeners/Invoice/InvoiceEmailActivity.php +++ b/app/Listeners/Invoice/InvoiceEmailActivity.php @@ -11,6 +11,7 @@ namespace App\Listeners\Invoice; +use App\Libraries\MultiDB; use App\Models\Activity; use App\Models\ClientContact; use App\Models\InvoiceInvitation; @@ -41,6 +42,8 @@ class InvoiceEmailActivity implements ShouldQueue */ public function handle($event) { + MultiDB::setDb($event->company->db); + $fields = new \stdClass; $fields->invoice_id = $event->invitation->invoice->id; diff --git a/app/Listeners/Invoice/InvoiceEmailFailedActivity.php b/app/Listeners/Invoice/InvoiceEmailFailedActivity.php index f7c098fc76e8..069853539c63 100644 --- a/app/Listeners/Invoice/InvoiceEmailFailedActivity.php +++ b/app/Listeners/Invoice/InvoiceEmailFailedActivity.php @@ -11,6 +11,7 @@ namespace App\Listeners\Invoice; +use App\Libraries\MultiDB; use App\Models\Activity; use App\Models\ClientContact; use App\Models\InvoiceInvitation; @@ -41,6 +42,8 @@ class InvoiceEmailFailedActivity implements ShouldQueue */ public function handle($event) { + MultiDB::setDb($event->company->db); + $fields = new \stdClass; $fields->invoice_id = $event->invoice->id; diff --git a/app/Listeners/Invoice/InvoiceEmailedNotification.php b/app/Listeners/Invoice/InvoiceEmailedNotification.php index aa1490387c8b..5673afb03778 100644 --- a/app/Listeners/Invoice/InvoiceEmailedNotification.php +++ b/app/Listeners/Invoice/InvoiceEmailedNotification.php @@ -12,6 +12,7 @@ namespace App\Listeners\Invoice; use App\Jobs\Mail\EntitySentMailer; +use App\Libraries\MultiDB; use App\Models\Activity; use App\Models\ClientContact; use App\Models\InvoiceInvitation; @@ -41,7 +42,8 @@ class InvoiceEmailedNotification implements ShouldQueue */ public function handle($event) { - $invitation = $event->invitation; + MultiDB::setDb($event->company->db); + foreach ($invitation->company->company_users as $company_user) { diff --git a/app/Listeners/Invoice/InvoiceReversedActivity.php b/app/Listeners/Invoice/InvoiceReversedActivity.php index 3bf956058a69..ecaee30ad19c 100644 --- a/app/Listeners/Invoice/InvoiceReversedActivity.php +++ b/app/Listeners/Invoice/InvoiceReversedActivity.php @@ -11,6 +11,7 @@ namespace App\Listeners\Invoice; +use App\Libraries\MultiDB; use App\Models\Activity; use App\Models\ClientContact; use App\Models\InvoiceInvitation; @@ -41,6 +42,8 @@ class InvoiceReversedActivity implements ShouldQueue */ public function handle($event) { + MultiDB::setDb($event->company->db); + $fields = new \stdClass; $fields->invoice_id = $event->invoice->id; diff --git a/app/Listeners/Invoice/UpdateInvoiceInvitations.php b/app/Listeners/Invoice/UpdateInvoiceInvitations.php index 83572299027e..52141fdd53a5 100644 --- a/app/Listeners/Invoice/UpdateInvoiceInvitations.php +++ b/app/Listeners/Invoice/UpdateInvoiceInvitations.php @@ -11,6 +11,7 @@ namespace App\Listeners\Invoice; +use App\Libraries\MultiDB; use App\Models\Invoice; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Queue\InteractsWithQueue; @@ -35,6 +36,8 @@ class UpdateInvoiceInvitations implements ShouldQueue */ public function handle($event) { + MultiDB::setDb($event->company->db); + $payment = $event->payment; $invoices = $payment->invoices; diff --git a/app/Listeners/Misc/InvitationViewedListener.php b/app/Listeners/Misc/InvitationViewedListener.php index 2b517a5d4c34..394474432058 100644 --- a/app/Listeners/Misc/InvitationViewedListener.php +++ b/app/Listeners/Misc/InvitationViewedListener.php @@ -12,6 +12,7 @@ namespace App\Listeners\Misc; use App\Jobs\Mail\EntityViewedMailer; +use App\Libraries\MultiDB; use App\Notifications\Admin\EntityViewedNotification; use App\Utils\Traits\Notifications\UserNotifies; use Illuminate\Contracts\Queue\ShouldQueue; @@ -39,7 +40,9 @@ class InvitationViewedListener implements ShouldQueue */ public function handle($event) { - $entity_name = $event->entity; + MultiDB::setDb($event->company->db); + + $entity_name = $event->entity; $invitation = $event->invitation; $notification = new EntityViewedNotification($invitation, $entity_name); diff --git a/app/Listeners/Payment/PaymentNotification.php b/app/Listeners/Payment/PaymentNotification.php index 039b02e75dfb..99f30b210050 100644 --- a/app/Listeners/Payment/PaymentNotification.php +++ b/app/Listeners/Payment/PaymentNotification.php @@ -12,6 +12,7 @@ namespace App\Listeners\Payment; use App\Jobs\Mail\EntityPaidMailer; +use App\Libraries\MultiDB; use App\Models\Activity; use App\Models\Invoice; use App\Models\Payment; @@ -43,7 +44,9 @@ class PaymentNotification implements ShouldQueue */ public function handle($event) { - $payment = $event->payment; + MultiDB::setDb($event->company->db); + + $payment = $event->payment; /*User notifications*/ foreach ($payment->company->company_users as $company_user) { diff --git a/app/Listeners/Quote/CreateQuoteInvitation.php b/app/Listeners/Quote/CreateQuoteInvitation.php index 8d67a1ac7d23..7344fba339a9 100644 --- a/app/Listeners/Quote/CreateQuoteInvitation.php +++ b/app/Listeners/Quote/CreateQuoteInvitation.php @@ -14,6 +14,7 @@ namespace App\Listeners\Quote; use App\Factory\CreditInvitationFactory; use App\Factory\InvoiceInvitationFactory; use App\Factory\QuoteInvitationFactory; +use App\Libraries\MultiDB; use App\Models\InvoiceInvitation; use App\Models\QuoteInvitation; use App\Utils\Traits\MakesHash; @@ -35,6 +36,8 @@ class CreateQuoteInvitation implements ShouldQueue */ public function handle($event) { + MultiDB::setDb($event->company->db); + $quote = $event->credit; $contacts = $quote->client->contacts; diff --git a/app/Listeners/Quote/ReachWorkflowSettings.php b/app/Listeners/Quote/ReachWorkflowSettings.php index 9cd54bbac131..2fc0cd19f893 100644 --- a/app/Listeners/Quote/ReachWorkflowSettings.php +++ b/app/Listeners/Quote/ReachWorkflowSettings.php @@ -3,6 +3,7 @@ namespace App\Listeners\Quote; use App\Jobs\Quote\QuoteWorkflowSettings; +use App\Libraries\MultiDB; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Queue\InteractsWithQueue; @@ -26,6 +27,8 @@ class ReachWorkflowSettings */ public function handle($event) { + MultiDB::setDb($event->company->db); + QuoteWorkflowSettings::dispatchNow($event->quote); } } diff --git a/app/Listeners/User/ArchivedUserActivity.php b/app/Listeners/User/ArchivedUserActivity.php index 887454229fc4..1680987a4311 100644 --- a/app/Listeners/User/ArchivedUserActivity.php +++ b/app/Listeners/User/ArchivedUserActivity.php @@ -11,6 +11,7 @@ namespace App\Listeners\User; +use App\Libraries\MultiDB; use App\Models\Activity; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; @@ -37,6 +38,8 @@ class ArchivedUserActivity implements ShouldQueue */ public function handle($event) { + MultiDB::setDb($event->company->db); + $fields = new \stdClass; if (auth()->user()->id) { diff --git a/app/Listeners/User/CreatedUserActivity.php b/app/Listeners/User/CreatedUserActivity.php index ada9fb56d672..0c80966b38aa 100644 --- a/app/Listeners/User/CreatedUserActivity.php +++ b/app/Listeners/User/CreatedUserActivity.php @@ -11,6 +11,7 @@ namespace App\Listeners\User; +use App\Libraries\MultiDB; use App\Models\Activity; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; @@ -37,6 +38,8 @@ class CreatedUserActivity implements ShouldQueue */ public function handle($event) { + MultiDB::setDb($event->company->db); + $fields = new \stdClass; if (auth()->user()) { diff --git a/app/Listeners/User/DeletedUserActivity.php b/app/Listeners/User/DeletedUserActivity.php index 298b705f5234..9774696521f6 100644 --- a/app/Listeners/User/DeletedUserActivity.php +++ b/app/Listeners/User/DeletedUserActivity.php @@ -11,6 +11,7 @@ namespace App\Listeners\User; +use App\Libraries\MultiDB; use App\Models\Activity; use App\Repositories\ActivityRepository; use Illuminate\Broadcasting\InteractsWithSockets; @@ -42,7 +43,9 @@ class DeletedUserActivity implements ShouldQueue */ public function handle($event) { - $fields = new \stdClass; + MultiDB::setDb($event->company->db); + + $fields = new \stdClass; if (auth()->user()->id) { $fields->user_id = auth()->user()->id; diff --git a/app/Listeners/User/RestoredUserActivity.php b/app/Listeners/User/RestoredUserActivity.php index d3e035af63df..ce23094b9c99 100644 --- a/app/Listeners/User/RestoredUserActivity.php +++ b/app/Listeners/User/RestoredUserActivity.php @@ -11,6 +11,7 @@ namespace App\Listeners\User; +use App\Libraries\MultiDB; use App\Models\Activity; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; @@ -37,6 +38,8 @@ class RestoredUserActivity implements ShouldQueue */ public function handle($event) { + MultiDB::setDb($event->company->db); + $fields = new \stdClass; if (auth()->user()->id) { diff --git a/app/Listeners/User/UpdateUserLastLogin.php b/app/Listeners/User/UpdateUserLastLogin.php index f9a8afe5839f..79e91c665cdd 100644 --- a/app/Listeners/User/UpdateUserLastLogin.php +++ b/app/Listeners/User/UpdateUserLastLogin.php @@ -11,12 +11,13 @@ namespace App\Listeners\User; +use App\Libraries\MultiDB; use App\Models\Activity; use App\Repositories\ActivityRepository; -use Illuminate\Contracts\Queue\ShouldQueue; -use Illuminate\Queue\InteractsWithQueue; use Illuminate\Broadcasting\InteractsWithSockets; +use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Events\Dispatchable; +use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\SerializesModels; class UpdateUserLastLogin implements ShouldQueue @@ -40,6 +41,8 @@ class UpdateUserLastLogin implements ShouldQueue */ public function handle($event) { + MultiDB::setDb($event->company->db); + $user = $event->user; $user->last_login = now(); diff --git a/app/Listeners/User/UpdatedUserActivity.php b/app/Listeners/User/UpdatedUserActivity.php index 1d9f656f213c..e33a06c8c13e 100644 --- a/app/Listeners/User/UpdatedUserActivity.php +++ b/app/Listeners/User/UpdatedUserActivity.php @@ -11,6 +11,7 @@ namespace App\Listeners\User; +use App\Libraries\MultiDB; use App\Models\Activity; use App\Repositories\ActivityRepository; use Illuminate\Contracts\Queue\ShouldQueue; @@ -37,6 +38,8 @@ class UpdatedUserActivity implements ShouldQueue */ public function handle($event) { + MultiDB::setDb($event->company->db); + $fields = new \stdClass; if (auth()->user()->id) {