From 575083890283665bd8b502f9f6be2d8075a7e9f1 Mon Sep 17 00:00:00 2001
From: Skander Mzali <skanderm@gmail.com>
Date: Tue, 28 Oct 2025 18:50:18 -0700
Subject: [PATCH 1/2] chore: simplify find_nearby_candidate query

---
 server/lib/orcasite/radio/candidate.ex | 46 ++++++++------------------
 1 file changed, 13 insertions(+), 33 deletions(-)

diff --git a/server/lib/orcasite/radio/candidate.ex b/server/lib/orcasite/radio/candidate.ex
index 650e7532e..39ce3d644 100644
--- a/server/lib/orcasite/radio/candidate.ex
+++ b/server/lib/orcasite/radio/candidate.ex
@@ -95,6 +95,10 @@ defmodule Orcasite.Radio.Candidate do
     end
   end
 
+  code_interface do
+    define :find_nearby_candidate
+  end
+
   actions do
     defaults [:read, :destroy]
 
@@ -139,44 +143,20 @@ defmodule Orcasite.Radio.Candidate do
     end
 
     read :find_nearby_candidate do
-      get? true
-
       argument :category, Orcasite.Types.DetectionCategory do
         allow_nil? false
       end
 
-      argument :timestamp, :utc_datetime
+      argument :timestamp, :utc_datetime, allow_nil?: false
       argument :within_minutes, :integer, default: 3
-      argument :feed_id, :string
-
-      prepare fn query, _context ->
-        require Ash.Query
-        timestamp = Ash.Query.get_argument(query, :timestamp)
-        within_minutes = Ash.Query.get_argument(query, :within_minutes)
-        category = Ash.Query.get_argument(query, :category)
-
-        feed_id =
-          Ash.Query.get_argument(query, :feed_id)
-          |> AshUUID.identify_format()
-          |> case do
-            :raw ->
-              Ash.Query.get_argument(query, :feed_id)
-
-            _ ->
-              "feed_" <> id = Ash.Query.get_argument(query, :feed_id)
-              {:ok, feed_id} = AshUUID.Encoder.decode(id)
-              feed_id
-          end
-
-        min_time = DateTime.add(timestamp, -within_minutes, :minute)
-        max_time = DateTime.add(timestamp, within_minutes, :minute)
-
-        query
-        |> Ash.Query.filter(
-          feed_id == ^feed_id and ^max_time >= min_time and max_time >= ^min_time and
-            category == ^category
-        )
-      end
+      argument :feed_id, :string, allow_nil?: false
+
+      filter expr(
+               feed_id == ^arg(:feed_id) and
+                 category == ^arg(:category) and
+                 min_time <= datetime_add(^arg(:timestamp), ^arg(:within_minutes), :minute) and
+                 max_time >= datetime_add(^arg(:timestamp), -(^arg(:within_minutes)), :minute)
+             )
     end
 
     update :update do

From cdceb62384347c9d3b6af8e97986092062a3d0d0 Mon Sep 17 00:00:00 2001
From: Skander Mzali <skanderm@gmail.com>
Date: Tue, 28 Oct 2025 18:50:35 -0700
Subject: [PATCH 2/2] chore: re-add get? option to query

---
 server/lib/orcasite/radio/candidate.ex | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/server/lib/orcasite/radio/candidate.ex b/server/lib/orcasite/radio/candidate.ex
index 39ce3d644..1d20d960b 100644
--- a/server/lib/orcasite/radio/candidate.ex
+++ b/server/lib/orcasite/radio/candidate.ex
@@ -143,6 +143,8 @@ defmodule Orcasite.Radio.Candidate do
     end
 
     read :find_nearby_candidate do
+      get? true
+
       argument :category, Orcasite.Types.DetectionCategory do
         allow_nil? false
       end