-
Notifications
You must be signed in to change notification settings - Fork 0
Fix reversal business dates in Accounting #31
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
belchertechnologiesllc
wants to merge
5
commits into
main
Choose a base branch
from
fix/reversal-local-business-date
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
be9949e
Fix reversal business-date handling
belchertechnologiesllc 8ff1974
Preserve reversal rows while fixing business dates
belchertechnologiesllc b4a2c6f
Test reversal business-date handling
belchertechnologiesllc 87f1e87
Sync reversal business-date migration version
belchertechnologiesllc a102aac
Remove superseded reversal migration version
belchertechnologiesllc File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
249 changes: 249 additions & 0 deletions
249
supabase/migrations/20260809001548_fix_reversal_business_dates.sql
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,249 @@ | ||
| -- Palace Elite: use membership-local business dates for reversals and historical accounting. | ||
| -- | ||
| -- Supabase/Postgres runs in UTC. A reversal created after 7 PM Central could | ||
| -- therefore receive tomorrow's `current_date`, while the user still considers | ||
| -- the activity part of the current business day. This migration gives each | ||
| -- membership a canonical IANA timezone, uses it for new reversal dates, and | ||
| -- interprets reversal/approval/void timestamps in that same timezone for | ||
| -- historical accounting snapshots. | ||
| -- | ||
| -- Existing ledger rows remain physically unchanged. Pre-fix reversal rows are | ||
| -- interpreted by their membership-local creation date because the reversal RPC | ||
| -- has always meant "reverse now" and did not expose a caller-selected date. | ||
|
|
||
| alter table public.memberships | ||
| add column if not exists business_timezone text; | ||
|
|
||
| update public.memberships | ||
| set business_timezone = 'America/Chicago' | ||
| where business_timezone is null; | ||
|
|
||
| alter table public.memberships | ||
| alter column business_timezone set default 'America/Chicago', | ||
| alter column business_timezone set not null; | ||
|
|
||
| comment on column public.memberships.business_timezone is | ||
| 'Canonical IANA timezone used to derive membership business dates from timestamps.'; | ||
|
|
||
| create or replace function public.get_benefit_unit_balances_as_of( | ||
| p_membership_id uuid, | ||
| p_as_of date | ||
| ) | ||
| returns table( | ||
| benefit_grant_id uuid, | ||
| benefit_name text, | ||
| pool public.benefit_pool, | ||
| quantity_kind public.quantity_kind, | ||
| ownership_unit_id uuid, | ||
| ownership_unit_name text, | ||
| allocation_percentage numeric, | ||
| allocated_quantity numeric, | ||
| ledger_delta numeric, | ||
| remaining_quantity numeric | ||
| ) | ||
| language sql | ||
| stable | ||
| security definer | ||
| set search_path = pg_catalog, public | ||
| as $$ | ||
| select | ||
| a.benefit_grant_id, | ||
| g.name, | ||
| g.pool, | ||
| g.quantity_kind, | ||
| a.ownership_unit_id, | ||
| ou.name, | ||
| a.allocation_percentage, | ||
| a.allocated_quantity, | ||
| coalesce(sum(t.quantity_delta), 0::numeric) as ledger_delta, | ||
| a.allocated_quantity + coalesce(sum(t.quantity_delta), 0::numeric) as remaining_quantity | ||
| from public.benefit_unit_allocations a | ||
| join public.benefit_grants g on g.id = a.benefit_grant_id | ||
| join public.ownership_units ou on ou.id = a.ownership_unit_id | ||
| join public.memberships m on m.id = a.membership_id | ||
| left join public.benefit_transactions t | ||
| on t.benefit_grant_id = a.benefit_grant_id | ||
| and t.ownership_unit_id = a.ownership_unit_id | ||
| and ( | ||
| case | ||
| when t.transaction_type = 'reversal' | ||
| then timezone(m.business_timezone, t.created_at)::date | ||
| else t.effective_date | ||
| end | ||
| ) <= p_as_of | ||
| and t.approved_at is not null | ||
| and timezone(m.business_timezone, t.approved_at)::date <= p_as_of | ||
| and ( | ||
| t.voided_at is null | ||
| or timezone(m.business_timezone, t.voided_at)::date > p_as_of | ||
| ) | ||
| where a.membership_id = p_membership_id | ||
| and g.archived_at is null | ||
| and public.user_has_membership_access(p_membership_id) | ||
| group by a.id, g.id, ou.id, m.id | ||
| order by g.pool, g.name, ou.name; | ||
| $$; | ||
|
|
||
| comment on function public.get_benefit_unit_balances_as_of(uuid, date) is | ||
| 'Returns ownership-unit benefit positions as of a membership-local business date using append-only approved ledger activity.'; | ||
|
|
||
| create or replace function public.create_benefit_reversal( | ||
| p_transaction_id uuid, | ||
| p_reason text, | ||
| p_source_reference text default null | ||
| ) | ||
| returns void | ||
| language plpgsql | ||
| security definer | ||
| set search_path = pg_catalog, public | ||
| as $$ | ||
| declare | ||
| v_source public.benefit_transactions%rowtype; | ||
| v_leg public.benefit_transactions%rowtype; | ||
| v_user uuid := auth.uid(); | ||
| v_reason text := nullif(btrim(p_reason), ''); | ||
| v_reversal_group uuid; | ||
| v_business_timezone text; | ||
| v_business_date date; | ||
| begin | ||
| if v_user is null then | ||
| raise exception 'Authentication is required.' using errcode = '42501'; | ||
| end if; | ||
|
|
||
| if v_reason is null then | ||
| raise exception 'A reversal reason is required.' using errcode = '23514'; | ||
| end if; | ||
|
|
||
| select * | ||
| into v_source | ||
| from public.benefit_transactions | ||
| where id = p_transaction_id | ||
| for update; | ||
|
|
||
| if not found then | ||
| raise exception 'Benefit transaction % was not found.', p_transaction_id | ||
| using errcode = 'P0002'; | ||
| end if; | ||
|
|
||
| if not public.user_is_membership_admin(v_source.membership_id) then | ||
| raise exception 'Membership administrator access is required.' using errcode = '42501'; | ||
| end if; | ||
|
|
||
| select m.business_timezone | ||
| into v_business_timezone | ||
| from public.memberships m | ||
| where m.id = v_source.membership_id; | ||
|
|
||
| if v_business_timezone is null then | ||
| raise exception 'Membership business timezone is not configured.' using errcode = '23514'; | ||
| end if; | ||
|
|
||
| v_business_date := timezone(v_business_timezone, now())::date; | ||
|
|
||
| if v_source.status <> 'approved' or v_source.voided_at is not null then | ||
| raise exception 'Only an approved, non-voided transaction can be reversed.' | ||
| using errcode = '23514'; | ||
| end if; | ||
|
|
||
| if v_source.transaction_type = 'reversal' then | ||
| raise exception 'A reversal cannot directly reverse another reversal.' | ||
| using errcode = '23514'; | ||
| end if; | ||
|
|
||
| if v_source.transaction_type = 'transfer' then | ||
| if v_source.transaction_group_id is null then | ||
| raise exception 'Transfer transaction % is missing its transaction group.', p_transaction_id | ||
| using errcode = '23514'; | ||
| end if; | ||
|
|
||
| v_reversal_group := gen_random_uuid(); | ||
|
|
||
| for v_leg in | ||
| select * | ||
| from public.benefit_transactions | ||
| where transaction_group_id = v_source.transaction_group_id | ||
| order by id | ||
| for update | ||
| loop | ||
| if v_leg.status <> 'approved' or v_leg.voided_at is not null then | ||
| raise exception 'Every transfer leg must be approved and non-voided before reversal.' | ||
| using errcode = '23514'; | ||
| end if; | ||
|
|
||
| insert into public.benefit_transactions ( | ||
| membership_id, | ||
| ownership_unit_id, | ||
| benefit_grant_id, | ||
| reservation_id, | ||
| transaction_type, | ||
| quantity_delta, | ||
| effective_date, | ||
| face_value, | ||
| economic_value, | ||
| status, | ||
| notes, | ||
| source_reference, | ||
| related_transaction_id, | ||
| transaction_group_id, | ||
| created_by | ||
| ) values ( | ||
| v_leg.membership_id, | ||
| v_leg.ownership_unit_id, | ||
| v_leg.benefit_grant_id, | ||
| v_leg.reservation_id, | ||
| 'reversal', | ||
| -v_leg.quantity_delta, | ||
| v_business_date, | ||
| v_leg.face_value, | ||
| v_leg.economic_value, | ||
| 'submitted', | ||
| v_reason, | ||
| nullif(btrim(p_source_reference), ''), | ||
| v_leg.id, | ||
| v_reversal_group, | ||
| v_user | ||
| ); | ||
| end loop; | ||
| else | ||
| insert into public.benefit_transactions ( | ||
| membership_id, | ||
| ownership_unit_id, | ||
| benefit_grant_id, | ||
| reservation_id, | ||
| transaction_type, | ||
| quantity_delta, | ||
| effective_date, | ||
| face_value, | ||
| economic_value, | ||
| status, | ||
| notes, | ||
| source_reference, | ||
| related_transaction_id, | ||
| created_by | ||
| ) values ( | ||
| v_source.membership_id, | ||
| v_source.ownership_unit_id, | ||
| v_source.benefit_grant_id, | ||
| v_source.reservation_id, | ||
| 'reversal', | ||
| -v_source.quantity_delta, | ||
| v_business_date, | ||
| v_source.face_value, | ||
| v_source.economic_value, | ||
| 'submitted', | ||
| v_reason, | ||
| nullif(btrim(p_source_reference), ''), | ||
| v_source.id, | ||
| v_user | ||
| ); | ||
| end if; | ||
| end; | ||
| $$; | ||
|
|
||
| revoke execute on function public.create_benefit_reversal(uuid, text, text) | ||
| from public, anon; | ||
| grant execute on function public.create_benefit_reversal(uuid, text, text) | ||
| to authenticated; | ||
|
|
||
| comment on function public.create_benefit_reversal(uuid, text, text) is | ||
| 'Creates an append-only reversal using the membership business timezone for effective_date.'; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| begin; | ||
|
|
||
| create extension if not exists pgtap with schema extensions; | ||
| select plan(6); | ||
|
|
||
| create temporary table reversal_business_date_test_ids ( | ||
| key text primary key, | ||
| value uuid not null | ||
| ); | ||
|
|
||
| insert into reversal_business_date_test_ids (key, value) | ||
| select 'membership', id | ||
| from public.memberships | ||
| where contract_number = '4135905'; | ||
|
|
||
| insert into reversal_business_date_test_ids (key, value) | ||
| select 'belcher', id | ||
| from public.ownership_units | ||
| where membership_id = (select value from reversal_business_date_test_ids where key = 'membership') | ||
| and name = 'Belcher'; | ||
|
|
||
| insert into reversal_business_date_test_ids (key, value) | ||
| select 'bpg_weeks', id | ||
| from public.benefit_grants | ||
| where membership_id = (select value from reversal_business_date_test_ids where key = 'membership') | ||
| and name = 'BPG Weeks'; | ||
|
|
||
| select is( | ||
| (select business_timezone from public.memberships where id = (select value from reversal_business_date_test_ids where key = 'membership')), | ||
| 'America/Chicago', | ||
| 'Membership has the canonical Central business timezone' | ||
| ); | ||
|
|
||
| select set_config( | ||
| 'request.jwt.claim.sub', | ||
| (select user_id::text from public.unit_users where role = 'admin' and revoked_at is null limit 1), | ||
| true | ||
| ); | ||
|
|
||
| select ok( | ||
| exists ( | ||
| select 1 | ||
| from public.get_benefit_unit_balances_as_of( | ||
| (select value from reversal_business_date_test_ids where key = 'membership'), | ||
| '2026-08-07' | ||
| ) | ||
| where benefit_name = 'Incentive Stays' | ||
| and ownership_unit_name = 'Belcher' | ||
| and ledger_delta = -1 | ||
| ), | ||
| 'Historical accounting still shows the original Aug 7 Incentive Stay use' | ||
| ); | ||
|
|
||
| select ok( | ||
| exists ( | ||
| select 1 | ||
| from public.get_benefit_unit_balances_as_of( | ||
| (select value from reversal_business_date_test_ids where key = 'membership'), | ||
| '2026-08-08' | ||
| ) | ||
| where benefit_name = 'Incentive Stays' | ||
| and ownership_unit_name = 'Belcher' | ||
| and ledger_delta = 0 | ||
| and remaining_quantity = allocated_quantity | ||
| ), | ||
| 'Historical accounting includes the approved reversal on the Aug 8 business date' | ||
| ); | ||
|
|
||
| with created as ( | ||
| insert into public.benefit_transactions ( | ||
| membership_id, | ||
| ownership_unit_id, | ||
| benefit_grant_id, | ||
| transaction_type, | ||
| quantity_delta, | ||
| quantity_used, | ||
| effective_date, | ||
| status, | ||
| notes | ||
| ) values ( | ||
| (select value from reversal_business_date_test_ids where key = 'membership'), | ||
| (select value from reversal_business_date_test_ids where key = 'belcher'), | ||
| (select value from reversal_business_date_test_ids where key = 'bpg_weeks'), | ||
| 'use', | ||
| -1, | ||
| 1, | ||
| timezone('America/Chicago', now())::date, | ||
| 'submitted', | ||
| 'reversal business-date pgTAP test' | ||
| ) | ||
| returning id | ||
| ) | ||
| insert into reversal_business_date_test_ids (key, value) | ||
| select 'test_use', id from created; | ||
|
|
||
| select public.approve_benefit_transaction( | ||
| (select value from reversal_business_date_test_ids where key = 'test_use') | ||
| ); | ||
|
|
||
| select public.create_benefit_reversal( | ||
| (select value from reversal_business_date_test_ids where key = 'test_use'), | ||
| 'reversal business-date pgTAP test reversal', | ||
| null | ||
| ); | ||
|
|
||
| select is( | ||
| ( | ||
| select effective_date | ||
| from public.benefit_transactions | ||
| where related_transaction_id = (select value from reversal_business_date_test_ids where key = 'test_use') | ||
| and transaction_type = 'reversal' | ||
| ), | ||
| timezone('America/Chicago', now())::date, | ||
| 'New reversal effective_date uses the membership-local business date' | ||
| ); | ||
|
|
||
| select ok( | ||
| exists ( | ||
| select 1 | ||
| from public.benefit_transactions | ||
| where transaction_type = 'reversal' | ||
| and notes = 'This was a test transaction' | ||
| and effective_date = '2026-08-09' | ||
| ), | ||
| 'Existing append-only reversal row remains physically unchanged' | ||
| ); | ||
|
|
||
| select ok( | ||
| has_function_privilege('authenticated', 'public.create_benefit_reversal(uuid,text,text)', 'EXECUTE') | ||
| and not has_function_privilege('anon', 'public.create_benefit_reversal(uuid,text,text)', 'EXECUTE'), | ||
| 'Reversal RPC remains restricted to authenticated users' | ||
| ); | ||
|
|
||
| select * from finish(); | ||
| rollback; | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On a fresh database built from these migrations, no Auth user or
unit_usersrow is seeded, and the earlier pgTAP suites create their users inside transactions that are rolled back. This subquery therefore returnsNULL, leavingauth.uid()unset, soapprove_benefit_transactionlater aborts withAuthentication is required; the Aug. 7/Aug. 8 assertions also depend on hosted ledger rows that no migration creates. As a result,supabase db testcannot complete on a clean checkout; create the admin and historical transaction/reversal fixtures within this test transaction.Useful? React with 👍 / 👎.