Extract duplicated collection methods in Builder

The logic for fetching views and collections are very nearly the
same bar aggregation support.

Author: paulinevos

src/Schema/Builder.php

@@ -6,6 +6,7 @@
 
 use Closure;
 use MongoDB\Collection;
+use MongoDB\Database;
 use MongoDB\Driver\Exception\ServerException;
 use MongoDB\Laravel\Connection;
 use MongoDB\Model\CollectionInfo;
@@ -154,23 +155,25 @@ public function dropAllTables()
     }
 
     /** @param string|null $schema Database name */
-    public function getTables($schema = null)
-    {
+    private function getCollectionRows(
+        $schema = null,
+        ?string $collectionType = null,
+        ?callable $aggregateStats = null,
+    ) {
         $db = $this->connection->getDatabase($schema);
         $collections = [];
 
         foreach ($db->listCollections() as $collectionInfo) {
             $collectionName = $collectionInfo->getName();
 
-            // Skip views, which don't support aggregate
-            if ($collectionInfo->getType() === 'view') {
+            if ($collectionType && $collectionInfo->getType() !== $collectionType) {
                 continue;
             }
 
-            $stats = $db->selectCollection($collectionName)->aggregate([
-                ['$collStats' => ['storageStats' => ['scale' => 1]]],
-                ['$project' => ['storageStats.totalSize' => 1]],
-            ])->toArray();
+            // Aggregation is not supported on views
+            $shouldAggregateStats = $aggregateStats !== null && $collectionInfo->getType() !== 'view';
+
+            $stats = $shouldAggregateStats ? $aggregateStats($db, $collectionName) : null;
 
             $collections[] = [
                 'name' => $collectionName,
@@ -188,34 +191,23 @@ public function getTables($schema = null)
         return $collections;
     }
 
-    /** @param  string|null $schema Database name */
-    public function getViews($schema = null)
+    /** @param string|null $schema Database name */
+    public function getTables($schema = null)
     {
-        $db = $this->connection->getDatabase($schema);
-        $collections = [];
-
-        foreach ($db->listCollections() as $collectionInfo) {
-            $collectionName = $collectionInfo->getName();
-
-            // Skip normal type collection
-            if ($collectionInfo->getType() !== 'view') {
-                continue;
-            }
-
-            $collections[] = [
-                'name' => $collectionName,
-                'schema' => $db->getDatabaseName(),
-                'schema_qualified_name' => $db->getDatabaseName() . '.' . $collectionName,
-                'size' => null,
-                'comment' => null,
-                'collation' => null,
-                'engine' => null,
-            ];
-        }
+        $aggregateStats = function (Database $db, string $collectionName): array {
+            return $db->selectCollection($collectionName)->aggregate([
+                ['$collStats' => ['storageStats' => ['scale' => 1]]],
+                ['$project' => ['storageStats.totalSize' => 1]],
+            ])->toArray();
+        };
 
-        usort($collections, fn ($a, $b) => $a['name'] <=> $b['name']);
+        return $this->getCollectionRows($schema, 'collection', $aggregateStats);
+    }
 
-        return $collections;
+    /** @param  string|null $schema Database name */
+    public function getViews($schema = null)
+    {
+        return $this->getCollectionRows($schema, 'view');
     }
 
     /**