Handle whereIn() in new ordering clause logic (#188)

Author: ryanmitchell

src/Entries/EntryQueryBuilder.php

@@ -27,44 +27,51 @@ public function orderBy($column, $direction = 'asc')
             $wheres = collect($this->builder->getQuery()->wheres);
 
             if ($wheres->where('column', 'collection')->count() == 1) {
-                if ($collection = Collection::find($wheres->firstWhere('column', 'collection')['value'])) {
-                    $blueprintField = $collection->entryBlueprints()
-                        ->flatMap(function ($blueprint) {
-                            return $blueprint->fields()
-                                ->all()
-                                ->filter(function ($field) {
-                                    return in_array($field->type(), ['float', 'integer', 'date']);
-                                });
-                        })
-                        ->filter()
-                        ->get($column);
-
-                    if ($blueprintField) {
-                        $castType = '';
-                        $fieldType = $blueprintField->type();
-
-                        $grammar = $this->builder->getConnection()->getQueryGrammar();
-                        $actualColumn = $grammar->wrap($actualColumn);
-
-                        if (in_array($fieldType, ['float'])) {
-                            $castType = 'float';
-                        } elseif (in_array($fieldType, ['integer'])) {
-                            $castType = 'float'; // bit sneaky but mysql doesnt support casting as integer, it wants unsigned
-                        } elseif (in_array($fieldType, ['date'])) {
-                            $castType = 'date';
-
-                            // sqlite casts dates to year, which is pretty unhelpful
-                            if (str_contains(get_class($grammar), 'SQLiteGrammar')) {
-                                $this->builder->orderByRaw("datetime({$actualColumn}) {$direction}");
+                $collectionWhere = $wheres->firstWhere('column', 'collection');
+                if (isset($collectionWhere['values']) && count($collectionWhere['values']) == 1) {
+                    $collectionWhere['value'] = $collectionWhere['values'][0];
+                }
 
-                                return $this;
+                if (isset($collectionWhere['value'])) {
+                    if ($collection = Collection::find($collectionWhere['value'])) {
+                        $blueprintField = $collection->entryBlueprints()
+                            ->flatMap(function ($blueprint) {
+                                return $blueprint->fields()
+                                    ->all()
+                                    ->filter(function ($field) {
+                                        return in_array($field->type(), ['float', 'integer', 'date']);
+                                    });
+                            })
+                            ->filter()
+                            ->get($column);
+
+                        if ($blueprintField) {
+                            $castType = '';
+                            $fieldType = $blueprintField->type();
+
+                            $grammar = $this->builder->getConnection()->getQueryGrammar();
+                            $actualColumn = $grammar->wrap($actualColumn);
+
+                            if (in_array($fieldType, ['float'])) {
+                                $castType = 'float';
+                            } elseif (in_array($fieldType, ['integer'])) {
+                                $castType = 'float'; // bit sneaky but mysql doesnt support casting as integer, it wants unsigned
+                            } elseif (in_array($fieldType, ['date'])) {
+                                $castType = 'date';
+
+                                // sqlite casts dates to year, which is pretty unhelpful
+                                if (str_contains(get_class($grammar), 'SQLiteGrammar')) {
+                                    $this->builder->orderByRaw("datetime({$actualColumn}) {$direction}");
+
+                                    return $this;
+                                }
                             }
-                        }
 
-                        if ($castType) {
-                            $this->builder->orderByRaw("cast({$actualColumn} as {$castType}) {$direction}");
+                            if ($castType) {
+                                $this->builder->orderByRaw("cast({$actualColumn} as {$castType}) {$direction}");
 
-                            return $this;
+                                return $this;
+                            }
                         }
                     }
                 }