From f84a3099644b66b41869cda5a262a5177f9bd18e Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 17 Jan 2023 08:37:15 +1100 Subject: [PATCH] Add task schedulers to login / refresh routes --- app/Http/Controllers/BaseController.php | 10 +++++----- app/Models/Company.php | 5 +++++ app/Transformers/CompanyTransformer.php | 7 +++++++ 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php index b7db539320..3403d0e212 100644 --- a/app/Http/Controllers/BaseController.php +++ b/app/Http/Controllers/BaseController.php @@ -109,7 +109,7 @@ class BaseController extends Controller 'company.bank_integrations', 'company.bank_transactions', 'company.bank_transaction_rules', - 'company.schedulers', + 'company.task_schedulers', ]; private $mini_load = [ @@ -129,7 +129,7 @@ class BaseController extends Controller 'company.subscriptions', 'company.bank_integrations', 'company.bank_transaction_rules', - 'company.schedulers', + 'company.task_schedulers', ]; public function __construct() @@ -467,7 +467,7 @@ class BaseController extends Controller $query->where('bank_transaction_rules.user_id', $user->id); } }, - 'company.schedulers'=> function ($query) use ($updated_at, $user) { + 'company.task_schedulers'=> function ($query) use ($updated_at, $user) { $query->where('updated_at', '>=', $updated_at); if (! $user->isAdmin()) { @@ -554,7 +554,7 @@ class BaseController extends Controller $query->where('bank_transaction_rules.user_id', $user->id); } }, - 'company.schedulers'=> function ($query) use ($user) { + 'company.task_schedulers'=> function ($query) use ($user) { if (! $user->isAdmin()) { $query->where('schedulers.user_id', $user->id); @@ -818,7 +818,7 @@ class BaseController extends Controller $query->where('bank_transactions.user_id', $user->id); } }, - 'company.schedulers'=> function ($query) use ($created_at, $user) { + 'company.task_schedulers'=> function ($query) use ($created_at, $user) { $query->where('created_at', '>=', $created_at); if (! $user->isAdmin()) { diff --git a/app/Models/Company.php b/app/Models/Company.php index ac80e2b52f..0afac617a2 100644 --- a/app/Models/Company.php +++ b/app/Models/Company.php @@ -177,6 +177,11 @@ class Company extends BaseModel return $this->hasMany(Scheduler::class); } + public function task_schedulers() //alias for schedulers + { + return $this->hasMany(Scheduler::class); + } + public function all_documents() { return $this->hasMany(Document::class); diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php index 179c4bcd91..9027184560 100644 --- a/app/Transformers/CompanyTransformer.php +++ b/app/Transformers/CompanyTransformer.php @@ -108,6 +108,7 @@ class CompanyTransformer extends EntityTransformer 'bank_transactions', 'bank_transaction_rules', 'task_schedulers', + 'schedulers', ]; /** @@ -251,6 +252,12 @@ class CompanyTransformer extends EntityTransformer return $this->includeCollection($company->schedulers, $transformer, Scheduler::class); } + public function includeSchedulers(Company $company) + { + $transformer = new SchedulerTransformer($this->serializer); + + return $this->includeCollection($company->schedulers, $transformer, Scheduler::class); + } public function includeBankTransactionRules(Company $company) {