fix: [website] Separate cases when search by UUID objects.

website/web/views/admin.py

@@ -3,6 +3,8 @@
 from datetime import datetime
 from datetime import timedelta
 from datetime import timezone
+from uuid import UUID
+
 from flask import abort
 from flask import Blueprint
 from flask import flash
@@ -502,13 +504,25 @@ def list_sightings() -> str:
  sighting_query = request.args.get("query", "")
  sightings = Sighting.query
  if sighting_query:
- sightings = sightings.filter(
- or_(
- Sighting.uuid == sighting_query,
- Sighting.type == sighting_query,
- Sighting.author.has(name=sighting_query),
+ try:
+ uuid_obj = UUID(sighting_query)
+ except Exception:
+ uuid_obj = None
+ if uuid_obj:
+ sightings = sightings.filter(
+ or_(
+ Sighting.uuid == uuid_obj,
+ Sighting.type == sighting_query,
+ Sighting.author.has(login=sighting_query),
+ )
+ )
+ else:
+ sightings = sightings.filter(
+ or_(
+ Sighting.type == sighting_query,
+ Sighting.author.has(login=sighting_query),
+ )
  )
- )
  sightings = sightings.order_by(Sighting.creation_timestamp.desc())
  page, per_page, offset = get_page_args(
  page_parameter="page", per_page_parameter="per_page"