From 0469de74662ae0e1a20665de51a983eebdf92b52 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 9 Oct 2019 16:47:12 +1100 Subject: [PATCH] fix for returning token on company creation --- app/Http/Controllers/CompanyController.php | 2 +- app/Models/CompanyUser.php | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/CompanyController.php b/app/Http/Controllers/CompanyController.php index b266b234ccb3..4a150aeaf682 100644 --- a/app/Http/Controllers/CompanyController.php +++ b/app/Http/Controllers/CompanyController.php @@ -234,7 +234,7 @@ class CompanyController extends BaseController $this->entity_type = CompanyUser::class; //return $this->itemResponse($company); - $ct = CompanyUser::whereUserId(auth()->user()->id); + $ct = CompanyUser::whereUserId(auth()->user()->id)->whereCompanyId($company->id); return $this->listResponse($ct); diff --git a/app/Models/CompanyUser.php b/app/Models/CompanyUser.php index 4ee4a3be4354..7e40b8494152 100644 --- a/app/Models/CompanyUser.php +++ b/app/Models/CompanyUser.php @@ -55,9 +55,12 @@ class CompanyUser extends Pivot return $this->hasOne(Company::class, 'id', 'company_id'); } + /*todo monitor this function - may fail under certain conditions*/ public function token() { + return $this->belongsTo(CompanyToken::class, 'user_id','user_id'); + /* return $this->hasOneThrough( CompanyToken::class, CompanyUser::class, @@ -66,6 +69,6 @@ class CompanyUser extends Pivot 'user_id', // Local key on CompanyToken table... 'company_id' // Local key on CompanyUser table... ); - + */ } }