refactor(overview): use English identifier as_of_date for point-in-time filter
This commit is contained in:
parent
ce877463d6
commit
0acd12360f
11 changed files with 113 additions and 112 deletions
37
lib/mv_web/live/member_live/index/as_of_date.ex
Normal file
37
lib/mv_web/live/member_live/index/as_of_date.ex
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
defmodule MvWeb.MemberLive.Index.AsOfDate do
|
||||
@moduledoc """
|
||||
URL codec for the point-in-time "active on X" membership filter (§1.24/§2.6).
|
||||
|
||||
The as-of date is a single ISO-8601 date X carried in the flat URL contract
|
||||
under the `as_of_date` key. When set, the overview keeps members who were
|
||||
active on X (`join_date <= X and (exit_date is nil or exit_date > X)`); the
|
||||
predicate itself lives in `OverviewQuery`. Absent or malformed values decode
|
||||
to nil (no filter), and nil encodes to the empty map so a fresh URL stays
|
||||
canonical.
|
||||
"""
|
||||
|
||||
@as_of_date_param Mv.Constants.as_of_date_param()
|
||||
|
||||
@doc """
|
||||
Decodes the as-of date from a params map. Missing or malformed ISO-8601
|
||||
values yield nil.
|
||||
"""
|
||||
@spec parse(map()) :: Date.t() | nil
|
||||
def parse(params) when is_map(params), do: parse_date(Map.get(params, @as_of_date_param))
|
||||
|
||||
@doc """
|
||||
Encodes an as-of date into URL params. nil yields the empty map.
|
||||
"""
|
||||
@spec to_params(Date.t() | nil) :: %{optional(String.t()) => String.t()}
|
||||
def to_params(%Date{} = date), do: %{@as_of_date_param => Date.to_iso8601(date)}
|
||||
def to_params(_), do: %{}
|
||||
|
||||
defp parse_date(value) when is_binary(value) do
|
||||
case Date.from_iso8601(String.trim(value)) do
|
||||
{:ok, date} -> date
|
||||
_ -> nil
|
||||
end
|
||||
end
|
||||
|
||||
defp parse_date(_), do: nil
|
||||
end
|
||||
|
|
@ -46,7 +46,7 @@ defmodule MvWeb.MemberLive.Index.OverviewQuery do
|
|||
opts[:boolean_custom_fields]
|
||||
)
|
||||
|> apply_date_filters(opts[:date_filters])
|
||||
|> apply_stichtag_filter(opts[:stichtag])
|
||||
|> apply_as_of_date_filter(opts[:as_of_date])
|
||||
|> apply_custom_date_filters(opts[:date_filters], opts[:date_custom_fields])
|
||||
|> apply_payment_filter(opts[:payment_filter], payment_period(opts))
|
||||
|> apply_suspended_filter(opts[:suspended], payment_period(opts))
|
||||
|
|
@ -285,20 +285,20 @@ defmodule MvWeb.MemberLive.Index.OverviewQuery do
|
|||
defp apply_custom_date_filters(query, _filters, _custom_fields), do: query
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Point-in-time membership ("Stichtag"): a member counts as a member on the
|
||||
# Point-in-time membership (as-of date): a member counts as a member on the
|
||||
# reference date X iff it had joined by X and had not yet left as of X
|
||||
# (§1.24/§2.6). "Left as of X" means a non-nil exit_date at or before X, so an
|
||||
# exit_date strictly after X (or nil) still counts as a member on X.
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
defp apply_stichtag_filter(query, %Date{} = x) do
|
||||
defp apply_as_of_date_filter(query, %Date{} = x) do
|
||||
Ash.Query.filter(
|
||||
query,
|
||||
expr(join_date <= ^x and (is_nil(exit_date) or exit_date > ^x))
|
||||
)
|
||||
end
|
||||
|
||||
defp apply_stichtag_filter(query, _), do: query
|
||||
defp apply_as_of_date_filter(query, _), do: query
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Sort (always append the unique id tie-breaker for keyset stability)
|
||||
|
|
@ -327,7 +327,7 @@ defmodule MvWeb.MemberLive.Index.OverviewQuery do
|
|||
])
|
||||
end
|
||||
|
||||
# "Beiträge" (payment) column: sort DB-side by the period-scoped unpaid-cycle
|
||||
# Fees (payment) column: sort DB-side by the period-scoped unpaid-cycle
|
||||
# count (§1.27). The count calculation takes the active period as arguments so
|
||||
# the sort key matches the displayed value; the id tie-breaker keeps keyset
|
||||
# pages stable across equal counts.
|
||||
|
|
|
|||
|
|
@ -1,36 +0,0 @@
|
|||
defmodule MvWeb.MemberLive.Index.Stichtag do
|
||||
@moduledoc """
|
||||
URL codec for the point-in-time membership ("Stichtag") filter (§1.24/§2.6).
|
||||
|
||||
The Stichtag is a single ISO-8601 date X carried in the flat URL contract
|
||||
under the `stichtag` key. When set, the overview keeps members who were active
|
||||
on X (`join_date <= X and (exit_date is nil or exit_date > X)`); the predicate
|
||||
itself lives in `OverviewQuery`. Absent or malformed values decode to nil (no
|
||||
filter), and nil encodes to the empty map so a fresh URL stays canonical.
|
||||
"""
|
||||
|
||||
@stichtag_param Mv.Constants.stichtag_param()
|
||||
|
||||
@doc """
|
||||
Decodes the Stichtag date from a params map. Missing or malformed ISO-8601
|
||||
values yield nil.
|
||||
"""
|
||||
@spec parse(map()) :: Date.t() | nil
|
||||
def parse(params) when is_map(params), do: parse_date(Map.get(params, @stichtag_param))
|
||||
|
||||
@doc """
|
||||
Encodes a Stichtag date into URL params. nil yields the empty map.
|
||||
"""
|
||||
@spec to_params(Date.t() | nil) :: %{optional(String.t()) => String.t()}
|
||||
def to_params(%Date{} = date), do: %{@stichtag_param => Date.to_iso8601(date)}
|
||||
def to_params(_), do: %{}
|
||||
|
||||
defp parse_date(value) when is_binary(value) do
|
||||
case Date.from_iso8601(String.trim(value)) do
|
||||
{:ok, date} -> date
|
||||
_ -> nil
|
||||
end
|
||||
end
|
||||
|
||||
defp parse_date(_), do: nil
|
||||
end
|
||||
Loading…
Add table
Add a link
Reference in a new issue