Merge branch 'main' into dependabot/hex/server/ash_postgres-1.5.23

server/lib/orcasite/notifications/resources/notification.ex

@@ -25,10 +25,22 @@ defmodule Orcasite.Notifications.Notification do
  constraints one_of: Event.types()
  end
 
+ attribute :target_count, :integer
+ attribute :notified_count, :integer, default: 0
+ attribute :notified_count_updated_at, :utc_datetime
+
  create_timestamp :inserted_at, private?: false, writable?: false
  update_timestamp :updated_at
  end
 
+ calculations do
+ calculate :progress,
+ :float,
+ expr(if(target_count == 0, do: 1, else: notified_count / target_count))
+
+ calculate :finished, :boolean, expr(notified_count == target_count)
+ end
+
  relationships do
  has_many :notification_instances, NotificationInstance
 
@@ -103,6 +115,11 @@ defmodule Orcasite.Notifications.Notification do
  end
  end
 
+ update :increment_notified_count do
+ change atomic_update(:notified_count, expr(notified_count + 1))
+ change atomic_update(:notified_count_updated_at, expr(now()))
+ end
+
  create :notify_confirmed_candidate do
  description "Create a notification for confirmed candidate (i.e. detection group)"
  accept [:candidate_id, :message]
@@ -172,6 +189,8 @@ defmodule Orcasite.Notifications.Notification do
  define :notify_confirmed_candidate,
  action: :notify_confirmed_candidate,
  args: [:candidate_id]
+
+ define :increment_notified_count
  end
 
  resource do
