diff --git a/lib/plausible/site.ex b/lib/plausible/site.ex index 93a966f18..8f56686aa 100644 --- a/lib/plausible/site.ex +++ b/lib/plausible/site.ex @@ -50,7 +50,6 @@ defmodule Plausible.Site do field :from_cache?, :boolean, virtual: true, default: false field :list_type, :string, virtual: true - field :is_pinned, :boolean, virtual: true timestamps() end diff --git a/lib/plausible/site/site_pin.ex b/lib/plausible/site/site_pin.ex deleted file mode 100644 index 6fc186440..000000000 --- a/lib/plausible/site/site_pin.ex +++ /dev/null @@ -1,16 +0,0 @@ -defmodule Plausible.Site.SitePin do - @moduledoc """ - Site pin schema - """ - - use Ecto.Schema - - @type t() :: %__MODULE__{} - - schema "site_pins" do - belongs_to :user, Plausible.Auth.User - belongs_to :site, Plausible.Site - - timestamps() - end -end diff --git a/lib/plausible/sites.ex b/lib/plausible/sites.ex index 21b1214f1..fb232e109 100644 --- a/lib/plausible/sites.ex +++ b/lib/plausible/sites.ex @@ -22,13 +22,10 @@ defmodule Plausible.Sites do on: sm.site_id == s.id, left_join: i in Plausible.Auth.Invitation, on: i.site_id == s.id, - left_join: p in Plausible.Site.SitePin, - on: p.site_id == s.id, - where: sm.user_id == ^user.id or i.email == ^user.email or p.user_id == ^user.id, + where: sm.user_id == ^user.id or i.email == ^user.email, select: %{ s - | is_pinned: not is_nil(p.id), - list_type: + | list_type: fragment( """ CASE WHEN ? IS NOT NULL THEN 'invitation' @@ -50,7 +47,7 @@ defmodule Plausible.Sites do sites_query = from(s in subquery(base_query), - order_by: [desc: s.is_pinned, asc: s.list_type, asc: s.domain], + order_by: [asc: s.list_type, asc: s.domain], preload: [ memberships: ^memberships_query, invitations: ^invitations_query @@ -67,7 +64,7 @@ defmodule Plausible.Sites do result = Plausible.Pagination.paginate(sites_query, pagination_params, - cursor_fields: [is_pinned: :desc, list_type: :asc, domain: :asc], + cursor_fields: [list_type: :asc, domain: :asc], limit: 24 ) diff --git a/priv/repo/migrations/20231027075521_add_site_pins.exs b/priv/repo/migrations/20231027075521_add_site_pins.exs deleted file mode 100644 index 4f21518f6..000000000 --- a/priv/repo/migrations/20231027075521_add_site_pins.exs +++ /dev/null @@ -1,13 +0,0 @@ -defmodule Plausible.Repo.Migrations.AddPinnedSites do - use Ecto.Migration - - def change do - create table(:site_pins) do - add :user_id, references(:users, on_delete: :delete_all), null: false - add :site_id, references(:sites, on_delete: :delete_all), null: false - timestamps() - end - - create unique_index(:site_pins, [:user_id, :site_id]) - end -end