Send new_detection notification on machine detection using AshOban trigger (#957)

* improvement: send new_detection notification on machine detection using AshOban trigger

* Fix validation for detection

* chore: fix wrong names

* chore: fix policies

* fix: set proper policy for machine detection action

* chore: remove unused notify_bout action, fix event_type during notify_live_bout

* chore: run format

Author: skanderm

server/config/runtime.exs

@@ -94,5 +94,4 @@ if config_env() == :prod do
     audio_image_bucket:
       System.get_env("ORCASITE_AUDIO_IMAGE_BUCKET", "audio-deriv-orcasound-net"),
     audio_image_bucket_region: System.get_env("ORCASITE_AUDIO_IMAGE_BUCKET_REGION", "us-west-2")
-
 end

server/lib/orcasite/accounts/api_key.ex

@@ -26,10 +26,6 @@ defmodule Orcasite.Accounts.ApiKey do
     attribute :expires_at, :utc_datetime_usec
   end
 
-  code_interface do
-    define :create
-  end
-
   calculations do
     calculate :invalid,
               :boolean,
@@ -41,6 +37,10 @@ defmodule Orcasite.Accounts.ApiKey do
     calculate :valid, :boolean, expr(not invalid)
   end
 
+  code_interface do
+    define :create
+  end
+
   relationships do
     belongs_to :user, Orcasite.Accounts.User
   end

server/lib/orcasite/notifications/event.ex

@@ -4,4 +4,6 @@ defmodule Orcasite.Notifications.Event do
   def humanize(:confirmed_candidate, true), do: "confirmed candidates"
   def humanize(:new_detection, false), do: "new detection"
   def humanize(:new_detection, true), do: "new detections"
+  def humanize(:live_bout, false), do: "live bout"
+  def humanize(:live_bout, true), do: "live bouts"
 end

…/orcasite/notifications/resources/job.ex server/lib/orcasite/notifications/job.exserver/lib/orcasite/notifications/resources/job.ex renamed to server/lib/orcasite/notifications/job.ex server/lib/orcasite/notifications/resources/job.ex renamed to server/lib/orcasite/notifications/job.ex

@@ -65,8 +65,9 @@ defmodule Orcasite.Notifications.Notification do
   end
 
   policies do
-    bypass actor_attribute_equals(:admin, true) do
-      authorize_if always()
+    bypass always() do
+      authorize_if actor_attribute_equals(:admin, true)
+      authorize_if AshOban.Checks.AshObanInteraction
     end
 
     bypass actor_attribute_equals(:moderator, true) do
@@ -89,6 +90,43 @@ defmodule Orcasite.Notifications.Notification do
     define :increment_notified_count
   end
 
+  changes do
+    change fn changeset, _context ->
+             changeset
+             |> Ash.Changeset.after_action(fn _, %{id: notification_id} = notification ->
+               Task.Supervisor.async_nolink(Orcasite.TaskSupervisor, fn ->
+                 target_count =
+                   Orcasite.Notifications.Subscription
+                   |> Ash.Query.for_read(:available_for_notification, %{
+                     notification_id: notification_id,
+                     event_type: notification.event_type
+                   })
+                   |> Ash.stream!()
+                   |> Stream.map(fn subscription ->
+                     Orcasite.Notifications.NotificationInstance
+                     |> Ash.Changeset.for_create(:create_with_relationships, %{
+                       notification: notification,
+                       subscription: subscription
+                     })
+                     |> Ash.create!()
+                   end)
+                   |> Enum.reduce(0, fn _, sum -> sum + 1 end)
+
+                 notification
+                 |> Ash.Changeset.for_update(:update, %{target_count: target_count})
+                 |> Ash.update(authorize?: false)
+               end)
+
+               {:ok, notification}
+             end)
+           end,
+           on: :create
+  end
+
+  preparations do
+    prepare build(load: [:progress, :finished])
+  end
+
   actions do
     defaults [:create, :read, :destroy]
 
@@ -175,39 +213,6 @@ defmodule Orcasite.Notifications.Notification do
       change atomic_update(:notified_count_updated_at, expr(now()))
     end
 
-    create :notify_bout do
-      description "Create a notification for a live bout"
-      argument :bout_id, :string, allow_nil?: false
-
-      argument :message, :string do
-        description """
-        What primary message subscribers will get (e.g. 'Southern Resident Killer Whales calls
-        and clicks can be heard at Orcasound Lab!')
-        """
-
-        allow_nil? false
-      end
-
-      change set_attribute(:event_type, :confirmed_candidate)
-
-      change before_action(fn changeset, _context ->
-               bout_id =
-                 Ash.Changeset.get_argument(changeset, :bout_id)
-
-               bout =
-                 Orcasite.Radio.Bout
-                 |> Ash.get(bout_id)
-                 |> Ash.load!(:feed)
-
-               changeset
-               |> Ash.Changeset.force_change_attribute(:meta, %{
-                 bout_id: bout_id,
-                 node: bout.feed.slug,
-                 message: Ash.Changeset.get_argument(changeset, :message)
-               })
-             end)
-    end
-
     create :notify_confirmed_candidate do
       description "Create a notification for confirmed candidate (i.e. detection group)"
       argument :candidate_id, :string, allow_nil?: false
@@ -280,6 +285,8 @@ defmodule Orcasite.Notifications.Notification do
       argument :feed, :map, allow_nil?: false
       argument :candidate, :map, allow_nil?: false
 
+      validate __MODULE__.Validations.RecentDetection
+
       change set_attribute(:event_type, :new_detection)
 
       change fn changeset, _context ->
@@ -305,43 +312,6 @@ defmodule Orcasite.Notifications.Notification do
     end
   end
 
-  changes do
-    change fn changeset, _context ->
-             changeset
-             |> Ash.Changeset.after_action(fn _, %{id: notification_id} = notification ->
-               Task.Supervisor.async_nolink(Orcasite.TaskSupervisor, fn ->
-                 target_count =
-                   Orcasite.Notifications.Subscription
-                   |> Ash.Query.for_read(:available_for_notification, %{
-                     notification_id: notification_id,
-                     event_type: notification.event_type
-                   })
-                   |> Ash.stream!()
-                   |> Stream.map(fn subscription ->
-                     Orcasite.Notifications.NotificationInstance
-                     |> Ash.Changeset.for_create(:create_with_relationships, %{
-                       notification: notification,
-                       subscription: subscription
-                     })
-                     |> Ash.create!()
-                   end)
-                   |> Enum.reduce(0, fn _, sum -> sum + 1 end)
-
-                 notification
-                 |> Ash.Changeset.for_update(:update, %{target_count: target_count})
-                 |> Ash.update(authorize?: false)
-               end)
-
-               {:ok, notification}
-             end)
-           end,
-           on: :create
-  end
-
-  preparations do
-    prepare build(load: [:progress, :finished])
-  end
-
   admin do
     table_columns [:id, :meta, :event_type, :inserted_at]
 

…/notifications/resources/notification.ex …b/orcasite/notifications/notification.exserver/lib/orcasite/notifications/resources/notification.ex renamed to server/lib/orcasite/notifications/notification.ex server/lib/orcasite/notifications/resources/notification.ex renamed to server/lib/orcasite/notifications/notification.ex

@@ -0,0 +1,19 @@
+defmodule Orcasite.Notifications.Notification.Validations.RecentDetection do
+  use Ash.Resource.Validation
+
+  @impl Ash.Resource.Validation
+  def validate(change, _opts, _context) do
+    change
+    |> Ash.Changeset.get_argument(:detection)
+    |> Map.get(:timestamp)
+    |> DateTime.compare(
+      DateTime.utc_now()
+      |> DateTime.add(-1, :hour)
+    )
+    |> case do
+      :gt -> :ok
+      :eq -> :ok
+      _ -> {:error, "detection must be within the last hour"}
+    end
+  end
+end

server/lib/orcasite/notifications/notification/validations/recent_detection.ex

@@ -79,6 +79,23 @@ defmodule Orcasite.Notifications.Subscriber do
     end
   end
 
+  validations do
+    validate fn changeset, _context ->
+      # Check if email subscriber already exists
+      with email when is_binary(email) <- changeset |> Ash.Changeset.get_argument(:email),
+           %{action_type: :create} <- changeset,
+           {:get, {:error, _}} <- {:get, Orcasite.Notifications.Subscriber.by_email(email)} do
+        :ok
+      else
+        {:get, other} ->
+          {:error, [field: :email, message: "email already exists"]}
+
+        err ->
+          :ok
+      end
+    end
+  end
+
   actions do
     defaults [:create, :read, :update, :destroy]
 
@@ -155,23 +172,6 @@ defmodule Orcasite.Notifications.Subscriber do
     end
   end
 
-  validations do
-    validate fn changeset, _context ->
-      # Check if email subscriber already exists
-      with email when is_binary(email) <- changeset |> Ash.Changeset.get_argument(:email),
-           %{action_type: :create} <- changeset,
-           {:get, {:error, _}} <- {:get, Orcasite.Notifications.Subscriber.by_email(email)} do
-        :ok
-      else
-        {:get, other} ->
-          {:error, [field: :email, message: "email already exists"]}
-
-        err ->
-          :ok
-      end
-    end
-  end
-
   admin do
     table_columns [:id, :name, :meta, :inserted_at]
     read_actions [:read, :by_email]