cleanup

Author: Blazik

src/Models/Scopes/MappedColumnsScope.php

@@ -14,36 +14,22 @@ class MappedColumnsScope implements Scope
     public function apply(EloquentBuilder $builder, Model $model): void
     {
         $builder->beforeQuery(function (QueryBuilder $builder) use ($model) {
-            if (!$mappedColToDbCol = $model->columns ?? null) {
+            if (!$attributeToColumn = $model->mapAttributeToColumn ?? null) {
                 return;
             }
 
             $modelTable = $model->getTable();
-            $mappedColToDbColWithTable = collect($mappedColToDbCol)
+            $attributeToColumnWithTable = collect($attributeToColumn)
                 ->mapWithKeys(fn($value, $key) => [$modelTable . '.' . $key => $modelTable . '.' . $value])
-                ->merge($mappedColToDbCol);
+                ->merge($attributeToColumn);
 
-            $dbColToMappedCol = $mappedColToDbColWithTable->flip();
-
-            $builder->columns = $this->mapColumns(
-                $builder->columns,
-                $mappedColToDbColWithTable,
-                $dbColToMappedCol,
-                $model
-            );
-
-            $builder->wheres = $this->mapColumns(
-                $builder->wheres,
-                $mappedColToDbColWithTable,
-                $dbColToMappedCol,
-                $model
-            );
-
-            $builder->joins = $this->mapJoins($builder->joins, $mappedColToDbColWithTable);
+            $builder->columns = $this->mapColumns($builder->columns, $attributeToColumnWithTable);
+            $builder->wheres = $this->mapColumns($builder->wheres, $attributeToColumnWithTable);
+            $builder->joins = $this->mapJoins($builder->joins, $attributeToColumnWithTable);
         });
     }
 
-    private function mapColumns($array, $mappedColToDbColWithTable, $dbColToMappedCol, $model)
+    private function mapColumns($array, $mappedColToDbColWithTable)
     {
         if (!$array) {
             return $array;

src/Models/Traits/HasMappableColumns.php

@@ -8,7 +8,7 @@
 use Illuminate\Support\Traits\Macroable;
 
 /**
- * @property array $columns
+ * @property array $mapAttributeToColumn
  */
 trait HasMappableColumns
 {
@@ -21,13 +21,13 @@ protected static function bootHasMappableColumns(): void
     {
         static::addGlobalScope(new MappedColumnsScope());
 
-        foreach ((new static)->columns ?? [] as $mappedCol => $dbCol) {
-            static::macro('get' . Str::studly($mappedCol) . 'Attribute', function () use ($dbCol) {
-                return $this->$dbCol;
+        foreach ((new static)->mapAttributeToColumn ?? [] as $attribute => $column) {
+            static::macro('get' . Str::studly($attribute) . 'Attribute', function () use ($column) {
+                return $this->$column;
             });
 
-            static::macro('set' . Str::studly($mappedCol) . 'Attribute', function ($value) use ($dbCol) {
-                $this->$dbCol = $value;
+            static::macro('set' . Str::studly($attribute) . 'Attribute', function ($value) use ($column) {
+                $this->$column = $value;
             });
         }
     }
@@ -37,16 +37,16 @@ public function newInstance($attributes = [], $exists = false): Model
         /** @var Model $instance */
         $instance = parent::newInstance($attributes, $exists);
 
-        foreach ($instance->columns ?? [] as $mappedCol => $dbCol) {
-            $instance->hidden[] = $dbCol;
-            $instance->appends[] = $mappedCol;
+        foreach ($instance->mapAttributeToColumn ?? [] as $attribute => $column) {
+            $instance->hidden[] = $column;
+            $instance->appends[] = $attribute;
 
-            if (in_array($mappedCol, $instance->guarded)) {
-                $instance->guarded[] = $dbCol;
+            if (in_array($attribute, $instance->guarded)) {
+                $instance->guarded[] = $column;
             }
 
-            if (in_array($mappedCol, $instance->fillable)) {
-                $instance->fillable[] = $dbCol;
+            if (in_array($attribute, $instance->fillable)) {
+                $instance->fillable[] = $column;
             }
         }