Not export tenant_id attribute

src/MultiTenantRecord.php

@@ -15,8 +15,8 @@ public function beforeSave($insert)
         if (!Yii::$app->user->isGuest) {
             $identity = Yii::$app->user->identity;
             if ($identity instanceof TenantInterface) {
-                if ($insert && $this->beforeApplyTenant() && !$this->tenant_id) {
-                    $this->tenant_id = $identity->getTenantId();
+                if ($insert && $this->beforeApplyTenant() && $this->{TenantInterface::ATTRIBUTE_NAME} === null) {
+                    $this->{TenantInterface::ATTRIBUTE_NAME} = $identity->getTenantId();
                     $this->afterApplyTenant();
                 }
             } else {
@@ -34,6 +34,21 @@ public static function find()
         return Yii::createObject(MultiTenantQuery::class, [get_called_class()]);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    protected function resolveFields(array $fields, array $expand)
+    {
+        $fields = parent::resolveFields($fields, $expand);
+
+        if ($this->hasAttribute(TenantInterface::ATTRIBUTE_NAME)) {
+            unset($fields[TenantInterface::ATTRIBUTE_NAME]);
+        }
+
+        return $fields;
+    }
+
+
 
     /**
      * This method is invoked before assign the attribute tenant id

src/TenantInterface.php

@@ -4,6 +4,8 @@
 
 interface TenantInterface {
 
+    const ATTRIBUTE_NAME = 'tenant_id';
+
     /**
      * Returns tenant id
      * @return integer id of tenant

tests/MultiTenantRecordTest.php

@@ -3,6 +3,9 @@
 namespace solutosoft\multitenant\tests;
 
 use solutosoft\multitenant\tests\fixtures\PersonFixture;
+use solutosoft\multitenant\tests\fixtures\PersonTagFixture;
+use solutosoft\multitenant\tests\fixtures\PessoaTagFixture;
+use solutosoft\multitenant\tests\fixtures\TagFixture;
 use solutosoft\multitenant\tests\models\Person;
 
 class MultiTenantRecordTest extends TestCase
@@ -23,7 +26,9 @@ protected function setUp()
     public function fixtures()
     {
         return [
-            'people' => PersonFixture::class
+            'people' => PersonFixture::class,
+            'tags' => TagFixture::class,
+            'persontags' => PersonTagFixture::class
         ];
     }
 
@@ -59,4 +64,17 @@ public function testFind()
         $this->assertCount(count($data), Person::find()->withoutTenant()->all());
         $this->assertCount(count($filtered), Person::find()->all());
     }
+
+    public function testToArray()
+    {
+        $person = $this->people('bob');
+        $data = $person->toArray([], ['tags']);
+
+        $this->assertArrayNotHasKey('tenant_id', $data);
+        $this->assertArrayHasKey('tags', $data);
+
+        foreach ($data['tags'] as $tag) {
+            $this->assertArrayNotHasKey('tenant_id', $tag);
+        }
+    }
 }

tests/TestCase.php

@@ -107,7 +107,7 @@ protected function setupDatabase()
         $db->createCommand()->createTable('person', [
             'id' => 'pk',
             'name' => 'string',
-            'profile_id' => 'integeger',
+            'profile_id' => 'integer',
             'tenant_id' => 'integer'
         ])->execute();
 
@@ -116,6 +116,21 @@ protected function setupDatabase()
             'number' => 'string',
             'description' => 'string'
         ])->execute();
+
+        $db->createCommand()->createTable('tag', [
+            'id' => 'pk',
+            'description' => 'string',
+            'tenant_id' => 'integer'
+        ])->execute();
+
+
+        $db->createCommand()->createTable('person_tag', [
+            'person_id' => 'integer',
+            'tag_id' => 'integer',
+            'PRIMARY KEY(person_id, tag_id)'
+        ])->execute();
+
+
     }
 
     /**

tests/fixtures/PersonTagFixture.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace solutosoft\multitenant\tests\fixtures;
+
+use yii\test\ActiveFixture;
+
+class PersonTagFixture extends ActiveFixture
+{
+    public $tableName = 'person_tag';
+}

tests/fixtures/data/person_tag.php

@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'person-tag-1' => [
+        'person_id' => 2,
+        'tag_id' => 1,
+    ],
+    'tag-2' => [
+        'person_id' => 2,
+        'tag_id' => 2,
+    ]
+];

tests/fixtures/data/tag.php

@@ -3,12 +3,12 @@
 return [
     'tag-1' => [
         'id' => 1,
-        'link' => 't01',
-        'description' => 'Tag 2'
+        'description' => 'Tag 1',
+        'tenant_id' => 1
     ],
     'tag-2' => [
         'id' => 2,
-        'link' => 't02',
-        'description' => 'Tag 2'
+        'description' => 'Tag 2',
+        'tenant_id' => 1
     ]
 ];

tests/models/Person.php

@@ -42,6 +42,15 @@ public function getProfile()
         return $this->hasOne(Profile::className(), ['id' => 'profile_id']);
     }
 
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getTags()
+    {
+        return $this->hasMany(Tag::className(), ['id' => 'tag_id'])
+            ->viaTable('person_tag', ['person_id' => 'id']);
+    }
+
     /**
      * @inheritdoc
      */
@@ -53,6 +62,16 @@ public function rules()
         ];
     }
 
+     /**
+     * @inheritdoc
+     */
+    public function extraFields()
+    {
+        return [
+            'tags'
+        ];
+    }
+
     /**
      * @inheritdoc
      */

tests/models/Tag.php

@@ -2,7 +2,7 @@
 
 namespace solutosoft\multitenant\tests\models;
 
-use soluto\base\db\MultiTenantRecord;
+use solutosoft\multitenant\MultiTenantRecord;
 use yii\db\ActiveRecord;
 
 /**
@@ -27,7 +27,7 @@ public static function tableName()
     public function rules()
     {
         return [
-            [['description', 'link'], 'string'],
+            [['description'], 'string'],
             [['description'], 'required']
         ];
     }