refactor: decouple UUID column guessing and UUID value preparation fo…

…r reuse in additional scopes
michaeldyrynda · Oct 21, 2024 · a0e81f8 · a0e81f8
1 parent 17702a2
commit a0e81f8
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/src/GeneratesUuid.php b/src/GeneratesUuid.php
@@ -122,15 +122,8 @@ public function resolveUuidVersion(): string
      */
     public function scopeWhereUuid($query, $uuid, $uuidColumn = null): Builder
     {
-        $uuidColumn = ! is_null($uuidColumn) && in_array($uuidColumn, $this->uuidColumns())
-            ? $uuidColumn
-            : $this->uuidColumns()[0];
-
-        $uuid = $this->normaliseUuids($uuid);
-
-        if ($this->isClassCastable($uuidColumn)) {
-            $uuid = $this->bytesFromUuid($uuid);
-        }
+        $uuidColumn = $this->guessUuidColumn($uuidColumn);
+        $uuid = $this->prepareUuid($uuid, $uuidColumn);
 
         return $query->whereIn(
             $this->qualifyColumn($uuidColumn),