From cf14306c2b3f82a81f8d56669a71633b4d4b5fce Mon Sep 17 00:00:00 2001 From: marvin-borner@live.com Date: Mon, 16 Apr 2018 21:09:05 +0200 Subject: Main merge to user management system - files are now at /main/public/ --- .../extend-user/src/Database/Models/Member.php | 124 +++++++++++++++++++++ .../extend-user/src/Database/Models/MemberAux.php | 20 ++++ 2 files changed, 144 insertions(+) create mode 100755 main/app/sprinkles/extend-user/src/Database/Models/Member.php create mode 100755 main/app/sprinkles/extend-user/src/Database/Models/MemberAux.php (limited to 'main/app/sprinkles/extend-user/src/Database/Models') diff --git a/main/app/sprinkles/extend-user/src/Database/Models/Member.php b/main/app/sprinkles/extend-user/src/Database/Models/Member.php new file mode 100755 index 0000000..98d9d70 --- /dev/null +++ b/main/app/sprinkles/extend-user/src/Database/Models/Member.php @@ -0,0 +1,124 @@ +createAuxIfNotExists(); + + if ($member->auxType) { + // Set the aux PK, if it hasn't been set yet + if (!$member->aux->id) { + $member->aux->id = $member->id; + } + + $member->aux->save(); + } + }); + } +} + +class Member extends User +{ + use LinkMemberAux; + + protected $fillable = [ + 'user_name', + 'first_name', + 'last_name', + 'email', + 'locale', + 'theme', + 'group_id', + 'flag_verified', + 'flag_enabled', + 'last_activity_id', + 'password', + 'deleted_at', + 'city', + 'country' + ]; + + protected $auxType = 'UserFrosting\Sprinkle\ExtendUser\Database\Models\MemberAux'; + + /** + * Required to be able to access the `aux` relationship in Twig without needing to do eager loading. + * @see http://stackoverflow.com/questions/29514081/cannot-access-eloquent-attributes-on-twig/35908957#35908957 + */ + public function __isset($name) + { + if (in_array($name, [ + 'aux' + ])) { + return true; + } else { + return parent::__isset($name); + } + } + + /** + * Globally joins the `members` table to access additional properties. + */ + protected static function boot() + { + parent::boot(); + + static::addGlobalScope(new MemberAuxScope); + } + + /** + * Custom mutator for Member property + */ + public function setCityAttribute($value) + { + $this->createAuxIfNotExists(); + + $this->aux->city = $value; + } + + /** + * Custom mutator for Member property + */ + public function setCountryAttribute($value) + { + $this->createAuxIfNotExists(); + + $this->aux->country = $value; + } + + /** + * Relationship for interacting with aux model (`members` table). + */ + public function aux() + { + return $this->hasOne($this->auxType, 'id'); + } + + /** + * If this instance doesn't already have a related aux model (either in the db on in the current object), then create one + */ + protected function createAuxIfNotExists() + { + if ($this->auxType && !count($this->aux)) { + // Create aux model and set primary key to be the same as the main user's + $aux = new $this->auxType; + + // Needed to immediately hydrate the relation. It will actually get saved in the bootLinkMemberAux method. + $this->setRelation('aux', $aux); + } + } +} diff --git a/main/app/sprinkles/extend-user/src/Database/Models/MemberAux.php b/main/app/sprinkles/extend-user/src/Database/Models/MemberAux.php new file mode 100755 index 0000000..c826409 --- /dev/null +++ b/main/app/sprinkles/extend-user/src/Database/Models/MemberAux.php @@ -0,0 +1,20 @@ +