Refactor HasBoardRecords and InteractsWithBoard to implement configurable reordering for improved data retrieval

Author: ManukMinasyan

src/Board/Concerns/HasBoardRecords.php

@@ -53,10 +53,15 @@ public function getBoardRecords(string $columnId): Collection
             $limit = $livewire->columnCardLimits[$columnId] ?? 10;
         }
 
-        return (clone $query)
-            ->where($statusField, $columnId)
-            ->limit($limit)
-            ->get();
+        $queryClone = (clone $query)->where($statusField, $columnId);
+
+        // Apply ordering if configured
+        $reorderBy = $this->getReorderBy();
+        if ($reorderBy) {
+            $queryClone->orderBy($reorderBy['column'], $reorderBy['direction']);
+        }
+
+        return $queryClone->limit($limit)->get();
     }
 
     /**

src/Concerns/InteractsWithBoard.php

@@ -97,9 +97,10 @@ public function updateRecordsOrderAndColumn(string $columnId, array $recordIds):
 
                 $updateData = [$statusField => $statusValue];
 
-                // Add sort order if the model has that column
-                if ($this->modelHasSortOrder($record)) {
-                    $updateData['sort_order'] = $index;
+                // Add sort order if reordering is configured
+                $reorderBy = $board->getReorderBy();
+                if ($reorderBy && $this->modelHasOrderColumn($record, $reorderBy['column'])) {
+                    $updateData[$reorderBy['column']] = $index;
                 }
 
                 $success = $record->update($updateData) && $success;
@@ -110,15 +111,15 @@ public function updateRecordsOrderAndColumn(string $columnId, array $recordIds):
     }
 
     /**
-     * Check if model has sort_order column.
+     * Check if model has the specified order column.
      */
-    protected function modelHasSortOrder($model): bool
+    protected function modelHasOrderColumn($model, string $columnName): bool
     {
         try {
             $table = $model->getTable();
             $schema = $model->getConnection()->getSchemaBuilder();
 
-            return $schema->hasColumn($table, 'sort_order');
+            return $schema->hasColumn($table, $columnName);
         } catch (Exception) {
             return false;
         }
@@ -194,11 +195,15 @@ public function getBoardColumnRecords(string $columnId): array
         $statusField = $board->getColumnIdentifierAttribute() ?? 'status';
         $limit = $this->columnCardLimits[$columnId] ?? 10;
 
-        return (clone $query)
-            ->where($statusField, $columnId)
-            ->limit($limit)
-            ->get()
-            ->toArray();
+        $queryClone = (clone $query)->where($statusField, $columnId);
+
+        // Apply ordering if configured
+        $reorderBy = $board->getReorderBy();
+        if ($reorderBy) {
+            $queryClone->orderBy($reorderBy['column'], $reorderBy['direction']);
+        }
+
+        return $queryClone->limit($limit)->get()->toArray();
     }
 
     /**