From 1c3966598db9dadda58454cc7819a53d7286eba4 Mon Sep 17 00:00:00 2001 From: Deon George Date: Thu, 24 Feb 2022 13:56:47 +1100 Subject: [PATCH] Change to how we resolve a user's team between Slack/ and App/* models --- src/Models/User.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Models/User.php b/src/Models/User.php index 15fdd15..2f70ebd 100644 --- a/src/Models/User.php +++ b/src/Models/User.php @@ -21,6 +21,11 @@ class User extends Model return $this->belongsTo(Enterprise::class); } + public function team() + { + return $this->belongsTo(Team::class); + } + /* ATTRIBUTES */ /** @@ -49,10 +54,10 @@ class User extends Model * * @return mixed */ - public function getTeamAttribute(): ?Team + public function getUserTeamAttribute(): ?Team { Log::debug(sprintf('%s:User [%s]',self::LOGKEY,$this->id),['team'=>$this->team_id,'enterprise'=>$this->enterprise_id,'eo'=>$this->enterprise]); - return $this->team_id ? Team::find($this->team_id) : (($x=$this->enterprise->teams) ? $x->first() : NULL); + return $this->team_id ? $this->team : (($x=$this->enterprise->teams) ? $x->first() : NULL); } -} +} \ No newline at end of file