@@ -197,21 +216,26 @@ defmodule Orcasite.Notifications.Notification do
  changeset
  |> Ash.Changeset.after_action(fn _, notification ->
  Task.Supervisor.async_nolink(Orcasite.TaskSupervisor, fn ->
- Orcasite.Notifications.Subscription
- |> Ash.Query.for_read(:available_for_notification, %{
- notification_id: notification.id,
- event_type: notification.event_type
- })
- |> Orcasite.Notifications.stream!()
- |> Stream.map(fn subscription ->
- Orcasite.Notifications.NotificationInstance
- |> Ash.Changeset.for_create(:create_with_relationships, %{
- notification: notification.id,
- subscription: subscription.id
+ target_count =
+ Orcasite.Notifications.Subscription
+ |> Ash.Query.for_read(:available_for_notification, %{
+ notification_id: notification.id,
+ event_type: notification.event_type
  })
- |> Orcasite.Notifications.create!()
- end)
- |> Stream.run()
+ |> Orcasite.Notifications.stream!()
+ |> Stream.map(fn subscription ->
+ Orcasite.Notifications.NotificationInstance
+ |> Ash.Changeset.for_create(:create_with_relationships, %{
+ notification: notification.id,
+ subscription: subscription.id
+ })
+ |> Orcasite.Notifications.create!()
+ end)
+ |> Enum.reduce(0, fn _, sum -> sum + 1 end)
+
+ notification
+ |> Ash.Changeset.for_update(:update, %{target_count: target_count})
+ |> Orcasite.Notifications.update()
  end)
 
  {:ok, notification}
@@ -220,6 +244,10 @@ defmodule Orcasite.Notifications.Notification do
  on: :create
  end
 
+ preparations do
+ prepare build(load: [:progress, :finished])
+ end
+
  graphql do
  type :notification
 

server/lib/orcasite/notifications/workers/send_notification_email.ex

@@ -59,18 +59,20 @@ defmodule Orcasite.Notifications.Workers.SendNotificationEmail do
 
  Task.Supervisor.async_nolink(Orcasite.TaskSupervisor, fn ->
  NotificationInstance
- |> Notifications.get!(notification_instance_id)
+ |> Notifications.get(notification_instance_id)
  |> case do
- nil ->
+ {:error, _} ->
  nil
 
- notif_instance ->
+ {:ok, notif_instance} ->
  notif_instance
  |> Ash.Changeset.for_destroy(:destroy)
  |> Notifications.destroy!()
  end
  end)
 
+ Orcasite.Notifications.Notification.increment_notified_count(notification)
+
  :ok
  end
 

server/priv/repo/migrations/20240328232225_add_tracking_to_notifications.exs

@@ -0,0 +1,25 @@
+defmodule Orcasite.Repo.Migrations.AddTrackingToNotifications do
+ @moduledoc """
+ Updates resources based on their most recent snapshots.
+
+ This file was autogenerated with `mix ash_postgres.generate_migrations`
+ """
+
+ use Ecto.Migration
+
+ def up do
+ alter table(:notifications) do
+ add :target_count, :bigint
+ add :notified_count, :bigint, default: 0
+ add :notified_count_updated_at, :utc_datetime
+ end
+ end
+
+ def down do
+ alter table(:notifications) do
+ remove :notified_count_updated_at
+ remove :notified_count
+ remove :target_count
+ end
+ end
+end

server/priv/resource_snapshots/repo/notifications/20240328232225.json

@@ -0,0 +1,132 @@
+{
+ "attributes": [
+ {
+ "default": "nil",
+ "size": null,
+ "type": "uuid",
+ "source": "id",
+ "references": null,
+ "allow_nil?": false,
+ "generated?": false,
+ "primary_key?": true
+ },
+ {
+ "default": "%{}",
+ "size": null,
+ "type": "map",
+ "source": "meta",
+ "references": null,
+ "allow_nil?": true,
+ "generated?": false,
+ "primary_key?": false
+ },
+ {
+ "default": "true",
+ "size": null,
+ "type": "boolean",
+ "source": "active",
+ "references": null,
+ "allow_nil?": true,
+ "generated?": false,
+ "primary_key?": false
+ },
+ {
+ "default": "nil",
+ "size": null,
+ "type": "text",
+ "source": "event_type",
+ "references": null,
+ "allow_nil?": true,
+ "generated?": false,
+ "primary_key?": false
+ },
+ {
+ "default": "nil",
+ "size": null,
+ "type": "bigint",
+ "source": "target_count",
+ "references": null,
+ "allow_nil?": true,
+ "generated?": false,
+ "primary_key?": false
+ },
+ {
+ "default": "0",
+ "size": null,
+ "type": "bigint",
+ "source": "notified_count",
+ "references": null,
+ "allow_nil?": true,
+ "generated?": false,
+ "primary_key?": false
+ },
+ {
+ "default": "nil",
+ "size": null,
+ "type": "utc_datetime",
+ "source": "notified_count_updated_at",
+ "references": null,
+ "allow_nil?": true,
+ "generated?": false,
+ "primary_key?": false
+ },
+ {
+ "default": "fragment(\"now()\")",
+ "size": null,
+ "type": "utc_datetime_usec",
+ "source": "inserted_at",
+ "references": null,
+ "allow_nil?": false,
+ "generated?": false,
+ "primary_key?": false
+ },
+ {
+ "default": "fragment(\"now()\")",
+ "size": null,
+ "type": "utc_datetime_usec",
+ "source": "updated_at",
+ "references": null,
+ "allow_nil?": false,
+ "generated?": false,
+ "primary_key?": false
+ }
+ ],
+ "table": "notifications",
+ "hash": "4DDEA23AF74FABB1F511CBC23120CEA61649F82506BBA3C9F2D41CE6DA873C36",
+ "repo": "Elixir.Orcasite.Repo",
+ "identities": [],
+ "schema": null,
+ "multitenancy": {
+ "global": null,
+ "strategy": null,
+ "attribute": null
+ },
+ "custom_indexes": [
+ {
+ "message": null,
+ "name": null,
+ "table": null,
+ "include": null,
+ "prefix": null,
+ "where": null,
+ "fields": [
+ {
+ "type": "atom",
+ "value": "meta"
+ }
+ ],
+ "unique": false,
+ "all_tenants?": false,
+ "concurrently": false,
+ "error_fields": [
+ "meta"
+ ],
+ "nulls_distinct": true,
+ "using": "gin"
+ }
+ ],
+ "base_filter": null,
+ "check_constraints": [],
+ "custom_statements": [],
+ "has_create_action": true
+}

ui/package.json

@@ -53,8 +53,8 @@
  "@types/leaflet": "^1.9.8",
  "@types/node": "20.11.30",
  "@types/phoenix": "^1.6.4",
- "@types/react": "18.2.70",
- "@types/react-dom": "18.2.22",
+ "@types/react": "18.2.73",
+ "@types/react-dom": "18.2.23",
  "@types/video.js": "^7.3.57",
  "@typescript-eslint/eslint-plugin": "^7.4.0",
  "eslint": "8.57.0",