From c304f92b0225d93054f5cc3faa545b16aef0040b Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Wed, 26 Jul 2023 12:39:11 +0200
Subject: [PATCH 01/40] Add Euros to currency options

---
 tracker/models/donation.py | 6 +++++-
 tracker/models/event.py    | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/tracker/models/donation.py b/tracker/models/donation.py
index 4d5bba818..b35c29aec 100644
--- a/tracker/models/donation.py
+++ b/tracker/models/donation.py
@@ -24,7 +24,11 @@
     'DonorCache',
 ]
 
-_currencyChoices = (('USD', 'US Dollars'), ('CAD', 'Canadian Dollars'))
+_currencyChoices = (
+    ('USD', 'US Dollars'),
+    ('CAD', 'Canadian Dollars'),
+    ('EUR', 'Euros'),
+)
 
 DonorVisibilityChoices = (
     ('FULL', 'Fully Visible'),
diff --git a/tracker/models/event.py b/tracker/models/event.py
index 630033ac0..b01c5626b 100644
--- a/tracker/models/event.py
+++ b/tracker/models/event.py
@@ -29,7 +29,11 @@
 ]
 
 _timezoneChoices = [(x, x) for x in pytz.common_timezones]
-_currencyChoices = (('USD', 'US Dollars'), ('CAD', 'Canadian Dollars'))
+_currencyChoices = (
+    ('USD', 'US Dollars'),
+    ('CAD', 'Canadian Dollars'),
+    ('EUR', 'Euros'),
+)
 
 
 logger = logging.getLogger(__name__)

From 48bd336235b32ca2b278cd2391f65c8fd98b7faa Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Wed, 26 Jul 2023 13:53:37 +0200
Subject: [PATCH 02/40] Support euros in the front-end

---
 bundles/@types/global.d.ts                    |  1 +
 bundles/public/util/currency.ts               | 13 ++++++++++-
 .../tracker/donation/components/Donate.tsx    |  4 +++-
 .../donation/components/DonateInitializer.tsx |  3 +++
 bundles/uikit/CurrencyInput.tsx               |  6 ++++-
 .../0031_add_euros_to_donation_and_event.py   | 23 +++++++++++++++++++
 6 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 tracker/migrations/0031_add_euros_to_donation_and_event.py

diff --git a/bundles/@types/global.d.ts b/bundles/@types/global.d.ts
index 6178d6051..bccf406f8 100644
--- a/bundles/@types/global.d.ts
+++ b/bundles/@types/global.d.ts
@@ -4,5 +4,6 @@ declare global {
   interface Window {
     AdminApp: any;
     TrackerApp: any;
+    currency: string;
   }
 }
diff --git a/bundles/public/util/currency.ts b/bundles/public/util/currency.ts
index 73c6bd078..357fc777d 100644
--- a/bundles/public/util/currency.ts
+++ b/bundles/public/util/currency.ts
@@ -1,5 +1,16 @@
 export function asCurrency(amount: string | number) {
-  return `$${Number(amount).toFixed(2)}`;
+  const currency = getCurrencySymbol();
+
+  return `${currency}${Number(amount).toFixed(2)}`;
+}
+
+export function getCurrencySymbol(): string {
+  switch (window.currency.toUpperCase()) {
+    case 'EUR':
+      return '€';
+    default:
+      return '$';
+  }
 }
 
 export function parseCurrency(amount?: string) {
diff --git a/bundles/tracker/donation/components/Donate.tsx b/bundles/tracker/donation/components/Donate.tsx
index f2ac194eb..035ca0ba9 100644
--- a/bundles/tracker/donation/components/Donate.tsx
+++ b/bundles/tracker/donation/components/Donate.tsx
@@ -93,6 +93,7 @@ const Donate = (props: DonateProps) => {
     updateDonation,
   ]);
   const updateComment = React.useCallback((comment: string) => updateDonation({ comment }), [updateDonation]);
+  const currencySymbol = CurrencyUtils.getCurrencySymbol();
 
   return (
     <Container>
@@ -169,7 +170,8 @@ const Donate = (props: DonateProps) => {
               key={amountPreset}
               look={Button.Looks.OUTLINED}
               onClick={updateAmountPreset(amountPreset)}>
-              ${amountPreset}
+              {currencySymbol}
+              {amountPreset}
             </Button>
           ))}
         </div>
diff --git a/bundles/tracker/donation/components/DonateInitializer.tsx b/bundles/tracker/donation/components/DonateInitializer.tsx
index 39cbe1a77..cd8b3bd4f 100644
--- a/bundles/tracker/donation/components/DonateInitializer.tsx
+++ b/bundles/tracker/donation/components/DonateInitializer.tsx
@@ -56,6 +56,7 @@ type DonateInitializerProps = {
   };
   initialIncentives: InitialIncentive[];
   event: {
+    paypalcurrency: string;
     receivername: string;
   };
   step: number;
@@ -115,6 +116,8 @@ const DonateInitializer = (props: DonateInitializerProps) => {
       };
     });
 
+    window.currency = event.paypalcurrency;
+
     dispatch(
       EventDetailsActions.loadEventDetails({
         csrfToken,
diff --git a/bundles/uikit/CurrencyInput.tsx b/bundles/uikit/CurrencyInput.tsx
index f91bfea33..7b6c0496d 100644
--- a/bundles/uikit/CurrencyInput.tsx
+++ b/bundles/uikit/CurrencyInput.tsx
@@ -2,6 +2,8 @@ import * as React from 'react';
 import classNames from 'classnames';
 import ReactNumeric from 'react-numeric';
 
+import * as CurrencyUtils from '@public/util/currency';
+
 import InputWrapper, { InputWrapperPassthroughProps } from './InputWrapper';
 
 import styles from './CurrencyInput.mod.css';
@@ -20,6 +22,8 @@ type CurrencyInputProps = InputWrapperPassthroughProps & {
 // - entering thousandths or beyond
 // - formatting according to user's locale
 const CurrencyInput = (props: CurrencyInputProps) => {
+  const currencySymbol = CurrencyUtils.getCurrencySymbol();
+
   const {
     size = InputWrapper.Sizes.NORMAL,
     value,
@@ -28,7 +32,7 @@ const CurrencyInput = (props: CurrencyInputProps) => {
     name,
     label,
     hint,
-    leader = '$',
+    leader = currencySymbol,
     trailer,
     marginless = false,
     className,
diff --git a/tracker/migrations/0031_add_euros_to_donation_and_event.py b/tracker/migrations/0031_add_euros_to_donation_and_event.py
new file mode 100644
index 000000000..9ae4e5e58
--- /dev/null
+++ b/tracker/migrations/0031_add_euros_to_donation_and_event.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.2.20 on 2023-07-26 10:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tracker', '0030_add_bid_chain'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='donation',
+            name='currency',
+            field=models.CharField(choices=[('USD', 'US Dollars'), ('CAD', 'Canadian Dollars'), ('EUR', 'Euros')], max_length=8, verbose_name='Currency'),
+        ),
+        migrations.AlterField(
+            model_name='event',
+            name='paypalcurrency',
+            field=models.CharField(choices=[('USD', 'US Dollars'), ('CAD', 'Canadian Dollars'), ('EUR', 'Euros')], default='USD', max_length=8, verbose_name='Currency'),
+        ),
+    ]

From 1f367ba626ad7639217788f58db758e9f7ed48ed Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Thu, 27 Jul 2023 10:14:58 +0200
Subject: [PATCH 03/40] Store the currency in the store

---
 bundles/@types/global.d.ts                    |  1 -
 .../modules/donations/DonationRow.tsx         |  9 +++-
 .../modules/donations/ModCommentModal.tsx     | 10 +++--
 .../modules/processing/ActionLog.tsx          |  6 ++-
 .../reading/ReadingDonationRowPopout.tsx      |  5 ++-
 bundles/public/util/currency.ts               | 27 ++++++++----
 bundles/public/util/currencySpec.ts           | 41 +++++++++++++++++++
 .../donation/__tests__/validateBid.spec.ts    | 27 ++++++------
 .../__tests__/validateDonation.spec.ts        |  5 ++-
 .../tracker/donation/components/Donate.tsx    | 11 +++--
 .../donation/components/DonateInitializer.tsx |  3 +-
 .../donation/components/DonationBidForm.tsx   | 11 +++--
 .../donation/components/DonationBids.tsx      |  4 +-
 .../donation/components/DonationPrizes.tsx    |  3 +-
 bundles/tracker/donation/validateBid.ts       | 11 +++--
 bundles/tracker/donation/validateDonation.ts  | 10 +++--
 .../event_details/EventDetailsReducer.ts      |  1 +
 .../event_details/EventDetailsStore.ts        |  2 +
 .../event_details/EventDetailsTypes.ts        |  1 +
 bundles/tracker/prizes/components/Prize.tsx   | 13 +++---
 .../tracker/prizes/components/PrizeCard.tsx   |  4 +-
 bundles/uikit/CurrencyInput.tsx               |  6 +--
 22 files changed, 149 insertions(+), 62 deletions(-)
 create mode 100644 bundles/public/util/currencySpec.ts

diff --git a/bundles/@types/global.d.ts b/bundles/@types/global.d.ts
index bccf406f8..6178d6051 100644
--- a/bundles/@types/global.d.ts
+++ b/bundles/@types/global.d.ts
@@ -4,6 +4,5 @@ declare global {
   interface Window {
     AdminApp: any;
     TrackerApp: any;
-    currency: string;
   }
 }
diff --git a/bundles/processing/modules/donations/DonationRow.tsx b/bundles/processing/modules/donations/DonationRow.tsx
index d9e1e93a3..c50fa5e45 100644
--- a/bundles/processing/modules/donations/DonationRow.tsx
+++ b/bundles/processing/modules/donations/DonationRow.tsx
@@ -1,12 +1,15 @@
 import * as React from 'react';
 import classNames from 'classnames';
 import { useDrag, useDrop } from 'react-dnd';
+import { useSelector } from 'react-redux';
 import { Clickable, Stack, Text } from '@spyrothon/sparx';
 
 import type { Donation, DonationBid } from '@public/apiv2/APITypes';
 import * as CurrencyUtils from '@public/util/currency';
 import DragHandle from '@uikit/icons/DragHandle';
 
+import * as EventDetailsStore from '@tracker/event_details/EventDetailsStore';
+
 import HighlightKeywords from './HighlightKeywords';
 
 import styles from './DonationRow.mod.css';
@@ -19,9 +22,10 @@ interface BidsRowProps {
 
 function BidsRow(props: BidsRowProps) {
   const { bids } = props;
+  const currency = useSelector(EventDetailsStore.getEventCurrency);
   if (bids.length === 0) return null;
 
-  const bidNames = bids.map(bid => `${bid.bid_name} (${CurrencyUtils.asCurrency(bid.amount)})`);
+  const bidNames = bids.map(bid => `${bid.bid_name} (${CurrencyUtils.asCurrency(bid.amount, { currency })})`);
 
   return (
     <Text variant="text-sm/normal" className={styles.bids}>
@@ -76,7 +80,8 @@ export default function DonationRow(props: DonationRowProps) {
     canDrop: checkDrop,
   } = props;
 
-  const amount = CurrencyUtils.asCurrency(donation.amount);
+  const currency = useSelector(EventDetailsStore.getEventCurrency);
+  const amount = CurrencyUtils.asCurrency(donation.amount, { currency });
   const donationTitle = (
     <Text variant="header-sm/normal">
       <strong>{amount}</strong>
diff --git a/bundles/processing/modules/donations/ModCommentModal.tsx b/bundles/processing/modules/donations/ModCommentModal.tsx
index 5994af89b..93287778c 100644
--- a/bundles/processing/modules/donations/ModCommentModal.tsx
+++ b/bundles/processing/modules/donations/ModCommentModal.tsx
@@ -1,5 +1,6 @@
 import * as React from 'react';
 import { useMutation } from 'react-query';
+import { useSelector } from 'react-redux';
 import { Button, Card, FormControl, Header, Stack, Text, TextArea } from '@spyrothon/sparx';
 
 import APIClient from '@public/apiv2/APIClient';
@@ -7,14 +8,16 @@ import { Donation } from '@public/apiv2/APITypes';
 import * as CurrencyUtils from '@public/util/currency';
 import TimeUtils from '@public/util/TimeUtils';
 
+import * as EventDetailsStore from '@tracker/event_details/EventDetailsStore';
+
 import RelativeTime from '../time/RelativeTime';
 import { useDonation } from './DonationsStore';
 
 import styles from '../donation-groups/CreateEditDonationGroupModal.mod.css';
 
-function renderDonationHeader(donation: Donation) {
+function renderDonationHeader(donation: Donation, currency: string) {
   const timestamp = TimeUtils.parseTimestamp(donation.timereceived);
-  const amount = CurrencyUtils.asCurrency(donation.amount);
+  const amount = CurrencyUtils.asCurrency(donation.amount, { currency });
 
   return (
     <Stack spacing="space-sm">
@@ -44,6 +47,7 @@ interface ModCommentModalProps {
 export default function ModCommentModal(props: ModCommentModalProps) {
   const { donationId, onClose } = props;
 
+  const currency = useSelector(EventDetailsStore.getEventCurrency);
   const donation = useDonation(donationId);
   const [comment, setComment] = React.useState(donation.modcomment ?? '');
 
@@ -59,7 +63,7 @@ export default function ModCommentModal(props: ModCommentModalProps) {
     <Card floating className={styles.modal}>
       <Stack as="form" spacing="space-lg" action="" onSubmit={handleSave}>
         <Header tag="h1">Edit Mod Comment</Header>
-        <Card>{renderDonationHeader(donation)}</Card>
+        <Card>{renderDonationHeader(donation, currency)}</Card>
         <FormControl label="Mod Comment">
           <TextArea
             value={comment}
diff --git a/bundles/processing/modules/processing/ActionLog.tsx b/bundles/processing/modules/processing/ActionLog.tsx
index e5619fbc6..21878ca88 100644
--- a/bundles/processing/modules/processing/ActionLog.tsx
+++ b/bundles/processing/modules/processing/ActionLog.tsx
@@ -1,5 +1,6 @@
 import * as React from 'react';
 import { useMutation } from 'react-query';
+import { useSelector } from 'react-redux';
 import { CSSTransition, TransitionGroup } from 'react-transition-group';
 import { Anchor, Button, Header, Text } from '@spyrothon/sparx';
 
@@ -8,6 +9,8 @@ import { Donation } from '@public/apiv2/APITypes';
 import * as CurrencyUtils from '@public/util/currency';
 import Undo from '@uikit/icons/Undo';
 
+import * as EventDetailsStore from '@tracker/event_details/EventDetailsStore';
+
 import { AdminRoutes, useAdminRoute } from '../../Routes';
 import { loadDonations, useDonation } from '../donations/DonationsStore';
 import useProcessingStore, { HistoryAction } from '../processing/ProcessingStore';
@@ -32,6 +35,7 @@ function getRelativeTime(timestamp: number, now: number = Date.now()) {
 function ActionEntry({ action }: { action: HistoryAction }) {
   const donationLink = useAdminRoute(AdminRoutes.DONATION(action.donationId));
   const donation = useDonation(action.donationId);
+  const currency = useSelector(EventDetailsStore.getEventCurrency);
 
   const store = useProcessingStore();
   const unprocess = useMutation(
@@ -46,7 +50,7 @@ function ActionEntry({ action }: { action: HistoryAction }) {
     },
   );
 
-  const amount = CurrencyUtils.asCurrency(donation.amount);
+  const amount = CurrencyUtils.asCurrency(donation.amount, { currency });
 
   return (
     <div className={styles.action} key={action.id}>
diff --git a/bundles/processing/modules/reading/ReadingDonationRowPopout.tsx b/bundles/processing/modules/reading/ReadingDonationRowPopout.tsx
index 646be8854..f678755e7 100644
--- a/bundles/processing/modules/reading/ReadingDonationRowPopout.tsx
+++ b/bundles/processing/modules/reading/ReadingDonationRowPopout.tsx
@@ -1,5 +1,6 @@
 import * as React from 'react';
 import { useMutation } from 'react-query';
+import { useSelector } from 'react-redux';
 import { Anchor, Button, Card, Checkbox, Header, openModal, Spacer, Stack, Text } from '@spyrothon/sparx';
 
 import { usePermission } from '@public/api/helpers/auth';
@@ -8,6 +9,7 @@ import * as CurrencyUtils from '@public/util/currency';
 
 import ModCommentModal from '@processing/modules/donations/ModCommentModal';
 import { AdminRoutes, useAdminRoute } from '@processing/Routes';
+import * as EventDetailsStore from '@tracker/event_details/EventDetailsStore';
 
 import useDonationGroupsStore from '../donation-groups/DonationGroupsStore';
 import { loadDonations, useDonation } from '../donations/DonationsStore';
@@ -21,8 +23,9 @@ export default function ReadingDonationRowPopout(props: ReadingDonationRowPopout
   const { donationId, onClose } = props;
   const donation = useDonation(donationId);
   const { groups, addDonationToGroup, removeDonationFromGroup, removeDonationFromAllGroups } = useDonationGroupsStore();
+  const currency = useSelector(EventDetailsStore.getEventCurrency);
 
-  const amount = CurrencyUtils.asCurrency(donation.amount);
+  const amount = CurrencyUtils.asCurrency(donation.amount, { currency });
   const donationLink = useAdminRoute(AdminRoutes.DONATION(donation.id));
   const donorLink = useAdminRoute(AdminRoutes.DONOR(donation.donor));
   const canEditDonors = usePermission('tracker.change_donor');
diff --git a/bundles/public/util/currency.ts b/bundles/public/util/currency.ts
index 357fc777d..1994c4cf0 100644
--- a/bundles/public/util/currency.ts
+++ b/bundles/public/util/currency.ts
@@ -1,16 +1,25 @@
-export function asCurrency(amount: string | number) {
-  const currency = getCurrencySymbol();
+// This type enforces that consumers pass in the `currency` they want to display.
+interface CurrencyOptions extends Omit<Intl.NumberFormatOptions, 'style'> {
+  currency: string;
+}
+
+export function asCurrency(amount: string | number, options: CurrencyOptions) {
+  // `en-US` is hardcoded here because we don't actually localize the frontend currently.
+  const formatter = new Intl.NumberFormat('en-US', { style: 'currency', ...options });
 
-  return `${currency}${Number(amount).toFixed(2)}`;
+  return formatter.format(Number(amount));
 }
 
-export function getCurrencySymbol(): string {
-  switch (window.currency.toUpperCase()) {
-    case 'EUR':
-      return '€';
-    default:
-      return '$';
+export function getCurrencySymbol(currency: string): string {
+  const formatter = new Intl.NumberFormat('en-US', { style: 'currency', currency, currencyDisplay: 'narrowSymbol' });
+
+  for (const part of formatter.formatToParts(0)) {
+    if (part.type === 'currency') return part.value;
   }
+
+  // If there was no currency symbol in the formatted string, then we can assume that
+  // the language does not expect there to be a symbol around the currency value.
+  return '';
 }
 
 export function parseCurrency(amount?: string) {
diff --git a/bundles/public/util/currencySpec.ts b/bundles/public/util/currencySpec.ts
new file mode 100644
index 000000000..0059c2cae
--- /dev/null
+++ b/bundles/public/util/currencySpec.ts
@@ -0,0 +1,41 @@
+import * as CurrencyUtils from './currency';
+
+describe('CurrencyUtils', () => {
+  describe('asCurrency', () => {
+    it('formats euros', () => {
+      const result = CurrencyUtils.asCurrency(123456.789, { currency: 'EUR', maximumFractionDigits: 0 });
+
+      expect(result).toEqual('€123,457');
+    });
+
+    it('formats with minimum digits', () => {
+      const result = CurrencyUtils.asCurrency(20, { currency: 'USD', minimumFractionDigits: 2 });
+
+      expect(result).toEqual('$20.00');
+    });
+
+    it('formats currency with full name', () => {
+      const result = CurrencyUtils.asCurrency(20, { currency: 'UAH', currencyDisplay: 'name' });
+
+      expect(result).toEqual('20.00 Ukrainian hryvnias');
+    });
+  });
+
+  describe('getCurrencySymbol', () => {
+    it('returns dollar symbol for USD', () => {
+      const result = CurrencyUtils.getCurrencySymbol('USD');
+
+      expect(result).toEqual('$');
+    });
+    it('returns euro symbol for EUR', () => {
+      const result = CurrencyUtils.getCurrencySymbol('EUR');
+
+      expect(result).toEqual('€');
+    });
+    it('returns blank string for wrong input', () => {
+      const result = CurrencyUtils.getCurrencySymbol('GDQ');
+
+      expect(result).toEqual('');
+    });
+  });
+});
diff --git a/bundles/tracker/donation/__tests__/validateBid.spec.ts b/bundles/tracker/donation/__tests__/validateBid.spec.ts
index b4334877e..948a70265 100644
--- a/bundles/tracker/donation/__tests__/validateBid.spec.ts
+++ b/bundles/tracker/donation/__tests__/validateBid.spec.ts
@@ -58,7 +58,7 @@ describe('validateBid', () => {
       amount: 2.5,
     };
 
-    const validation = validateBid(bid, basicIncentive, donation, [], false, false);
+    const validation = validateBid('USD', bid, basicIncentive, donation, [], false, false);
     expect(validation.valid).toBe(true);
     expect(validation.errors.length).toEqual(0);
   });
@@ -71,9 +71,12 @@ describe('validateBid', () => {
         customoptionname: 'test',
       };
 
-      const validation = validateBid(bid, basicIncentive, donation, [], false, false);
+      const validation = validateBid('USD', bid, basicIncentive, donation, [], false, false);
       expect(validation.valid).toBe(false);
-      expect(validation.errors).toContain({ field: 'amount', message: BidErrors.AMOUNT_MINIMUM(BID_MINIMUM_AMOUNT) });
+      expect(validation.errors).toContain({
+        field: 'amount',
+        message: BidErrors.AMOUNT_MINIMUM(BID_MINIMUM_AMOUNT, 'USD'),
+      });
     });
 
     it('passes when amount equals allowed minimum', () => {
@@ -82,7 +85,7 @@ describe('validateBid', () => {
         amount: BID_MINIMUM_AMOUNT,
       };
 
-      const validation = validateBid(bid, basicIncentive, donation, [], false, false);
+      const validation = validateBid('USD', bid, basicIncentive, donation, [], false, false);
       expect(validation.valid).toBe(true);
       expect(validation.errors.length).toEqual(0);
     });
@@ -94,7 +97,7 @@ describe('validateBid', () => {
         amount: max,
       };
 
-      const validation = validateBid(bid, basicIncentive, donation, [], false, false);
+      const validation = validateBid('USD', bid, basicIncentive, donation, [], false, false);
       expect(validation.valid).toBe(true);
       expect(validation.errors.length).toEqual(0);
     });
@@ -106,9 +109,9 @@ describe('validateBid', () => {
         amount: max + 1,
       };
 
-      const validation = validateBid(bid, basicIncentive, donation, [], false, false);
+      const validation = validateBid('USD', bid, basicIncentive, donation, [], false, false);
       expect(validation.valid).toBe(false);
-      expect(validation.errors).toContain({ field: 'amount', message: BidErrors.AMOUNT_MAXIMUM(max) });
+      expect(validation.errors).toContain({ field: 'amount', message: BidErrors.AMOUNT_MAXIMUM(max, 'USD') });
     });
   });
 
@@ -119,7 +122,7 @@ describe('validateBid', () => {
         amount: 2.5,
       };
 
-      const validation = validateBid(bid, incentiveWithOptions, donation, [], true, false);
+      const validation = validateBid('USD', bid, incentiveWithOptions, donation, [], true, false);
       expect(validation.valid).toBe(false);
       expect(validation.errors).toContain({ field: 'incentiveId', message: BidErrors.NO_CHOICE });
     });
@@ -130,7 +133,7 @@ describe('validateBid', () => {
         amount: 2.5,
       };
 
-      const validation = validateBid(bid, incentiveWithOptions, donation, [], true, true);
+      const validation = validateBid('USD', bid, incentiveWithOptions, donation, [], true, true);
       expect(validation.valid).toBe(true);
       expect(validation.errors.length).toEqual(0);
     });
@@ -142,7 +145,7 @@ describe('validateBid', () => {
         customoptionname: 'test',
       };
 
-      const validation = validateBid(bid, incentiveWithOptions, donation, [], true, true, true);
+      const validation = validateBid('USD', bid, incentiveWithOptions, donation, [], true, true, true);
       expect(validation.valid).toBe(true);
       expect(validation.errors.length).toEqual(0);
     });
@@ -154,7 +157,7 @@ describe('validateBid', () => {
         customoptionname: '',
       };
 
-      const validation = validateBid(bid, incentiveWithOptions, donation, [], true, true, true);
+      const validation = validateBid('USD', bid, incentiveWithOptions, donation, [], true, true, true);
       expect(validation.valid).toBe(false);
       expect(validation.errors).toContain({
         field: 'new option',
@@ -169,7 +172,7 @@ describe('validateBid', () => {
         customoptionname: 'this is too long to be allowable clearly',
       };
 
-      const validation = validateBid(bid, incentiveWithOptions, donation, [], true, true, true);
+      const validation = validateBid('USD', bid, incentiveWithOptions, donation, [], true, true, true);
       expect(validation.valid).toBe(false);
       expect(validation.errors).toContain({
         field: 'new option',
diff --git a/bundles/tracker/donation/__tests__/validateDonation.spec.ts b/bundles/tracker/donation/__tests__/validateDonation.spec.ts
index 22c0aa8c4..4f236136a 100644
--- a/bundles/tracker/donation/__tests__/validateDonation.spec.ts
+++ b/bundles/tracker/donation/__tests__/validateDonation.spec.ts
@@ -4,6 +4,7 @@ import validateDonation, { DonationErrors } from '../validateDonation';
 
 const eventDetails = {
   csrfToken: 'testing',
+  currency: 'USD',
   receiverName: 'a beneficiary',
   prizesUrl: 'https://example.com/prizes',
   donateUrl: 'https://example.com/donate',
@@ -57,7 +58,7 @@ describe('validateDonation', () => {
       expect(validation.valid).toBe(false);
       expect(validation.errors).toContain({
         field: 'amount',
-        message: DonationErrors.AMOUNT_MINIMUM(eventDetails.minimumDonation),
+        message: DonationErrors.AMOUNT_MINIMUM(eventDetails.minimumDonation, 'USD'),
       });
     });
 
@@ -74,7 +75,7 @@ describe('validateDonation', () => {
       expect(validation.valid).toBe(false);
       expect(validation.errors).toContain({
         field: 'amount',
-        message: DonationErrors.AMOUNT_MAXIMUM(eventDetails.maximumDonation),
+        message: DonationErrors.AMOUNT_MAXIMUM(eventDetails.maximumDonation, 'USD'),
       });
     });
   });
diff --git a/bundles/tracker/donation/components/Donate.tsx b/bundles/tracker/donation/components/Donate.tsx
index 035ca0ba9..cf4cb5053 100644
--- a/bundles/tracker/donation/components/Donate.tsx
+++ b/bundles/tracker/donation/components/Donate.tsx
@@ -66,7 +66,7 @@ const Donate = (props: DonateProps) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [eventId]);
 
-  const { receiverName, donateUrl, minimumDonation, maximumDonation, step } = eventDetails;
+  const { currency, receiverName, donateUrl, minimumDonation, maximumDonation, step } = eventDetails;
   const { name, email, wantsEmails, amount, comment } = donation;
 
   const updateDonation = React.useCallback(
@@ -93,7 +93,6 @@ const Donate = (props: DonateProps) => {
     updateDonation,
   ]);
   const updateComment = React.useCallback((comment: string) => updateDonation({ comment }), [updateDonation]);
-  const currencySymbol = CurrencyUtils.getCurrencySymbol();
 
   return (
     <Container>
@@ -152,9 +151,10 @@ const Donate = (props: DonateProps) => {
           name="amount"
           value={amount}
           label="Amount"
+          currency={currency}
           hint={
             <React.Fragment>
-              Minimum donation is <strong>{CurrencyUtils.asCurrency(minimumDonation)}</strong>
+              Minimum donation is <strong>{CurrencyUtils.asCurrency(minimumDonation, { currency })}</strong>
             </React.Fragment>
           }
           size={CurrencyInput.Sizes.LARGE}
@@ -170,8 +170,7 @@ const Donate = (props: DonateProps) => {
               key={amountPreset}
               look={Button.Looks.OUTLINED}
               onClick={updateAmountPreset(amountPreset)}>
-              {currencySymbol}
-              {amountPreset}
+              {CurrencyUtils.asCurrency(amountPreset, { currency })}
             </Button>
           ))}
         </div>
@@ -215,7 +214,7 @@ const Donate = (props: DonateProps) => {
           fullwidth
           onClick={handleSubmit}
           data-testid="donation-submit">
-          Donate {amount != null ? CurrencyUtils.asCurrency(amount) : null}
+          Donate {amount != null ? CurrencyUtils.asCurrency(amount, { currency }) : null}
         </Button>
       </section>
     </Container>
diff --git a/bundles/tracker/donation/components/DonateInitializer.tsx b/bundles/tracker/donation/components/DonateInitializer.tsx
index cd8b3bd4f..7cfe83e5a 100644
--- a/bundles/tracker/donation/components/DonateInitializer.tsx
+++ b/bundles/tracker/donation/components/DonateInitializer.tsx
@@ -116,11 +116,10 @@ const DonateInitializer = (props: DonateInitializerProps) => {
       };
     });
 
-    window.currency = event.paypalcurrency;
-
     dispatch(
       EventDetailsActions.loadEventDetails({
         csrfToken,
+        currency: event.paypalcurrency,
         receiverName: event.receivername,
         prizesUrl,
         donateUrl,
diff --git a/bundles/tracker/donation/components/DonationBidForm.tsx b/bundles/tracker/donation/components/DonationBidForm.tsx
index 62908c711..61e96e558 100644
--- a/bundles/tracker/donation/components/DonationBidForm.tsx
+++ b/bundles/tracker/donation/components/DonationBidForm.tsx
@@ -32,7 +32,8 @@ type DonationBidFormProps = {
 const DonationBidForm = (props: DonationBidFormProps) => {
   const { incentiveId, step, total: donationTotal, className, onSubmit } = props;
 
-  const { incentive, bidChoices, donation, bids, allocatedTotal } = useSelector((state: StoreState) => ({
+  const { currency, incentive, bidChoices, donation, bids, allocatedTotal } = useSelector((state: StoreState) => ({
+    currency: EventDetailsStore.getEventCurrency(state),
     incentive: EventDetailsStore.getIncentive(state, incentiveId),
     bidChoices: EventDetailsStore.getChildIncentives(state, incentiveId),
     donation: DonationStore.getDonation(state),
@@ -41,7 +42,7 @@ const DonationBidForm = (props: DonationBidFormProps) => {
   }));
 
   const remainingDonationTotal = donationTotal - allocatedTotal;
-  const remainingDonationTotalString = CurrencyUtils.asCurrency(remainingDonationTotal);
+  const remainingDonationTotalString = CurrencyUtils.asCurrency(remainingDonationTotal, { currency });
 
   const [allocatedAmount, setAllocatedAmount] = React.useState(remainingDonationTotal);
   const [selectedChoiceId, setSelectedChoiceId] = React.useState<number | undefined>(undefined);
@@ -57,6 +58,7 @@ const DonationBidForm = (props: DonationBidFormProps) => {
   const bidValidation = React.useMemo(
     () =>
       validateBid(
+        currency,
         {
           incentiveId: selectedChoiceId != null ? selectedChoiceId : incentiveId,
           amount: allocatedAmount,
@@ -70,6 +72,7 @@ const DonationBidForm = (props: DonationBidFormProps) => {
         customOptionSelected,
       ),
     [
+      currency,
       selectedChoiceId,
       incentiveId,
       allocatedAmount,
@@ -115,7 +118,8 @@ const DonationBidForm = (props: DonationBidFormProps) => {
           <Text marginless>
             Current Raised Amount:{' '}
             <span>
-              {CurrencyUtils.asCurrency(incentive.amount)} / {CurrencyUtils.asCurrency(incentive.goal)}
+              {CurrencyUtils.asCurrency(incentive.amount, { currency })} /{' '}
+              {CurrencyUtils.asCurrency(incentive.goal, { currency })}
             </span>
           </Text>
         </React.Fragment>
@@ -125,6 +129,7 @@ const DonationBidForm = (props: DonationBidFormProps) => {
         value={Math.min(allocatedAmount, remainingDonationTotal)}
         name="incentiveBidAmount"
         label="Amount to put towards incentive"
+        currency={currency}
         hint={
           <React.Fragment>
             You have <strong>{remainingDonationTotalString}</strong> remaining.
diff --git a/bundles/tracker/donation/components/DonationBids.tsx b/bundles/tracker/donation/components/DonationBids.tsx
index 59603d634..cc69580b8 100644
--- a/bundles/tracker/donation/components/DonationBids.tsx
+++ b/bundles/tracker/donation/components/DonationBids.tsx
@@ -29,8 +29,8 @@ type BidItemProps = {
 
 const BidItem = (props: BidItemProps) => {
   const { bid, incentive, onDelete, errors } = props;
-
-  const bidAmount = CurrencyUtils.asCurrency(bid.amount);
+  const currency = useSelector(EventDetailsStore.getEventCurrency);
+  const bidAmount = CurrencyUtils.asCurrency(bid.amount, { currency });
 
   return (
     <div className={styles.bid}>
diff --git a/bundles/tracker/donation/components/DonationPrizes.tsx b/bundles/tracker/donation/components/DonationPrizes.tsx
index fa1397aba..bc3e0cecf 100644
--- a/bundles/tracker/donation/components/DonationPrizes.tsx
+++ b/bundles/tracker/donation/components/DonationPrizes.tsx
@@ -20,6 +20,7 @@ type PrizeProps = {
 
 const PrizeRow = (props: PrizeProps) => {
   const { eventId, prize } = props;
+  const currency = useSelector(EventDetailsStore.getEventCurrency);
 
   return (
     <div className={styles.prize}>
@@ -27,7 +28,7 @@ const PrizeRow = (props: PrizeProps) => {
         {prize.url != null ? <Anchor href={Routes.EVENT_PRIZE(eventId, prize.id)}>{prize.name}</Anchor> : prize.name}
       </Text>
       <Text size={Text.Sizes.SIZE_14} marginless>
-        <strong>{CurrencyUtils.asCurrency(prize.minimumbid)}</strong>{' '}
+        <strong>{CurrencyUtils.asCurrency(prize.minimumbid, { currency })}</strong>{' '}
         {prize.sumdonations ? 'Total Donations' : 'Minimum Single Donation'}
       </Text>
     </div>
diff --git a/bundles/tracker/donation/validateBid.ts b/bundles/tracker/donation/validateBid.ts
index d8b223969..9585faff6 100644
--- a/bundles/tracker/donation/validateBid.ts
+++ b/bundles/tracker/donation/validateBid.ts
@@ -12,14 +12,17 @@ export const BidErrors = {
   NO_CHOICE: 'Bid must select a choice',
   NO_AMOUNT: 'Bid amount is required',
 
-  AMOUNT_MINIMUM: (min: number) => `Bid amount must be greater than (${CurrencyUtils.asCurrency(min)})`,
-  AMOUNT_MAXIMUM: (max: number) => `Amount is larger than remaining total (${CurrencyUtils.asCurrency(max)}).`,
+  AMOUNT_MINIMUM: (min: number, currency: string) =>
+    `Bid amount must be greater than (${CurrencyUtils.asCurrency(min, { currency })})`,
+  AMOUNT_MAXIMUM: (max: number, currency: string) =>
+    `Amount is larger than remaining total (${CurrencyUtils.asCurrency(max, { currency })}).`,
 
   NO_CUSTOM_CHOICE: 'New option does not have a value',
   CUSTOM_CHOICE_LENGTH: (maxLength: number) => `New choice must be less than ${maxLength} characters`,
 };
 
 export default function validateBid(
+  currency: string,
   newBid: Partial<Bid>,
   incentive: Incentive,
   donation: Donation,
@@ -48,14 +51,14 @@ export default function validateBid(
     if (newBid.amount < BID_MINIMUM_AMOUNT) {
       errors.push({
         field: 'amount',
-        message: BidErrors.AMOUNT_MINIMUM(BID_MINIMUM_AMOUNT),
+        message: BidErrors.AMOUNT_MINIMUM(BID_MINIMUM_AMOUNT, currency),
       });
     }
 
     if (newBid.amount > remainingTotal) {
       errors.push({
         field: 'amount',
-        message: BidErrors.AMOUNT_MAXIMUM(remainingTotal),
+        message: BidErrors.AMOUNT_MAXIMUM(remainingTotal, currency),
       });
     }
   }
diff --git a/bundles/tracker/donation/validateDonation.ts b/bundles/tracker/donation/validateDonation.ts
index 74c32b97a..77cc76a64 100644
--- a/bundles/tracker/donation/validateDonation.ts
+++ b/bundles/tracker/donation/validateDonation.ts
@@ -11,8 +11,10 @@ import { Bid, Donation, Validation } from './DonationTypes';
 export const DonationErrors = {
   NO_AMOUNT: 'Donation amount is not set',
 
-  AMOUNT_MINIMUM: (min: number) => `Donation amount is below the allowed minimum (${CurrencyUtils.asCurrency(min)})`,
-  AMOUNT_MAXIMUM: (max: number) => `Donation amount is above the allowed maximum (${CurrencyUtils.asCurrency(max)})`,
+  AMOUNT_MINIMUM: (min: number, currency: string) =>
+    `Donation amount is below the allowed minimum (${CurrencyUtils.asCurrency(min, { currency })})`,
+  AMOUNT_MAXIMUM: (max: number, currency: string) =>
+    `Donation amount is above the allowed maximum (${CurrencyUtils.asCurrency(max, { currency })})`,
 
   TOO_MANY_BIDS: (maxBids: number) => `Only ${maxBids} bids can be set per donation.`,
   BID_SUM_EXCEEDS_TOTAL: 'Sum of bid amounts exceeds donation total.',
@@ -30,14 +32,14 @@ export default function validateDonation(eventDetails: EventDetails, donation: D
     if (donation.amount < eventDetails.minimumDonation) {
       errors.push({
         field: 'amount',
-        message: DonationErrors.AMOUNT_MINIMUM(eventDetails.minimumDonation),
+        message: DonationErrors.AMOUNT_MINIMUM(eventDetails.minimumDonation, eventDetails.currency),
       });
     }
 
     if (donation.amount > eventDetails.maximumDonation) {
       errors.push({
         field: 'amount',
-        message: DonationErrors.AMOUNT_MAXIMUM(eventDetails.maximumDonation),
+        message: DonationErrors.AMOUNT_MAXIMUM(eventDetails.maximumDonation, eventDetails.currency),
       });
     }
 
diff --git a/bundles/tracker/event_details/EventDetailsReducer.ts b/bundles/tracker/event_details/EventDetailsReducer.ts
index 269835ffc..65285f89b 100644
--- a/bundles/tracker/event_details/EventDetailsReducer.ts
+++ b/bundles/tracker/event_details/EventDetailsReducer.ts
@@ -8,6 +8,7 @@ type EventDetailsState = EventDetails;
 
 const initialState: EventDetailsState = {
   csrfToken: '',
+  currency: '',
   receiverName: '',
   prizesUrl: '',
   donateUrl: '',
diff --git a/bundles/tracker/event_details/EventDetailsStore.ts b/bundles/tracker/event_details/EventDetailsStore.ts
index 2a8b47610..26d6d109e 100644
--- a/bundles/tracker/event_details/EventDetailsStore.ts
+++ b/bundles/tracker/event_details/EventDetailsStore.ts
@@ -10,6 +10,8 @@ export const getPrizes = (state: StoreState) => state.eventDetails.prizes;
 
 export const getEventDetails = getEventDetailsState;
 
+export const getEventCurrency = createSelector([getEventDetailsState], state => state.currency);
+
 export const getIncentives = createSelector([getIncentivesById], incentivesById => Object.values(incentivesById));
 
 export const getIncentive = createSelector(
diff --git a/bundles/tracker/event_details/EventDetailsTypes.ts b/bundles/tracker/event_details/EventDetailsTypes.ts
index 1613d3e56..32f9874b8 100644
--- a/bundles/tracker/event_details/EventDetailsTypes.ts
+++ b/bundles/tracker/event_details/EventDetailsTypes.ts
@@ -30,6 +30,7 @@ export type Prize = {
 
 export type EventDetails = {
   csrfToken: string;
+  currency: string;
   receiverName: string;
   prizesUrl: string;
   donateUrl: string;
diff --git a/bundles/tracker/prizes/components/Prize.tsx b/bundles/tracker/prizes/components/Prize.tsx
index cddeaabbc..61d58bffe 100644
--- a/bundles/tracker/prizes/components/Prize.tsx
+++ b/bundles/tracker/prizes/components/Prize.tsx
@@ -12,6 +12,7 @@ import LoadingDots from '@uikit/LoadingDots';
 import Markdown from '@uikit/Markdown';
 import Text from '@uikit/Text';
 
+import * as EventDetailsStore from '@tracker/event_details/EventDetailsStore';
 import * as EventActions from '@tracker/events/EventActions';
 import * as EventStore from '@tracker/events/EventStore';
 import useDispatch from '@tracker/hooks/useDispatch';
@@ -47,11 +48,11 @@ const PrizeDonateButton = ({ prize, now, onClick }: PrizeDonateButtonProps) => {
   return null;
 };
 
-function getPrizeDetails(prize: PrizeTypes.Prize) {
+function getPrizeDetails(prize: PrizeTypes.Prize, currency: string) {
   return [
     {
       name: 'Estimated Value',
-      value: prize.estimatedValue != null ? CurrencyUtils.asCurrency(prize.estimatedValue) : undefined,
+      value: prize.estimatedValue != null ? CurrencyUtils.asCurrency(prize.estimatedValue, { currency }) : undefined,
     },
     {
       name: 'Opening Run',
@@ -90,11 +91,13 @@ const Prize = (props: PrizeProps) => {
   const [prizeError, setPrizeError] = useState(false);
   const setPrizeErrorTrue = useCallback(() => setPrizeError(true), []);
   const dispatch = useDispatch();
-  const { event, eventId, prize } = useSelector((state: StoreState) => {
+  const { currency, event, eventId, prize } = useSelector((state: StoreState) => {
+    const currency = EventDetailsStore.getEventCurrency(state);
     const prize = PrizeStore.getPrize(state, { prizeId });
     const event = prize != null ? EventStore.getEvent(state, { eventId: prize.eventId }) : undefined;
 
     return {
+      currency,
       event,
       eventId: prize != null ? prize.eventId : undefined,
       prize,
@@ -134,7 +137,7 @@ const Prize = (props: PrizeProps) => {
       </Container>
     );
 
-  const prizeDetails = getPrizeDetails(prize);
+  const prizeDetails = getPrizeDetails(prize, currency);
   const prizeImage = prizeError ? null : PrizeUtils.getPrimaryImage(prize);
 
   return (
@@ -172,7 +175,7 @@ const Prize = (props: PrizeProps) => {
               ) : null}
             </Text>
             <Text size={Text.Sizes.SIZE_20}>
-              <strong>{CurrencyUtils.asCurrency(prize.minimumBid)} </strong>
+              <strong>{CurrencyUtils.asCurrency(prize.minimumBid, { currency })} </strong>
               {prize.sumDonations ? 'Total Donations' : 'Minimum Single Donation'}
             </Text>
 
diff --git a/bundles/tracker/prizes/components/PrizeCard.tsx b/bundles/tracker/prizes/components/PrizeCard.tsx
index bcf930ab3..cc365e822 100644
--- a/bundles/tracker/prizes/components/PrizeCard.tsx
+++ b/bundles/tracker/prizes/components/PrizeCard.tsx
@@ -9,6 +9,7 @@ import Clickable from '@uikit/Clickable';
 import Header from '@uikit/Header';
 import Text from '@uikit/Text';
 
+import * as EventDetailsStore from '@tracker/event_details/EventDetailsStore';
 import RouterUtils, { Routes } from '@tracker/router/RouterUtils';
 import { StoreState } from '@tracker/Store';
 
@@ -28,6 +29,7 @@ const PrizeCard = (props: PrizeCardProps) => {
   const { prizeId, className } = props;
   const now = TimeUtils.getNowLocal();
 
+  const currency = useSelector(EventDetailsStore.getEventCurrency);
   const [prizeError, setPrizeError] = useState(false);
   const setPrizeErrorTrue = useCallback(() => setPrizeError(true), []);
 
@@ -78,7 +80,7 @@ const PrizeCard = (props: PrizeCardProps) => {
           </Text>
         ) : null}
         <Text className={styles.minimumDonation} color={Text.Colors.MUTED} size={Text.Sizes.SIZE_12} marginless>
-          <strong>{CurrencyUtils.asCurrency(prize.minimumBid)}</strong>
+          <strong>{CurrencyUtils.asCurrency(prize.minimumBid, { currency })}</strong>
           <br />
           {prize.sumDonations ? 'Total Donations' : 'Minimum Donation'}
         </Text>
diff --git a/bundles/uikit/CurrencyInput.tsx b/bundles/uikit/CurrencyInput.tsx
index 7b6c0496d..e8fed9fde 100644
--- a/bundles/uikit/CurrencyInput.tsx
+++ b/bundles/uikit/CurrencyInput.tsx
@@ -8,7 +8,8 @@ import InputWrapper, { InputWrapperPassthroughProps } from './InputWrapper';
 
 import styles from './CurrencyInput.mod.css';
 
-type CurrencyInputProps = InputWrapperPassthroughProps & {
+type CurrencyInputProps = Omit<InputWrapperPassthroughProps, 'leader'> & {
+  currency: string;
   value?: number;
   placeholder?: string;
   disabled?: boolean;
@@ -22,8 +23,7 @@ type CurrencyInputProps = InputWrapperPassthroughProps & {
 // - entering thousandths or beyond
 // - formatting according to user's locale
 const CurrencyInput = (props: CurrencyInputProps) => {
-  const currencySymbol = CurrencyUtils.getCurrencySymbol();
-
+  const currencySymbol = CurrencyUtils.getCurrencySymbol(props.currency);
   const {
     size = InputWrapper.Sizes.NORMAL,
     value,

From 83bc8c34c2d928b3dc6834c1dbcce748d8a202f3 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Thu, 27 Jul 2023 10:46:02 +0200
Subject: [PATCH 04/40] Set default currency in reducer to make the tests happy

---
 bundles/public/util/currency.ts                      | 12 ++++++++----
 bundles/public/util/currencySpec.ts                  |  8 +++++++-
 bundles/tracker/event_details/EventDetailsReducer.ts |  2 +-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/bundles/public/util/currency.ts b/bundles/public/util/currency.ts
index 1994c4cf0..33486d135 100644
--- a/bundles/public/util/currency.ts
+++ b/bundles/public/util/currency.ts
@@ -11,10 +11,14 @@ export function asCurrency(amount: string | number, options: CurrencyOptions) {
 }
 
 export function getCurrencySymbol(currency: string): string {
-  const formatter = new Intl.NumberFormat('en-US', { style: 'currency', currency, currencyDisplay: 'narrowSymbol' });
-
-  for (const part of formatter.formatToParts(0)) {
-    if (part.type === 'currency') return part.value;
+  try {
+    const formatter = new Intl.NumberFormat('en-US', { style: 'currency', currency, currencyDisplay: 'narrowSymbol' });
+
+    for (const part of formatter.formatToParts(0)) {
+      if (part.type === 'currency') return part.value;
+    }
+  } catch (e: unknown) {
+    // Ignored: RangeError: invalid currency code in NumberFormat()
   }
 
   // If there was no currency symbol in the formatted string, then we can assume that
diff --git a/bundles/public/util/currencySpec.ts b/bundles/public/util/currencySpec.ts
index 0059c2cae..b93913443 100644
--- a/bundles/public/util/currencySpec.ts
+++ b/bundles/public/util/currencySpec.ts
@@ -32,9 +32,15 @@ describe('CurrencyUtils', () => {
 
       expect(result).toEqual('€');
     });
-    it('returns blank string for wrong input', () => {
+    it("returns input currency when it's 3 letters", () => {
       const result = CurrencyUtils.getCurrencySymbol('GDQ');
 
+      // This is how the api works for some reason. GDQ is not a valid ISO-4217 currency, yet the api returns it.
+      expect(result).toEqual('GDQ');
+    });
+    it('returns blank string for wrong input', () => {
+      const result = CurrencyUtils.getCurrencySymbol('Invalid currency!');
+
       expect(result).toEqual('');
     });
   });
diff --git a/bundles/tracker/event_details/EventDetailsReducer.ts b/bundles/tracker/event_details/EventDetailsReducer.ts
index 65285f89b..e38751650 100644
--- a/bundles/tracker/event_details/EventDetailsReducer.ts
+++ b/bundles/tracker/event_details/EventDetailsReducer.ts
@@ -8,7 +8,7 @@ type EventDetailsState = EventDetails;
 
 const initialState: EventDetailsState = {
   csrfToken: '',
-  currency: '',
+  currency: 'USD', // Default to USD, mainly for automated tests
   receiverName: '',
   prizesUrl: '',
   donateUrl: '',

From 8c43244692353f5b4dc0ec3e3d38ed14421e1263 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Thu, 27 Jul 2023 13:03:45 +0200
Subject: [PATCH 05/40] Clarify comment

---
 bundles/tracker/event_details/EventDetailsReducer.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/tracker/event_details/EventDetailsReducer.ts b/bundles/tracker/event_details/EventDetailsReducer.ts
index e38751650..b36de6273 100644
--- a/bundles/tracker/event_details/EventDetailsReducer.ts
+++ b/bundles/tracker/event_details/EventDetailsReducer.ts
@@ -8,7 +8,7 @@ type EventDetailsState = EventDetails;
 
 const initialState: EventDetailsState = {
   csrfToken: '',
-  currency: 'USD', // Default to USD, mainly for automated tests
+  currency: 'USD', // Default to USD to make tests happy
   receiverName: '',
   prizesUrl: '',
   donateUrl: '',

From f3fded7de3f794cb2322b6af8e37cc5559755449 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Fri, 28 Jul 2023 08:39:04 +0200
Subject: [PATCH 06/40] Display donation currency on reading and processing
 pages

---
 bundles/admin/donationProcessing/processDonations.tsx     | 5 ++++-
 bundles/admin/donationProcessing/processDonationsSpec.tsx | 3 +++
 bundles/admin/donationProcessing/readDonations.tsx        | 5 ++++-
 bundles/admin/donationProcessing/readDonationsSpec.tsx    | 2 ++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/bundles/admin/donationProcessing/processDonations.tsx b/bundles/admin/donationProcessing/processDonations.tsx
index 560f05810..0ad537407 100644
--- a/bundles/admin/donationProcessing/processDonations.tsx
+++ b/bundles/admin/donationProcessing/processDonations.tsx
@@ -10,6 +10,7 @@ import useSafeDispatch from '@public/api/useDispatch';
 import { useCachedCallback } from '@public/hooks/useCachedCallback';
 import { useFetchDonors } from '@public/hooks/useFetchDonors';
 import Spinner from '@public/spinner';
+import * as CurrencyUtils from '@public/util/currency';
 
 import styles from './donations.mod.css';
 
@@ -156,7 +157,9 @@ export default React.memo(function ProcessDonations() {
                     {canEditDonors ? <a href={`${ADMIN_ROOT}donor/${donation.donor}`}>{donorLabel}</a> : donorLabel}
                   </td>
                   <td>
-                    <a href={`${ADMIN_ROOT}donation/${donation.pk}`}>${(+donation.amount).toFixed(2)}</a>
+                    <a href={`${ADMIN_ROOT}donation/${donation.pk}`}>
+                      {CurrencyUtils.asCurrency(donation.amount, { currency: donation.currency })}
+                    </a>
                   </td>
                   <td className={styles['comment']}>{donation.comment}</td>
                   <td>
diff --git a/bundles/admin/donationProcessing/processDonationsSpec.tsx b/bundles/admin/donationProcessing/processDonationsSpec.tsx
index 702cba335..8cde37064 100644
--- a/bundles/admin/donationProcessing/processDonationsSpec.tsx
+++ b/bundles/admin/donationProcessing/processDonationsSpec.tsx
@@ -49,6 +49,7 @@ describe('ProcessDonations', () => {
             {
               donor: 1,
               amount: 164.87,
+              currency: 'USD',
               comment: 'Amazing Comment',
               pk: 123,
             },
@@ -99,6 +100,7 @@ describe('ProcessDonations', () => {
               {
                 donor: 1,
                 amount: 164.87,
+                currency: 'USD',
                 comment: 'Amazing Comment',
                 pk: 123,
               },
@@ -190,6 +192,7 @@ describe('ProcessDonations', () => {
               {
                 donor: 1,
                 amount: 164.87,
+                currency: 'USD',
                 comment: 'Amazing Comment',
                 pk: 123,
               },
diff --git a/bundles/admin/donationProcessing/readDonations.tsx b/bundles/admin/donationProcessing/readDonations.tsx
index b8a0125b7..c66d06a56 100644
--- a/bundles/admin/donationProcessing/readDonations.tsx
+++ b/bundles/admin/donationProcessing/readDonations.tsx
@@ -9,6 +9,7 @@ import useSafeDispatch from '@public/api/useDispatch';
 import { useCachedCallback } from '@public/hooks/useCachedCallback';
 import { useFetchDonors } from '@public/hooks/useFetchDonors';
 import Spinner from '@public/spinner';
+import * as CurrencyUtils from '@public/util/currency';
 
 import styles from './donations.mod.css';
 
@@ -114,7 +115,9 @@ export default React.memo(function ReadDonations() {
                     {canEditDonors ? <a href={`${ADMIN_ROOT}donor/${donation.donor}`}>{donorLabel}</a> : donorLabel}
                   </td>
                   <td>
-                    <a href={`${ADMIN_ROOT}donation/${donation.pk}`}>${(+donation.amount).toFixed(2)}</a>
+                    <a href={`${ADMIN_ROOT}donation/${donation.pk}`}>
+                      {CurrencyUtils.asCurrency(donation.amount, { currency: donation.currency })}
+                    </a>
                   </td>
                   <td className={styles['comment']}>
                     {donation.pinned && '📌'}
diff --git a/bundles/admin/donationProcessing/readDonationsSpec.tsx b/bundles/admin/donationProcessing/readDonationsSpec.tsx
index ae3e13270..a023d2453 100644
--- a/bundles/admin/donationProcessing/readDonationsSpec.tsx
+++ b/bundles/admin/donationProcessing/readDonationsSpec.tsx
@@ -49,6 +49,7 @@ describe('ReadDonations', () => {
             {
               donor: 1,
               amount: 164.87,
+              currency: 'USD',
               comment: 'Amazing Comment',
               pinned: false,
               pk: 123,
@@ -141,6 +142,7 @@ describe('ReadDonations', () => {
             {
               donor: 1,
               amount: 164.87,
+              currency: 'USD',
               comment: 'Amazing Comment',
               pinned: true,
               pk: 123,

From 25a86d65dbbdf134c4517c1145fb2f6045a5caa6 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Sun, 30 Jul 2023 21:04:43 +0200
Subject: [PATCH 07/40] Extract currency from donation for processing bundle

---
 bundles/processing/modules/donations/DonationRow.tsx | 12 ++++--------
 .../processing/modules/donations/ModCommentModal.tsx | 10 +++-------
 bundles/processing/modules/processing/ActionLog.tsx  |  6 +-----
 .../modules/reading/ReadingDonationRowPopout.tsx     |  5 +----
 4 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/bundles/processing/modules/donations/DonationRow.tsx b/bundles/processing/modules/donations/DonationRow.tsx
index c50fa5e45..c3db15542 100644
--- a/bundles/processing/modules/donations/DonationRow.tsx
+++ b/bundles/processing/modules/donations/DonationRow.tsx
@@ -1,15 +1,12 @@
 import * as React from 'react';
 import classNames from 'classnames';
 import { useDrag, useDrop } from 'react-dnd';
-import { useSelector } from 'react-redux';
 import { Clickable, Stack, Text } from '@spyrothon/sparx';
 
 import type { Donation, DonationBid } from '@public/apiv2/APITypes';
 import * as CurrencyUtils from '@public/util/currency';
 import DragHandle from '@uikit/icons/DragHandle';
 
-import * as EventDetailsStore from '@tracker/event_details/EventDetailsStore';
-
 import HighlightKeywords from './HighlightKeywords';
 
 import styles from './DonationRow.mod.css';
@@ -18,11 +15,11 @@ const UNKNOWN_DONOR_NAME = '(unknown)';
 
 interface BidsRowProps {
   bids: DonationBid[];
+  currency: string;
 }
 
 function BidsRow(props: BidsRowProps) {
-  const { bids } = props;
-  const currency = useSelector(EventDetailsStore.getEventCurrency);
+  const { bids, currency } = props;
   if (bids.length === 0) return null;
 
   const bidNames = bids.map(bid => `${bid.bid_name} (${CurrencyUtils.asCurrency(bid.amount, { currency })})`);
@@ -80,8 +77,7 @@ export default function DonationRow(props: DonationRowProps) {
     canDrop: checkDrop,
   } = props;
 
-  const currency = useSelector(EventDetailsStore.getEventCurrency);
-  const amount = CurrencyUtils.asCurrency(donation.amount, { currency });
+  const amount = CurrencyUtils.asCurrency(donation.amount, { currency: donation.currency });
   const donationTitle = (
     <Text variant="header-sm/normal">
       <strong>{amount}</strong>
@@ -139,7 +135,7 @@ export default function DonationRow(props: DonationRowProps) {
           </Stack>
           {renderActions(donation)}
         </Stack>
-        {showBids ? <BidsRow bids={donation.bids} /> : null}
+        {showBids ? <BidsRow bids={donation.bids} currency={donation.currency} /> : null}
       </div>
       {donationComment}
     </div>
diff --git a/bundles/processing/modules/donations/ModCommentModal.tsx b/bundles/processing/modules/donations/ModCommentModal.tsx
index 93287778c..978c12901 100644
--- a/bundles/processing/modules/donations/ModCommentModal.tsx
+++ b/bundles/processing/modules/donations/ModCommentModal.tsx
@@ -1,6 +1,5 @@
 import * as React from 'react';
 import { useMutation } from 'react-query';
-import { useSelector } from 'react-redux';
 import { Button, Card, FormControl, Header, Stack, Text, TextArea } from '@spyrothon/sparx';
 
 import APIClient from '@public/apiv2/APIClient';
@@ -8,16 +7,14 @@ import { Donation } from '@public/apiv2/APITypes';
 import * as CurrencyUtils from '@public/util/currency';
 import TimeUtils from '@public/util/TimeUtils';
 
-import * as EventDetailsStore from '@tracker/event_details/EventDetailsStore';
-
 import RelativeTime from '../time/RelativeTime';
 import { useDonation } from './DonationsStore';
 
 import styles from '../donation-groups/CreateEditDonationGroupModal.mod.css';
 
-function renderDonationHeader(donation: Donation, currency: string) {
+function renderDonationHeader(donation: Donation) {
   const timestamp = TimeUtils.parseTimestamp(donation.timereceived);
-  const amount = CurrencyUtils.asCurrency(donation.amount, { currency });
+  const amount = CurrencyUtils.asCurrency(donation.amount, { currency: donation.currency });
 
   return (
     <Stack spacing="space-sm">
@@ -47,7 +44,6 @@ interface ModCommentModalProps {
 export default function ModCommentModal(props: ModCommentModalProps) {
   const { donationId, onClose } = props;
 
-  const currency = useSelector(EventDetailsStore.getEventCurrency);
   const donation = useDonation(donationId);
   const [comment, setComment] = React.useState(donation.modcomment ?? '');
 
@@ -63,7 +59,7 @@ export default function ModCommentModal(props: ModCommentModalProps) {
     <Card floating className={styles.modal}>
       <Stack as="form" spacing="space-lg" action="" onSubmit={handleSave}>
         <Header tag="h1">Edit Mod Comment</Header>
-        <Card>{renderDonationHeader(donation, currency)}</Card>
+        <Card>{renderDonationHeader(donation)}</Card>
         <FormControl label="Mod Comment">
           <TextArea
             value={comment}
diff --git a/bundles/processing/modules/processing/ActionLog.tsx b/bundles/processing/modules/processing/ActionLog.tsx
index 21878ca88..7c443a3d4 100644
--- a/bundles/processing/modules/processing/ActionLog.tsx
+++ b/bundles/processing/modules/processing/ActionLog.tsx
@@ -1,6 +1,5 @@
 import * as React from 'react';
 import { useMutation } from 'react-query';
-import { useSelector } from 'react-redux';
 import { CSSTransition, TransitionGroup } from 'react-transition-group';
 import { Anchor, Button, Header, Text } from '@spyrothon/sparx';
 
@@ -9,8 +8,6 @@ import { Donation } from '@public/apiv2/APITypes';
 import * as CurrencyUtils from '@public/util/currency';
 import Undo from '@uikit/icons/Undo';
 
-import * as EventDetailsStore from '@tracker/event_details/EventDetailsStore';
-
 import { AdminRoutes, useAdminRoute } from '../../Routes';
 import { loadDonations, useDonation } from '../donations/DonationsStore';
 import useProcessingStore, { HistoryAction } from '../processing/ProcessingStore';
@@ -35,7 +32,6 @@ function getRelativeTime(timestamp: number, now: number = Date.now()) {
 function ActionEntry({ action }: { action: HistoryAction }) {
   const donationLink = useAdminRoute(AdminRoutes.DONATION(action.donationId));
   const donation = useDonation(action.donationId);
-  const currency = useSelector(EventDetailsStore.getEventCurrency);
 
   const store = useProcessingStore();
   const unprocess = useMutation(
@@ -50,7 +46,7 @@ function ActionEntry({ action }: { action: HistoryAction }) {
     },
   );
 
-  const amount = CurrencyUtils.asCurrency(donation.amount, { currency });
+  const amount = CurrencyUtils.asCurrency(donation.amount, { currency: donation.currency });
 
   return (
     <div className={styles.action} key={action.id}>
diff --git a/bundles/processing/modules/reading/ReadingDonationRowPopout.tsx b/bundles/processing/modules/reading/ReadingDonationRowPopout.tsx
index f678755e7..c8441bc31 100644
--- a/bundles/processing/modules/reading/ReadingDonationRowPopout.tsx
+++ b/bundles/processing/modules/reading/ReadingDonationRowPopout.tsx
@@ -1,6 +1,5 @@
 import * as React from 'react';
 import { useMutation } from 'react-query';
-import { useSelector } from 'react-redux';
 import { Anchor, Button, Card, Checkbox, Header, openModal, Spacer, Stack, Text } from '@spyrothon/sparx';
 
 import { usePermission } from '@public/api/helpers/auth';
@@ -9,7 +8,6 @@ import * as CurrencyUtils from '@public/util/currency';
 
 import ModCommentModal from '@processing/modules/donations/ModCommentModal';
 import { AdminRoutes, useAdminRoute } from '@processing/Routes';
-import * as EventDetailsStore from '@tracker/event_details/EventDetailsStore';
 
 import useDonationGroupsStore from '../donation-groups/DonationGroupsStore';
 import { loadDonations, useDonation } from '../donations/DonationsStore';
@@ -23,9 +21,8 @@ export default function ReadingDonationRowPopout(props: ReadingDonationRowPopout
   const { donationId, onClose } = props;
   const donation = useDonation(donationId);
   const { groups, addDonationToGroup, removeDonationFromGroup, removeDonationFromAllGroups } = useDonationGroupsStore();
-  const currency = useSelector(EventDetailsStore.getEventCurrency);
 
-  const amount = CurrencyUtils.asCurrency(donation.amount, { currency });
+  const amount = CurrencyUtils.asCurrency(donation.amount, { currency: donation.currency });
   const donationLink = useAdminRoute(AdminRoutes.DONATION(donation.id));
   const donorLink = useAdminRoute(AdminRoutes.DONOR(donation.donor));
   const canEditDonors = usePermission('tracker.change_donor');

From 52e0bdac978c8ef60f6103ab3630d2a5247f01df Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Mon, 14 Aug 2023 15:15:54 +0200
Subject: [PATCH 08/40] Fix the prize grid and prize page not showing the
 proper currency

---
 bundles/tracker/prizes/components/Prize.tsx     | 5 ++---
 bundles/tracker/prizes/components/PrizeCard.tsx | 5 ++---
 bundles/tracker/prizes/components/Prizes.tsx    | 9 +++++----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/bundles/tracker/prizes/components/Prize.tsx b/bundles/tracker/prizes/components/Prize.tsx
index 61d58bffe..8990dd2ff 100644
--- a/bundles/tracker/prizes/components/Prize.tsx
+++ b/bundles/tracker/prizes/components/Prize.tsx
@@ -12,7 +12,6 @@ import LoadingDots from '@uikit/LoadingDots';
 import Markdown from '@uikit/Markdown';
 import Text from '@uikit/Text';
 
-import * as EventDetailsStore from '@tracker/event_details/EventDetailsStore';
 import * as EventActions from '@tracker/events/EventActions';
 import * as EventStore from '@tracker/events/EventStore';
 import useDispatch from '@tracker/hooks/useDispatch';
@@ -92,12 +91,12 @@ const Prize = (props: PrizeProps) => {
   const setPrizeErrorTrue = useCallback(() => setPrizeError(true), []);
   const dispatch = useDispatch();
   const { currency, event, eventId, prize } = useSelector((state: StoreState) => {
-    const currency = EventDetailsStore.getEventCurrency(state);
     const prize = PrizeStore.getPrize(state, { prizeId });
     const event = prize != null ? EventStore.getEvent(state, { eventId: prize.eventId }) : undefined;
 
     return {
-      currency,
+      // Fall back to USD in case the event is undefined
+      currency: event?.paypalCurrency || 'USD',
       event,
       eventId: prize != null ? prize.eventId : undefined,
       prize,
diff --git a/bundles/tracker/prizes/components/PrizeCard.tsx b/bundles/tracker/prizes/components/PrizeCard.tsx
index cc365e822..1909108d6 100644
--- a/bundles/tracker/prizes/components/PrizeCard.tsx
+++ b/bundles/tracker/prizes/components/PrizeCard.tsx
@@ -9,7 +9,6 @@ import Clickable from '@uikit/Clickable';
 import Header from '@uikit/Header';
 import Text from '@uikit/Text';
 
-import * as EventDetailsStore from '@tracker/event_details/EventDetailsStore';
 import RouterUtils, { Routes } from '@tracker/router/RouterUtils';
 import { StoreState } from '@tracker/Store';
 
@@ -22,14 +21,14 @@ import styles from './PrizeCard.mod.css';
 type PrizeCardProps = {
   // TODO: should be a number
   prizeId: string;
+  currency: string;
   className?: string;
 };
 
 const PrizeCard = (props: PrizeCardProps) => {
-  const { prizeId, className } = props;
+  const { prizeId, className, currency } = props;
   const now = TimeUtils.getNowLocal();
 
-  const currency = useSelector(EventDetailsStore.getEventCurrency);
   const [prizeError, setPrizeError] = useState(false);
   const setPrizeErrorTrue = useCallback(() => setPrizeError(true), []);
 
diff --git a/bundles/tracker/prizes/components/Prizes.tsx b/bundles/tracker/prizes/components/Prizes.tsx
index fd9c4f575..13d3e19f8 100644
--- a/bundles/tracker/prizes/components/Prizes.tsx
+++ b/bundles/tracker/prizes/components/Prizes.tsx
@@ -30,10 +30,11 @@ const FEATURED_SECTION_LIMIT = 6;
 type PrizeGridProps = {
   prizes: Prize[];
   name: string;
+  currency: string;
 };
 
 const PrizeGrid = (props: PrizeGridProps) => {
-  const { prizes, name } = props;
+  const { prizes, name, currency } = props;
 
   return (
     <section className={styles.section}>
@@ -42,7 +43,7 @@ const PrizeGrid = (props: PrizeGridProps) => {
       </Header>
       <div className={styles.grid}>
         {prizes.map(prize => (
-          <PrizeCard key={prize.id} prizeId={prize.id} />
+          <PrizeCard key={prize.id} currency={currency} prizeId={prize.id} />
         ))}
       </div>
     </section>
@@ -105,11 +106,11 @@ const Prizes = (props: PrizesProps) => {
         <React.Fragment>
           {closingPrizes.length > 0 && (
             <React.Fragment>
-              <PrizeGrid prizes={closingPrizes} name="Closing Soon!" />
+              <PrizeGrid prizes={closingPrizes} currency={event.paypalCurrency} name="Closing Soon!" />
               <hr className={styles.divider} />
             </React.Fragment>
           )}
-          <PrizeGrid prizes={allPrizes} name="All Prizes" />
+          <PrizeGrid prizes={allPrizes} currency={event.paypalCurrency} name="All Prizes" />
         </React.Fragment>
       ) : (
         <div className={styles.loadingDots}>

From a41886046796ef11a81c972e75bad0bc28316937 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Mon, 14 Aug 2023 15:17:20 +0200
Subject: [PATCH 09/40] Overlooked tests

---
 bundles/tracker/prizes/components/PrizeCardSpec.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bundles/tracker/prizes/components/PrizeCardSpec.tsx b/bundles/tracker/prizes/components/PrizeCardSpec.tsx
index cd20ea3aa..7f770b326 100644
--- a/bundles/tracker/prizes/components/PrizeCardSpec.tsx
+++ b/bundles/tracker/prizes/components/PrizeCardSpec.tsx
@@ -23,6 +23,7 @@ describe('PrizeCard', () => {
   function render(props = {}) {
     const defaultProps = {
       prizeId: '123',
+      currency: 'USD',
     };
 
     return renderWithState(<PrizeCard {...defaultProps} {...props} />);

From a5309786763371f4ee0924b8ce0cc6f20898f847 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Mon, 14 Aug 2023 15:28:01 +0200
Subject: [PATCH 10/40] Merge migrations

---
 tracker/migrations/0033_merge_20230814_1327.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 tracker/migrations/0033_merge_20230814_1327.py

diff --git a/tracker/migrations/0033_merge_20230814_1327.py b/tracker/migrations/0033_merge_20230814_1327.py
new file mode 100644
index 000000000..f0cf4d5e4
--- /dev/null
+++ b/tracker/migrations/0033_merge_20230814_1327.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.2.20 on 2023-08-14 13:27
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tracker', '0031_add_euros_to_donation_and_event'),
+        ('tracker', '0032_add_more_indices'),
+    ]
+
+    operations = [
+    ]

From d89364318a276ee7d6777c3051705de6a4e29ab9 Mon Sep 17 00:00:00 2001
From: Benjamin Cutler <uraniumanchor@users.noreply.github.com>
Date: Tue, 13 Feb 2024 14:57:41 -0700
Subject: [PATCH 11/40] add `start` field to Milestone model (#647)

[#187041665]
---
 tests/test_api.py                             |  1 +
 tests/test_milestone.py                       | 23 ++++++++++++++++++-
 tests/test_settings.py                        |  1 +
 tracker/admin/donation.py                     |  2 +-
 .../migrations/0036_add_milestone_start.py    | 20 ++++++++++++++++
 tracker/models/donation.py                    | 10 ++++++++
 6 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 tracker/migrations/0036_add_milestone_start.py

diff --git a/tests/test_api.py b/tests/test_api.py
index b696765c0..7cdc71b89 100755
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -1362,6 +1362,7 @@ def format_milestone(cls, milestone, request):
         return dict(
             fields=dict(
                 event=milestone.event_id,
+                start=float(milestone.start),
                 amount=float(milestone.amount),
                 name=milestone.name,
                 description=milestone.description,
diff --git a/tests/test_milestone.py b/tests/test_milestone.py
index f0d5acd14..0f94e6daf 100644
--- a/tests/test_milestone.py
+++ b/tests/test_milestone.py
@@ -1,10 +1,31 @@
 import random
 
+from django.core.exceptions import ValidationError
 from django.test import TestCase
 from django.urls import reverse
 
+from tracker.models import Milestone
+
 from . import randgen
-from .util import today_noon
+from .util import APITestCase, today_noon
+
+
+class TestMilestone(APITestCase):
+    model_name = 'milestone'
+
+    def setUp(self):
+        super().setUp()
+        self.milestone = Milestone.objects.create(
+            event=self.event, name='Test Milestone', amount=1000
+        )
+
+    def test_validation(self):
+        with self.assertRaises(ValidationError):
+            self.milestone.start = 1000
+            self.milestone.clean()
+
+        self.milestone.start = 500
+        self.milestone.clean()
 
 
 class TestMilestoneViews(TestCase):
diff --git a/tests/test_settings.py b/tests/test_settings.py
index 2aa42a7a5..ccb5d1298 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -26,6 +26,7 @@
         'OPTIONS': {'timeout': 5},
     },
 }
+SILENCED_SYSTEM_CHECKS = ['models.W042']
 STATIC_URL = '/static/'
 STATIC_ROOT = os.path.join(os.path.dirname(__file__), 'static')
 MEDIA_ROOT = os.path.join(os.path.dirname(__file__), 'media')
diff --git a/tracker/admin/donation.py b/tracker/admin/donation.py
index 644365d4f..95c2f241a 100644
--- a/tracker/admin/donation.py
+++ b/tracker/admin/donation.py
@@ -349,4 +349,4 @@ class MilestoneAdmin(EventLockedMixin, CustomModelAdmin):
     form = MilestoneForm
     search_fields = ('event', 'name', 'description', 'short_description')
     list_filter = ('event',)
-    list_display = ('name', 'event', 'amount', 'visible')
+    list_display = ('name', 'event', 'start', 'amount', 'visible')
diff --git a/tracker/migrations/0036_add_milestone_start.py b/tracker/migrations/0036_add_milestone_start.py
new file mode 100644
index 000000000..22ad39558
--- /dev/null
+++ b/tracker/migrations/0036_add_milestone_start.py
@@ -0,0 +1,20 @@
+# Generated by Django 5.0 on 2024-02-13 21:23
+
+import tracker.validators
+from decimal import Decimal
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tracker', '0035_interview_changes'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='milestone',
+            name='start',
+            field=models.DecimalField(decimal_places=2, default=Decimal('0.00'), max_digits=20, validators=[tracker.validators.positive, tracker.validators.nonzero]),
+        ),
+    ]
diff --git a/tracker/models/donation.py b/tracker/models/donation.py
index 6486f2c37..b3e1dcacb 100644
--- a/tracker/models/donation.py
+++ b/tracker/models/donation.py
@@ -581,6 +581,12 @@ class Meta:
 
 class Milestone(models.Model):
     event = models.ForeignKey('tracker.Event', on_delete=models.CASCADE)
+    start = models.DecimalField(
+        decimal_places=2,
+        max_digits=20,
+        default=Decimal('0.00'),
+        validators=[positive, nonzero],
+    )
     amount = models.DecimalField(
         decimal_places=2,
         max_digits=20,
@@ -597,6 +603,10 @@ class Milestone(models.Model):
         help_text='Alternative description text to display in tight spaces',
     )
 
+    def clean(self):
+        if self.start >= self.amount:
+            raise ValidationError({'start': 'start must be less than amount'})
+
     def __str__(self):
         return f'{self.event.name} -- {self.name} -- {self.amount}'
 

From 60de322cb6c7d78ab820ffcff302d6dc6af5699c Mon Sep 17 00:00:00 2001
From: Benjamin Cutler <uraniumanchor@users.noreply.github.com>
Date: Tue, 13 Feb 2024 22:10:28 -0700
Subject: [PATCH 12/40] add video links (#648)

[#186804968]
---
 bundles/common/Permissions.ts              |  8 ++++++
 tests/apiv2/test_runs.py                   |  2 ++
 tests/apiv2/test_videolinks.py             | 28 ++++++++++++++++++
 tests/test_speedrun.py                     |  4 +++
 tracker/admin/__init__.py                  |  1 +
 tracker/admin/event.py                     |  8 ++++++
 tracker/admin/forms.py                     |  4 +++
 tracker/admin/inlines.py                   |  6 ++++
 tracker/api/serializers.py                 | 20 ++++++++++++-
 tracker/api/views/run.py                   |  2 +-
 tracker/migrations/0037_add_video_links.py | 33 ++++++++++++++++++++++
 tracker/models/__init__.py                 |  4 +++
 tracker/models/event.py                    | 22 +++++++++++++++
 13 files changed, 140 insertions(+), 2 deletions(-)
 create mode 100644 tests/apiv2/test_videolinks.py
 create mode 100644 tracker/migrations/0037_add_video_links.py

diff --git a/bundles/common/Permissions.ts b/bundles/common/Permissions.ts
index 68098b992..f055ad705 100644
--- a/bundles/common/Permissions.ts
+++ b/bundles/common/Permissions.ts
@@ -27,6 +27,8 @@ export type Permission =
   | 'tracker.add_speedrun'
   | 'tracker.add_submission'
   | 'tracker.add_userprofile'
+  | 'tracker.add_videolink'
+  | 'tracker.add_videolinktype'
   | 'tracker.add_wordfilter'
   | 'tracker.can_change_log'
   | 'tracker.can_edit_locked_events'
@@ -59,6 +61,8 @@ export type Permission =
   | 'tracker.change_speedrun'
   | 'tracker.change_submission'
   | 'tracker.change_userprofile'
+  | 'tracker.change_videolink'
+  | 'tracker.change_videolinktype'
   | 'tracker.change_wordfilter'
   | 'tracker.delete_ad'
   | 'tracker.delete_all_bids'
@@ -89,6 +93,8 @@ export type Permission =
   | 'tracker.delete_speedrun'
   | 'tracker.delete_submission'
   | 'tracker.delete_userprofile'
+  | 'tracker.delete_videolink'
+  | 'tracker.delete_videolinktype'
   | 'tracker.delete_wordfilter'
   | 'tracker.edit_prize_key_keys'
   | 'tracker.remove_prize_key_winners'
@@ -130,4 +136,6 @@ export type Permission =
   | 'tracker.view_test'
   | 'tracker.view_usernames'
   | 'tracker.view_userprofile'
+  | 'tracker.view_videolink'
+  | 'tracker.view_videolinktype'
   | 'tracker.view_wordfilter';
diff --git a/tests/apiv2/test_runs.py b/tests/apiv2/test_runs.py
index d0d1184c3..0d5d5ce60 100644
--- a/tests/apiv2/test_runs.py
+++ b/tests/apiv2/test_runs.py
@@ -4,6 +4,7 @@
     HeadsetSerializer,
     RunnerSerializer,
     SpeedRunSerializer,
+    VideoLinkSerializer,
 )
 
 from ..test_speedrun import TestSpeedRunBase
@@ -89,6 +90,7 @@ def _format_run(self, run, *, with_event=True, with_tech_notes=False):
             'starttime': run.starttime,
             'anchor_time': run.anchor_time,
             'setup_time': run.setup_time,
+            'video_links': VideoLinkSerializer(run.video_links, many=True).data,
         }
         if with_event:
             data['event'] = EventSerializer(run.event).data
diff --git a/tests/apiv2/test_videolinks.py b/tests/apiv2/test_videolinks.py
new file mode 100644
index 000000000..ed91d6491
--- /dev/null
+++ b/tests/apiv2/test_videolinks.py
@@ -0,0 +1,28 @@
+from tests import randgen
+from tests.util import APITestCase
+from tracker import models
+from tracker.api.serializers import VideoLinkSerializer
+
+
+class TestVideoLinkSerializer(APITestCase):
+    def setUp(self):
+        super().setUp()
+        self.event = randgen.generate_event(self.rand)
+        self.event.save()
+        self.run = randgen.generate_run(self.rand, event=self.event)
+        self.run.save()
+        self.link_type = models.VideoLinkType.objects.create(name='youtube')
+        self.link1 = models.VideoLink.objects.create(
+            run=self.run, link_type=self.link_type, url='http://example.com/youtube'
+        )
+
+    def test_serializer(self):
+        data = VideoLinkSerializer(self.link1).data
+        self.assertEqual(
+            data,
+            {
+                'id': self.link1.id,
+                'link_type': self.link_type.name,
+                'url': self.link1.url,
+            },
+        )
diff --git a/tests/test_speedrun.py b/tests/test_speedrun.py
index c19e8017e..3d1f6d0c8 100755
--- a/tests/test_speedrun.py
+++ b/tests/test_speedrun.py
@@ -37,6 +37,10 @@ def setUp(self):
         self.run5 = models.SpeedRun.objects.create(name='Test Run 5', order=4)
         self.runner1 = models.Runner.objects.create(name='trihex')
         self.runner2 = models.Runner.objects.create(name='neskamikaze')
+        link_type = models.VideoLinkType.objects.create(name='youtube')
+        self.video_link1 = models.VideoLink.objects.create(
+            run=self.run2, link_type=link_type, url='https://youtu.be/deadbeef'
+        )
 
 
 class TestSpeedRun(TestSpeedRunBase):
diff --git a/tracker/admin/__init__.py b/tracker/admin/__init__.py
index ce5b1f2e4..a22d72bc7 100644
--- a/tracker/admin/__init__.py
+++ b/tracker/admin/__init__.py
@@ -12,5 +12,6 @@
 admin.site.register(models.Submission)
 admin.site.register(models.UserProfile)
 admin.site.register(models.PrizeCategory)
+admin.site.register(models.VideoLinkType)
 admin.site.index_template = 'admin/tracker/menu.html'
 admin.site.site_header = 'Donation Tracker'
diff --git a/tracker/admin/event.py b/tracker/admin/event.py
index ae6fa6d82..fd1a34016 100644
--- a/tracker/admin/event.py
+++ b/tracker/admin/event.py
@@ -20,6 +20,7 @@
 from tracker import forms, models, search_filters, settings
 
 from ..auth import send_registration_mail
+from . import inlines
 from .filters import RunListFilter
 from .forms import (
     EventForm,
@@ -29,6 +30,7 @@
     SpeedRunAdminForm,
     StartRunForm,
     TestEmailForm,
+    VideoLinkAdminForm,
 )
 from .util import CustomModelAdmin, EventLockedMixin
 
@@ -776,6 +778,7 @@ class SpeedRunAdmin(EventLockedMixin, CustomModelAdmin):
     ]
     readonly_fields = ('deprecated_runners', 'starttime', 'bids')
     actions = ['start_run']
+    inlines = (inlines.VideoLinkInline,)
 
     @admin.display(description='Runners')
     def runners_(self, instance):
@@ -896,3 +899,8 @@ class HeadsetAdmin(CustomModelAdmin):
     form = HeadsetAdminForm
     search_fields = ('name',)
     list_display = ('name', 'pronouns')
+
+
+@admin.register(models.VideoLink)
+class VideoLinkAdmin(CustomModelAdmin):
+    form = VideoLinkAdminForm
diff --git a/tracker/admin/forms.py b/tracker/admin/forms.py
index 98c16ee80..44231dc08 100644
--- a/tracker/admin/forms.py
+++ b/tracker/admin/forms.py
@@ -226,3 +226,7 @@ def clean_keys(self):
         if models.PrizeKey.objects.filter(key__in=keys).exists():
             raise ValidationError('At least one key already exists.')
         return keys
+
+
+class VideoLinkAdminForm(djforms.ModelForm):
+    run = make_ajax_field(models.VideoLink, 'run', 'run')
diff --git a/tracker/admin/inlines.py b/tracker/admin/inlines.py
index 028b80150..180cacb10 100644
--- a/tracker/admin/inlines.py
+++ b/tracker/admin/inlines.py
@@ -146,3 +146,9 @@ class PrizeInline(CustomStackedInline):
         'edit_link',
     ]
     readonly_fields = ('edit_link',)
+
+
+class VideoLinkInline(CustomStackedInline):
+    model = models.VideoLink
+    readonly_fields = ('edit_link',)
+    extra = 1
diff --git a/tracker/api/serializers.py b/tracker/api/serializers.py
index 72cf679f7..0635e33fa 100644
--- a/tracker/api/serializers.py
+++ b/tracker/api/serializers.py
@@ -12,7 +12,7 @@
 from tracker.models import Interview
 from tracker.models.bid import Bid, DonationBid
 from tracker.models.donation import Donation, Donor
-from tracker.models.event import Event, Headset, Runner, SpeedRun
+from tracker.models.event import Event, Headset, Runner, SpeedRun, VideoLink
 
 log = logging.getLogger(__name__)
 
@@ -346,6 +346,22 @@ class Meta:
         )
 
 
+class VideoLinkSerializer(TrackerModelSerializer):
+    class LinkTypeSerializer(TrackerModelSerializer):
+        def to_representation(self, instance):
+            return instance.name
+
+    link_type = LinkTypeSerializer()
+
+    class Meta:
+        model = VideoLink
+        fields = (
+            'id',
+            'link_type',
+            'url',
+        )
+
+
 class SpeedRunSerializer(
     WithPermissionsSerializerMixin, EventNestedSerializerMixin, TrackerModelSerializer
 ):
@@ -354,6 +370,7 @@ class SpeedRunSerializer(
     runners = RunnerSerializer(many=True)
     hosts = HeadsetSerializer(many=True)
     commentators = HeadsetSerializer(many=True)
+    video_links = VideoLinkSerializer(many=True)
 
     class Meta:
         model = SpeedRun
@@ -376,6 +393,7 @@ class Meta:
             'setup_time',
             'anchor_time',
             'tech_notes',
+            'video_links',
         )
 
     def __init__(self, *args, with_tech_notes=False, **kwargs):
diff --git a/tracker/api/views/run.py b/tracker/api/views/run.py
index 774022451..be9d8fcc2 100644
--- a/tracker/api/views/run.py
+++ b/tracker/api/views/run.py
@@ -17,7 +17,7 @@ class SpeedRunViewSet(
     TrackerReadViewSet,
 ):
     queryset = SpeedRun.objects.select_related('event').prefetch_related(
-        'runners', 'hosts', 'commentators'
+        'runners', 'hosts', 'commentators', 'video_links__link_type'
     )
     serializer_class = SpeedRunSerializer
     pagination_class = TrackerPagination
diff --git a/tracker/migrations/0037_add_video_links.py b/tracker/migrations/0037_add_video_links.py
new file mode 100644
index 000000000..7e4eb9b02
--- /dev/null
+++ b/tracker/migrations/0037_add_video_links.py
@@ -0,0 +1,33 @@
+# Generated by Django 4.2 on 2024-01-10 17:37
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tracker', '0036_add_milestone_start'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='VideoLinkType',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=32, unique=True)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='VideoLink',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('url', models.URLField()),
+                ('link_type', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='tracker.videolinktype')),
+                ('run', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='video_links', to='tracker.speedrun')),
+            ],
+            options={
+                'unique_together': {('run', 'link_type')},
+            },
+        ),
+    ]
diff --git a/tracker/models/__init__.py b/tracker/models/__init__.py
index 0e7c52dd9..a4fc0ffbc 100644
--- a/tracker/models/__init__.py
+++ b/tracker/models/__init__.py
@@ -8,6 +8,8 @@
     Runner,
     SpeedRun,
     Submission,
+    VideoLink,
+    VideoLinkType,
 )
 from tracker.models.interstitial import Ad, Interstitial, Interview
 from tracker.models.log import Log
@@ -40,6 +42,8 @@
     'Runner',
     'Headset',
     'Submission',
+    'VideoLinkType',
+    'VideoLink',
     'Country',
     'CountryRegion',
     'WordFilter',
diff --git a/tracker/models/event.py b/tracker/models/event.py
index 13800e645..e772e19b8 100644
--- a/tracker/models/event.py
+++ b/tracker/models/event.py
@@ -872,3 +872,25 @@ def validate_unique(self, exclude=None):
 
     def natural_key(self):
         return (self.name,)
+
+
+class VideoLinkType(models.Model):
+    name = models.CharField(max_length=32, unique=True)
+
+    def __str__(self):
+        return self.name
+
+
+class VideoLink(models.Model):
+    run = models.ForeignKey(
+        SpeedRun, on_delete=models.PROTECT, related_name='video_links'
+    )
+    link_type = models.ForeignKey(VideoLinkType, on_delete=models.PROTECT)
+    url = models.URLField()
+    # public = models.BooleanField(default=True) # TODO: add this once I figure out how to filter nested serializers
+
+    def __str__(self):
+        return f'{self.run} -- {self.link_type} -- {self.url}'
+
+    class Meta:
+        unique_together = ('run', 'link_type')

From 51473b8a218aaba543ab35ba6dcf2024e0725f57 Mon Sep 17 00:00:00 2001
From: Benjamin Cutler <uraniumanchor@users.noreply.github.com>
Date: Tue, 13 Feb 2024 23:04:23 -0700
Subject: [PATCH 13/40] always sort donations on read page (#649)

[#186840841]
---
 .../modules/donations/DonationsStore.tsx         | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/bundles/processing/modules/donations/DonationsStore.tsx b/bundles/processing/modules/donations/DonationsStore.tsx
index e254cf6ae..6a185bb83 100644
--- a/bundles/processing/modules/donations/DonationsStore.tsx
+++ b/bundles/processing/modules/donations/DonationsStore.tsx
@@ -134,6 +134,10 @@ export function useDonations(donationIds: DonationId[] | Set<DonationId>) {
   return React.useMemo(() => Array.from(donationIds).map(id => donations[id]), [donations, donationIds]);
 }
 
+function sortDonations(donations: Donation[]) {
+  return [...donations].sort((a, b) => a.timereceived.localeCompare(b.timereceived));
+}
+
 // NOTE(faulty): This is a little bit gross, but the two use cases of filtering
 // donations are either literal filtering with a predicate (filter tabs on the
 // reading page), or filtering to a known set of ids (group tabs on the reading
@@ -146,11 +150,13 @@ export function useFilteredDonations(
   const [donations, groupIds] = useDonationsStore(state => [state.donations, state[donationState]]);
   return React.useMemo(() => {
     if (typeof predicateOrIds === 'function') {
-      return Array.from(groupIds)
-        .map(id => donations[id])
-        .filter(predicateOrIds);
+      return sortDonations(
+        Array.from(groupIds)
+          .map(id => donations[id])
+          .filter(predicateOrIds),
+      );
     } else {
-      return predicateOrIds.filter(id => groupIds.has(id)).map(id => donations[id]);
+      return sortDonations(predicateOrIds.filter(id => groupIds.has(id)).map(id => donations[id]));
     }
   }, [donations, groupIds, predicateOrIds]);
 }
@@ -162,7 +168,7 @@ function getAndSortDonations(donations: Record<string, Donation>, ids: Set<Donat
     result = result.filter(filter);
   }
 
-  return result.sort((a, b) => a.timereceived.localeCompare(b.timereceived));
+  return sortDonations(result);
 }
 
 export function useDonationsInState(donationState: DonationState, filter?: DonationPredicate) {

From ce9b6904ac9a465febdc2f69ede21de201e97335 Mon Sep 17 00:00:00 2001
From: Jon <jonegeland@gmail.com>
Date: Sat, 17 Feb 2024 15:53:14 -0800
Subject: [PATCH 14/40] [apiv2] Add more fields to runs to match v1 details
 (#651)

---
 tests/apiv2/test_runs.py   | 4 ++++
 tracker/api/serializers.py | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/tests/apiv2/test_runs.py b/tests/apiv2/test_runs.py
index 0d5d5ce60..9b249e367 100644
--- a/tests/apiv2/test_runs.py
+++ b/tests/apiv2/test_runs.py
@@ -78,15 +78,19 @@ def _format_run(self, run, *, with_event=True, with_tech_notes=False):
             'id': run.id,
             'name': run.name,
             'display_name': run.display_name,
+            'twitch_name': run.twitch_name,
             'commentators': HeadsetSerializer(run.commentators, many=True).data,
             'run_time': run.run_time,
             'order': run.order,
             'hosts': HeadsetSerializer(run.hosts, many=True).data,
             'endtime': run.endtime,
             'category': run.category,
+            'coop': run.coop,
+            'onsite': run.onsite,
             'runners': RunnerSerializer(run.runners, many=True).data,
             'description': run.description,
             'console': run.console,
+            'release_year': run.release_year,
             'starttime': run.starttime,
             'anchor_time': run.anchor_time,
             'setup_time': run.setup_time,
diff --git a/tracker/api/serializers.py b/tracker/api/serializers.py
index 0635e33fa..32279a2a9 100644
--- a/tracker/api/serializers.py
+++ b/tracker/api/serializers.py
@@ -380,9 +380,13 @@ class Meta:
             'event',
             'name',
             'display_name',
+            'twitch_name',
             'description',
             'category',
+            'coop',
+            'onsite',
             'console',
+            'release_year',
             'runners',
             'hosts',
             'commentators',

From 9e2bda05b0e2ab98d4a1ad061b0aea29f9758cf2 Mon Sep 17 00:00:00 2001
From: Benjamin Cutler <uraniumanchor@users.noreply.github.com>
Date: Wed, 21 Feb 2024 14:10:04 -0700
Subject: [PATCH 15/40] fix Milestone start validation (#654)

[#187091880]
---
 tests/test_milestone.py                       |  7 +++++++
 .../migrations/0038_milestone_start_zero.py   | 20 +++++++++++++++++++
 tracker/models/donation.py                    |  2 +-
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 tracker/migrations/0038_milestone_start_zero.py

diff --git a/tests/test_milestone.py b/tests/test_milestone.py
index 0f94e6daf..91cfc9fa9 100644
--- a/tests/test_milestone.py
+++ b/tests/test_milestone.py
@@ -27,6 +27,13 @@ def test_validation(self):
         self.milestone.start = 500
         self.milestone.clean()
 
+        self.milestone.start = 0
+        self.milestone.clean()
+
+        with self.assertRaises(ValidationError):
+            self.milestone.start = -1
+            self.milestone.full_clean()
+
 
 class TestMilestoneViews(TestCase):
     def setUp(self):
diff --git a/tracker/migrations/0038_milestone_start_zero.py b/tracker/migrations/0038_milestone_start_zero.py
new file mode 100644
index 000000000..1cb71139d
--- /dev/null
+++ b/tracker/migrations/0038_milestone_start_zero.py
@@ -0,0 +1,20 @@
+# Generated by Django 5.0 on 2024-02-21 20:49
+
+import tracker.validators
+from decimal import Decimal
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tracker', '0037_add_video_links'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='milestone',
+            name='start',
+            field=models.DecimalField(decimal_places=2, default=Decimal('0.00'), max_digits=20, validators=[tracker.validators.positive]),
+        ),
+    ]
diff --git a/tracker/models/donation.py b/tracker/models/donation.py
index b3e1dcacb..6966a4211 100644
--- a/tracker/models/donation.py
+++ b/tracker/models/donation.py
@@ -585,7 +585,7 @@ class Milestone(models.Model):
         decimal_places=2,
         max_digits=20,
         default=Decimal('0.00'),
-        validators=[positive, nonzero],
+        validators=[positive],
     )
     amount = models.DecimalField(
         decimal_places=2,

From 44c46fafd133a7ad6407b62fc2e69e3d2d88d2f4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Feb 2024 14:19:38 -0700
Subject: [PATCH 16/40] Bump selenium from 4.16.0 to 4.18.1 (#653)

Bumps [selenium](https://github.com/SeleniumHQ/Selenium) from 4.16.0 to 4.18.1.
- [Release notes](https://github.com/SeleniumHQ/Selenium/releases)
- [Commits](https://github.com/SeleniumHQ/Selenium/compare/selenium-4.16.0...selenium-4.18.1)

---
updated-dependencies:
- dependency-name: selenium
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 tests/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index 885d702d5..0df989ee8 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -17,6 +17,6 @@ webpack-manifest==2.1.1
 # only for testing
 lxml==4.9.4 ; python_version<"3.10" # azure issue?
 responses~=0.24.1
-selenium==4.16.0
+selenium==4.18.1
 tblib==3.0.0
 unittest-xml-reporting==3.2.0

From 227aadfb7fb2a096744441bed53c367108706a3b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Feb 2024 21:43:21 +0000
Subject: [PATCH 17/40] Update responses requirement from ~=0.24.1 to ~=0.25.0
 (#650)

Updates the requirements on [responses](https://github.com/getsentry/responses) to permit the latest version.
- [Release notes](https://github.com/getsentry/responses/releases)
- [Changelog](https://github.com/getsentry/responses/blob/master/CHANGES)
- [Commits](https://github.com/getsentry/responses/compare/0.24.1...0.25.0)

---
updated-dependencies:
- dependency-name: responses
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 tests/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index 0df989ee8..7b93cc28c 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -16,7 +16,7 @@ python-dateutil==2.8.2 ; python_version<"3.11"
 webpack-manifest==2.1.1
 # only for testing
 lxml==4.9.4 ; python_version<"3.10" # azure issue?
-responses~=0.24.1
+responses~=0.25.0
 selenium==4.18.1
 tblib==3.0.0
 unittest-xml-reporting==3.2.0

From 825a81e326fbb56856a8e2a4e3f1d0e83c9b6443 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Feb 2024 15:03:04 -0700
Subject: [PATCH 18/40] Bump pre-commit from 3.5.0 to 3.6.2 (#652)

* Bump pre-commit from 3.5.0 to 3.6.2

Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 3.5.0 to 3.6.2.
- [Release notes](https://github.com/pre-commit/pre-commit/releases)
- [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md)
- [Commits](https://github.com/pre-commit/pre-commit/compare/v3.5.0...v3.6.2)

---
updated-dependencies:
- dependency-name: pre-commit
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Lock pre-commit for Python 3.8

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Benjamin Cutler <uraniumanchor@users.noreply.github.com>
---
 tests/requirements.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index 7b93cc28c..6d919d989 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -9,7 +9,8 @@ django-mptt==0.14.0
 django-post-office==3.6.0
 django-timezone-field==6.1.0
 djangorestframework==3.14.0
-pre-commit==3.5.0
+pre-commit==3.5.0 ; python_version<"3.9"
+pre-commit==3.6.2 ; python_version>="3.9"
 python-dateutil==2.8.2
 backports.zoneinfo==0.2.1 ; python_version<"3.9"
 python-dateutil==2.8.2 ; python_version<"3.11"

From b89ba9f709462643ad96fd5d973cdc117b0315fe Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Tue, 12 Mar 2024 07:48:15 +0100
Subject: [PATCH 19/40] Lint

---
 .../modules/event/EventTotalDisplay.tsx           | 15 ++++++++-------
 bundles/public/apiv2/APITypes.tsx                 |  1 +
 bundles/public/util/currency.ts                   |  7 ++++++-
 tracker/api/serializers.py                        |  1 +
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/bundles/processing/modules/event/EventTotalDisplay.tsx b/bundles/processing/modules/event/EventTotalDisplay.tsx
index 7e93ef6a6..89172dd91 100644
--- a/bundles/processing/modules/event/EventTotalDisplay.tsx
+++ b/bundles/processing/modules/event/EventTotalDisplay.tsx
@@ -3,15 +3,10 @@ import { useQuery } from 'react-query';
 import { Header, Stack, Text } from '@spyrothon/sparx';
 
 import APIClient from '@public/apiv2/APIClient';
+import * as CurrencyUtils from '@public/util/currency';
 
 import useEventTotalStore, { setEventTotalIfNewer } from './EventTotalStore';
 
-const currencyFormat = Intl.NumberFormat('en-US', {
-  style: 'currency',
-  currency: 'USD',
-  minimumIntegerDigits: 1,
-  minimumFractionDigits: 2,
-});
 const numberFormat = Intl.NumberFormat('en-US', { maximumFractionDigits: 0 });
 
 interface EventTotalDisplayProps {
@@ -50,7 +45,13 @@ export default function EventTotalDisplay(props: EventTotalDisplayProps) {
         <Header tag="h2" variant="text-sm/secondary">
           Total Raised
         </Header>
-        <Text variant="header-md/normal">{isLoading ? '--' : currencyFormat.format(total)}</Text>
+        <Text variant="header-md/normal">
+          {isLoading
+            ? '--'
+            : CurrencyUtils.asCurrency(total, {
+                currency: event?.paypalcurrency ?? 'USD',
+              })}
+        </Text>
       </div>
     </Stack>
   );
diff --git a/bundles/public/apiv2/APITypes.tsx b/bundles/public/apiv2/APITypes.tsx
index 8fb131ec0..9913b881f 100644
--- a/bundles/public/apiv2/APITypes.tsx
+++ b/bundles/public/apiv2/APITypes.tsx
@@ -35,6 +35,7 @@ export type Event = {
   hashtag: string;
   date: string;
   timezone: string;
+  paypalcurrency: string;
   use_one_step_screening: boolean;
   amount?: number;
   donation_count?: number;
diff --git a/bundles/public/util/currency.ts b/bundles/public/util/currency.ts
index 33486d135..379fd7e99 100644
--- a/bundles/public/util/currency.ts
+++ b/bundles/public/util/currency.ts
@@ -5,7 +5,12 @@ interface CurrencyOptions extends Omit<Intl.NumberFormatOptions, 'style'> {
 
 export function asCurrency(amount: string | number, options: CurrencyOptions) {
   // `en-US` is hardcoded here because we don't actually localize the frontend currently.
-  const formatter = new Intl.NumberFormat('en-US', { style: 'currency', ...options });
+  const formatter = new Intl.NumberFormat('en-US', {
+    style: 'currency',
+    minimumIntegerDigits: 1,
+    minimumFractionDigits: 2,
+    ...options,
+  });
 
   return formatter.format(Number(amount));
 }
diff --git a/tracker/api/serializers.py b/tracker/api/serializers.py
index 32279a2a9..3c3a02ed6 100644
--- a/tracker/api/serializers.py
+++ b/tracker/api/serializers.py
@@ -284,6 +284,7 @@ class Meta:
             'name',
             'amount',
             'donation_count',
+            'paypalcurrency',
             'hashtag',
             'datetime',
             'timezone',

From 71ee57f10e5122eaef74e7149f7736cd74308af4 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Sat, 13 Apr 2024 08:42:35 +0200
Subject: [PATCH 20/40] Merge migrations

---
 tracker/migrations/0039_merge_20240413_0642.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 tracker/migrations/0039_merge_20240413_0642.py

diff --git a/tracker/migrations/0039_merge_20240413_0642.py b/tracker/migrations/0039_merge_20240413_0642.py
new file mode 100644
index 000000000..42824dfda
--- /dev/null
+++ b/tracker/migrations/0039_merge_20240413_0642.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.2.20 on 2024-04-13 06:42
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tracker', '0033_merge_20230814_1327'),
+        ('tracker', '0038_milestone_start_zero'),
+    ]
+
+    operations = [
+    ]

From 590411c9a978727e04b5091c23f0ff8b6064f545 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Sun, 14 Apr 2024 18:15:59 +0200
Subject: [PATCH 21/40] Set min frac digits to 0 when max is also 0

---
 bundles/public/util/currency.ts | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/bundles/public/util/currency.ts b/bundles/public/util/currency.ts
index 379fd7e99..fcb9fdb6f 100644
--- a/bundles/public/util/currency.ts
+++ b/bundles/public/util/currency.ts
@@ -4,13 +4,20 @@ interface CurrencyOptions extends Omit<Intl.NumberFormatOptions, 'style'> {
 }
 
 export function asCurrency(amount: string | number, options: CurrencyOptions) {
-  // `en-US` is hardcoded here because we don't actually localize the frontend currently.
-  const formatter = new Intl.NumberFormat('en-US', {
+  const formatOptions = {
     style: 'currency',
     minimumIntegerDigits: 1,
     minimumFractionDigits: 2,
     ...options,
-  });
+  };
+
+  // We need to set minimumFractionDigits to 0 when the max is 0
+  if (formatOptions.maximumFractionDigits === 0) {
+    formatOptions.minimumFractionDigits = 0;
+  }
+
+  // `en-US` is hardcoded here because we don't actually localize the frontend currently.
+  const formatter = new Intl.NumberFormat('en-US', formatOptions);
 
   return formatter.format(Number(amount));
 }

From 34e8489aec8b9a179cc7d41615961803e0a6df2c Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Thu, 29 Aug 2024 15:26:56 +0200
Subject: [PATCH 22/40] Update from master

---
 tracker/migrations/0041_merge_20240829_1326.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 tracker/migrations/0041_merge_20240829_1326.py

diff --git a/tracker/migrations/0041_merge_20240829_1326.py b/tracker/migrations/0041_merge_20240829_1326.py
new file mode 100644
index 000000000..b293ae775
--- /dev/null
+++ b/tracker/migrations/0041_merge_20240829_1326.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.2.20 on 2024-08-29 13:26
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tracker', '0040_add_interstitial_anchor'),
+        ('tracker', '0040_merge_20240729_1306'),
+    ]
+
+    operations = [
+    ]

From 468cc1bf49bf00694f32ad03bf4720eaf8c3724f Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Mon, 14 Oct 2024 11:01:18 +0200
Subject: [PATCH 23/40] Merge database migrations

---
 tracker/migrations/0048_merge_20241014_0900.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 tracker/migrations/0048_merge_20241014_0900.py

diff --git a/tracker/migrations/0048_merge_20241014_0900.py b/tracker/migrations/0048_merge_20241014_0900.py
new file mode 100644
index 000000000..f5bea25be
--- /dev/null
+++ b/tracker/migrations/0048_merge_20241014_0900.py
@@ -0,0 +1,14 @@
+# Generated by Django 5.1.2 on 2024-10-14 09:00
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tracker', '0041_merge_20240829_1326'),
+        ('tracker', '0047_merge_talent_contenttypes'),
+    ]
+
+    operations = [
+    ]

From 587e6554d6e11b1f08ac3aac36a3481ea0176e82 Mon Sep 17 00:00:00 2001
From: Benjamin Cutler <uraniumanchor@users.noreply.github.com>
Date: Fri, 1 Nov 2024 13:01:26 -0600
Subject: [PATCH 24/40] update react-router to 6.4 (#730)

[#188449418]
---
 bundles/admin/app.js                          | 148 ++++---
 .../donationProcessing/processPendingBids.tsx |   2 +-
 .../processPendingBidsSpec.tsx                |  10 +-
 bundles/admin/index.js                        |  11 +-
 bundles/admin/interstitials/Editor/index.tsx  |  14 +-
 bundles/admin/scheduleEditor/index.js         |  16 +-
 bundles/admin/scheduleEditor/indexSpec.tsx    |   8 +-
 bundles/processing/App.tsx                    |  10 +-
 bundles/processing/pages/ProcessDonations.tsx |   4 +-
 bundles/processing/pages/ReadDonations.tsx    |   4 +-
 bundles/public/api/index.js                   |  13 +-
 bundles/public/api/reducers/index.js          |   4 +-
 bundles/tracker/App.tsx                       |  44 +-
 .../donation/__tests__/Donate.spec.tsx        |   8 +-
 .../tracker/donation/components/Donate.tsx    |   4 +-
 .../tracker/events/components/EventRouter.tsx |  41 --
 bundles/tracker/index.tsx                     |   1 -
 bundles/tracker/prizes/components/Prize.tsx   |  13 +-
 .../tracker/prizes/components/PrizeCard.tsx   |   7 +-
 .../prizes/components/PrizeCardSpec.tsx       |   7 +-
 .../tracker/prizes/components/PrizeSpec.tsx   |   7 +-
 bundles/tracker/router/RouterUtils.ts         |  55 +--
 package.json                                  |   9 +-
 tracker/ui/urls.py                            |   4 +-
 webpack.config.js                             |   3 +-
 yarn.lock                                     | 383 ++----------------
 26 files changed, 264 insertions(+), 566 deletions(-)
 delete mode 100644 bundles/tracker/events/components/EventRouter.tsx

diff --git a/bundles/admin/app.js b/bundles/admin/app.js
index 9d7dc97c2..757a4f2c0 100644
--- a/bundles/admin/app.js
+++ b/bundles/admin/app.js
@@ -1,13 +1,12 @@
 import React from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { Route, Switch, useRouteMatch } from 'react-router';
-import { Link } from 'react-router-dom';
-import loadable from '@loadable/component';
+import { Outlet, Route, Routes } from 'react-router';
+import { BrowserRouter, Link } from 'react-router-dom';
 
 import { useConstants } from '@common/Constants';
 import Loading from '@common/Loading';
 import { actions } from '@public/api';
-import { usePermission, usePermissions } from '@public/api/helpers/auth';
+import { usePermissions } from '@public/api/helpers/auth';
 import V2HTTPUtils from '@public/apiv2/HTTPUtils';
 import Dropdown from '@public/dropdown';
 import Spinner from '@public/spinner';
@@ -17,20 +16,15 @@ import { setAPIRoot } from '@tracker/Endpoints';
 import NotFound from '../public/notFound';
 import ScheduleEditor from './scheduleEditor';
 
-const Interstitials = loadable(() => import('./interstitials' /* webpackChunkName: 'interstitials' */), {
-  loading: Loading,
-});
+const Interstitials = React.lazy(() => import('./interstitials' /* webpackChunkName: 'interstitials' */));
 
-const ProcessPendingBids = loadable(
-  () => import('./donationProcessing/processPendingBids' /* webpackChunkName: 'donationProcessing' */),
-  {
-    loading: Loading,
-  },
+const ProcessPendingBids = React.lazy(() =>
+  import('./donationProcessing/processPendingBids' /* webpackChunkName: 'donationProcessing' */),
 );
 
 const EventMenuComponents = {};
 
-function EventMenu(name, path) {
+function EventMenu(name) {
   return (
     EventMenuComponents[name] ||
     (EventMenuComponents[name] = function EventMenuInner() {
@@ -38,8 +32,6 @@ function EventMenu(name, path) {
         events: state.models.event,
         status: state.status,
       }));
-      const url = useRouteMatch().url;
-      path = path || url;
       const sortedEvents = React.useMemo(
         () => [...(events || [])].sort((a, b) => b.datetime.localeCompare(a.datetime)),
         [events],
@@ -52,7 +44,7 @@ function EventMenu(name, path) {
             {sortedEvents &&
               sortedEvents.map(e => (
                 <li key={e.pk}>
-                  <Link to={`${path}/${e.pk}`}>{e.short}</Link>
+                  <Link to={`${e.pk}`}>{e.short}</Link>
                   {(!e.allow_donations || e.locked) && '🔒'}
                 </li>
               ))}
@@ -64,8 +56,6 @@ function EventMenu(name, path) {
 }
 
 function DropdownMenu({ name, path }) {
-  const match = useRouteMatch();
-
   const events = useSelector(state => state.models.event);
   const sortedEvents = React.useMemo(
     () => [...(events || [])].sort((a, b) => b.datetime.localeCompare(a.datetime)),
@@ -87,7 +77,7 @@ function DropdownMenu({ name, path }) {
           {sortedEvents &&
             sortedEvents.map(e => (
               <li key={e.pk}>
-                <Link to={`${match.url}/${path}/${e.pk}`}>{e.short}</Link>
+                <Link to={`${path}/${e.pk}`}>{e.short}</Link>
                 {(!e.allow_donations || e.locked) && '🔒'}
               </li>
             ))}
@@ -97,8 +87,36 @@ function DropdownMenu({ name, path }) {
   );
 }
 
-function App() {
-  const match = useRouteMatch();
+function Menu() {
+  const { ADMIN_ROOT } = useConstants();
+  const canSeeHiddenBids = usePermissions(['tracker.change_bid', 'tracker.view_hidden_bid']);
+  const { status } = useSelector(state => ({
+    status: state.status,
+  }));
+  return (
+    <div style={{ height: 60, display: 'flex', alignItems: 'center' }}>
+      <Spinner spinning={status.event !== 'success'}>
+        {ADMIN_ROOT && (
+          <>
+            <a href={ADMIN_ROOT}>Admin Home</a>
+            &mdash;
+          </>
+        )}
+        <DropdownMenu name="Schedule Editor" path="schedule_editor" />
+        &mdash;
+        <DropdownMenu name="Interstitials" path="interstitials" />
+        {canSeeHiddenBids && (
+          <>
+            &mdash;
+            <DropdownMenu name="Process Pending Bids" path="process_pending_bids" />
+          </>
+        )}
+      </Spinner>
+    </div>
+  );
+}
+
+function App({ rootPath }) {
   const dispatch = useDispatch();
 
   const [ready, setReady] = React.useState(false);
@@ -107,11 +125,10 @@ function App() {
     status: state.status,
   }));
 
-  const { API_ROOT, APIV2_ROOT, ADMIN_ROOT } = useConstants();
-  const canChangeDonations = usePermission('tracker.change_donation');
+  const { API_ROOT, APIV2_ROOT } = useConstants();
   const canSeeHiddenBids = usePermissions(['tracker.change_bid', 'tracker.view_hidden_bid']);
 
-  React.useEffect(() => {
+  React.useLayoutEffect(() => {
     setAPIRoot(API_ROOT);
     V2HTTPUtils.setAPIRoot(APIV2_ROOT);
     setReady(true);
@@ -130,51 +147,54 @@ function App() {
   }, [dispatch, status.event, ready]);
 
   return (
-    <Switch>
-      <Route>
-        <div style={{ position: 'relative', display: 'flex', height: 'calc(100vh - 51px)', flexDirection: 'column' }}>
-          <div style={{ height: 60, display: 'flex', alignItems: 'center' }}>
-            <Spinner spinning={status.event !== 'success'}>
-              {ADMIN_ROOT && (
+    <Spinner spinning={!ready}>
+      <BrowserRouter>
+        <Routes>
+          <Route path={rootPath}>
+            <Route
+              element={
                 <>
-                  <a href={ADMIN_ROOT}>Admin Home</a>
-                  &mdash;
+                  <Menu />
+                  <Outlet />
                 </>
+              }>
+              <Route path="" element={<div />} />
+              <Route path="schedule_editor/" element={React.createElement(EventMenu('Schedule Editor'))} />
+              <Route
+                path="schedule_editor/:eventId"
+                element={
+                  <React.Suspense fallback={<Loading />}>
+                    <ScheduleEditor />
+                  </React.Suspense>
+                }
+              />
+              <Route
+                path="interstitials/:eventId"
+                element={
+                  <React.Suspense fallback={<Loading />}>
+                    <Interstitials />
+                  </React.Suspense>
+                }
+              />
+              {canSeeHiddenBids && (
+                <Route path="process_pending_bids/" element={React.createElement(EventMenu('Process Pending Bids'))} />
               )}
-              <DropdownMenu name="Schedule Editor" path="schedule_editor" />
-              &mdash;
-              <DropdownMenu name="Interstitials" path="interstitials" />
               {canSeeHiddenBids && (
-                <>
-                  &mdash;
-                  <DropdownMenu name="Process Pending Bids" path="process_pending_bids" />
-                </>
+                <Route
+                  path="process_pending_bids/:eventId"
+                  element={
+                    <React.Suspense fallback={<Loading />}>
+                      <ProcessPendingBids />
+                    </React.Suspense>
+                  }
+                />
               )}
-            </Spinner>
-          </div>
-          <Spinner spinning={!ready}>
-            <div style={{ flex: '1 0 1', overflow: 'auto' }}>
-              <Switch>
-                <Route path={`${match.url}/schedule_editor/`} exact component={EventMenu('Schedule Editor')} />
-                <Route path={`${match.url}/schedule_editor/:event`} component={ScheduleEditor} />
-                <Route path={`${match.url}/interstitials/:event`} component={Interstitials} />
-                {canSeeHiddenBids && (
-                  <Route
-                    path={`${match.url}/process_pending_bids/`}
-                    exact
-                    component={EventMenu('Process Pending Bids')}
-                  />
-                )}
-                {canSeeHiddenBids && (
-                  <Route path={`${match.url}/process_pending_bids/:event`} component={ProcessPendingBids} />
-                )}
-                <Route component={NotFound} />
-              </Switch>
-            </div>
-          </Spinner>
-        </div>
-      </Route>
-    </Switch>
+              <Route path="*" element={<NotFound />} />
+            </Route>
+          </Route>
+        </Routes>
+      </BrowserRouter>
+    </Spinner>
   );
 }
 
diff --git a/bundles/admin/donationProcessing/processPendingBids.tsx b/bundles/admin/donationProcessing/processPendingBids.tsx
index 3ef7adec8..f87d5b6c9 100644
--- a/bundles/admin/donationProcessing/processPendingBids.tsx
+++ b/bundles/admin/donationProcessing/processPendingBids.tsx
@@ -30,7 +30,7 @@ const stateMap = {
 
 export default React.memo(function ProcessPendingBids() {
   const { ADMIN_ROOT } = useConstants();
-  const eventId = +useParams<{ event: string }>().event;
+  const eventId = +useParams<{ eventId: string }>().eventId!;
   const status = useSelector((state: any) => state.status);
   const bids = useSelector((state: any) => state.models.bid) as Bid[];
   const event = useSelector((state: any) => state.models.event?.find((e: any) => e.pk === eventId));
diff --git a/bundles/admin/donationProcessing/processPendingBidsSpec.tsx b/bundles/admin/donationProcessing/processPendingBidsSpec.tsx
index 225a94c44..778b920fa 100644
--- a/bundles/admin/donationProcessing/processPendingBidsSpec.tsx
+++ b/bundles/admin/donationProcessing/processPendingBidsSpec.tsx
@@ -1,7 +1,9 @@
 import React from 'react';
 import MockAdapter from 'axios-mock-adapter';
 import { Provider } from 'react-redux';
-import { Route, StaticRouter } from 'react-router';
+import { Route } from 'react-router';
+import { Routes } from 'react-router-dom';
+import { StaticRouter } from 'react-router-dom/server';
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 import { render, waitFor } from '@testing-library/react';
@@ -89,8 +91,10 @@ describe('ProcessPendingBids', () => {
     });
     return render(
       <Provider store={store}>
-        <StaticRouter location={`${eventId}`}>
-          <Route path={':event'} component={ProcessPendingBids} />
+        <StaticRouter location={`/${eventId}`}>
+          <Routes>
+            <Route path="/:eventId" element={<ProcessPendingBids />} />
+          </Routes>
         </StaticRouter>
       </Provider>,
     );
diff --git a/bundles/admin/index.js b/bundles/admin/index.js
index 82b8d4879..6b3aeff98 100644
--- a/bundles/admin/index.js
+++ b/bundles/admin/index.js
@@ -1,11 +1,9 @@
 import React from 'react';
-import { ConnectedRouter } from 'connected-react-router';
 import { DndProvider } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 import { createRoot } from 'react-dom/client';
 import { QueryClient, QueryClientProvider } from 'react-query';
 import { Provider } from 'react-redux';
-import { Redirect, Route, Switch } from 'react-router';
 
 import Constants from '@common/Constants';
 import { createTrackerStore } from '@public/api';
@@ -17,8 +15,6 @@ import App from './app';
 import '@common/init';
 
 function Routes(props) {
-  const redirect = React.useCallback(({ location }) => <Redirect to={location.pathname.replace(/\/\/+/g, '/')} />, []);
-
   const store = createTrackerStore();
   const queryClient = new QueryClient({
     defaultOptions: {
@@ -34,12 +30,7 @@ function Routes(props) {
         <QueryClientProvider client={queryClient}>
           <Provider store={store}>
             <Constants.Provider value={props.CONSTANTS}>
-              <ConnectedRouter history={store.history}>
-                <Switch>
-                  <Route exact strict path="(.*//+.*)" render={redirect} />
-                  <Route path={props.ROOT_PATH} component={App} />
-                </Switch>
-              </ConnectedRouter>
+              <App rootPath={props.ROOT_PATH} />
             </Constants.Provider>
           </Provider>
         </QueryClientProvider>
diff --git a/bundles/admin/interstitials/Editor/index.tsx b/bundles/admin/interstitials/Editor/index.tsx
index f46a1e7b1..758a57017 100644
--- a/bundles/admin/interstitials/Editor/index.tsx
+++ b/bundles/admin/interstitials/Editor/index.tsx
@@ -20,20 +20,20 @@ type Aggregate = [Interview[], Ad[] | ServerError, Run[], Person | ServerError];
 
 export default function InterstitialEditor() {
   const { API_ROOT, CSRF_TOKEN } = useConstants();
-  const { event } = useParams<{ event: string }>();
+  const { eventId } = useParams<{ eventId: string }>();
   const [promise, setPromise] = useState<Promise<Aggregate>>(new Promise(() => {}));
   const [saveError, setSaveError] = useState<ServerError | null>(null);
   const fetchAll = useCallback(() => {
     setPromise(
       Promise.all([
-        fetch(`${API_ROOT}interviews/${event}`).then(JSONResponseWithForbidden),
-        fetch(`${API_ROOT}ads/${event}`).then(JSONResponseWithForbidden),
-        fetch(`${API_ROOT}search?type=run&event=${event}`).then(JSONResponse),
+        fetch(`${API_ROOT}interviews/${eventId}`).then(JSONResponseWithForbidden),
+        fetch(`${API_ROOT}ads/${eventId}`).then(JSONResponseWithForbidden),
+        fetch(`${API_ROOT}search?type=run&event=${eventId}`).then(JSONResponse),
         fetch(`${API_ROOT}me`).then(JSONResponseWithForbidden),
       ]),
     );
     setSaveError(null);
-  }, [API_ROOT, event]);
+  }, [API_ROOT, eventId]);
   useEffect(fetchAll, [fetchAll]);
 
   const moveInterstitial = useCallback(
@@ -97,7 +97,7 @@ export default function InterstitialEditor() {
   );
 
   const [result, error, state] = usePromise(promise, [promise]);
-  if (state === 'pending') return 'Loading...';
+  if (state === 'pending') return <>Loading...</>;
   if (error) {
     return (
       <div className="error">
@@ -109,7 +109,7 @@ export default function InterstitialEditor() {
     );
   }
   if (!result) {
-    return 'shrug';
+    return <>shrug</>;
   }
   const interviews = result[0] as Interview[] | ServerError;
   const ads = result[1] as Ad[] | ServerError;
diff --git a/bundles/admin/scheduleEditor/index.js b/bundles/admin/scheduleEditor/index.js
index ad3b3a07c..5afaa6c15 100644
--- a/bundles/admin/scheduleEditor/index.js
+++ b/bundles/admin/scheduleEditor/index.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import { connect } from 'react-redux';
+import { useParams } from 'react-router';
 
 import { actions } from '@public/api';
 import authHelper from '@public/api/helpers/auth';
@@ -40,13 +41,13 @@ class ScheduleEditor extends React.Component {
   }
 
   componentDidUpdate(newProps) {
-    if (this.props.match.params.event !== newProps.match.params.event) {
-      this.refreshSpeedruns_(newProps.match.params.event);
+    if (this.props.eventId !== newProps.eventId) {
+      this.refreshSpeedruns_(newProps.eventId);
     }
   }
 
   componentDidMount() {
-    this.refreshSpeedruns_(this.props.match.params.event);
+    this.refreshSpeedruns_(this.props.eventId);
   }
 
   refreshSpeedruns_(event) {
@@ -87,7 +88,7 @@ class ScheduleEditor extends React.Component {
 function select(state, props) {
   const { models, drafts, status, singletons } = state;
   const { speedrun: speedruns, event: events = [] } = models;
-  const event = events.find(e => e.pk === parseInt(props.match?.params?.event)) || null;
+  const event = events.find(e => e.pk === parseInt(props.eventId)) || null;
   const { me } = singletons;
   return {
     event,
@@ -149,4 +150,9 @@ function dispatch(dispatch) {
   };
 }
 
-export default connect(select, dispatch)(ScheduleEditor);
+const Connected = connect(select, dispatch)(ScheduleEditor);
+
+export default function Wrapped() {
+  const { eventId } = useParams();
+  return <Connected eventId={eventId} />;
+}
diff --git a/bundles/admin/scheduleEditor/indexSpec.tsx b/bundles/admin/scheduleEditor/indexSpec.tsx
index b4c52e186..5ff341790 100644
--- a/bundles/admin/scheduleEditor/indexSpec.tsx
+++ b/bundles/admin/scheduleEditor/indexSpec.tsx
@@ -1,6 +1,8 @@
 import * as React from 'react';
 import fetchMock from 'fetch-mock';
 import { Provider } from 'react-redux';
+import { Route, Routes } from 'react-router';
+import { StaticRouter } from 'react-router-dom/server';
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 import { render, screen } from '@testing-library/react';
@@ -31,7 +33,11 @@ describe('ScheduleEditor', () => {
     });
     return render(
       <Provider store={store}>
-        <ScheduleEditor match={{ params: { event: eventId } }} />
+        <StaticRouter location={`/${eventId}`}>
+          <Routes>
+            <Route path="/:eventId" element={<ScheduleEditor />} />
+          </Routes>
+        </StaticRouter>
       </Provider>,
     );
   }
diff --git a/bundles/processing/App.tsx b/bundles/processing/App.tsx
index e85ba76a5..dae346772 100644
--- a/bundles/processing/App.tsx
+++ b/bundles/processing/App.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { Route, Switch } from 'react-router';
+import { Route, Routes } from 'react-router';
 
 import { useConstants } from '@common/Constants';
 import { usePermission } from '@public/api/helpers/auth';
@@ -49,14 +49,14 @@ export default function App() {
 
   return (
     <AppContainer theme={theme} accent={accent}>
-      <Switch>
+      <Routes>
         {canChangeDonations && (
           <>
-            <Route path="/v2/:eventId/processing/donations" exact component={ProcessDonations} />
-            <Route path="/v2/:eventId/processing/read" exact component={ReadDonations} />
+            <Route path="/v2/:eventId/processing/donations" element={<ProcessDonations />} />
+            <Route path="/v2/:eventId/processing/read" element={<ReadDonations />} />
           </>
         )}
-      </Switch>
+      </Routes>
     </AppContainer>
   );
 }
diff --git a/bundles/processing/pages/ProcessDonations.tsx b/bundles/processing/pages/ProcessDonations.tsx
index 8136056e7..5df173d91 100644
--- a/bundles/processing/pages/ProcessDonations.tsx
+++ b/bundles/processing/pages/ProcessDonations.tsx
@@ -96,8 +96,8 @@ export default function ProcessDonations() {
   const { partition, partitionCount, processingMode } = useProcessingStore();
   const process = PROCESSES[processingMode];
 
-  const { data: event } = useQuery(`events.${eventId}`, () => APIClient.getEvent(eventId));
-  const donationsQuery = useQuery(`donations.unprocessed.${processingMode}`, () => process.fetch(eventId), {
+  const { data: event } = useQuery(`events.${eventId}`, () => APIClient.getEvent(eventId!));
+  const donationsQuery = useQuery(`donations.unprocessed.${processingMode}`, () => process.fetch(eventId!), {
     onSuccess: donations => loadDonations(donations),
   });
 
diff --git a/bundles/processing/pages/ReadDonations.tsx b/bundles/processing/pages/ReadDonations.tsx
index 93bd3d2aa..35ebf11d4 100644
--- a/bundles/processing/pages/ReadDonations.tsx
+++ b/bundles/processing/pages/ReadDonations.tsx
@@ -145,8 +145,8 @@ export default function ReadDonations() {
   const params = useParams<{ eventId: string }>();
   const { eventId } = params;
 
-  const { data: event } = useQuery(`events.${eventId}`, () => APIClient.getEvent(eventId));
-  const donationsQuery = useQuery(`donations.unread`, () => APIClient.getUnreadDonations(eventId), {
+  const { data: event } = useQuery(`events.${eventId}`, () => APIClient.getEvent(eventId!));
+  const donationsQuery = useQuery(`donations.unread`, () => APIClient.getUnreadDonations(eventId!), {
     onSuccess: loadDonations,
   });
 
diff --git a/bundles/public/api/index.js b/bundles/public/api/index.js
index 9cc818572..d6fa9d032 100644
--- a/bundles/public/api/index.js
+++ b/bundles/public/api/index.js
@@ -1,5 +1,3 @@
-import { routerMiddleware } from 'connected-react-router';
-import { createBrowserHistory } from 'history';
 import { applyMiddleware, createStore } from 'redux';
 import thunk from 'redux-thunk';
 import { composeWithDevTools } from '@redux-devtools/extension';
@@ -22,13 +20,6 @@ const composeEnhancers = composeWithDevTools({
 
 export { actions };
 
-export function createTrackerStore({ history } = {}) {
-  history = history || createBrowserHistory();
-
-  const store = createStore(
-    createRootReducer(history),
-    composeEnhancers(applyMiddleware(freezeReducer, thunk, routerMiddleware(history))),
-  );
-  store.history = history;
-  return store;
+export function createTrackerStore() {
+  return createStore(createRootReducer(history), composeEnhancers(applyMiddleware(freezeReducer, thunk)));
 }
diff --git a/bundles/public/api/reducers/index.js b/bundles/public/api/reducers/index.js
index dd971d17e..80df6a3d2 100644
--- a/bundles/public/api/reducers/index.js
+++ b/bundles/public/api/reducers/index.js
@@ -1,4 +1,3 @@
-import { connectRouter } from 'connected-react-router';
 import { combineReducers } from 'redux';
 
 import drafts from './drafts';
@@ -7,9 +6,8 @@ import models from './models';
 import singletons from './singletons';
 import status from './status';
 
-const createRootReducer = history =>
+const createRootReducer = () =>
   combineReducers({
-    router: connectRouter(history),
     drafts,
     models,
     status,
diff --git a/bundles/tracker/App.tsx b/bundles/tracker/App.tsx
index 37db12811..0f8c6e1df 100644
--- a/bundles/tracker/App.tsx
+++ b/bundles/tracker/App.tsx
@@ -1,17 +1,34 @@
 import * as React from 'react';
-import { Route, Router, Switch } from 'react-router-dom';
+import { useParams } from 'react-router';
+import { BrowserRouter, Route, Routes } from 'react-router-dom';
 
 import { useConstants } from '@common/Constants';
 
+import Donate from '@tracker/donation/components/Donate';
+import Prize from '@tracker/prizes/components/Prize';
+import Prizes from '@tracker/prizes/components/Prizes';
+
 import { AnalyticsEvent, setAnalyticsURL, track } from './analytics/Analytics';
 import DonateInitializer from './donation/components/DonateInitializer';
-import EventRouter from './events/components/EventRouter';
 import NotFound from './router/components/NotFound';
-import { createTrackerHistory, Routes } from './router/RouterUtils';
 import { setAPIRoot } from './Endpoints';
 
+function PrizesRoute() {
+  const { eventId } = useParams();
+  return <Prizes eventId={eventId!} />;
+}
+
+function PrizeRoute() {
+  const { prizeId } = useParams();
+  return <Prize prizeId={prizeId!} />;
+}
+
+function DonateRoute() {
+  const { eventId } = useParams();
+  return <Donate eventId={eventId!} />;
+}
+
 const App = (props: React.ComponentProps<typeof DonateInitializer>) => {
-  const history = React.useMemo(() => createTrackerHistory(props.ROOT_PATH), [props.ROOT_PATH]);
   const { ANALYTICS_URL, API_ROOT } = useConstants();
   const [ready, setReady] = React.useState(false);
 
@@ -27,16 +44,21 @@ const App = (props: React.ComponentProps<typeof DonateInitializer>) => {
     });
   }, []);
 
+  const { SWEEPSTAKES_URL } = useConstants();
+
   return (
     <>
       {ready && (
-        <Router history={history}>
-          <Switch>
-            {/* TODO: Remove `EVENT_DONATE` from here once it gets normalized */}
-            <Route path={[Routes.EVENT_BASE(':eventId'), Routes.EVENT_DONATE(':eventId')]} component={EventRouter} />
-            <NotFound />
-          </Switch>
-        </Router>
+        <BrowserRouter basename={props.ROOT_PATH}>
+          <Routes>
+            <Route path="events/:eventId">
+              {SWEEPSTAKES_URL && <Route path="prizes" element={<PrizesRoute />} />}
+              {SWEEPSTAKES_URL && <Route path="prizes/:prizeId" element={<PrizeRoute />} />}
+              <Route path="donate" element={<DonateRoute />} />
+            </Route>
+            <Route path="*" element={<NotFound />} />
+          </Routes>
+        </BrowserRouter>
       )}
     </>
   );
diff --git a/bundles/tracker/donation/__tests__/Donate.spec.tsx b/bundles/tracker/donation/__tests__/Donate.spec.tsx
index 7e1540f1f..472181073 100644
--- a/bundles/tracker/donation/__tests__/Donate.spec.tsx
+++ b/bundles/tracker/donation/__tests__/Donate.spec.tsx
@@ -1,4 +1,5 @@
 import * as React from 'react';
+import { MemoryRouter } from 'react-router-dom';
 import userEvent from '@testing-library/user-event';
 
 import * as EventDetailsActions from '@tracker/event_details/EventDetailsActions';
@@ -7,7 +8,12 @@ import { createStore, fireEvent, render } from '@tracker/testing/test-utils';
 import Donate from '../components/Donate';
 
 const renderDonate = (store?: ReturnType<typeof createStore>) => {
-  const rendered = render(<Donate eventId="some-event" />, { store });
+  const rendered = render(
+    <MemoryRouter>
+      <Donate eventId="some-event" />
+    </MemoryRouter>,
+    { store },
+  );
   const getAddIncentivesButton = () => rendered.getByTestId('addincentives-button') as HTMLButtonElement;
   const getSubmitButton = () => rendered.getByTestId('donation-submit') as HTMLButtonElement;
   const getSubmitBidButton = () => rendered.getByTestId('incentiveBidForm-submitBid') as HTMLButtonElement;
diff --git a/bundles/tracker/donation/components/Donate.tsx b/bundles/tracker/donation/components/Donate.tsx
index d5282d4b3..18836556e 100644
--- a/bundles/tracker/donation/components/Donate.tsx
+++ b/bundles/tracker/donation/components/Donate.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import { useSelector } from 'react-redux';
+import { useLocation } from 'react-router';
 
 import { useConstants } from '@common/Constants';
 import { useCachedCallback } from '@public/hooks/useCachedCallback';
@@ -16,7 +17,6 @@ import TextInput from '@uikit/TextInput';
 
 import * as EventDetailsStore from '@tracker/event_details/EventDetailsStore';
 import useDispatch from '@tracker/hooks/useDispatch';
-import RouterUtils from '@tracker/router/RouterUtils';
 import { StoreState } from '@tracker/Store';
 
 import { AnalyticsEvent, track } from '../../analytics/Analytics';
@@ -37,7 +37,7 @@ const Donate = (props: DonateProps) => {
   const dispatch = useDispatch();
   const { eventId } = props;
 
-  const urlHash = RouterUtils.getLocationHash();
+  const urlHash = useLocation().hash;
   React.useEffect(() => {
     const presetAmount = CurrencyUtils.parseCurrency(urlHash);
     if (presetAmount != null) {
diff --git a/bundles/tracker/events/components/EventRouter.tsx b/bundles/tracker/events/components/EventRouter.tsx
deleted file mode 100644
index 58cf18682..000000000
--- a/bundles/tracker/events/components/EventRouter.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import * as React from 'react';
-import { Route, Switch, useRouteMatch } from 'react-router-dom';
-
-import { useConstants } from '@common/Constants';
-
-import Donate from '@tracker/donation/components/Donate';
-import Prize from '@tracker/prizes/components/Prize';
-import Prizes from '@tracker/prizes/components/Prizes';
-import NotFound from '@tracker/router/components/NotFound';
-import { Routes } from '@tracker/router/RouterUtils';
-
-function PrizePage() {
-  const routeMatch = useRouteMatch<{ prizeId: string }>();
-  const { prizeId } = routeMatch.params;
-
-  return <Prize prizeId={prizeId} />;
-}
-
-const EventRouter = () => {
-  const routeMatch = useRouteMatch<{ eventId: string }>();
-  // TODO: type this better when DonateInitializer doesn't need page-load props
-  const eventId = routeMatch.params.eventId;
-  const { SWEEPSTAKES_URL } = useConstants();
-
-  return (
-    <Switch>
-      {SWEEPSTAKES_URL && (
-        <Route exact path={Routes.EVENT_PRIZES(eventId)}>
-          <Prizes eventId={eventId} />
-        </Route>
-      )}
-      {SWEEPSTAKES_URL && <Route exact path={Routes.EVENT_PRIZE(eventId, ':prizeId')} component={PrizePage} />}
-      <Route exact path={Routes.EVENT_DONATE(eventId)}>
-        <Donate eventId={eventId} />
-      </Route>
-      <NotFound />
-    </Switch>
-  );
-};
-
-export default EventRouter;
diff --git a/bundles/tracker/index.tsx b/bundles/tracker/index.tsx
index 53e878605..03cdbc901 100644
--- a/bundles/tracker/index.tsx
+++ b/bundles/tracker/index.tsx
@@ -7,7 +7,6 @@ import ErrorBoundary from '@public/errorBoundary';
 import ThemeProvider from '@uikit/ThemeProvider';
 
 import DonateInitializer from './donation/components/DonateInitializer';
-import RouterUtils from './router/RouterUtils';
 import AppWrapper from './App';
 import { createTrackerStore } from './Store';
 
diff --git a/bundles/tracker/prizes/components/Prize.tsx b/bundles/tracker/prizes/components/Prize.tsx
index 8990dd2ff..42be784c3 100644
--- a/bundles/tracker/prizes/components/Prize.tsx
+++ b/bundles/tracker/prizes/components/Prize.tsx
@@ -1,5 +1,6 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
+import { useNavigate } from 'react-router';
 
 import { useConstants } from '@common/Constants';
 import * as CurrencyUtils from '@public/util/currency';
@@ -15,7 +16,7 @@ import Text from '@uikit/Text';
 import * as EventActions from '@tracker/events/EventActions';
 import * as EventStore from '@tracker/events/EventStore';
 import useDispatch from '@tracker/hooks/useDispatch';
-import RouterUtils, { Routes } from '@tracker/router/RouterUtils';
+import RouterUtils, { Routes as TrackerRoutes } from '@tracker/router/RouterUtils';
 import { StoreState } from '@tracker/Store';
 
 import * as PrizeActions from '../PrizeActions';
@@ -113,19 +114,21 @@ const Prize = (props: PrizeProps) => {
     }
   }, [dispatch, event, eventId]);
 
+  const navigate = useNavigate();
+
   const handleDonate = useCallback(() => {
     if (prize == null) return;
-    RouterUtils.navigateTo(Routes.EVENT_DONATE(prize.eventId), {
+    RouterUtils.navigateTo(navigate, TrackerRoutes.EVENT_DONATE(prize.eventId), {
       hash: prize.minimumBid != null ? prize.minimumBid.toFixed(2) : '',
       forceReload: true,
     });
-  }, [prize]);
+  }, [navigate, prize]);
 
   const handleBack = useCallback(() => {
     if (prize) {
-      RouterUtils.navigateTo(Routes.EVENT_PRIZES(prize.eventId));
+      RouterUtils.navigateTo(navigate, TrackerRoutes.EVENT_PRIZES(prize.eventId));
     }
-  }, [prize]);
+  }, [navigate, prize]);
 
   if (prize == null)
     return (
diff --git a/bundles/tracker/prizes/components/PrizeCard.tsx b/bundles/tracker/prizes/components/PrizeCard.tsx
index 0d6805eda..bedc39f30 100644
--- a/bundles/tracker/prizes/components/PrizeCard.tsx
+++ b/bundles/tracker/prizes/components/PrizeCard.tsx
@@ -1,6 +1,7 @@
 import React, { useCallback, useState } from 'react';
 import classNames from 'classnames';
 import { useSelector } from 'react-redux';
+import { useNavigate } from 'react-router';
 
 import * as CurrencyUtils from '@public/util/currency';
 import TimeUtils from '@public/util/TimeUtils';
@@ -34,11 +35,13 @@ const PrizeCard = (props: PrizeCardProps) => {
 
   const prize = useSelector((state: StoreState) => PrizeStore.getPrize(state, { prizeId }));
 
+  const navigate = useNavigate();
+
   const handleViewPrize = useCallback(() => {
     if (prize) {
-      RouterUtils.navigateTo(Routes.EVENT_PRIZE(prize.eventId, prize.id));
+      RouterUtils.navigateTo(navigate, Routes.EVENT_PRIZE(prize.eventId, prize.id));
     }
-  }, [prize]);
+  }, [navigate, prize]);
 
   if (prize == null) {
     return <div className={styles.card} />;
diff --git a/bundles/tracker/prizes/components/PrizeCardSpec.tsx b/bundles/tracker/prizes/components/PrizeCardSpec.tsx
index 7f770b326..ff55e3005 100644
--- a/bundles/tracker/prizes/components/PrizeCardSpec.tsx
+++ b/bundles/tracker/prizes/components/PrizeCardSpec.tsx
@@ -1,4 +1,5 @@
 import * as React from 'react';
+import { MemoryRouter } from 'react-router-dom';
 import { fireEvent } from '@testing-library/react';
 
 import { getFixturePrize } from '../../../../spec/fixtures/Prize';
@@ -26,6 +27,10 @@ describe('PrizeCard', () => {
       currency: 'USD',
     };
 
-    return renderWithState(<PrizeCard {...defaultProps} {...props} />);
+    return renderWithState(
+      <MemoryRouter>
+        <PrizeCard {...defaultProps} {...props} />
+      </MemoryRouter>,
+    );
   }
 });
diff --git a/bundles/tracker/prizes/components/PrizeSpec.tsx b/bundles/tracker/prizes/components/PrizeSpec.tsx
index 7fb748674..edcf5266b 100644
--- a/bundles/tracker/prizes/components/PrizeSpec.tsx
+++ b/bundles/tracker/prizes/components/PrizeSpec.tsx
@@ -1,4 +1,5 @@
 import * as React from 'react';
+import { MemoryRouter } from 'react-router-dom';
 import { fireEvent } from '@testing-library/react';
 
 import { getFixturePrize } from '../../../../spec/fixtures/Prize';
@@ -25,6 +26,10 @@ describe('Prize', () => {
       prizeId: '123',
     };
 
-    return renderWithState(<Prize {...defaultProps} {...props} />);
+    return renderWithState(
+      <MemoryRouter>
+        <Prize {...defaultProps} {...props} />
+      </MemoryRouter>,
+    );
   }
 });
diff --git a/bundles/tracker/router/RouterUtils.ts b/bundles/tracker/router/RouterUtils.ts
index e499d896f..cc40fec9c 100644
--- a/bundles/tracker/router/RouterUtils.ts
+++ b/bundles/tracker/router/RouterUtils.ts
@@ -1,5 +1,6 @@
-import { createBrowserHistory } from 'history';
+// import { createBrowserHistory } from 'history';
 import queryString from 'query-string';
+import { NavigateOptions as NavOptions, useNavigate } from 'react-router';
 
 export const Routes = {
   EVENT_BASE: (eventId: string | number) => `/events/${eventId}`,
@@ -19,52 +20,38 @@ type NavigateOptions = {
   state?: Record<string, unknown>;
 };
 
-let history: ReturnType<typeof createBrowserHistory> | null = null;
-
 export function createTrackerHistory(rootPath: string) {
-  history = createBrowserHistory({ basename: rootPath });
-
-  // Re-apply browser-standard scrolling behavior on route transitions
-  history.listen((location, action) => {
-    // If the user is navigating backwards, don't reset scroll.
-    if (action === 'POP') return;
-    window.scrollTo(0, 0);
-  });
-  return history;
+  // history = createBrowserHistory({ basename: rootPath });
+  //
+  // // Re-apply browser-standard scrolling behavior on route transitions
+  // history.listen((location, action) => {
+  //   // If the user is navigating backwards, don't reset scroll.
+  //   if (action === 'POP') return;
+  //   window.scrollTo(0, 0);
+  // });
+  // return history;
 }
 
 export default {
-  get history() {
-    return history;
-  },
-
-  getLocation: () => history?.location,
-  getLocationHash: () => history?.location.hash.slice(1),
-
-  navigateTo(pathname: string, options: NavigateOptions = {}) {
-    if (!history) {
-      return;
-    }
-    const { replace = false, forceReload = false, query, hash, state } = options;
-
-    const navigate = replace ? history.replace : history.push;
-
-    let fullPath = pathname;
+  navigateTo(
+    navigate: ReturnType<typeof useNavigate>,
+    path: string,
+    options: NavigateOptions = {},
+    navOptions: NavOptions = {},
+  ) {
+    const { forceReload = false, query, hash, state } = options;
+
+    let fullPath = path;
     if (query != null) {
       fullPath += `?${queryString.stringify(query)}`;
     }
     if (hash != null) {
       fullPath += `#${hash}`;
     }
-
-    navigate(fullPath, state);
+    navigate(fullPath, { ...navOptions, state });
 
     if (forceReload) {
       window.location.reload();
     }
   },
-
-  isLocalUrl(url: string) {
-    return !/(?:^[a-z][a-z0-9+.-]*:|\/\/)/.test(url);
-  },
 };
diff --git a/package.json b/package.json
index e0a13d1e7..ccdf9de27 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,6 @@
     "@fortawesome/free-regular-svg-icons": "^5.11.2",
     "@fortawesome/free-solid-svg-icons": "^5.11.2",
     "@fortawesome/react-fontawesome": "^0.1.7",
-    "@loadable/component": "^5.15.3",
     "@react-dnd/invariant": "^4.0.2",
     "@redux-devtools/extension": "^3.2.5",
     "@spyrothon/sparx": "^0.10.2",
@@ -32,10 +31,8 @@
     "@spyrothon/tokens": "^0.10.2",
     "axios": "^1.7.4",
     "classnames": "^2.3.2",
-    "connected-react-router": "^6.9.3",
     "css-loader": "^6.7.3",
     "cssnano": "^6.0.1",
-    "history": "^4.10.1",
     "html-webpack-plugin": "^5.5.0",
     "invariant": "^2.2.4",
     "keymirror": "^0.1.1",
@@ -62,8 +59,8 @@
     "react-numeric": "^1.0.0",
     "react-query": "^3.39.3",
     "react-redux": "^8.0.5",
-    "react-router": "^5.1.2",
-    "react-router-dom": "^5.1.2",
+    "react-router": "^6.27.0",
+    "react-router-dom": "^6.27.0",
     "react-transition-group": "^4.4.5",
     "react-use-promise": "^0.5.0",
     "redux": "^4.2.1",
@@ -98,8 +95,6 @@
     "@types/react-dom": "^18.0.11",
     "@types/react-highlight-words": "^0.16.4",
     "@types/react-redux": "^7.1.25",
-    "@types/react-router": "^5.1.2",
-    "@types/react-router-dom": "^5.1.2",
     "@types/react-transition-group": "^4.4.5",
     "@types/redux-mock-store": "^1.0.3",
     "@types/validator": "^13.7.14",
diff --git a/tracker/ui/urls.py b/tracker/ui/urls.py
index ba5e12dd6..3b43b91e2 100644
--- a/tracker/ui/urls.py
+++ b/tracker/ui/urls.py
@@ -1,11 +1,13 @@
 from django.urls import path
 
+from ..views import donateviews
 from . import views
 
 app_name = 'tracker'
 urlpatterns = [
     path('', views.index, name='index'),
     path('admin/<path:extra>', views.admin_redirect),
-    path('donate/<slug:event>', views.donate, name='donate'),
+    path('donate/<slug:event>', donateviews.donate),
+    path('events/<slug:event>/donate', views.donate, name='donate'),
     path('events/<path:extra>', views.index, name='events'),
 ]
diff --git a/webpack.config.js b/webpack.config.js
index 1e289c3cb..cd8a368a1 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -8,6 +8,7 @@ const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin'
 const PROD = process.env.NODE_ENV === 'production';
 const SOURCE_MAPS = process.env.SOURCE_MAPS ?? false;
 const ANALYZE = process.env.ANALYZE ?? false;
+const NO_MANIFEST = !!process.env.NO_MANIFEST ?? false;
 const PROJECT_ROOT = __dirname;
 
 console.log(PROD ? 'PRODUCTION BUILD' : 'DEVELOPMENT BUILD');
@@ -168,7 +169,7 @@ module.exports = {
         },
       },
   plugins: compact([
-    ...generateHTMLWebpackPlugins(),
+    ...(NO_MANIFEST ? [] : generateHTMLWebpackPlugins()),
     new MiniCssExtractPlugin({
       filename: PROD ? 'tracker-[name]-[contenthash].css' : 'tracker-[name].css',
       chunkFilename: PROD ? '[id].[contenthash].css' : '[id].css',
diff --git a/yarn.lock b/yarn.lock
index 915225884..0e5f3bcc1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -136,7 +136,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.8, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.2, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.7.7, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
+"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.8, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.2, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
   version: 7.22.15
   resolution: "@babel/runtime@npm:7.22.15"
   dependencies:
@@ -943,18 +943,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/gen-mapping@npm:^0.3.0, @jridgewell/gen-mapping@npm:^0.3.2":
-  version: 0.3.3
-  resolution: "@jridgewell/gen-mapping@npm:0.3.3"
-  dependencies:
-    "@jridgewell/set-array": ^1.0.1
-    "@jridgewell/sourcemap-codec": ^1.4.10
-    "@jridgewell/trace-mapping": ^0.3.9
-  checksum: 4a74944bd31f22354fc01c3da32e83c19e519e3bbadafa114f6da4522ea77dd0c2842607e923a591d60a76699d819a2fbb6f3552e277efdb9b58b081390b60ab
-  languageName: node
-  linkType: hard
-
-"@jridgewell/gen-mapping@npm:^0.3.5":
+"@jridgewell/gen-mapping@npm:^0.3.2, @jridgewell/gen-mapping@npm:^0.3.5":
   version: 0.3.5
   resolution: "@jridgewell/gen-mapping@npm:0.3.5"
   dependencies:
@@ -965,13 +954,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/resolve-uri@npm:3.1.0":
-  version: 3.1.0
-  resolution: "@jridgewell/resolve-uri@npm:3.1.0"
-  checksum: b5ceaaf9a110fcb2780d1d8f8d4a0bfd216702f31c988d8042e5f8fbe353c55d9b0f55a1733afdc64806f8e79c485d2464680ac48a0d9fcadb9548ee6b81d267
-  languageName: node
-  linkType: hard
-
 "@jridgewell/resolve-uri@npm:^3.1.0":
   version: 3.1.2
   resolution: "@jridgewell/resolve-uri@npm:3.1.2"
@@ -979,13 +961,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/set-array@npm:^1.0.1":
-  version: 1.1.2
-  resolution: "@jridgewell/set-array@npm:1.1.2"
-  checksum: 69a84d5980385f396ff60a175f7177af0b8da4ddb81824cb7016a9ef914eee9806c72b6b65942003c63f7983d4f39a5c6c27185bbca88eb4690b62075602e28e
-  languageName: node
-  linkType: hard
-
 "@jridgewell/set-array@npm:^1.2.1":
   version: 1.2.1
   resolution: "@jridgewell/set-array@npm:1.2.1"
@@ -993,16 +968,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/source-map@npm:^0.3.2":
-  version: 0.3.3
-  resolution: "@jridgewell/source-map@npm:0.3.3"
-  dependencies:
-    "@jridgewell/gen-mapping": ^0.3.0
-    "@jridgewell/trace-mapping": ^0.3.9
-  checksum: ae1302146339667da5cd6541260ecbef46ae06819a60f88da8f58b3e64682f787c09359933d050dea5d2173ea7fa40f40dd4d4e7a8d325c5892cccd99aaf8959
-  languageName: node
-  linkType: hard
-
 "@jridgewell/source-map@npm:^0.3.3":
   version: 0.3.6
   resolution: "@jridgewell/source-map@npm:0.3.6"
@@ -1013,38 +978,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/sourcemap-codec@npm:1.4.14":
-  version: 1.4.14
-  resolution: "@jridgewell/sourcemap-codec@npm:1.4.14"
-  checksum: 61100637b6d173d3ba786a5dff019e1a74b1f394f323c1fee337ff390239f053b87266c7a948777f4b1ee68c01a8ad0ab61e5ff4abb5a012a0b091bec391ab97
-  languageName: node
-  linkType: hard
-
-"@jridgewell/sourcemap-codec@npm:^1.4.10":
-  version: 1.4.15
-  resolution: "@jridgewell/sourcemap-codec@npm:1.4.15"
-  checksum: b881c7e503db3fc7f3c1f35a1dd2655a188cc51a3612d76efc8a6eb74728bef5606e6758ee77423e564092b4a518aba569bbb21c9bac5ab7a35b0c6ae7e344c8
-  languageName: node
-  linkType: hard
-
-"@jridgewell/sourcemap-codec@npm:^1.4.14":
+"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14":
   version: 1.5.0
   resolution: "@jridgewell/sourcemap-codec@npm:1.5.0"
   checksum: 05df4f2538b3b0f998ea4c1cd34574d0feba216fa5d4ccaef0187d12abf82eafe6021cec8b49f9bb4d90f2ba4582ccc581e72986a5fcf4176ae0cfeb04cf52ec
   languageName: node
   linkType: hard
 
-"@jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.9":
-  version: 0.3.18
-  resolution: "@jridgewell/trace-mapping@npm:0.3.18"
-  dependencies:
-    "@jridgewell/resolve-uri": 3.1.0
-    "@jridgewell/sourcemap-codec": 1.4.14
-  checksum: 0572669f855260808c16fe8f78f5f1b4356463b11d3f2c7c0b5580c8ba1cbf4ae53efe9f627595830856e57dbac2325ac17eb0c3dd0ec42102e6f227cc289c02
-  languageName: node
-  linkType: hard
-
-"@jridgewell/trace-mapping@npm:^0.3.20, @jridgewell/trace-mapping@npm:^0.3.24, @jridgewell/trace-mapping@npm:^0.3.25":
+"@jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.20, @jridgewell/trace-mapping@npm:^0.3.24, @jridgewell/trace-mapping@npm:^0.3.25":
   version: 0.3.25
   resolution: "@jridgewell/trace-mapping@npm:0.3.25"
   dependencies:
@@ -1061,19 +1002,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@loadable/component@npm:^5.15.3":
-  version: 5.15.3
-  resolution: "@loadable/component@npm:5.15.3"
-  dependencies:
-    "@babel/runtime": ^7.7.7
-    hoist-non-react-statics: ^3.3.1
-    react-is: ^16.12.0
-  peerDependencies:
-    react: ^16.3.0 || ^17.0.0 || ^18.0.0
-  checksum: 78ac341465f2310db30381bc75e8bf73a33f99af849a6a2d87eb3842da0ba1df265e08045dc4f3fee1d194522a43a030baa91740045b64aad002f159ccce64bf
-  languageName: node
-  linkType: hard
-
 "@mapbox/hast-util-table-cell-style@npm:^0.2.0":
   version: 0.2.0
   resolution: "@mapbox/hast-util-table-cell-style@npm:0.2.0"
@@ -2691,6 +2619,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@remix-run/router@npm:1.20.0":
+  version: 1.20.0
+  resolution: "@remix-run/router@npm:1.20.0"
+  checksum: 6bff41117eabb867b17c89baa727580f0a431368b309cd9a1f69767aafa68ea9cac95ff0eeb86d37c2c8655f5cd7c6283d37ae5e6d93e94f648c6112ddb24ede
+  languageName: node
+  linkType: hard
+
 "@sindresorhus/is@npm:^4.0.0":
   version: 4.6.0
   resolution: "@sindresorhus/is@npm:4.6.0"
@@ -3319,27 +3254,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-router-dom@npm:^5.1.2":
-  version: 5.3.3
-  resolution: "@types/react-router-dom@npm:5.3.3"
-  dependencies:
-    "@types/history": ^4.7.11
-    "@types/react": "*"
-    "@types/react-router": "*"
-  checksum: 28c4ea48909803c414bf5a08502acbb8ba414669b4b43bb51297c05fe5addc4df0b8fd00e0a9d1e3535ec4073ef38aaafac2c4a2b95b787167d113bc059beff3
-  languageName: node
-  linkType: hard
-
-"@types/react-router@npm:*, @types/react-router@npm:^5.1.2":
-  version: 5.1.20
-  resolution: "@types/react-router@npm:5.1.20"
-  dependencies:
-    "@types/history": ^4.7.11
-    "@types/react": "*"
-  checksum: 128764143473a5e9457ddc715436b5d49814b1c214dde48939b9bef23f0e77f52ffcdfa97eb8d3cc27e2c229869c0cdd90f637d887b62f2c9f065a87d6425419
-  languageName: node
-  linkType: hard
-
 "@types/react-transition-group@npm:^4.4.5":
   version: 4.4.5
   resolution: "@types/react-transition-group@npm:4.4.5"
@@ -3887,16 +3801,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn@npm:^8.0.4, acorn@npm:^8.5.0, acorn@npm:^8.7.1, acorn@npm:^8.9.0":
-  version: 8.10.0
-  resolution: "acorn@npm:8.10.0"
-  bin:
-    acorn: bin/acorn
-  checksum: 538ba38af0cc9e5ef983aee196c4b8b4d87c0c94532334fa7e065b2c8a1f85863467bb774231aae91613fcda5e68740c15d97b1967ae3394d20faddddd8af61d
-  languageName: node
-  linkType: hard
-
-"acorn@npm:^8.8.2":
+"acorn@npm:^8.0.4, acorn@npm:^8.7.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0":
   version: 8.12.1
   resolution: "acorn@npm:8.12.1"
   bin:
@@ -4459,21 +4364,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.0.0, browserslist@npm:^4.21.4, browserslist@npm:^4.21.5":
-  version: 4.21.10
-  resolution: "browserslist@npm:4.21.10"
-  dependencies:
-    caniuse-lite: ^1.0.30001517
-    electron-to-chromium: ^1.4.477
-    node-releases: ^2.0.13
-    update-browserslist-db: ^1.0.11
-  bin:
-    browserslist: cli.js
-  checksum: 1e27c0f111a35d1dd0e8fc2c61781b0daefabc2c9471b0b10537ce54843014bceb2a1ce4571af1a82b2bf1e6e6e05d38865916689a158f03bc2c7a4ec2577db8
-  languageName: node
-  linkType: hard
-
-"browserslist@npm:^4.21.10":
+"browserslist@npm:^4.0.0, browserslist@npm:^4.21.10, browserslist@npm:^4.21.4, browserslist@npm:^4.21.5":
   version: 4.23.3
   resolution: "browserslist@npm:4.23.3"
   dependencies:
@@ -4622,14 +4513,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001464, caniuse-lite@npm:^1.0.30001517":
-  version: 1.0.30001528
-  resolution: "caniuse-lite@npm:1.0.30001528"
-  checksum: 7b6a71d41de1ce2b95f5851e7074050b7600157acf02c5701d9650a1faf824e368163f4ede5e269d4ea44fe33e00fe60673cb86f40cac35bd02a9a9a4ef7f162
-  languageName: node
-  linkType: hard
-
-"caniuse-lite@npm:^1.0.30001646":
+"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001464, caniuse-lite@npm:^1.0.30001646":
   version: 1.0.30001653
   resolution: "caniuse-lite@npm:1.0.30001653"
   checksum: 289cf06c26a46f3e6460ccd5feffa788ab0ab35d306898c48120c65cfb11959bfa560e9f739393769b4fd01150c69b0747ad3ad5ec3abf3dfafd66df3c59254e
@@ -4980,29 +4864,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"connected-react-router@npm:^6.9.3":
-  version: 6.9.3
-  resolution: "connected-react-router@npm:6.9.3"
-  dependencies:
-    immutable: ^3.8.1 || ^4.0.0
-    lodash.isequalwith: ^4.4.0
-    prop-types: ^15.7.2
-    seamless-immutable: ^7.1.3
-  peerDependencies:
-    history: ^4.7.2
-    react: ^16.4.0 || ^17.0.0
-    react-redux: ^6.0.0 || ^7.1.0
-    react-router: ^4.3.1 || ^5.0.0
-    redux: ^3.6.0 || ^4.0.0
-  dependenciesMeta:
-    immutable:
-      optional: true
-    seamless-immutable:
-      optional: true
-  checksum: 047a11c2f3c9993087f3cd467789445781320c61f3184e1016e7b05862a275006004867231cc7396c7f213afd2fbce7e8ac0df39ba2cda7502d72a140657f9e7
-  languageName: node
-  linkType: hard
-
 "console-control-strings@npm:^1.1.0":
   version: 1.1.0
   resolution: "console-control-strings@npm:1.1.0"
@@ -5719,7 +5580,6 @@ __metadata:
     "@fortawesome/free-solid-svg-icons": ^5.11.2
     "@fortawesome/react-fontawesome": ^0.1.7
     "@gamesdonequick/prettier-config": ^2.2.1
-    "@loadable/component": ^5.15.3
     "@pmmmwh/react-refresh-webpack-plugin": ^0.5.10
     "@react-dnd/invariant": ^4.0.2
     "@redux-devtools/extension": ^3.2.5
@@ -5747,8 +5607,6 @@ __metadata:
     "@types/react-dom": ^18.0.11
     "@types/react-highlight-words": ^0.16.4
     "@types/react-redux": ^7.1.25
-    "@types/react-router": ^5.1.2
-    "@types/react-router-dom": ^5.1.2
     "@types/react-transition-group": ^4.4.5
     "@types/redux-mock-store": ^1.0.3
     "@types/validator": ^13.7.14
@@ -5758,7 +5616,6 @@ __metadata:
     axios-mock-adapter: ^1.21.4
     buffer: ^6.0.3
     classnames: ^2.3.2
-    connected-react-router: ^6.9.3
     css-loader: ^6.7.3
     cssnano: ^6.0.1
     eslint: ^8.48.0
@@ -5768,7 +5625,6 @@ __metadata:
     esno: ^0.17.0
     events: ^3.3.0
     fetch-mock: ^9.11.0
-    history: ^4.10.1
     html-webpack-plugin: ^5.5.0
     invariant: ^2.2.4
     jasmine-core: ^3.5.0
@@ -5804,8 +5660,8 @@ __metadata:
     react-query: ^3.39.3
     react-redux: ^8.0.5
     react-refresh: ^0.14.0
-    react-router: ^5.1.2
-    react-router-dom: ^5.1.2
+    react-router: ^6.27.0
+    react-router-dom: ^6.27.0
     react-transition-group: ^4.4.5
     react-use-promise: ^0.5.0
     redux: ^4.2.1
@@ -5866,13 +5722,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"electron-to-chromium@npm:^1.4.477":
-  version: 1.4.510
-  resolution: "electron-to-chromium@npm:1.4.510"
-  checksum: c129dbd5735876fbd25b541cc6fd138914ba8c2189f0c30e2145b645d79d67fcb22f64dc28801ec847e8e71418f89318bd8f0ab02d464979bec2668a06dc4268
-  languageName: node
-  linkType: hard
-
 "electron-to-chromium@npm:^1.5.4":
   version: 1.5.13
   resolution: "electron-to-chromium@npm:1.5.13"
@@ -6228,14 +6077,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"escalade@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "escalade@npm:3.1.1"
-  checksum: a3e2a99f07acb74b3ad4989c48ca0c3140f69f923e56d0cba0526240ee470b91010f9d39001f2a4a313841d237ede70a729e92125191ba5d21e74b106800b133
-  languageName: node
-  linkType: hard
-
-"escalade@npm:^3.1.2":
+"escalade@npm:^3.1.1, escalade@npm:^3.1.2":
   version: 3.1.2
   resolution: "escalade@npm:3.1.2"
   checksum: 1ec0977aa2772075493002bdbd549d595ff6e9393b1cb0d7d6fcaf78c750da0c158f180938365486f75cb69fba20294351caddfce1b46552a7b6c3cde52eaa02
@@ -6829,17 +6671,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"follow-redirects@npm:^1.0.0":
-  version: 1.15.2
-  resolution: "follow-redirects@npm:1.15.2"
-  peerDependenciesMeta:
-    debug:
-      optional: true
-  checksum: faa66059b66358ba65c234c2f2a37fcec029dc22775f35d9ad6abac56003268baf41e55f9ee645957b32c7d9f62baf1f0b906e68267276f54ec4b4c597c2b190
-  languageName: node
-  linkType: hard
-
-"follow-redirects@npm:^1.15.6":
+"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.15.6":
   version: 1.15.6
   resolution: "follow-redirects@npm:1.15.6"
   peerDependenciesMeta:
@@ -7316,21 +7148,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"history@npm:^4.10.1, history@npm:^4.9.0":
-  version: 4.10.1
-  resolution: "history@npm:4.10.1"
-  dependencies:
-    "@babel/runtime": ^7.1.2
-    loose-envify: ^1.2.0
-    resolve-pathname: ^3.0.0
-    tiny-invariant: ^1.0.2
-    tiny-warning: ^1.0.0
-    value-equal: ^1.0.1
-  checksum: addd84bc4683929bae4400419b5af132ff4e4e9b311a0d4e224579ea8e184a6b80d7f72c55927e4fa117f69076a9e47ce082d8d0b422f1a9ddac7991490ca1d0
-  languageName: node
-  linkType: hard
-
-"hoist-non-react-statics@npm:^3.1.0, hoist-non-react-statics@npm:^3.3.0, hoist-non-react-statics@npm:^3.3.1, hoist-non-react-statics@npm:^3.3.2":
+"hoist-non-react-statics@npm:^3.3.0, hoist-non-react-statics@npm:^3.3.2":
   version: 3.3.2
   resolution: "hoist-non-react-statics@npm:3.3.2"
   dependencies:
@@ -7565,7 +7383,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"immutable@npm:^3.8.1 || ^4.0.0, immutable@npm:^4.2.2":
+"immutable@npm:^4.2.2":
   version: 4.3.0
   resolution: "immutable@npm:4.3.0"
   checksum: bbd7ea99e2752e053323543d6ff1cc71a4b4614fa6121f321ca766db2bd2092f3f1e0a90784c5431350b7344a4f792fa002eac227062d59b9377b6c09063b58b
@@ -8072,13 +7890,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"isarray@npm:0.0.1":
-  version: 0.0.1
-  resolution: "isarray@npm:0.0.1"
-  checksum: 49191f1425681df4a18c2f0f93db3adb85573bcdd6a4482539d98eac9e705d8961317b01175627e860516a2fc45f8f9302db26e5a380a97a520e272e2a40a8d4
-  languageName: node
-  linkType: hard
-
 "isarray@npm:^2.0.5":
   version: 2.0.5
   resolution: "isarray@npm:2.0.5"
@@ -8434,13 +8245,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.isequalwith@npm:^4.4.0":
-  version: 4.4.0
-  resolution: "lodash.isequalwith@npm:4.4.0"
-  checksum: 428ba7a57c47ec05e2dd18c03a4b4c45dac524a46af7ce3f412594bfc7be6a5acaa51acf9ea113d0002598e9aafc6e19ee8d20bc28363145fcb4d21808c9039f
-  languageName: node
-  linkType: hard
-
 "lodash.isplainobject@npm:^4.0.6":
   version: 4.0.6
   resolution: "lodash.isplainobject@npm:4.0.6"
@@ -8503,7 +8307,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"loose-envify@npm:^1.0.0, loose-envify@npm:^1.1.0, loose-envify@npm:^1.2.0, loose-envify@npm:^1.3.1, loose-envify@npm:^1.4.0":
+"loose-envify@npm:^1.0.0, loose-envify@npm:^1.1.0, loose-envify@npm:^1.4.0":
   version: 1.4.0
   resolution: "loose-envify@npm:1.4.0"
   dependencies:
@@ -9419,13 +9223,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-releases@npm:^2.0.13":
-  version: 2.0.13
-  resolution: "node-releases@npm:2.0.13"
-  checksum: 17ec8f315dba62710cae71a8dad3cd0288ba943d2ece43504b3b1aa8625bf138637798ab470b1d9035b0545996f63000a8a926e0f6d35d0996424f8b6d36dda3
-  languageName: node
-  linkType: hard
-
 "node-releases@npm:^2.0.18":
   version: 2.0.18
   resolution: "node-releases@npm:2.0.18"
@@ -9877,15 +9674,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-to-regexp@npm:^1.7.0":
-  version: 1.8.0
-  resolution: "path-to-regexp@npm:1.8.0"
-  dependencies:
-    isarray: 0.0.1
-  checksum: 709f6f083c0552514ef4780cb2e7e4cf49b0cc89a97439f2b7cc69a608982b7690fb5d1720a7473a59806508fc2dae0be751ba49f495ecf89fd8fbc62abccbcd
-  languageName: node
-  linkType: hard
-
 "path-to-regexp@npm:^2.2.1":
   version: 2.4.0
   resolution: "path-to-regexp@npm:2.4.0"
@@ -9914,14 +9702,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"picocolors@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "picocolors@npm:1.0.0"
-  checksum: a2e8092dd86c8396bdba9f2b5481032848525b3dc295ce9b57896f931e63fc16f79805144321f72976383fc249584672a75cc18d6777c6b757603f372f745981
-  languageName: node
-  linkType: hard
-
-"picocolors@npm:^1.0.1":
+"picocolors@npm:^1.0.0, picocolors@npm:^1.0.1":
   version: 1.0.1
   resolution: "picocolors@npm:1.0.1"
   checksum: fa68166d1f56009fc02a34cdfd112b0dd3cf1ef57667ac57281f714065558c01828cdf4f18600ad6851cbe0093952ed0660b1e0156bddf2184b6aaf5817553a5
@@ -11097,7 +10878,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-is@npm:^16.12.0, react-is@npm:^16.13.1, react-is@npm:^16.6.0, react-is@npm:^16.7.0":
+"react-is@npm:^16.13.1, react-is@npm:^16.7.0":
   version: 16.13.1
   resolution: "react-is@npm:16.13.1"
   checksum: f7a19ac3496de32ca9ae12aa030f00f14a3d45374f1ceca0af707c831b2a6098ef0d6bdae51bd437b0a306d7f01d4677fcc8de7c0d331eb47ad0f46130e53c5f
@@ -11236,39 +11017,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-router-dom@npm:^5.1.2":
-  version: 5.3.4
-  resolution: "react-router-dom@npm:5.3.4"
+"react-router-dom@npm:^6.27.0":
+  version: 6.27.0
+  resolution: "react-router-dom@npm:6.27.0"
   dependencies:
-    "@babel/runtime": ^7.12.13
-    history: ^4.9.0
-    loose-envify: ^1.3.1
-    prop-types: ^15.6.2
-    react-router: 5.3.4
-    tiny-invariant: ^1.0.2
-    tiny-warning: ^1.0.0
+    "@remix-run/router": 1.20.0
+    react-router: 6.27.0
   peerDependencies:
-    react: ">=15"
-  checksum: b86a6f2f5222f041e38adf4e4b32c7643d6735a1a915ef25855b2db285fd059d72ba8d62e5bcd5d822b8ef9520a80453209e55077f5a90d0f72e908979b8f535
+    react: ">=16.8"
+    react-dom: ">=16.8"
+  checksum: de3dcc56297a2879a0e3997fa34ba0f3e1b9986a2ad3ef7991f913902ecf38da0282c98f7834f344ce2d881dbab0a382201a57e9f9ef5e9816febdb26dc038b7
   languageName: node
   linkType: hard
 
-"react-router@npm:5.3.4, react-router@npm:^5.1.2":
-  version: 5.3.4
-  resolution: "react-router@npm:5.3.4"
+"react-router@npm:6.27.0, react-router@npm:^6.27.0":
+  version: 6.27.0
+  resolution: "react-router@npm:6.27.0"
   dependencies:
-    "@babel/runtime": ^7.12.13
-    history: ^4.9.0
-    hoist-non-react-statics: ^3.1.0
-    loose-envify: ^1.3.1
-    path-to-regexp: ^1.7.0
-    prop-types: ^15.6.2
-    react-is: ^16.6.0
-    tiny-invariant: ^1.0.2
-    tiny-warning: ^1.0.0
+    "@remix-run/router": 1.20.0
   peerDependencies:
-    react: ">=15"
-  checksum: 892d4e274a23bf4f39abc2efca54472fb646d3aed4b584020cf49654d2f50d09a2bacebe7c92b4ec7cb8925077376dfcd0664bad6442a73604397cefec9f01f9
+    react: ">=16.8"
+  checksum: d22eedc33bcb11891b431655f90eed2d52c2fb3165ad11ca625f62970caf59c4859e6b1a3f92e78902b31ff1a8b2482ebf97ddebb82e9687d1f98730c14e04e6
   languageName: node
   linkType: hard
 
@@ -11585,13 +11354,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve-pathname@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "resolve-pathname@npm:3.0.0"
-  checksum: 6147241ba42c423dbe83cb067a2b4af4f60908c3af57e1ea567729cc71416c089737fe2a73e9e79e7a60f00f66c91e4b45ad0d37cd4be2d43fec44963ef14368
-  languageName: node
-  linkType: hard
-
 "resolve-pkg-maps@npm:^1.0.0":
   version: 1.0.0
   resolution: "resolve-pkg-maps@npm:1.0.0"
@@ -11768,18 +11530,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"schema-utils@npm:^3.0.0, schema-utils@npm:^3.1.1":
-  version: 3.1.2
-  resolution: "schema-utils@npm:3.1.2"
-  dependencies:
-    "@types/json-schema": ^7.0.8
-    ajv: ^6.12.5
-    ajv-keywords: ^3.5.2
-  checksum: 39683edfe3beff018cdb1ae4fa296fc55cea13a080aa2b4d9351895cd64b22ba4d87e2e548c2a2ac1bc76e60980670adb0f413a58104479f1a0c12e5663cb8ca
-  languageName: node
-  linkType: hard
-
-"schema-utils@npm:^3.2.0":
+"schema-utils@npm:^3.0.0, schema-utils@npm:^3.1.1, schema-utils@npm:^3.2.0":
   version: 3.3.0
   resolution: "schema-utils@npm:3.3.0"
   dependencies:
@@ -11802,13 +11553,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"seamless-immutable@npm:^7.1.3":
-  version: 7.1.4
-  resolution: "seamless-immutable@npm:7.1.4"
-  checksum: f65c1dc12e460265ccc4b164085b807570f9fb8a619cd3c216fc7ed933fb09c57a24a7df1b638dc9bd6367d8d69c2f00b5370b0c0996b4046242539096d2d0c6
-  languageName: node
-  linkType: hard
-
 "select-hose@npm:^2.0.0":
   version: 2.0.0
   resolution: "select-hose@npm:2.0.0"
@@ -12558,21 +12302,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"terser@npm:^5.10.0":
-  version: 5.16.9
-  resolution: "terser@npm:5.16.9"
-  dependencies:
-    "@jridgewell/source-map": ^0.3.2
-    acorn: ^8.5.0
-    commander: ^2.20.0
-    source-map-support: ~0.5.20
-  bin:
-    terser: bin/terser
-  checksum: b373693ee01ce08cc9b9595d57df889acbbc899d929a7fe53662330ce954d53145582f6715c9cc4839d555f5769a28fbeb203155b54e3a9c6c646db292002edd
-  languageName: node
-  linkType: hard
-
-"terser@npm:^5.26.0":
+"terser@npm:^5.10.0, terser@npm:^5.26.0":
   version: 5.31.6
   resolution: "terser@npm:5.31.6"
   dependencies:
@@ -12607,20 +12337,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tiny-invariant@npm:^1.0.2":
-  version: 1.3.1
-  resolution: "tiny-invariant@npm:1.3.1"
-  checksum: 872dbd1ff20a21303a2fd20ce3a15602cfa7fcf9b228bd694a52e2938224313b5385a1078cb667ed7375d1612194feaca81c4ecbe93121ca1baebe344de4f84c
-  languageName: node
-  linkType: hard
-
-"tiny-warning@npm:^1.0.0":
-  version: 1.0.3
-  resolution: "tiny-warning@npm:1.0.3"
-  checksum: da62c4acac565902f0624b123eed6dd3509bc9a8d30c06e017104bedcf5d35810da8ff72864400ad19c5c7806fc0a8323c68baf3e326af7cb7d969f846100d71
-  languageName: node
-  linkType: hard
-
 "tmp@npm:^0.2.1":
   version: 0.2.1
   resolution: "tmp@npm:0.2.1"
@@ -13107,20 +12823,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"update-browserslist-db@npm:^1.0.11":
-  version: 1.0.11
-  resolution: "update-browserslist-db@npm:1.0.11"
-  dependencies:
-    escalade: ^3.1.1
-    picocolors: ^1.0.0
-  peerDependencies:
-    browserslist: ">= 4.21.0"
-  bin:
-    update-browserslist-db: cli.js
-  checksum: b98327518f9a345c7cad5437afae4d2ae7d865f9779554baf2a200fdf4bac4969076b679b1115434bd6557376bdd37ca7583d0f9b8f8e302d7d4cc1e91b5f231
-  languageName: node
-  linkType: hard
-
 "update-browserslist-db@npm:^1.1.0":
   version: 1.1.0
   resolution: "update-browserslist-db@npm:1.1.0"
@@ -13226,13 +12928,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"value-equal@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "value-equal@npm:1.0.1"
-  checksum: bb7ae1facc76b5cf8071aeb6c13d284d023fdb370478d10a5d64508e0e6e53bb459c4bbe34258df29d82e6f561f874f0105eba38de0e61fe9edd0bdce07a77a2
-  languageName: node
-  linkType: hard
-
 "vary@npm:^1, vary@npm:~1.1.2":
   version: 1.1.2
   resolution: "vary@npm:1.1.2"

From 61a6d59b6e7582f7a2dd42160c2a9794e084971b Mon Sep 17 00:00:00 2001
From: Benjamin Cutler <uraniumanchor@users.noreply.github.com>
Date: Fri, 1 Nov 2024 13:26:08 -0600
Subject: [PATCH 25/40] ads API v2 (#731)

[#184870633]
---
 bundles/common/Permissions.ts                 |   1 -
 tests/apiv2/test_ads.py                       | 220 ++++++++++++++++++
 tests/apiv2/test_events.py                    |   2 +-
 tests/apiv2/test_runs.py                      |  12 +-
 tests/randgen.py                              |  32 ++-
 tests/test_api.py                             |  26 ++-
 tests/test_speedrun.py                        |  31 ++-
 tests/util.py                                 |  21 +-
 tracker/api/messages.py                       |   4 +
 tracker/api/serializers.py                    | 130 +++++++++--
 tracker/api/urls.py                           |   3 +-
 tracker/api/views/__init__.py                 |   2 +
 tracker/api/views/ad.py                       |  16 ++
 tracker/api_urls.py                           |   2 +-
 .../0048_remove_old_ad_permission.py          |  17 ++
 tracker/models/interstitial.py                |   7 +-
 tracker/views/api.py                          |   4 +-
 17 files changed, 469 insertions(+), 61 deletions(-)
 create mode 100644 tests/apiv2/test_ads.py
 create mode 100644 tracker/api/views/ad.py
 create mode 100644 tracker/migrations/0048_remove_old_ad_permission.py

diff --git a/bundles/common/Permissions.ts b/bundles/common/Permissions.ts
index da62d867b..0bbd4bc4b 100644
--- a/bundles/common/Permissions.ts
+++ b/bundles/common/Permissions.ts
@@ -100,7 +100,6 @@ export type Permission =
   | 'tracker.show_queries'
   | 'tracker.top_level_bid'
   | 'tracker.view_ad'
-  | 'tracker.view_ads'
   | 'tracker.view_amountfilter'
   | 'tracker.view_bid'
   | 'tracker.view_bidsuggestion'
diff --git a/tests/apiv2/test_ads.py b/tests/apiv2/test_ads.py
new file mode 100644
index 000000000..c96d63ff9
--- /dev/null
+++ b/tests/apiv2/test_ads.py
@@ -0,0 +1,220 @@
+import random
+
+from tests import randgen
+from tests.util import APITestCase
+from tracker import models
+from tracker.api import messages
+from tracker.api.serializers import AdSerializer
+
+
+class TestAd(APITestCase):
+    model_name = 'ad'
+    serializer_class = AdSerializer
+    rand = random.Random()
+
+    def setUp(self):
+        super().setUp()
+        self.run = randgen.generate_run(self.rand, event=self.event, ordered=True)
+        self.run.save()
+        self.ad = randgen.generate_ad(self.rand, run=self.run)
+        self.ad.save()
+
+    def test_fetch(self):
+        with self.subTest('happy path'), self.saveSnapshot():
+            data = self.get_list(user=self.view_user)['results']
+            self.assertV2ModelPresent(self.ad, data)
+
+            data = self.get_list(kwargs={'event_pk': self.event.pk})['results']
+            self.assertV2ModelPresent(self.ad, data)
+
+            data = self.get_detail(self.ad)
+            self.assertV2ModelPresent(self.ad, data)
+
+        with self.subTest('blank event'):
+            data = self.get_list(kwargs={'event_pk': self.locked_event.pk})
+            self.assertEqual(data['count'], 0)
+
+        with self.subTest('unauthenticated'):
+            self.get_list(user=None, status_code=403)
+            self.get_detail(self.ad, user=None, status_code=403)
+
+    def test_create(self):
+        with self.subTest(
+            'happy path with ids'
+        ), self.saveSnapshot(), self.assertLogsChanges(2):
+            data = self.post_new(
+                data={
+                    'event': self.event.pk,
+                    'order': self.run.order,
+                    'suborder': 'last',
+                    'sponsor_name': 'Contoso',
+                    'ad_name': 'Contoso University',
+                    'ad_type': 'IMAGE',
+                    'filename': 'foobar.jpg',
+                },
+                user=self.add_user,
+            )
+            result = models.Ad.objects.get(id=data['id'])
+            self.assertV2ModelPresent(result, data)
+
+            data = self.post_new(
+                data={
+                    'anchor': self.run.pk,
+                    'suborder': result.suborder + 1,
+                    'sponsor_name': 'Contoso',
+                    'ad_name': 'Contoso University 2',
+                    'ad_type': 'IMAGE',
+                    'filename': 'foobar_2.jpg',
+                    'tags': ['test'],
+                }
+            )
+            result = models.Ad.objects.get(id=data['id'])
+            self.assertV2ModelPresent(result, data)
+
+        with self.subTest(
+            'happy path with natural keys'
+        ), self.saveSnapshot(), self.assertLogsChanges(2):
+            data = self.post_new(
+                data={
+                    'event': self.event.natural_key(),
+                    'order': self.run.order,
+                    'suborder': 'last',
+                    'sponsor_name': 'Contoso',
+                    'ad_name': 'Contoso University Natural',
+                    'ad_type': 'IMAGE',
+                    'filename': 'foobar.jpg',
+                },
+                user=self.add_user,
+            )
+            result = models.Ad.objects.get(id=data['id'])
+            self.assertV2ModelPresent(result, data)
+
+            data = self.post_new(
+                data={
+                    'anchor': self.run.natural_key(),
+                    'suborder': result.suborder + 1,
+                    'sponsor_name': 'Contoso',
+                    'ad_name': 'Contoso University 2 Natural',
+                    'ad_type': 'IMAGE',
+                    'filename': 'foobar_2.jpg',
+                    'tags': ['test'],
+                }
+            )
+            result = models.Ad.objects.get(id=data['id'])
+            self.assertV2ModelPresent(result, data)
+
+        with self.subTest('locked event user'), self.assertLogsChanges(1):
+            self.post_new(
+                data={
+                    'event': self.locked_event.pk,
+                    'order': 1,
+                    'suborder': 1,
+                    'sponsor_name': 'Contoso',
+                    'ad_name': 'Contoso Universtity',
+                    'ad_type': 'IMAGE',
+                    'filename': 'foobar_3.jpg',
+                },
+                user=self.locked_user,
+            )
+
+        with self.subTest('error cases'):
+            self.post_new(
+                data={
+                    'event': self.locked_event.pk,
+                },
+                user=self.add_user,
+                status_code=403,
+            )
+
+            self.post_new(
+                data={
+                    'event': self.event.pk,
+                    'order': self.run.order,
+                    'anchor': self.run.pk,
+                },
+                status_code=400,
+                expected_error_codes={
+                    'event': messages.ANCHOR_FIELD_CODE,
+                    'order': messages.ANCHOR_FIELD_CODE,
+                },
+            )
+
+            self.run.order = None
+            self.run.save()
+
+            self.post_new(
+                data={
+                    'anchor': self.run.pk,
+                },
+                status_code=400,
+                expected_error_codes={'anchor': messages.INVALID_ANCHOR_CODE},
+            )
+
+            # doesn't blow up if missing/nonsense
+
+            self.post_new(
+                data={
+                    'anchor': {'what': 'is this'},
+                },
+                status_code=400,
+            )
+
+            self.post_new(
+                data={
+                    'suborder': 'last',
+                },
+                status_code=400,
+            )
+
+            self.post_new(
+                data={
+                    'event': 'not_an_id',
+                },
+                status_code=400,
+            )
+
+            self.post_new(
+                data={
+                    'event': {'total': 'garbage'},
+                    'suborder': 'last',
+                },
+                status_code=400,
+            )
+
+            self.post_new(
+                data={
+                    'order': {'also': 'silly'},
+                    'suborder': 'last',
+                },
+                status_code=400,
+            )
+
+        with self.subTest('anonymous user'):
+            self.post_new(user=None, status_code=403)
+
+    def test_patch(self):
+        with self.subTest('happy path'), self.saveSnapshot(), self.assertLogsChanges(2):
+            data = self.patch_detail(
+                self.ad,
+                data={
+                    'sponsor_name': 'Still Contoso',
+                },
+                user=self.add_user,
+            )
+            self.assertV2ModelPresent(self.ad, data)
+
+            self.patch_detail(
+                self.ad,
+                data={
+                    'sponsor_name': 'Also Still Contoso',
+                },
+                kwargs={'event_pk': self.event.pk},
+            )
+
+        with self.subTest('wrong event'):
+            self.patch_detail(
+                self.ad,
+                data={},
+                kwargs={'event_pk': self.blank_event.pk},
+                status_code=404,
+            )
diff --git a/tests/apiv2/test_events.py b/tests/apiv2/test_events.py
index f26c8a9c0..5f1fcc815 100644
--- a/tests/apiv2/test_events.py
+++ b/tests/apiv2/test_events.py
@@ -16,7 +16,7 @@ def setUp(self):
         self.client.force_authenticate(user=self.super_user)
 
     def test_event_list(self):
-        events = [self.event, self.locked_event]
+        events = [self.blank_event, self.event, self.locked_event]
         serialized = self.get_paginated_response(
             events, EventSerializer(events, many=True).data
         )
diff --git a/tests/apiv2/test_runs.py b/tests/apiv2/test_runs.py
index f2a46f1d5..01f9b3279 100644
--- a/tests/apiv2/test_runs.py
+++ b/tests/apiv2/test_runs.py
@@ -100,7 +100,11 @@ def test_create(self):
         with self.subTest(
             'full blown model w/implicit tag creation'
         ), self.saveSnapshot(), self.assertLogsChanges(1):
-            last_run = models.SpeedRun.objects.filter(event=self.event).last()
+            last_run = (
+                models.SpeedRun.objects.filter(event=self.event)
+                .exclude(order=None)
+                .last()
+            )
             data = self.post_new(
                 data={
                     'event': self.event.short,
@@ -198,9 +202,9 @@ def test_create(self):
                 },
             )
 
-        with self.subTest('blank entry smoke test'), self.assertLogsChanges(0):
+        with self.subTest('mostly blank entry'), self.assertLogsChanges(0):
             self.post_new(
-                data={},
+                data={'order': 'last'},
                 status_code=400,
                 expected_error_codes={
                     'event': 'required',
@@ -218,7 +222,7 @@ def test_create(self):
                     'setup_time': '5:00',
                     'runners': [self.runner1.id],
                 },
-                kwargs={'event_pk': self.event1.pk},
+                kwargs={'event_pk': self.event.pk},
             )
             model = models.SpeedRun.objects.get(id=data['id'])
             self.assertV2ModelPresent(model, data)
diff --git a/tests/randgen.py b/tests/randgen.py
index c605bca80..1718eb4ab 100644
--- a/tests/randgen.py
+++ b/tests/randgen.py
@@ -6,6 +6,7 @@
 from decimal import Decimal
 
 from tracker.models import (
+    Ad,
     Bid,
     Donation,
     DonationBid,
@@ -654,11 +655,38 @@ def generate_milestone(
     return milestone
 
 
-def generate_interview(rand: random.Random, *, event=None, run=None, suborder=None):
+def generate_ad(
+    rand: random.Random, *, event=None, run=None, order=None, suborder=None
+):
+    if event is None:
+        if run:
+            event = run.event
+        else:
+            event = rand.choice(Event.objects.all())
+            assert event is not None, 'need at least one event'
+    if order is None and run is None:
+        run = rand.choice(event.speedrun_set.exclude(order=None))
+        assert run, 'need at least one ordered run in the event'
+    if suborder is None:
+        last = Interstitial.objects.filter(order=order if order else run.order).last()
+        suborder = last.suborder + 1 if last else 1
+    ad = Ad(event=event, suborder=suborder, ad_type='IMAGE')
+    if run:
+        ad.anchor = run
+    else:
+        ad.order = order
+    ad.filename = random_name(rand, 'filename') + '.jpg'
+    ad.ad_name = random_name(rand, 'ad_name')
+    ad.clean()
+    return ad
+
+
+def generate_interview(
+    rand: random.Random, *, event=None, run=None, order=None, suborder=None
+):
     if event is None:
         if run:
             event = run.event
-            assert event, 'provided run needs to belong to an event'
         else:
             event = rand.choice(Event.objects.all())
             assert event is not None, 'need at least one event'
diff --git a/tests/test_api.py b/tests/test_api.py
index e8644985c..9c62a7a5e 100755
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -194,10 +194,11 @@ class TestSpeedRun(APITestCase):
     model_name = 'Speed Run'
 
     def setUp(self):
-        super(TestSpeedRun, self).setUp()
+        super().setUp()
         self.blechy = models.Talent.objects.create(name='blechy')
         self.spike = models.Talent.objects.create(name='SpikeVegeta')
         self.run1 = models.SpeedRun.objects.create(
+            event=self.event,
             name='Test Run',
             category='test%',
             giantbomb_id=0x5EADBEEF,
@@ -214,13 +215,25 @@ def setUp(self):
         self.run1.commentators.add(self.blechy)
         self.run1.hosts.add(self.spike)
         self.run2 = models.SpeedRun.objects.create(
-            name='Test Run 2', run_time='0:15:00', setup_time='0:05:00', order=2
+            event=self.event,
+            name='Test Run 2',
+            run_time='0:15:00',
+            setup_time='0:05:00',
+            order=2,
         )
         self.run3 = models.SpeedRun.objects.create(
-            name='Test Run 3', run_time='0:20:00', setup_time='0:05:00', order=None
+            event=self.event,
+            name='Test Run 3',
+            run_time='0:20:00',
+            setup_time='0:05:00',
+            order=None,
         )
         self.run4 = models.SpeedRun.objects.create(
-            name='Test Run 4', run_time='0:05:00', setup_time='0', order=3
+            event=self.event,
+            name='Test Run 4',
+            run_time='0:05:00',
+            setup_time='0',
+            order=3,
         )
         self.runner1 = models.Talent.objects.create(name='trihex')
         self.runner2 = models.Talent.objects.create(name='PJ')
@@ -946,9 +959,6 @@ def test_event_annotations(self):
             domain='PAYPAL',
             transactionstate='PENDING',
         )
-        # make sure empty events show up too
-        extra_event = randgen.generate_event(self.rand, today_noon)
-        extra_event.save()
         request = self.factory.get('/api/v1/search', dict(type='event'))
         request.user = self.add_user
         data = self.parseJSON(tracker.views.api.search(request))
@@ -973,7 +983,7 @@ def test_event_annotations(self):
         )
         self.assertModelPresent(
             {
-                'pk': extra_event.id,
+                'pk': self.blank_event.id,
                 'model': 'tracker.event',
                 'fields': {'amount': 0.0, 'count': 0, 'max': 0.0, 'avg': 0.0},
             },
diff --git a/tests/test_speedrun.py b/tests/test_speedrun.py
index ecc196e49..94ebc2bfe 100755
--- a/tests/test_speedrun.py
+++ b/tests/test_speedrun.py
@@ -21,21 +21,36 @@
 class TestSpeedRunBase(TransactionTestCase):
     def setUp(self):
         super().setUp()
-        self.event1 = models.Event.objects.create(datetime=today_noon, targetamount=5)
+        if not hasattr(self, 'event'):
+            self.event = models.Event.objects.create(
+                datetime=today_noon, targetamount=5
+            )
         self.run1 = models.SpeedRun.objects.create(
-            name='Test Run', run_time='45:00', setup_time='5:00', order=1
+            event=self.event,
+            name='Test Run',
+            run_time='45:00',
+            setup_time='5:00',
+            order=1,
         )
         self.run2 = models.SpeedRun.objects.create(
-            name='Test Run 2', run_time='15:00', setup_time='5:00', order=2
+            event=self.event,
+            name='Test Run 2',
+            run_time='15:00',
+            setup_time='5:00',
+            order=2,
         )
         self.run3 = models.SpeedRun.objects.create(
-            name='Test Run 3', run_time='5:00', order=3
+            event=self.event, name='Test Run 3', run_time='5:00', order=3
         )
         self.run4 = models.SpeedRun.objects.create(
-            name='Test Run 4', run_time='1:20:00', setup_time='5:00', order=None
+            event=self.event,
+            name='Test Run 4',
+            run_time='1:20:00',
+            setup_time='5:00',
+            order=None,
         )
         self.run5 = models.SpeedRun.objects.create(
-            name='Test Run 5', order=4, run_time='15:00'
+            event=self.event, name='Test Run 5', order=4, run_time='15:00'
         )
         self.runner1 = models.Talent.objects.create(name='trihex')
         self.runner2 = models.Talent.objects.create(name='neskamikaze')
@@ -60,7 +75,7 @@ def test_timestamps(self):
         self.assertEqual(self.run1.setup_time, '0:05:00')
 
     def test_first_run_start_time(self):
-        self.assertEqual(self.run1.starttime, self.event1.datetime)
+        self.assertEqual(self.run1.starttime, self.event.datetime)
 
     def test_second_run_start_time(self):
         self.assertEqual(
@@ -98,7 +113,7 @@ def test_removing_run_from_schedule(self):
         self.run1.order = None
         self.run1.save()
         self.run2.refresh_from_db()
-        self.assertEqual(self.run2.starttime, self.event1.datetime)
+        self.assertEqual(self.run2.starttime, self.event.datetime)
 
     def test_update_runners_on_save(self):
         self.run1.runners.add(self.runner1, self.runner2)
diff --git a/tests/util.py b/tests/util.py
index 9119bca12..e3aed262a 100644
--- a/tests/util.py
+++ b/tests/util.py
@@ -267,9 +267,10 @@ def get_detail(
             self.client.force_authenticate(user=other_kwargs['user'])
         model_name = model_name or self.model_name
         assert model_name is not None
+        pk = obj if isinstance(obj, int) else obj.pk
         url = reverse(
             self._get_viewname(model_name, 'detail', **kwargs),
-            kwargs={'pk': obj.pk, **kwargs},
+            kwargs={'pk': pk, **kwargs},
         )
         with self._snapshot('GET', url, data) as snapshot:
             response = self.client.get(
@@ -540,7 +541,11 @@ def _compare_model(
             (
                 f'{prefix}.' if prefix else '' + k,
                 self._compare_model(
-                    expected_model[k], found_model[k], partial, prefix=k
+                    expected_model[k],
+                    found_model[k],
+                    partial,
+                    prefix=k,
+                    missing_ok=missing_ok,
                 ),
             )
             for k in expected_model.keys()
@@ -818,10 +823,9 @@ def _snapshot(self, method, url, data):
                 re.sub(r'^Test', '', self.__class__.__name__),
                 re.sub(r'^test_', '', self._testMethodName).lower(),
             ]
-            subtest = getattr(self, '_subtest', None)
-            while subtest:
+            subtest = self
+            while subtest := getattr(subtest, '_subtest', None):
                 pieces.append(re.sub(r'\W', '_', subtest._message).lower())
-                subtest = subtest._subtest
 
             # obscure ids from url since they can drift depending on test order/results, remove leading tracker since it's redundant, and slugify everything else
             pieces += [
@@ -843,6 +847,7 @@ def _snapshot(self, method, url, data):
             yield APITestCase._Snapshot(url, method)
 
     def setUp(self):
+        super().setUp()
         self._save_snapshot = False
         self.rand = random.Random()
         self.factory = RequestFactory()
@@ -854,6 +859,12 @@ def setUp(self):
             name='Locked Event',
             locked=True,
         )
+        self.blank_event = models.Event.objects.create(
+            datetime=tomorrow_noon,
+            targetamount=5,
+            short='blank',
+            name='Blank Event',
+        )
         self.event = models.Event.objects.create(
             datetime=today_noon, targetamount=5, short='event', name='Test Event'
         )
diff --git a/tracker/api/messages.py b/tracker/api/messages.py
index 9f8d6fbb6..41833a330 100644
--- a/tracker/api/messages.py
+++ b/tracker/api/messages.py
@@ -46,3 +46,7 @@
     'Nested models are only writeable on creation, use the endpoint for that specific model instead.'
 )
 NO_NESTED_UPDATES_CODE = 'no_nested_updates'
+ANCHOR_FIELD = _('`event` and `order` fields are implicit if specifying `anchor`.')
+ANCHOR_FIELD_CODE = 'invalid_anchor_sibling'
+INVALID_ANCHOR = _('Specified anchor is not ordered.')
+INVALID_ANCHOR_CODE = 'invalid_anchor'
diff --git a/tracker/api/serializers.py b/tracker/api/serializers.py
index ccaeba9d2..74d2943bf 100644
--- a/tracker/api/serializers.py
+++ b/tracker/api/serializers.py
@@ -6,13 +6,16 @@
 from functools import cached_property
 from inspect import signature
 
-from django.core.exceptions import NON_FIELD_ERRORS, ObjectDoesNotExist, ValidationError
+from django.core.exceptions import NON_FIELD_ERRORS, ObjectDoesNotExist
+from django.core.exceptions import ValidationError as DjangoValidationError
 from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
+from rest_framework.exceptions import ErrorDetail, ValidationError
 from rest_framework.utils import model_meta
+from rest_framework.validators import UniqueTogetherValidator
 
 from tracker.api import messages
-from tracker.models import Interview
+from tracker.models import Ad, Interstitial, Interview
 from tracker.models.bid import Bid, DonationBid
 from tracker.models.donation import Donation, Donor, Milestone
 from tracker.models.event import Event, SpeedRun, Tag, Talent, VideoLink, VideoLinkType
@@ -27,15 +30,24 @@ def _coalesce_validation_errors(errors):
         try:
             errors()
             errors = None
-        except ValidationError as other:
-            errors = other
+        except DjangoValidationError as e:
+            errors = e.update_error_dict({})
+        except ValidationError as e:
+            errors = DjangoValidationError({}).update_error_dict(e.detail)
     try:
         yield
-    except ValidationError as e:
+    except DjangoValidationError as e:
         errors = errors or {}
         if isinstance(errors, list) and errors:
             errors = {NON_FIELD_ERRORS: errors}
         errors = e.update_error_dict(errors)
+    except ValidationError as e:
+        # TODO: what about nested keys? does that ever come up?
+        errors = errors or defaultdict(list)
+        if isinstance(errors, list) and errors:
+            errors = defaultdict(list).update({NON_FIELD_ERRORS: errors})
+        for k, v in e.detail.items():
+            errors[k].extend(v if isinstance(v, list) else [v])
     if errors:
         raise ValidationError(errors)
 
@@ -54,6 +66,13 @@ def __init__(self, instance=None, exclude_from_clean=None, **kwargs):
         self.exclude_from_clean = exclude_from_clean or []
         super().__init__(instance, **kwargs)
 
+    def get_validators(self):
+        validators = super().get_validators()
+        # we do this ourselves and it causes weird issues elsewhere
+        return tuple(
+            v for v in validators if not isinstance(v, UniqueTogetherValidator)
+        )
+
     def validate(self, attrs):
         if isinstance(attrs, dict):
             exclude = (
@@ -85,13 +104,8 @@ def validate(self, attrs):
                     invalid_updates = [k for k in attrs if k in self.nested_creates]
                     if invalid_updates:
                         raise ValidationError(
-                            {
-                                k: ValidationError(
-                                    messages.NO_NESTED_UPDATES,
-                                    code=messages.NO_NESTED_UPDATES_CODE,
-                                )
-                                for k in invalid_updates
-                            }
+                            {k: messages.NO_NESTED_UPDATES for k in invalid_updates},
+                            code=messages.NO_NESTED_UPDATES_CODE,
                         )
         return super().validate(attrs)
 
@@ -237,6 +251,10 @@ def __init__(self, *args, event_pk=None, **kwargs):
         #  ones that use it any more
         super().__init__(*args, **kwargs)
         self.event_pk = event_pk
+        # without this check, patching by event url doesn't work
+        self.event_in_url = (
+            view := self.context.get('view', None)
+        ) and 'event_pk' in view.kwargs
 
     def get_fields(self):
         fields = super().get_fields()
@@ -263,7 +281,11 @@ def to_representation(self, instance):
         return ret
 
     def to_internal_value(self, data):
-        if 'event' not in data and (event_pk := self.get_event_pk()):
+        if (
+            isinstance(data, dict)
+            and 'event' not in data
+            and (event_pk := self.get_event_pk())
+        ):
             data['event'] = event_pk
         value = super().to_internal_value(data)
         return value
@@ -274,7 +296,7 @@ def validate(self, data):
         if (
             not self.event_move
             and self.instance
-            and 'event' in getattr(self, 'initial_data', {})
+            and ('event' in getattr(self, 'initial_data', {}) and not self.event_in_url)
         ):
             raise ValidationError(
                 {'event': messages.EVENT_READ_ONLY}, code=messages.EVENT_READ_ONLY_CODE
@@ -601,7 +623,10 @@ def to_internal_value(self, data):
 
 
 class SpeedRunSerializer(
-    WithPermissionsSerializerMixin, EventNestedSerializerMixin, TrackerModelSerializer
+    PrimaryOrNaturalKeyLookup,
+    WithPermissionsSerializerMixin,
+    EventNestedSerializerMixin,
+    TrackerModelSerializer,
 ):
     type = ClassNameField()
     event = EventSerializer()
@@ -667,14 +692,12 @@ def to_representation(self, instance):
         return super().to_representation(instance)
 
     def to_internal_value(self, data):
-        last = data.get('order', None) == 'last'
+        last = isinstance(data, dict) and data.get('order', None) == 'last'
         if last:
             del data['order']
         value = super().to_internal_value(data)
-        # I'm not sure what will happen if we somehow get to this point without an event,
-        #  but I think things are already falling apart by then
-        if last and value.get('event', None) is not None:
-            run = value['event'].speedrun_set.last()
+        if last:
+            run = value['event'].speedrun_set.exclude(order=None).last()
             if run:
                 value['order'] = run.order + 1
             else:
@@ -688,13 +711,13 @@ def get_fields(self):
         return fields
 
 
-class InterviewSerializer(EventNestedSerializerMixin, TrackerModelSerializer):
+class InterstitialSerializer(EventNestedSerializerMixin, TrackerModelSerializer):
     type = ClassNameField()
     event = EventSerializer()
-    tags = TagField(many=True)
+    tags = TagField(many=True, required=False, allow_create=True)
+    anchor = SpeedRunSerializer(required=False)
 
     class Meta:
-        model = Interview
         fields = (
             'type',
             'id',
@@ -702,6 +725,66 @@ class Meta:
             'anchor',
             'order',
             'suborder',
+            'tags',
+        )
+
+    def to_internal_value(self, data):
+        errors = defaultdict(list)
+        if anchor := data.get('anchor', None):
+            if 'event' in data:
+                errors['event'].append(
+                    ErrorDetail(messages.ANCHOR_FIELD, code=messages.ANCHOR_FIELD_CODE)
+                )
+            if 'order' in data:
+                errors['order'].append(
+                    ErrorDetail(messages.ANCHOR_FIELD, code=messages.ANCHOR_FIELD_CODE)
+                )
+
+            with _coalesce_validation_errors(errors):
+                if anchor := SpeedRunSerializer().to_internal_value(anchor):
+                    data['anchor'] = anchor.id
+                    data['event'] = anchor.event_id
+                    if anchor.order:
+                        data['order'] = anchor.order
+                    else:
+                        errors['anchor'].append(
+                            ErrorDetail(
+                                messages.INVALID_ANCHOR,
+                                code=messages.INVALID_ANCHOR_CODE,
+                            )
+                        )
+        if last := data.get('suborder', None) == 'last':
+            data['suborder'] = 10000  # TODO: horrible lie to silence the validation
+        with _coalesce_validation_errors(errors):
+            value = super().to_internal_value(data)
+        if last:
+            if interstitial := Interstitial.objects.filter(
+                event=value['event'],
+                order=value['order'],
+            ).last():
+                value['suborder'] = interstitial.suborder + 1
+            else:
+                data['suborder'] = 1
+
+        return value
+
+
+class AdSerializer(InterstitialSerializer):
+    class Meta:
+        model = Ad
+        fields = InterstitialSerializer.Meta.fields + (
+            'sponsor_name',
+            'ad_name',
+            'ad_type',
+            'filename',
+            'blurb',
+        )
+
+
+class InterviewSerializer(InterstitialSerializer):
+    class Meta:
+        model = Interview
+        fields = InterstitialSerializer.Meta.fields + (
             'social_media',
             'interviewers',
             'topic',
@@ -711,7 +794,6 @@ class Meta:
             'length',
             'subjects',
             'camera_operator',
-            'tags',
         )
 
 
diff --git a/tracker/api/urls.py b/tracker/api/urls.py
index a9ff7245f..bf3cc26e9 100644
--- a/tracker/api/urls.py
+++ b/tracker/api/urls.py
@@ -4,7 +4,7 @@
 from rest_framework import routers
 
 from tracker.api import views
-from tracker.api.views import bids, donations, interview, me, milestone, run, talent
+from tracker.api.views import ad, bids, donations, interview, me, milestone, run, talent
 
 router = routers.DefaultRouter()
 
@@ -29,6 +29,7 @@ def event_nested_route(path, viewset, *, basename=None, feed=False):
 event_nested_route(r'bids', bids.BidViewSet, feed=True)
 event_nested_route(r'talent', talent.TalentViewSet)
 event_nested_route(r'runs', run.SpeedRunViewSet)
+event_nested_route(r'ads', ad.AdViewSet)
 event_nested_route(r'interviews', interview.InterviewViewSet)
 event_nested_route(r'milestones', milestone.MilestoneViewSet)
 router.register(r'donations', donations.DonationViewSet, basename='donations')
diff --git a/tracker/api/views/__init__.py b/tracker/api/views/__init__.py
index bb575a80b..826e06b03 100644
--- a/tracker/api/views/__init__.py
+++ b/tracker/api/views/__init__.py
@@ -210,6 +210,8 @@ def perform_update(self, serializer):
         super().perform_update(serializer)
         changed_values = {}
         for key, value in old_values.items():
+            if key not in serializer.data:
+                continue  # happens with certain nested urls
             new_value = serializer.data[key]
             if isinstance(new_value, list):
                 # this is a bit tricky since either one or both could be blank, but we need to handle lists
diff --git a/tracker/api/views/ad.py b/tracker/api/views/ad.py
new file mode 100644
index 000000000..46528f2cb
--- /dev/null
+++ b/tracker/api/views/ad.py
@@ -0,0 +1,16 @@
+import logging
+
+from tracker.api.pagination import TrackerPagination
+from tracker.api.permissions import tracker_permission
+from tracker.api.serializers import AdSerializer
+from tracker.api.views import EventCreateNestedMixin, TrackerFullViewSet
+from tracker.models import Ad
+
+logger = logging.getLogger(__name__)
+
+
+class AdViewSet(TrackerFullViewSet, EventCreateNestedMixin):
+    queryset = Ad.objects.select_related('event')
+    serializer_class = AdSerializer
+    pagination_class = TrackerPagination
+    permission_classes = [tracker_permission('tracker.view_ad')]
diff --git a/tracker/api_urls.py b/tracker/api_urls.py
index fc644af77..4a252402e 100644
--- a/tracker/api_urls.py
+++ b/tracker/api_urls.py
@@ -13,7 +13,7 @@
     path('me/', api.me, name='me'),
     # moved over from private repo, stopgap until v2 is ready
     path('ads/<int:event>/', api.ads, name='ads'),
-    path('interstitial/', api.interstitial, name='interstitial'),
+    path('interstitial/', api.interstitial_reorder, name='interstitial'),
     path('interviews/<int:event>/', api.interviews, name='interviews'),
     path('hosts/<int:event>/', api.hosts),
 ]
diff --git a/tracker/migrations/0048_remove_old_ad_permission.py b/tracker/migrations/0048_remove_old_ad_permission.py
new file mode 100644
index 000000000..513816f0a
--- /dev/null
+++ b/tracker/migrations/0048_remove_old_ad_permission.py
@@ -0,0 +1,17 @@
+# Generated by Django 5.1 on 2024-10-23 21:55
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tracker', '0047_merge_talent_contenttypes'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='ad',
+            options={},
+        ),
+    ]
diff --git a/tracker/models/interstitial.py b/tracker/models/interstitial.py
index 87b2cf112..4a53466eb 100644
--- a/tracker/models/interstitial.py
+++ b/tracker/models/interstitial.py
@@ -44,10 +44,10 @@ class Meta:
 
     @property
     def run(self):
-        if self.order is None:  # should never happen, but blows things up if it does
-            return None
         if self.anchor:
             return self.anchor
+        if self.order is None:  # should never happen, but blows things up if it does
+            return None
         runs = SpeedRun.objects.filter(event=self.event)
         return (
             runs.filter(order__lte=self.order).last()
@@ -89,7 +89,7 @@ def save(self, *args, **kwargs):
         super().save(*args, **kwargs)
 
     def clean(self):
-        if self.order is None and self.run is None:
+        if self.order is None and self.anchor is None:
             raise ValidationError(
                 {'order': 'order cannot be null if the interstitial is not anchored'}
             )
@@ -145,7 +145,6 @@ class Ad(Interstitial):
 
     class Meta:
         unique_together = ('sponsor_name', 'ad_name')
-        permissions = (('view_ads', 'Can view ads'),)  # TODO: get rid of this
 
     def __str__(self):
         return '%s - %s - %s' % (self.sponsor_name, self.ad_name, self.ad_type)
diff --git a/tracker/views/api.py b/tracker/views/api.py
index 8fcd6bce8..aab86dc01 100644
--- a/tracker/views/api.py
+++ b/tracker/views/api.py
@@ -66,7 +66,7 @@
     'root',
     'ads',
     'interviews',
-    'interstitial',
+    'interstitial_reorder',
     'hosts',
 ]
 
@@ -869,7 +869,7 @@ def interviews(request, event):
 @permission_required('tracker.change_interstitial', raise_exception=True)
 @transaction.atomic
 @require_POST
-def interstitial(request):
+def interstitial_reorder(request):
     try:
         model = Interstitial.objects.get(id=request.POST['id'])
     except Interstitial.DoesNotExist:

From a5aa715ffd9636e1346b6444dd6877d16d1f3448 Mon Sep 17 00:00:00 2001
From: Benjamin Cutler <uraniumanchor@users.noreply.github.com>
Date: Fri, 1 Nov 2024 15:05:09 -0600
Subject: [PATCH 26/40] create/edit Interview on v2 (#734)

[#188495256]
---
 tests/apiv2/test_ads.py           |  84 +----------------
 tests/apiv2/test_interstitials.py |  90 +++++++++++++++++++
 tests/apiv2/test_interviews.py    | 144 +++++++++++++++++++++++++-----
 tests/util.py                     |   9 +-
 tracker/api/views/interview.py    |   7 +-
 5 files changed, 224 insertions(+), 110 deletions(-)
 create mode 100644 tests/apiv2/test_interstitials.py

diff --git a/tests/apiv2/test_ads.py b/tests/apiv2/test_ads.py
index c96d63ff9..e1bc314ac 100644
--- a/tests/apiv2/test_ads.py
+++ b/tests/apiv2/test_ads.py
@@ -1,21 +1,19 @@
 import random
 
 from tests import randgen
-from tests.util import APITestCase
 from tracker import models
-from tracker.api import messages
 from tracker.api.serializers import AdSerializer
 
+from .test_interstitials import InterstitialTestCase
 
-class TestAd(APITestCase):
+
+class TestAd(InterstitialTestCase):
     model_name = 'ad'
     serializer_class = AdSerializer
     rand = random.Random()
 
     def setUp(self):
         super().setUp()
-        self.run = randgen.generate_run(self.rand, event=self.event, ordered=True)
-        self.run.save()
         self.ad = randgen.generate_ad(self.rand, run=self.run)
         self.ad.save()
 
@@ -117,81 +115,6 @@ def test_create(self):
                 user=self.locked_user,
             )
 
-        with self.subTest('error cases'):
-            self.post_new(
-                data={
-                    'event': self.locked_event.pk,
-                },
-                user=self.add_user,
-                status_code=403,
-            )
-
-            self.post_new(
-                data={
-                    'event': self.event.pk,
-                    'order': self.run.order,
-                    'anchor': self.run.pk,
-                },
-                status_code=400,
-                expected_error_codes={
-                    'event': messages.ANCHOR_FIELD_CODE,
-                    'order': messages.ANCHOR_FIELD_CODE,
-                },
-            )
-
-            self.run.order = None
-            self.run.save()
-
-            self.post_new(
-                data={
-                    'anchor': self.run.pk,
-                },
-                status_code=400,
-                expected_error_codes={'anchor': messages.INVALID_ANCHOR_CODE},
-            )
-
-            # doesn't blow up if missing/nonsense
-
-            self.post_new(
-                data={
-                    'anchor': {'what': 'is this'},
-                },
-                status_code=400,
-            )
-
-            self.post_new(
-                data={
-                    'suborder': 'last',
-                },
-                status_code=400,
-            )
-
-            self.post_new(
-                data={
-                    'event': 'not_an_id',
-                },
-                status_code=400,
-            )
-
-            self.post_new(
-                data={
-                    'event': {'total': 'garbage'},
-                    'suborder': 'last',
-                },
-                status_code=400,
-            )
-
-            self.post_new(
-                data={
-                    'order': {'also': 'silly'},
-                    'suborder': 'last',
-                },
-                status_code=400,
-            )
-
-        with self.subTest('anonymous user'):
-            self.post_new(user=None, status_code=403)
-
     def test_patch(self):
         with self.subTest('happy path'), self.saveSnapshot(), self.assertLogsChanges(2):
             data = self.patch_detail(
@@ -214,7 +137,6 @@ def test_patch(self):
         with self.subTest('wrong event'):
             self.patch_detail(
                 self.ad,
-                data={},
                 kwargs={'event_pk': self.blank_event.pk},
                 status_code=404,
             )
diff --git a/tests/apiv2/test_interstitials.py b/tests/apiv2/test_interstitials.py
new file mode 100644
index 000000000..6094be534
--- /dev/null
+++ b/tests/apiv2/test_interstitials.py
@@ -0,0 +1,90 @@
+from unittest import SkipTest
+
+from tests import randgen
+from tests.util import APITestCase
+from tracker.api import messages
+
+
+class InterstitialTestCase(APITestCase):
+    def setUp(self):
+        super().setUp()
+        self.run = randgen.generate_run(self.rand, event=self.event, ordered=True)
+        self.run.save()
+
+    def test_interstitial_common(self):
+        if getattr(self, 'model_name', None) is None:
+            raise SkipTest
+        with self.subTest('error cases'):
+            self.post_new(
+                data={
+                    'event': self.locked_event.pk,
+                },
+                user=self.add_user,
+                status_code=403,
+            )
+
+            self.post_new(
+                data={
+                    'event': self.event.pk,
+                    'order': self.run.order,
+                    'anchor': self.run.pk,
+                },
+                status_code=400,
+                expected_error_codes={
+                    'event': messages.ANCHOR_FIELD_CODE,
+                    'order': messages.ANCHOR_FIELD_CODE,
+                },
+            )
+
+            self.run.order = None
+            self.run.save()
+
+            self.post_new(
+                data={
+                    'anchor': self.run.pk,
+                },
+                status_code=400,
+                expected_error_codes={'anchor': messages.INVALID_ANCHOR_CODE},
+            )
+
+            # doesn't blow up if missing/nonsense
+
+            self.post_new(
+                data={
+                    'anchor': {'what': 'is this'},
+                },
+                status_code=400,
+            )
+
+            self.post_new(
+                data={
+                    'suborder': 'last',
+                },
+                status_code=400,
+            )
+
+            self.post_new(
+                data={
+                    'event': 'not_an_id',
+                },
+                status_code=400,
+            )
+
+            self.post_new(
+                data={
+                    'event': {'total': 'garbage'},
+                    'suborder': 'last',
+                },
+                status_code=400,
+            )
+
+            self.post_new(
+                data={
+                    'order': {'also': 'silly'},
+                    'suborder': 'last',
+                },
+                status_code=400,
+            )
+
+        with self.subTest('anonymous user'):
+            self.post_new(user=None, status_code=403)
diff --git a/tests/apiv2/test_interviews.py b/tests/apiv2/test_interviews.py
index a557b4644..cd4698253 100644
--- a/tests/apiv2/test_interviews.py
+++ b/tests/apiv2/test_interviews.py
@@ -1,46 +1,146 @@
 import random
 
 from tests import randgen
-from tests.util import APITestCase
 from tracker.api.serializers import InterviewSerializer
+from tracker.models import Interview
 
+from .test_interstitials import InterstitialTestCase
 
-class TestInterviews(APITestCase):
+
+class TestInterviews(InterstitialTestCase):
     model_name = 'interview'
     serializer_class = InterviewSerializer
     rand = random.Random()
 
     def setUp(self):
         super().setUp()
-        self.run = randgen.generate_run(self.rand, event=self.event, ordered=True)
-        self.run.save()
         self.public_interview = randgen.generate_interview(self.rand, run=self.run)
         self.public_interview.save()
         self.private_interview = randgen.generate_interview(self.rand, run=self.run)
         self.private_interview.public = False
         self.private_interview.save()
 
-    def test_public_fetch(self):
-        data = self.get_detail(self.public_interview)
-        self.assertV2ModelPresent(self.public_interview, data)
+    def test_fetch(self):
+        with self.subTest('happy path'), self.saveSnapshot():
+            with self.subTest('public'):
+                data = self.get_detail(self.public_interview)
+                self.assertV2ModelPresent(self.public_interview, data)
+
+                data = self.get_list()['results']
+                self.assertV2ModelPresent(self.public_interview, data)
+                self.assertV2ModelNotPresent(self.private_interview, data)
+
+            with self.subTest('private'):
+                data = self.get_detail(self.private_interview, user=self.view_user)
+                self.assertV2ModelPresent(self.private_interview, data)
+
+                data = self.get_list(data={'all': ''})['results']
+                self.assertV2ModelPresent(self.public_interview, data)
+                self.assertV2ModelPresent(self.private_interview, data)
+
+        with self.subTest('error cases'):
+            self.get_detail(self.private_interview, user=None, status_code=404)
+            self.get_list(data={'all': ''}, status_code=403)
+
+    def test_create(self):
+        with self.subTest(
+            'happy path with ids'
+        ), self.saveSnapshot(), self.assertLogsChanges(2):
+            data = self.post_new(
+                data={
+                    'event': self.event.id,
+                    'order': self.run.order,
+                    'suborder': 'last',
+                    'interviewers': 'feasel',
+                    'subjects': 'PJ',
+                    'topic': 'Why Are You a Chaos Elemental',
+                    'length': '15:00',
+                },
+                user=self.add_user,
+            )
+            result = Interview.objects.get(id=data['id'])
+            self.assertV2ModelPresent(result, data)
+
+            data = self.post_new(
+                data={
+                    'anchor': self.run.id,
+                    'suborder': data['suborder'] + 1,
+                    'interviewers': 'SpikeVegeta',
+                    'subjects': 'puwexil',
+                    'topic': 'Why Are You an Order Elemental',
+                    'length': '15:00',
+                }
+            )
+            result = Interview.objects.get(id=data['id'])
+            self.assertV2ModelPresent(result, data)
 
-    def test_private_fetch(self):
-        self.get_detail(self.private_interview, status_code=404)
+        with self.subTest(
+            'happy path with natural keys'
+        ), self.saveSnapshot(), self.assertLogsChanges(2):
+            data = self.post_new(
+                data={
+                    'event': self.event.natural_key(),
+                    'order': self.run.order,
+                    'suborder': 'last',
+                    'interviewers': 'frozenflygone',
+                    'subjects': 'Sent',
+                    'topic': 'Why Are You a Prize Elemental',
+                    'length': '15:00',
+                },
+                user=self.add_user,
+            )
+            result = Interview.objects.get(id=data['id'])
+            self.assertV2ModelPresent(result, data)
 
-        self.client.force_authenticate(self.view_user)
+            data = self.post_new(
+                data={
+                    'anchor': self.run.natural_key(),
+                    'suborder': data['suborder'] + 1,
+                    'interviewers': 'JHobz',
+                    'subjects': 'Brossentia',
+                    'topic': 'Why Are You a Punishment Elemental',
+                    'length': '15:00',
+                }
+            )
+            result = Interview.objects.get(id=data['id'])
+            self.assertV2ModelPresent(result, data)
 
-        data = self.get_detail(self.private_interview)
-        self.assertV2ModelPresent(self.private_interview, data)
+        with self.subTest('locked event user'), self.assertLogsChanges(1):
+            self.post_new(
+                data={
+                    'event': self.locked_event.pk,
+                    'order': 1,
+                    'suborder': 1,
+                    'interviewers': 'Keizaron',
+                    'subjects': 'Andy',
+                    'topic': 'Why Are You a Random Elemental',
+                    'length': '15:00',
+                },
+                user=self.locked_user,
+            )
 
-    def test_public_list(self):
-        data = self.get_list()['results']
-        self.assertV2ModelPresent(self.public_interview, data)
-        self.assertV2ModelNotPresent(self.private_interview, data)
+    def test_patch(self):
+        with self.subTest('happy path'), self.saveSnapshot(), self.assertLogsChanges(2):
+            data = self.patch_detail(
+                self.private_interview,
+                data={
+                    'topic': 'Setting a new PB',
+                },
+                user=self.add_user,
+            )
+            self.assertV2ModelPresent(self.private_interview, data)
 
-    def test_private_list(self):
-        self.get_list(data={'all': ''}, status_code=403)
+            self.patch_detail(
+                self.private_interview,
+                data={
+                    'topic': 'Setting a new WR',
+                },
+                kwargs={'event_pk': self.event.pk},
+            )
 
-        self.client.force_authenticate(self.view_user)
-        data = self.get_list(data={'all': ''})['results']
-        self.assertV2ModelPresent(self.public_interview, data)
-        self.assertV2ModelPresent(self.private_interview, data)
+        with self.subTest('wrong event'):
+            self.patch_detail(
+                self.private_interview,
+                kwargs={'event_pk': self.blank_event.pk},
+                status_code=404,
+            )
diff --git a/tests/util.py b/tests/util.py
index e3aed262a..45b239137 100644
--- a/tests/util.py
+++ b/tests/util.py
@@ -784,7 +784,7 @@ def saveSnapshot(self):
         # TODO: don't save 'empty' results by default?
         assert getattr(self, '_save_snapshot', False) is False, 'no nesting this yet'
         self._save_snapshot = True
-        self._snapshot_num = 1
+        self._last_subtest = None
         try:
             yield
         finally:
@@ -824,9 +824,13 @@ def _snapshot(self, method, url, data):
                 re.sub(r'^test_', '', self._testMethodName).lower(),
             ]
             subtest = self
-            while subtest := getattr(subtest, '_subtest', None):
+            while next_subtest := getattr(subtest, '_subtest', None):
+                subtest = next_subtest
                 pieces.append(re.sub(r'\W', '_', subtest._message).lower())
 
+            if self._last_subtest is not subtest:
+                self._snapshot_num = 1
+
             # obscure ids from url since they can drift depending on test order/results, remove leading tracker since it's redundant, and slugify everything else
             pieces += [
                 f'S{self._snapshot_num}',
@@ -838,6 +842,7 @@ def _snapshot(self, method, url, data):
 
             snapshot_name = '_'.join(p.strip('_') for p in pieces)
             self._snapshot_num += 1
+            self._last_subtest = subtest
 
             basepath = os.path.join(os.path.dirname(__file__), 'snapshots')
             os.makedirs(basepath, exist_ok=True)
diff --git a/tracker/api/views/interview.py b/tracker/api/views/interview.py
index e38795dd1..05f360ebb 100644
--- a/tracker/api/views/interview.py
+++ b/tracker/api/views/interview.py
@@ -3,16 +3,13 @@
 from tracker.api.pagination import TrackerPagination
 from tracker.api.permissions import PrivateGenericPermissions
 from tracker.api.serializers import InterviewSerializer
-from tracker.api.views import EventNestedMixin, TrackerReadViewSet
+from tracker.api.views import EventCreateNestedMixin, TrackerFullViewSet
 from tracker.models import Interview
 
 logger = logging.getLogger(__name__)
 
 
-class InterviewViewSet(
-    EventNestedMixin,
-    TrackerReadViewSet,
-):
+class InterviewViewSet(TrackerFullViewSet, EventCreateNestedMixin):
     queryset = Interview.objects.select_related('event')
     serializer_class = InterviewSerializer
     pagination_class = TrackerPagination

From 61f2eace34b1652aac80abd00c70238be0234130 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Nov 2024 16:38:00 -0600
Subject: [PATCH 27/40] Bump selenium from 4.25.0 to 4.26.1 (#733)

Bumps [selenium](https://github.com/SeleniumHQ/Selenium) from 4.25.0 to 4.26.1.
- [Release notes](https://github.com/SeleniumHQ/Selenium/releases)
- [Commits](https://github.com/SeleniumHQ/Selenium/commits)

---
updated-dependencies:
- dependency-name: selenium
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 tests/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index cd73fcd51..91be5b262 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -19,6 +19,6 @@ webpack-manifest==2.1.1
 daphne==4.1.2
 lxml==4.9.4 ; python_version<"3.10" # azure issue?
 responses~=0.25.3
-selenium==4.25.0
+selenium==4.26.1
 tblib==3.0.0
 unittest-xml-reporting==3.2.0

From 702145016ea50a302bc3cdd86227dece9a040a4f Mon Sep 17 00:00:00 2001
From: Benjamin Cutler <uraniumanchor@users.noreply.github.com>
Date: Fri, 1 Nov 2024 16:38:07 -0600
Subject: [PATCH 28/40] clean up Milestone V2 API (#735)

[#188514709]
---
 .../{test_milestone.py => test_milestones.py} | 157 +++++++++++-------
 tests/util.py                                 |  11 +-
 tracker/api/messages.py                       |   5 +-
 tracker/api/serializers.py                    |   1 +
 tracker/api/views/milestone.py                |  10 +-
 5 files changed, 110 insertions(+), 74 deletions(-)
 rename tests/apiv2/{test_milestone.py => test_milestones.py} (50%)

diff --git a/tests/apiv2/test_milestone.py b/tests/apiv2/test_milestones.py
similarity index 50%
rename from tests/apiv2/test_milestone.py
rename to tests/apiv2/test_milestones.py
index d6d331297..3d35cc269 100644
--- a/tests/apiv2/test_milestone.py
+++ b/tests/apiv2/test_milestones.py
@@ -1,9 +1,10 @@
 from tests.util import APITestCase
 from tracker import models
-from tracker.api.serializers import MilestoneSerializer
+from tracker.api import messages
+from tracker.api.serializers import EventSerializer, MilestoneSerializer
 
 
-class TestMilestoneAPI(APITestCase):
+class TestMilestones(APITestCase):
     model_name = 'milestone'
     serializer_class = MilestoneSerializer
 
@@ -12,7 +13,7 @@ def _format_milestone(self, milestone, with_event=True):
             'type': 'milestone',
             'id': milestone.id,
             'amount': milestone.amount,
-            **({'event': milestone.event_id} if with_event else {}),
+            **({'event': EventSerializer(milestone.event).data} if with_event else {}),
             'description': milestone.description,
             'short_description': milestone.short_description,
             'start': milestone.start,
@@ -41,62 +42,49 @@ def test_serializer(self):
             data,
         )
 
-    def test_detail(self):
-        with self.subTest('user with permission'):
-            serialized = MilestoneSerializer(self.hidden_milestone)
-            data = self.get_detail(self.hidden_milestone, user=self.view_user)
-            self.assertV2ModelPresent(serialized.data, data)
-
-        with self.subTest('user without permission'):
-            self.get_detail(self.hidden_milestone, status_code=404, user=None)
-            serialized = MilestoneSerializer(self.public_milestone)
-            data = self.get_detail(self.public_milestone)
-            self.assertV2ModelPresent(serialized.data, data)
-
-    def test_list(self):
-        with self.subTest('user with permission'):
-            data = self.get_list(user=self.view_user)['results']
-            self.assertV2ModelPresent(self.public_milestone, data)
-            self.assertV2ModelNotPresent(self.hidden_milestone, data)
-            data = self.get_list(data={'all': ''})['results']
-            self.assertV2ModelPresent(self.public_milestone, data)
-            self.assertV2ModelPresent(self.hidden_milestone, data)
-
-        with self.subTest('user without permission'):
-            data = self.get_list(user=None)['results']
-            self.assertV2ModelPresent(self.public_milestone, data)
-            self.assertV2ModelNotPresent(self.hidden_milestone, data)
-            event_data = self.get_list(kwargs={'event_pk': self.event.pk})['results']
-            self.assertV2ModelPresent(
-                MilestoneSerializer(self.public_milestone, event_pk=self.event.pk).data,
-                event_data,
-            )
-            self.get_list(data={'all': ''}, status_code=403)
+    def test_fetch(self):
+        with self.subTest('happy path'), self.saveSnapshot():
+            with self.subTest('public'):
+                serialized = MilestoneSerializer(self.public_milestone)
+                data = self.get_detail(self.public_milestone)
+                self.assertV2ModelPresent(serialized.data, data)
+                data = self.get_list()['results']
+                self.assertV2ModelPresent(self.public_milestone, data)
+                self.assertV2ModelNotPresent(self.hidden_milestone, data)
+                event_data = self.get_list(kwargs={'event_pk': self.event.pk})[
+                    'results'
+                ]
+                self.assertV2ModelPresent(
+                    MilestoneSerializer(
+                        self.public_milestone, event_pk=self.event.pk
+                    ).data,
+                    event_data,
+                )
+
+            with self.subTest('private'):
+                serialized = MilestoneSerializer(self.hidden_milestone)
+                data = self.get_detail(self.hidden_milestone, user=self.view_user)
+                self.assertV2ModelPresent(serialized.data, data)
+                data = self.get_list(data={'all': ''})['results']
+                self.assertV2ModelPresent(self.public_milestone, data)
+                self.assertV2ModelPresent(self.hidden_milestone, data)
 
         with self.subTest('empty event'):
             data = self.get_list(kwargs={'event_pk': self.locked_event.pk})
             self.assertEqual(data['count'], 0, 'List was not empty')
 
-    def test_create(self):
-        with self.subTest('user with normal permission'):
-            data = self.post_new(
-                data={
-                    'name': 'New Milestone',
-                    'event': self.event.pk,
-                    'amount': 1000,
-                },
-                user=self.add_user,
-            )
-            self.assertV2ModelPresent(
-                MilestoneSerializer(models.Milestone.objects.get(id=data['id'])).data,
-                data,
-            )
+        with self.subTest('error cases'):
+            self.get_detail(self.hidden_milestone, status_code=404, user=None)
+            self.get_list(data={'all': ''}, status_code=403)
 
+    def test_create(self):
+        with self.subTest('happy path'), self.saveSnapshot(), self.assertLogsChanges(3):
             data = self.post_new(
                 data={
                     'name': 'New Milestone 2',
                     'amount': 1250,
                 },
+                user=self.add_user,
                 kwargs={'event_pk': self.event.pk},
             )
             self.assertV2ModelPresent(
@@ -106,6 +94,38 @@ def test_create(self):
                 data,
             )
 
+            with self.subTest('with ids'):
+                data = self.post_new(
+                    data={
+                        'name': 'New Milestone',
+                        'event': self.event.pk,
+                        'amount': 1000,
+                    },
+                )
+                self.assertV2ModelPresent(
+                    MilestoneSerializer(
+                        models.Milestone.objects.get(id=data['id'])
+                    ).data,
+                    data,
+                )
+
+            with self.subTest('with natural keys'):
+                data = self.post_new(
+                    data={
+                        'name': 'New Milestone 3',
+                        'event': self.event.natural_key(),
+                        'amount': 1750,
+                    },
+                    user=self.add_user,
+                )
+                self.assertV2ModelPresent(
+                    MilestoneSerializer(
+                        models.Milestone.objects.get(id=data['id'])
+                    ).data,
+                    data,
+                )
+
+        with self.subTest('error cases'):
             self.post_new(
                 data={
                     'name': 'Locked Milestone',
@@ -114,6 +134,7 @@ def test_create(self):
                 },
                 status_code=403,
             )
+            self.post_new(user=None, status_code=403)
 
         with self.subTest('user with locked permission'):
             data = self.post_new(
@@ -124,32 +145,22 @@ def test_create(self):
                 },
                 user=self.locked_user,
             )
+            result = models.Milestone.objects.get(id=data['id'])
             self.assertV2ModelPresent(
-                MilestoneSerializer(models.Milestone.objects.get(id=data['id'])).data,
+                result,
                 data,
             )
 
-        with self.subTest('anonymous user'):
-            self.post_new(user=None, status_code=403)
-
     def test_patch(self):
         # move to locked event for testing patch
         self.hidden_milestone.event = self.locked_event
         self.hidden_milestone.save()
 
-        with self.subTest('user with normal permission'):
+        with self.subTest('happy path'), self.saveSnapshot(), self.assertLogsChanges(1):
             data = self.patch_detail(
                 self.public_milestone, data={'amount': 750}, user=self.add_user
             )
-            self.assertV2ModelPresent(
-                MilestoneSerializer(self.public_milestone).data, data
-            )
-            self.patch_detail(
-                self.public_milestone, data={'event': self.event.id}, status_code=400
-            )
-            self.patch_detail(
-                self.hidden_milestone, data={'amount': 1250}, status_code=403
-            )
+            self.assertV2ModelPresent(self.public_milestone, data)
 
         with self.subTest('user with locked permission'):
             data = self.patch_detail(
@@ -159,5 +170,23 @@ def test_patch(self):
                 MilestoneSerializer(self.hidden_milestone).data, data
             )
 
-        with self.subTest('anonymous user'):
-            self.patch_detail(self.public_milestone, user=None, status_code=403)
+        with self.subTest('error cases'):
+            self.patch_detail(
+                self.public_milestone,
+                data={'event': self.event.id},
+                status_code=400,
+                expected_error_codes=messages.EVENT_READ_ONLY_CODE,
+            )
+            self.patch_detail(
+                self.hidden_milestone,
+                data={'amount': 1250},
+                user=self.add_user,
+                status_code=403,
+                expected_error_codes=messages.UNAUTHORIZED_LOCKED_EVENT_CODE,
+            )
+            self.patch_detail(
+                self.public_milestone,
+                user=None,
+                status_code=403,
+                expected_error_codes=messages.NOT_AUTHENTICATED_CODE,
+            )
diff --git a/tests/util.py b/tests/util.py
index 45b239137..8cabde308 100644
--- a/tests/util.py
+++ b/tests/util.py
@@ -350,8 +350,10 @@ def get_noun(
 
     def _check_nested_codes(self, data, codes):
         mismatched_codes = {}
-        if not isinstance(data, (list, dict)):
-            raise TypeError(f'Expected list or dict, got {type(data)}')
+        if not isinstance(data, (list, dict, ErrorDetail)):
+            raise TypeError(f'Expected list, dict, or ErrorDetail, got {type(data)}')
+        if isinstance(data, ErrorDetail):
+            data = [data]
         if isinstance(data, list):
             # FIXME: this comes up if, for example, one entry in an M2M is valid
             #  but the others are not, but there isn't a test case that exercises this
@@ -482,6 +484,9 @@ def patch_detail(
             self._get_viewname(model_name, 'detail', **kwargs),
             kwargs={'pk': obj.pk, **kwargs},
         )
+        if status_code >= 400 and not expected_error_codes:
+            # just a debug point to make an exhaustive pass on this later
+            pass
         with self._snapshot('PATCH', url, data) as snapshot:
             response = self.client.patch(
                 url,
@@ -826,6 +831,8 @@ def _snapshot(self, method, url, data):
             subtest = self
             while next_subtest := getattr(subtest, '_subtest', None):
                 subtest = next_subtest
+                if subtest._message == 'happy path':
+                    continue
                 pieces.append(re.sub(r'\W', '_', subtest._message).lower())
 
             if self._last_subtest is not subtest:
diff --git a/tracker/api/messages.py b/tracker/api/messages.py
index 41833a330..c16667a47 100644
--- a/tracker/api/messages.py
+++ b/tracker/api/messages.py
@@ -1,4 +1,5 @@
 from django.utils.translation import gettext_lazy as _
+from rest_framework.exceptions import NotAuthenticated
 
 GENERIC_NOT_FOUND = _(
     'That resource does not exist or you do not have permission to view it.'
@@ -28,8 +29,6 @@
 UNAUTHORIZED_OBJECT_CODE = 'unauthorized_object'
 EVENT_READ_ONLY = _('Event is read-only after create for that model.')
 EVENT_READ_ONLY_CODE = 'event_read_only'
-EVENT_LOCKED = _('Event is locked and you do not have permission.')
-EVENT_LOCKED_CODE = 'event_locked'
 INVALID_PK = _('Could not find a related object with the primary key `{pk}`.')
 INVALID_PK_CODE = 'invalid_pk'
 INVALID_NATURAL_KEY = _(
@@ -50,3 +49,5 @@
 ANCHOR_FIELD_CODE = 'invalid_anchor_sibling'
 INVALID_ANCHOR = _('Specified anchor is not ordered.')
 INVALID_ANCHOR_CODE = 'invalid_anchor'
+NOT_AUTHENTICATED = NotAuthenticated.default_detail
+NOT_AUTHENTICATED_CODE = NotAuthenticated.default_code
diff --git a/tracker/api/serializers.py b/tracker/api/serializers.py
index 74d2943bf..c667e1750 100644
--- a/tracker/api/serializers.py
+++ b/tracker/api/serializers.py
@@ -801,6 +801,7 @@ class MilestoneSerializer(
     WithPermissionsSerializerMixin, EventNestedSerializerMixin, TrackerModelSerializer
 ):
     type = ClassNameField()
+    event = EventSerializer()
 
     class Meta:
         model = Milestone
diff --git a/tracker/api/views/milestone.py b/tracker/api/views/milestone.py
index 4726583b7..f1d3935bc 100644
--- a/tracker/api/views/milestone.py
+++ b/tracker/api/views/milestone.py
@@ -2,9 +2,8 @@
 from tracker.api.permissions import PrivateGenericPermissions
 from tracker.api.serializers import MilestoneSerializer
 from tracker.api.views import (
-    EventCreateNestedMixin,
-    TrackerReadViewSet,
-    TrackerUpdateMixin,
+    EventNestedMixin,
+    TrackerFullViewSet,
     WithSerializerPermissionsMixin,
 )
 from tracker.models import Milestone
@@ -12,9 +11,8 @@
 
 class MilestoneViewSet(
     WithSerializerPermissionsMixin,
-    EventCreateNestedMixin,
-    TrackerUpdateMixin,
-    TrackerReadViewSet,
+    EventNestedMixin,
+    TrackerFullViewSet,
 ):
     queryset = Milestone.objects.all()
     serializer_class = MilestoneSerializer

From f29e3deb326d4e34194f3886867d744a93aa3139 Mon Sep 17 00:00:00 2001
From: Benjamin Cutler <uraniumanchor@users.noreply.github.com>
Date: Wed, 6 Nov 2024 13:07:15 -0700
Subject: [PATCH 29/40] update API V2 validation (#736)

[#188529254]
---
 tests/apiv2/test_api.py    |  37 ++++++++++++
 tests/test_speedrun.py     |   2 +-
 tests/util.py              |  15 ++++-
 tracker/api/messages.py    |   2 +
 tracker/api/serializers.py | 112 ++++++++++++++++++++++++++++---------
 tracker/api/views/bids.py  |  17 ++----
 6 files changed, 143 insertions(+), 42 deletions(-)
 create mode 100644 tests/apiv2/test_api.py

diff --git a/tests/apiv2/test_api.py b/tests/apiv2/test_api.py
new file mode 100644
index 000000000..d0c2d8bcb
--- /dev/null
+++ b/tests/apiv2/test_api.py
@@ -0,0 +1,37 @@
+from tests.util import APITestCase
+from tracker.api import messages
+
+
+class TestAPI(APITestCase):
+    # not really generic but these need to be tested somewhere
+
+    def test_coalesce_errors(self):
+        self.post_new(
+            model_name='bid',
+            data={
+                'event': 'foo',
+                'parent': 'bar',
+            },
+            user=self.super_user,
+            status_code=400,
+            expected_error_codes={
+                'event': 'incorrect_type',
+                'parent': 'incorrect_type',
+            },
+        )
+
+    def test_bad_nesting(self):
+        self.post_new(
+            model_name='interview',
+            data={'anchor': {'no': 'nesting'}},
+            user=self.super_user,
+            status_code=400,
+            expected_error_codes={'anchor': messages.NO_NESTED_CREATES_CODE},
+        )
+
+        self.post_new(
+            model_name='speedrun',
+            data={'runners': [{'also': 'nesting'}]},
+            status_code=400,
+            expected_error_codes={'runners': messages.NO_NESTED_CREATES_CODE},
+        )
diff --git a/tests/test_speedrun.py b/tests/test_speedrun.py
index 94ebc2bfe..3b1a8f5bc 100755
--- a/tests/test_speedrun.py
+++ b/tests/test_speedrun.py
@@ -465,7 +465,7 @@ def test_start_run(self):
             self.assertEqual(self.run2.setup_time, '0:30:40')
             self.run3.refresh_from_db()
             expected_start = datetime.datetime.combine(
-                self.event1.date, datetime.time(19, 35), tzinfo=datetime.timezone.utc
+                self.event1.date, datetime.time(13, 35), tzinfo=self.event1.timezone
             )
             self.assertEqual(self.run3.anchor_time, expected_start)
             self.assertEqual(self.run3.starttime, expected_start)
diff --git a/tests/util.py b/tests/util.py
index 8cabde308..862613994 100644
--- a/tests/util.py
+++ b/tests/util.py
@@ -409,7 +409,7 @@ def _check_status_and_error_codes(
             if mismatched_codes:
                 self.fail(
                     '\n'.join(
-                        f'expected error code for `{field}`: `{code}` not present in `{",".join((e.code if isinstance(e, ErrorDetail) else str(e)) for e in data.get(field, []))}`'
+                        f'expected error code for `{field}`: `{code}` not present in `{",".join((str(e.code) if isinstance(e, ErrorDetail) else str(e)) for e in data.get(field, []))}`'
                         for field, code in mismatched_codes.items()
                     )
                 )
@@ -787,13 +787,22 @@ def assertLogsChanges(self, number, action_flag=None):
     @contextlib.contextmanager
     def saveSnapshot(self):
         # TODO: don't save 'empty' results by default?
-        assert getattr(self, '_save_snapshot', False) is False, 'no nesting this yet'
+        previous = getattr(self, '_save_snapshot', False)
         self._save_snapshot = True
         self._last_subtest = None
         try:
             yield
         finally:
-            self._save_snapshot = False
+            self._save_snapshot = previous
+
+    @contextlib.contextmanager
+    def suppressSnapshot(self):
+        previous = getattr(self, '_save_snapshot', False)
+        self._save_snapshot = False
+        try:
+            yield
+        finally:
+            self._save_snapshot = previous
 
     class _Snapshot:
         def __init__(self, url, method, data=None, stream=None):
diff --git a/tracker/api/messages.py b/tracker/api/messages.py
index c16667a47..542407e25 100644
--- a/tracker/api/messages.py
+++ b/tracker/api/messages.py
@@ -41,6 +41,8 @@
 INVALID_NATURAL_KEY_LENGTH_CODE = 'invalid_natural_key_length'
 INVALID_LOOKUP_TYPE = _('Could not parse that input as a valid relational key.')
 INVALID_LOOKUP_TYPE_CODE = 'invalid_lookup_type'
+NO_NESTED_CREATES = _('That model creation cannot be nested from this endpoint.')
+NO_NESTED_CREATES_CODE = 'no_nested_creates'
 NO_NESTED_UPDATES = _(
     'Nested models are only writeable on creation, use the endpoint for that specific model instead.'
 )
diff --git a/tracker/api/serializers.py b/tracker/api/serializers.py
index c667e1750..86c30b378 100644
--- a/tracker/api/serializers.py
+++ b/tracker/api/serializers.py
@@ -1,5 +1,6 @@
 """Define serialization of the Django models into the REST framework."""
 
+import contextlib
 import logging
 from collections import defaultdict
 from contextlib import contextmanager
@@ -11,6 +12,7 @@
 from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
 from rest_framework.exceptions import ErrorDetail, ValidationError
+from rest_framework.serializers import ListSerializer, as_serializer_error
 from rest_framework.utils import model_meta
 from rest_framework.validators import UniqueTogetherValidator
 
@@ -24,36 +26,61 @@
 
 
 @contextmanager
-def _coalesce_validation_errors(errors):
+def _coalesce_validation_errors(errors, ignored=None):
     """takes either a list, a dict, or a function that can potentially throw ValidationError"""
+    ignored = set(ignored if ignored else [])
     if callable(errors):
         try:
             errors()
-            errors = None
-        except DjangoValidationError as e:
-            errors = e.update_error_dict({})
-        except ValidationError as e:
-            errors = DjangoValidationError({}).update_error_dict(e.detail)
+            errors = {}
+        except (DjangoValidationError, ValidationError) as e:
+            errors = as_serializer_error(e)
+    elif isinstance(errors, list):
+        if errors:
+            errors = {NON_FIELD_ERRORS: errors}
+        else:
+            errors = {}
     try:
         yield
-    except DjangoValidationError as e:
-        errors = errors or {}
-        if isinstance(errors, list) and errors:
-            errors = {NON_FIELD_ERRORS: errors}
-        errors = e.update_error_dict(errors)
-    except ValidationError as e:
-        # TODO: what about nested keys? does that ever come up?
-        errors = errors or defaultdict(list)
-        if isinstance(errors, list) and errors:
-            errors = defaultdict(list).update({NON_FIELD_ERRORS: errors})
-        for k, v in e.detail.items():
-            errors[k].extend(v if isinstance(v, list) else [v])
-    if errors:
-        raise ValidationError(errors)
+        other_errors = {}
+    except (DjangoValidationError, ValidationError) as e:
+        other_errors = as_serializer_error(e)
+    if errors or other_errors:
+        all_errors = {}
+        for key, e in errors.items():
+            o = other_errors.get(key, [] if isinstance(e, list) else {})
+            if (isinstance(e, list) and isinstance(o, dict)) or (
+                isinstance(e, dict) and isinstance(o, list)
+            ):
+                raise ValidationError(
+                    {
+                        key: 'Type conflict while processing validation errors, report this as a bug'
+                    },
+                    code='programming_error',
+                )
+            if isinstance(o, list):
+                o = [oe for oe in o if key not in ignored or oe.code != 'required']
+            if e or o:
+                if isinstance(e, list):
+                    all_errors[key] = e + o
+                else:
+                    # FIXME: this doesn't handle nested keys yet, but I don't have a good test case
+                    all_errors[key] = {**e, **o}
+        for key, o in other_errors.items():
+            if isinstance(o, list):
+                o = [oe for oe in o if key not in ignored or oe.code != 'required']
+                if o:
+                    all_errors.setdefault(key, []).extend(o)
+            else:
+                all_errors[key] = {**all_errors.get(key, {}), **o}
+        assert all_errors, 'ended up with an empty error list after merging'
+        raise ValidationError(all_errors)
 
 
 class WithPermissionsSerializerMixin:
     def __init__(self, *args, with_permissions=(), **kwargs):
+        if isinstance(with_permissions, str):
+            with_permissions = (with_permissions,)
         self.permissions = tuple(with_permissions)
         super().__init__(*args, **kwargs)
 
@@ -73,6 +100,34 @@ def get_validators(self):
             v for v in validators if not isinstance(v, UniqueTogetherValidator)
         )
 
+    def to_internal_value(self, data):
+        request = self.context.get('request', None)
+        errors = defaultdict(list)
+        if request and request.method == 'POST':
+            for key, value in data.items():
+                field = self.fields.get(key, None)
+                if (
+                    (
+                        isinstance(field, TrackerModelSerializer)
+                        and isinstance(value, dict)
+                    )
+                    or (
+                        isinstance(field, ListSerializer)
+                        and isinstance(field.child, TrackerModelSerializer)
+                        and any(isinstance(v, dict) for v in value)
+                    )
+                ) and key not in self.nested_creates:
+                    errors[key].append(
+                        ErrorDetail(
+                            messages.NO_NESTED_CREATES,
+                            code=messages.NO_NESTED_CREATES_CODE,
+                        )
+                    )
+            for key in errors:
+                data.pop(key, None)
+        with _coalesce_validation_errors(errors, ignored=errors.keys()):
+            return super().to_internal_value(data)
+
     def validate(self, attrs):
         if isinstance(attrs, dict):
             exclude = (
@@ -417,14 +472,19 @@ def get_fields(self):
         return fields
 
     def to_internal_value(self, data):
-        value = super().to_internal_value(data)
+        parent = None
+        errors = defaultdict(list)
         if 'parent' in data:
             try:
-                value['parent'] = Bid.objects.filter(pk=data['parent']).first()
+                parent = Bid.objects.filter(pk=data['parent']).first()
             except ValueError:
-                # nonsense values could cause a vague error message here, but if you feed garbage to
-                #  my API you should expect to get garbage back
-                value['parent'] = None
+                errors['parent'].append(
+                    ErrorDetail(messages.INVALID_LOOKUP_TYPE, code='incorrect_type')
+                )
+        with _coalesce_validation_errors(errors):
+            value = super().to_internal_value(data)
+            if parent:
+                value['parent'] = parent
         return value
 
     def validate(self, attrs):
@@ -740,7 +800,7 @@ def to_internal_value(self, data):
                     ErrorDetail(messages.ANCHOR_FIELD, code=messages.ANCHOR_FIELD_CODE)
                 )
 
-            with _coalesce_validation_errors(errors):
+            with contextlib.suppress(ValidationError):
                 if anchor := SpeedRunSerializer().to_internal_value(anchor):
                     data['anchor'] = anchor.id
                     data['event'] = anchor.event_id
diff --git a/tracker/api/views/bids.py b/tracker/api/views/bids.py
index 0dedd9be0..e47194a9c 100644
--- a/tracker/api/views/bids.py
+++ b/tracker/api/views/bids.py
@@ -1,7 +1,7 @@
+import contextlib
 import logging
 
 from django.utils.translation import gettext_lazy as _
-from rest_framework import mixins
 from rest_framework.decorators import action
 from rest_framework.exceptions import PermissionDenied
 from rest_framework.response import Response
@@ -12,8 +12,7 @@
 from tracker.api.serializers import BidSerializer
 from tracker.api.views import (
     EventNestedMixin,
-    TrackerReadViewSet,
-    TrackerUpdateMixin,
+    TrackerFullViewSet,
     WithSerializerPermissionsMixin,
 )
 from tracker.models import Bid, SpeedRun
@@ -24,9 +23,7 @@
 class BidViewSet(
     WithSerializerPermissionsMixin,
     EventNestedMixin,
-    mixins.CreateModelMixin,
-    TrackerUpdateMixin,
-    TrackerReadViewSet,
+    TrackerFullViewSet,
 ):
     queryset = Bid.objects.all()
     serializer_class = BidSerializer
@@ -48,19 +45,15 @@ def get_event_from_request(self):
         if event:
             return event
         if 'speedrun' in self.request.data:
-            try:
+            with contextlib.suppress(ValueError):
                 speedrun = SpeedRun.objects.filter(
                     pk=self.request.data['speedrun']
                 ).first()
                 return speedrun and speedrun.event
-            except ValueError:
-                pass
         if 'parent' in self.request.data:
-            try:
+            with contextlib.suppress(ValueError):
                 bid = Bid.objects.filter(pk=self.request.data['parent']).first()
                 return bid and bid.event
-            except ValueError:
-                pass
         return None
 
     def get_serializer(self, instance=None, *args, **kwargs):

From 51c25012f62ce81a1c69fff9e14403d6e4841d50 Mon Sep 17 00:00:00 2001
From: Benjamin Cutler <uraniumanchor@users.noreply.github.com>
Date: Wed, 6 Nov 2024 15:33:59 -0700
Subject: [PATCH 30/40] permissions tweaks to Bids (#737)

- view_hidden_bid is a last resort, view_bid or change_bid are now sufficient

[#188391351]
---
 bundles/admin/app.js       |  12 +-
 tests/apiv2/test_bids.py   | 508 +++++++++++++++++++++----------------
 tests/util.py              |  16 ++
 tracker/api/permissions.py |  10 +-
 tracker/api/serializers.py |   7 +-
 5 files changed, 323 insertions(+), 230 deletions(-)

diff --git a/bundles/admin/app.js b/bundles/admin/app.js
index 757a4f2c0..042eb6f7d 100644
--- a/bundles/admin/app.js
+++ b/bundles/admin/app.js
@@ -6,7 +6,7 @@ import { BrowserRouter, Link } from 'react-router-dom';
 import { useConstants } from '@common/Constants';
 import Loading from '@common/Loading';
 import { actions } from '@public/api';
-import { usePermissions } from '@public/api/helpers/auth';
+import { usePermission } from '@public/api/helpers/auth';
 import V2HTTPUtils from '@public/apiv2/HTTPUtils';
 import Dropdown from '@public/dropdown';
 import Spinner from '@public/spinner';
@@ -89,7 +89,7 @@ function DropdownMenu({ name, path }) {
 
 function Menu() {
   const { ADMIN_ROOT } = useConstants();
-  const canSeeHiddenBids = usePermissions(['tracker.change_bid', 'tracker.view_hidden_bid']);
+  const canChangeBids = usePermission('tracker.change_bid');
   const { status } = useSelector(state => ({
     status: state.status,
   }));
@@ -105,7 +105,7 @@ function Menu() {
         <DropdownMenu name="Schedule Editor" path="schedule_editor" />
         &mdash;
         <DropdownMenu name="Interstitials" path="interstitials" />
-        {canSeeHiddenBids && (
+        {canChangeBids && (
           <>
             &mdash;
             <DropdownMenu name="Process Pending Bids" path="process_pending_bids" />
@@ -126,7 +126,7 @@ function App({ rootPath }) {
   }));
 
   const { API_ROOT, APIV2_ROOT } = useConstants();
-  const canSeeHiddenBids = usePermissions(['tracker.change_bid', 'tracker.view_hidden_bid']);
+  const canChangeBids = usePermission('tracker.change_bid');
 
   React.useLayoutEffect(() => {
     setAPIRoot(API_ROOT);
@@ -176,10 +176,10 @@ function App({ rootPath }) {
                   </React.Suspense>
                 }
               />
-              {canSeeHiddenBids && (
+              {canChangeBids && (
                 <Route path="process_pending_bids/" element={React.createElement(EventMenu('Process Pending Bids'))} />
               )}
-              {canSeeHiddenBids && (
+              {canChangeBids && (
                 <Route
                   path="process_pending_bids/:eventId"
                   element={
diff --git a/tests/apiv2/test_bids.py b/tests/apiv2/test_bids.py
index 37b92c74c..6fd21ff72 100644
--- a/tests/apiv2/test_bids.py
+++ b/tests/apiv2/test_bids.py
@@ -1,6 +1,6 @@
 import datetime
 
-from django.contrib.auth.models import Permission
+from django.contrib.auth.models import Permission, User
 
 from tracker import models
 from tracker.api.serializers import BidSerializer
@@ -11,49 +11,53 @@
 
 class TestBidViewSet(TestBidBase, APITestCase):
     model_name = 'bid'
-    view_user_permissions = ['view_hidden_bid']
     add_user_permissions = ['top_level_bid']
+    serializer_class = BidSerializer
 
     def setUp(self):
         super().setUp()
         self.client.force_authenticate(user=self.locked_user)
 
-    def test_detail(self):
-        serialized = BidSerializer(self.opened_parent_bid, tree=True)
-        data = self.get_detail(self.opened_parent_bid)
-        self.assertEqual(data, serialized.data)
-        serialized = BidSerializer(self.chain_top, tree=True)
-        data = self.get_detail(self.chain_top)
-        self.assertEqual(data, serialized.data)
-
-        with self.subTest('nested'):
-            serialized = BidSerializer(
-                self.opened_parent_bid, event_pk=self.event.id, tree=True
-            )
-            data = self.get_detail(
-                self.opened_parent_bid, kwargs={'event_pk': self.event.id}
-            )
-            self.assertEqual(data, serialized.data)
-
-    def test_hidden_detail(self):
-        with self.subTest('user with permission'):
-            self.hidden_parent_bid.refresh_from_db()
-            serialized = BidSerializer(
-                self.hidden_parent_bid,
-                include_hidden=True,
-                tree=True,
-                with_permissions=('tracker.view_hidden_bid',),
-            )
-            data = self.get_detail(self.hidden_parent_bid)
-            self.assertEqual(data, serialized.data)
-
-        with self.subTest('user without permission'):
-            self.client.force_authenticate(user=None)
-            self.get_detail(self.hidden_parent_bid, status_code=404)
-
-    def test_list(self):
-        with self.subTest('authenticated'):
-            with self.subTest('normal list'):
+        # to test toplevel permission
+        self.limited_user = User.objects.create(username='limited_user')
+        self.limited_user.user_permissions.add(
+            Permission.objects.get(codename='add_bid'),
+            Permission.objects.get(codename='change_bid'),
+        )
+        self.view_hidden_user = User.objects.create(username='view_hidden_user')
+        self.view_hidden_user.user_permissions.add(
+            Permission.objects.get(codename='view_hidden_bid')
+        )
+
+    def test_fetch(self):
+        with self.saveSnapshot():
+            with self.subTest('detail'):
+                serialized = BidSerializer(self.opened_parent_bid, tree=True)
+                data = self.get_detail(self.opened_parent_bid)
+                self.assertEqual(data, serialized.data)
+                serialized = BidSerializer(self.chain_top, tree=True)
+                data = self.get_detail(self.chain_top)
+                self.assertEqual(data, serialized.data)
+
+                with self.subTest('nested'):
+                    serialized = BidSerializer(
+                        self.opened_parent_bid, event_pk=self.event.id, tree=True
+                    )
+                    data = self.get_detail(
+                        self.opened_parent_bid, kwargs={'event_pk': self.event.id}
+                    )
+                    self.assertEqual(data, serialized.data)
+                with self.subTest('hidden'):
+                    self.hidden_parent_bid.refresh_from_db()
+                    serialized = BidSerializer(
+                        self.hidden_parent_bid,
+                        include_hidden=True,
+                        tree=True,
+                        with_permissions=('tracker.view_hidden_bid',),
+                    )
+                    data = self.get_detail(self.hidden_parent_bid)
+                    self.assertEqual(data, serialized.data)
+            with self.subTest('list'):
                 serialized = BidSerializer(
                     models.Bid.objects.filter(event=self.event).public(),
                     event_pk=self.event.id,
@@ -62,6 +66,31 @@ def test_list(self):
                 data = self.get_list(kwargs={'event_pk': self.event.pk})
                 self.assertEqual(data['results'], serialized.data)
 
+                with self.subTest('normal tree'):
+                    serialized = BidSerializer(
+                        models.Bid.objects.filter(event=self.event, level=0).public(),
+                        many=True,
+                        event_pk=self.event.id,
+                        tree=True,
+                    )
+                    data = self.get_noun('tree', kwargs={'event_pk': self.event.pk})
+                    self.assertEqual(data['results'], serialized.data)
+
+                with self.subTest('hidden tree'):
+                    serialized = BidSerializer(
+                        models.Bid.objects.filter(event=self.event, level=0),
+                        include_hidden=True,
+                        with_permissions=('tracker.view_hidden_bid',),
+                        many=True,
+                        event_pk=self.event.id,
+                        tree=True,
+                    )
+                    data = self.get_noun(
+                        'tree',
+                        kwargs={'event_pk': self.event.pk, 'feed': 'all'},
+                    )
+                    self.assertEqual(data['results'], serialized.data)
+
             with self.subTest('feeds'):
                 for feed in ['open', 'closed']:
                     with self.subTest(feed):
@@ -82,36 +111,50 @@ def test_list(self):
                     opened_bid = BidSerializer(self.opened_bid, event_pk=self.event.id)
                     # challenge is pinned, always shows up regardless of parameters
                     challenge = BidSerializer(self.challenge, event_pk=self.event.id)
-                    data = self.get_list(
-                        kwargs={'event_pk': self.event.pk, 'feed': 'current'},
-                        data={'now': self.run.starttime},
-                    )
-                    self.assertV2ModelPresent(opened_bid.data, data['results'])
-                    self.assertV2ModelPresent(challenge.data, data['results'])
-                    data = self.get_list(
-                        kwargs={'event_pk': self.event.pk, 'feed': 'current'},
-                        data={'now': self.run.endtime + datetime.timedelta(seconds=1)},
-                    )
-                    self.assertV2ModelNotPresent(opened_bid.data, data['results'])
-                    self.assertV2ModelPresent(challenge.data, data['results'])
-                    # need `min_runs` or we'll just get the run anyway
-                    data = self.get_list(
-                        kwargs={'event_pk': self.event.pk, 'feed': 'current'},
-                        data={
-                            'min_runs': 0,
-                            'now': self.run.starttime - datetime.timedelta(minutes=60),
-                            'delta': 30,
-                        },
-                    )
-                    self.assertV2ModelNotPresent(opened_bid.data, data['results'])
-                    self.assertV2ModelPresent(challenge.data, data['results'])
-                    # pathological, but it tests max_runs
-                    data = self.get_list(
-                        kwargs={'event_pk': self.event.pk, 'feed': 'current'},
-                        data={'max_runs': 0, 'now': self.run.starttime},
-                    )
-                    self.assertV2ModelNotPresent(opened_bid.data, data['results'])
-                    self.assertV2ModelPresent(challenge.data, data['results'])
+
+                    with self.subTest('start of run'):
+                        data = self.get_list(
+                            kwargs={'event_pk': self.event.pk, 'feed': 'current'},
+                            data={'now': self.run.starttime},
+                        )
+                        self.assertV2ModelPresent(opened_bid.data, data['results'])
+                        self.assertV2ModelPresent(challenge.data, data['results'])
+                    with self.suppressSnapshot():
+                        with self.subTest('end of run'):
+                            data = self.get_list(
+                                kwargs={'event_pk': self.event.pk, 'feed': 'current'},
+                                data={
+                                    'now': self.run.endtime
+                                    + datetime.timedelta(seconds=1)
+                                },
+                            )
+                            self.assertV2ModelNotPresent(
+                                opened_bid.data, data['results']
+                            )
+                            self.assertV2ModelPresent(challenge.data, data['results'])
+                        # need `min_runs` or we'll just get the run anyway
+                        with self.subTest('an hour ago'):
+                            data = self.get_list(
+                                kwargs={'event_pk': self.event.pk, 'feed': 'current'},
+                                data={
+                                    'min_runs': 0,
+                                    'now': self.run.starttime
+                                    - datetime.timedelta(minutes=60),
+                                    'delta': 30,
+                                },
+                            )
+                            self.assertV2ModelNotPresent(
+                                opened_bid.data, data['results']
+                            )
+                            self.assertV2ModelPresent(challenge.data, data['results'])
+
+                        # pathological, but it tests max_runs
+                        data = self.get_list(
+                            kwargs={'event_pk': self.event.pk, 'feed': 'current'},
+                            data={'max_runs': 0, 'now': self.run.starttime},
+                        )
+                        self.assertV2ModelNotPresent(opened_bid.data, data['results'])
+                        self.assertV2ModelPresent(challenge.data, data['results'])
 
                 # hidden feeds
                 for feed in ['pending', 'all']:
@@ -130,9 +173,13 @@ def test_list(self):
                         )
                         self.assertEqual(data['results'], serialized.data)
 
-        with self.subTest('anonymous'):
-            self.client.force_authenticate(user=None)
+        with self.subTest('limited permissions'):
+            self.get_list(data={'feed': 'all'}, user=self.view_hidden_user)
+            self.get_detail(self.denied_bid)
+            self.get_list(data={'feed': 'all'}, user=self.view_user)
+            self.get_detail(self.denied_bid)
 
+        with self.subTest('anonymous'):
             with self.subTest('normal feeds without permission'):
                 self.get_list(
                     kwargs={'event_pk': self.event.pk},
@@ -140,81 +187,63 @@ def test_list(self):
                 for feed in ['open', 'closed', 'current']:
                     with self.subTest(feed):
                         self.get_list(
+                            user=None,
                             kwargs={'event_pk': self.event.pk, 'feed': feed},
                         )
 
-            with self.subTest('hidden feeds without permission'):
-                for feed in ['pending', 'all']:
-                    with self.subTest(feed):
-                        self.get_list(
-                            kwargs={'event_pk': self.event.pk, 'feed': feed},
-                            status_code=403,
-                        )
-
-    def test_tree(self):
-        with self.subTest('normal tree'):
-            serialized = BidSerializer(
-                models.Bid.objects.filter(event=self.event, level=0).public(),
-                many=True,
-                event_pk=self.event.id,
-                tree=True,
-            )
-            data = self.get_noun('tree', kwargs={'event_pk': self.event.pk})
-            self.assertEqual(data['results'], serialized.data)
-
-        with self.subTest('hidden tree'):
-            serialized = BidSerializer(
-                models.Bid.objects.filter(event=self.event, level=0),
-                include_hidden=True,
-                with_permissions=('tracker.view_hidden_bid',),
-                many=True,
-                event_pk=self.event.id,
-                tree=True,
-            )
-            data = self.get_noun(
-                'tree',
-                kwargs={'event_pk': self.event.pk, 'feed': 'all'},
-            )
-            self.assertEqual(data['results'], serialized.data)
-
-        with self.subTest('hidden tree without permission'):
-            self.get_noun(
-                'tree',
-                kwargs={'event_pk': self.event.pk, 'feed': 'all'},
-                user=None,
-                status_code=403,
-            )
+            with self.subTest('error cases'):
+                with self.subTest('hidden feeds without permission'):
+                    for feed in ['pending', 'all']:
+                        with self.subTest(feed):
+                            self.get_list(
+                                kwargs={'event_pk': self.event.pk, 'feed': feed},
+                                status_code=403,
+                            )
+
+                with self.subTest('hidden bid without permission'):
+                    self.get_detail(self.hidden_parent_bid, status_code=404)
+
+                with self.subTest('hidden tree without permission'):
+                    self.get_noun(
+                        'tree',
+                        kwargs={'event_pk': self.event.pk, 'feed': 'all'},
+                        status_code=403,
+                    )
 
     def test_create(self):
-        with self.subTest('attach to event'):
-            data = self.post_new(data={'name': 'New Event Bid', 'event': self.event.pk})
-            serialized = BidSerializer(models.Bid.objects.get(pk=data['id']))
-            self.assertEqual(data, serialized.data)
-
-        with self.subTest('attach to parent'):
-            data = self.post_new(
-                data={'name': 'New Child', 'parent': self.opened_parent_bid.pk},
-            )
-            serialized = BidSerializer(models.Bid.objects.get(pk=data['id']))
-            self.assertEqual(data, serialized.data)
+        with self.saveSnapshot(), self.assertLogsChanges(4):
+            # TODO: natural key tests
+            with self.subTest('attach to event'):
+                data = self.post_new(
+                    data={'name': 'New Event Bid', 'event': self.event.pk}
+                )
+                serialized = BidSerializer(models.Bid.objects.get(pk=data['id']))
+                self.assertEqual(data, serialized.data)
 
-        with self.subTest('attach to speedrun'):
-            data = self.post_new(
-                data={'name': 'New Run Bid', 'speedrun': self.run.pk},
-            )
-            serialized = BidSerializer(models.Bid.objects.get(pk=data['id']))
-            self.assertEqual(data, serialized.data)
+            with self.subTest('attach to parent'):
+                data = self.post_new(
+                    data={'name': 'New Child', 'parent': self.opened_parent_bid.pk},
+                )
+                serialized = BidSerializer(models.Bid.objects.get(pk=data['id']))
+                self.assertEqual(data, serialized.data)
 
-        with self.subTest('attach to chain'):
-            data = self.post_new(
-                data={
-                    'name': 'Chain Abyss',
-                    'parent': self.chain_bottom.pk,
-                    'goal': 50,
-                },
-            )
-            serialized = BidSerializer(models.Bid.objects.get(pk=data['id']))
-            self.assertEqual(data, serialized.data)
+            with self.subTest('attach to speedrun'):
+                data = self.post_new(
+                    data={'name': 'New Run Bid', 'speedrun': self.run.pk},
+                )
+                serialized = BidSerializer(models.Bid.objects.get(pk=data['id']))
+                self.assertEqual(data, serialized.data)
+
+            with self.subTest('attach to chain'):
+                data = self.post_new(
+                    data={
+                        'name': 'Chain Abyss',
+                        'parent': self.chain_bottom.pk,
+                        'goal': 50,
+                    },
+                )
+                serialized = BidSerializer(models.Bid.objects.get(pk=data['id']))
+                self.assertEqual(data, serialized.data)
 
         with self.subTest('attach to locked event with permission'):
             data = self.post_new(
@@ -238,110 +267,116 @@ def test_create(self):
             serialized = BidSerializer(models.Bid.objects.get(pk=data['id']))
             self.assertEqual(data, serialized.data)
 
-        with self.subTest('attach to nonsense'):
-
-            self.post_new(
-                data={'name': 'Nonsense Bid', 'event': 'foo'}, status_code=400
-            )
-            data = self.post_new(
-                data={'name': 'Nonsense Bid', 'speedrun': 'bar'},
-                status_code=400,
-            )
-            data = self.post_new(
-                data={'name': 'Nonsense Bid', 'parent': 'baz'},
-                status_code=400,
-            )
-
-        with self.subTest('model validation'):
-            # smoke test, don't want to repeat all the validation rules here
-            data = self.post_new(
-                data={
-                    'name': 'Nonsense Repeat Bid',
-                    'event': self.event.pk,
-                    'goal': 500,
-                    'repeat': 12,
-                },
-                status_code=400,
-            )
-
-        self.client.force_authenticate(user=self.add_user)
+        with self.subTest('error cases'):
+            with self.subTest('attach to nonsense'):
+                self.post_new(
+                    data={'name': 'Nonsense Bid', 'event': 'foo'},
+                    status_code=400,
+                    expected_error_codes={'event': 'incorrect_type'},
+                )
+                self.post_new(
+                    data={'name': 'Nonsense Bid', 'speedrun': 'bar'},
+                    status_code=400,
+                    expected_error_codes={'speedrun': 'incorrect_type'},
+                )
+                self.post_new(
+                    data={'name': 'Nonsense Bid', 'parent': 'baz'},
+                    status_code=400,
+                    expected_error_codes={'parent': 'incorrect_type'},
+                )
 
-        with self.subTest('require locked permission'):
-            self.post_new(
-                data={
-                    'name': 'New Locked Event Bid 2',
-                    'event': self.locked_event.pk,
-                },
-                status_code=403,
-            )
+            with self.subTest('model validation'):
+                # smoke test, don't want to repeat all the validation rules here
+                self.post_new(
+                    data={
+                        'name': 'Nonsense Repeat Bid',
+                        'event': self.event.pk,
+                        'goal': 500,
+                        'repeat': 12,
+                        'istarget': True,
+                    },
+                    status_code=400,
+                    expected_error_codes={'repeat': 'invalid'},
+                )
 
-            self.post_new(
-                data={
-                    'name': 'New Locked Run Bid 2',
-                    'speedrun': self.locked_run.pk,
-                },
-                status_code=403,
-            )
+            with self.subTest('require locked permission'):
+                self.post_new(
+                    data={
+                        'name': 'New Locked Event Bid 2',
+                        'event': self.locked_event.pk,
+                    },
+                    user=self.add_user,
+                    status_code=403,
+                )
 
-            self.post_new(
-                data={
-                    'name': 'New Locked Child 2',
-                    'parent': self.locked_parent_bid.pk,
-                },
-                status_code=403,
-            )
+                self.post_new(
+                    data={
+                        'name': 'New Locked Run Bid 2',
+                        'speedrun': self.locked_run.pk,
+                    },
+                    status_code=403,
+                )
 
-        with self.subTest('require top level permission for bids without parents'):
-            self.add_user.user_permissions.remove(
-                Permission.objects.get(codename='top_level_bid')
-            )
-            # TODO: maybe make a separate user for this
-            del self.add_user._perm_cache
-            del self.add_user._user_perm_cache
+                self.post_new(
+                    data={
+                        'name': 'New Locked Child 2',
+                        'parent': self.locked_parent_bid.pk,
+                    },
+                    status_code=403,
+                )
 
-            self.post_new(
-                data={'name': 'New Event Bid 2', 'event': self.event.pk},
-                status_code=403,
-            )
+            with self.subTest('require top level permission for bids without parents'):
+                self.post_new(
+                    data={'name': 'New Event Bid 2', 'event': self.event.pk},
+                    user=self.limited_user,
+                    status_code=403,
+                )
 
-            self.post_new(
-                data={
-                    'name': 'New Child 2',
-                    'parent': self.opened_parent_bid.pk,
-                },
-                status_code=201,
-            )
+                self.post_new(
+                    data={
+                        'name': 'New Child 2',
+                        'parent': self.opened_parent_bid.pk,
+                    },
+                    status_code=201,
+                )
 
-        with self.subTest('anonymous'):
-            self.post_new(
-                data={
-                    'name': 'New Child 3',
-                    'parent': self.opened_parent_bid.pk,
-                },
-                status_code=403,
-                user=None,
-            )
+            with self.subTest('anonymous'):
+                self.post_new(
+                    data={
+                        'name': 'New Child 3',
+                        'parent': self.opened_parent_bid.pk,
+                    },
+                    status_code=403,
+                    user=None,
+                )
 
     def test_patch(self):
-        with self.subTest('can edit locked bid with permission'):
+        with self.saveSnapshot(), self.assertLogsChanges(1):
+            data = self.patch_detail(self.challenge, data={'name': 'Challenge Updated'})
+            self.assertV2ModelPresent(self.challenge, data)
+
+        with self.subTest(
+            'can edit locked bid with permission'
+        ), self.assertLogsChanges(1):
             data = self.patch_detail(
                 self.locked_challenge, data={'name': 'Locked Updated'}
             )
             self.assertEqual(data['name'], 'Locked Updated')
 
-        self.client.force_authenticate(user=self.add_user)
-
-        with self.subTest('can edit top level bids'):
+        with self.subTest(
+            'can edit top level bids even without creation permission'
+        ), self.assertLogsChanges(1):
             data = self.patch_detail(
                 self.opened_parent_bid,
                 data={'name': 'Opened Parent Updated'},
+                user=self.limited_user,
             )
             self.assertEqual(data['name'], 'Opened Parent Updated')
 
         with self.subTest('should not be able to change parent'):
             self.patch_detail(
                 self.opened_bid,
-                data={'parent': self.opened_parent_bid.pk},
+                data={'parent': self.opened_parent_bid.pk},  # same parent, so no-op
             )
 
             self.patch_detail(
@@ -360,7 +395,7 @@ def test_patch(self):
         with self.subTest('should not be able to move to a locked event'):
             self.patch_detail(
                 self.opened_parent_bid,
-                data={'event': self.locked_event.pk},  # same parent
+                data={'event': self.locked_event.pk},
                 status_code=403,
             )
             self.patch_detail(
@@ -372,7 +407,7 @@ def test_patch(self):
         with self.subTest('anonymous'):
             self.patch_detail(
                 self.opened_parent_bid,
-                data={'name': 'Opened Parent Updated Anonymous'},  # different parent
+                data={'name': 'Opened Parent Updated Anonymous'},
                 status_code=403,
                 user=None,
             )
@@ -499,6 +534,37 @@ def test_single(self):
                     serialized.data['options'],
                 )
 
+        with self.subTest('hidden permissions checks'):
+            for bid in [
+                self.pending_bid,
+                self.denied_bid,
+                self.hidden_bid,
+                self.hidden_parent_bid,
+            ]:
+                # smoke test for base case
+                with self.assertRaises(AssertionError):
+                    BidSerializer().to_representation(bid)
+
+                # flag isn't enough, permission needs to be provided
+                with self.assertRaises(AssertionError):
+                    BidSerializer(include_hidden=True).to_representation(bid)
+
+                # permission isn't enough, the flag needs to be specified too
+                with self.assertRaises(AssertionError):
+                    BidSerializer(
+                        with_permissions='tracker.view_hidden_bid'
+                    ).to_representation(bid)
+
+                # any of the following permissions are sufficient
+                for perm in [
+                    'tracker.view_hidden_bid',
+                    'tracker.view_bid',
+                    'tracker.change_bid',
+                ]:
+                    BidSerializer(
+                        include_hidden=True, with_permissions=perm
+                    ).to_representation(bid)
+
         with self.subTest('child bid'):
             serialized = BidSerializer(self.opened_bid, tree=True)
             self.assertV2ModelPresent(
diff --git a/tests/util.py b/tests/util.py
index 862613994..b7eca2078 100644
--- a/tests/util.py
+++ b/tests/util.py
@@ -7,6 +7,7 @@
 import json
 import logging
 import os
+import pickle
 import random
 import re
 import sys
@@ -38,6 +39,15 @@
 from tracker.compat import zoneinfo
 
 
+class PickledRandom(random.Random):
+    # I live in hell
+    def getstate(self):
+        return 'pickled'
+
+    def setstate(self, state):
+        pass
+
+
 def parse_test_mail(mail):
     lines = [
         x.partition(':')
@@ -871,6 +881,12 @@ def setUp(self):
         super().setUp()
         self._save_snapshot = False
         self.rand = random.Random()
+        # depending on the environment this might not be pickleable, which makes random test failures extremely
+        #  hard to diagnose
+        try:
+            pickle.dumps(self.rand)
+        except NotImplementedError:
+            self.rand = PickledRandom()
         self.factory = RequestFactory()
         self.client = APIClient()
         self.locked_event = models.Event.objects.create(
diff --git a/tracker/api/permissions.py b/tracker/api/permissions.py
index a2ea608eb..98728e9cd 100644
--- a/tracker/api/permissions.py
+++ b/tracker/api/permissions.py
@@ -60,7 +60,10 @@ def has_permission(self, request: Request, view: t.Callable):
         return super().has_permission(request, view) and (
             feed is None
             or feed in self.PUBLIC_FEEDS
-            or request.user.has_perm('tracker.view_hidden_bid')
+            or any(
+                request.user.has_perm(f'tracker.{p}')
+                for p in ('view_hidden_bid', 'change_bid', 'view_bid')
+            )
         )
 
 
@@ -72,7 +75,10 @@ class BidStatePermission(BasePermission):
     def has_object_permission(self, request: Request, view: t.Callable, obj: t.Any):
         return super().has_object_permission(request, view, obj) and (
             obj.state in self.PUBLIC_STATES
-            or request.user.has_perm('tracker.view_hidden_bid')
+            or any(
+                request.user.has_perm(f'tracker.{p}')
+                for p in ('view_hidden_bid', 'change_bid', 'view_bid')
+            )
         )
 
 
diff --git a/tracker/api/serializers.py b/tracker/api/serializers.py
index 86c30b378..64ec5a04b 100644
--- a/tracker/api/serializers.py
+++ b/tracker/api/serializers.py
@@ -420,8 +420,13 @@ def _find_children(self, parent):
         yield from (child for child in self._tree if child.parent_id == parent.id)
 
     def _has_permission(self, instance):
+        # check for any of the sufficient permissions
         return instance.state in Bid.PUBLIC_STATES or (
-            self.include_hidden and 'tracker.view_hidden_bid' in self.permissions
+            self.include_hidden
+            and (
+                {'tracker.view_hidden_bid', 'tracker.view_bid', 'tracker.change_bid'}
+                & set(self.permissions)
+            )
         )
 
     def to_representation(self, instance, child=False):

From 21098ff1961af0cf0b9d375c5b36afd5e39104e2 Mon Sep 17 00:00:00 2001
From: Benjamin Cutler <uraniumanchor@users.noreply.github.com>
Date: Tue, 12 Nov 2024 16:10:40 -0700
Subject: [PATCH 31/40] add DonationBid to v2, under donations/bids (#738)

[#184870652]
---
 .pre-commit-config.yaml            |   5 +
 tests/apiv2/test_donation_bids.py  | 257 +++++++++++++++++++++++++++++
 tests/randgen.py                   |   7 +-
 tests/util.py                      |  56 ++++++-
 tracker/api/permissions.py         |  20 +++
 tracker/api/serializers.py         |  36 +++-
 tracker/api/views/bids.py          |   7 +
 tracker/api/views/donation_bids.py |  43 +++++
 tracker/api/views/donations.py     |   7 +
 9 files changed, 422 insertions(+), 16 deletions(-)
 create mode 100644 tests/apiv2/test_donation_bids.py
 create mode 100644 tracker/api/views/donation_bids.py

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 0110be27f..b882de3c6 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -15,6 +15,11 @@ repos:
   rev: 7.1.0
   hooks:
     - id: flake8
+- repo: https://github.com/pycqa/autoflake
+  rev: v2.3.1
+  hooks:
+    - id: autoflake
+      args: [--remove-all-unused-imports, --in-place]
 - repo: local
   hooks:
     - id: prettier
diff --git a/tests/apiv2/test_donation_bids.py b/tests/apiv2/test_donation_bids.py
new file mode 100644
index 000000000..8b01781a6
--- /dev/null
+++ b/tests/apiv2/test_donation_bids.py
@@ -0,0 +1,257 @@
+from decimal import Decimal
+
+from tests import randgen
+from tests.util import APITestCase
+from tracker import models
+from tracker.api.serializers import DonationBidSerializer
+
+
+class TestDonationBids(APITestCase):
+    model_name = 'donationbid'
+    serializer_class = DonationBidSerializer
+    extra_serializer_kwargs = {'with_permissions': 'tracker.view_hidden_bid'}
+    view_user_permissions = ['view_bid']
+
+    def _format_donation_bid(self, bid):
+        bid.refresh_from_db()
+        return {
+            'type': 'donationbid',
+            'id': bid.id,
+            'donation': bid.donation_id,
+            'bid': bid.bid_id,
+            'bid_name': bid.bid.fullname(),
+            'bid_state': bid.bid.state,
+            'amount': str(bid.amount),
+        }
+
+    def setUp(self):
+        super().setUp()
+        self.donor = randgen.generate_donor(self.rand)
+        self.donor.save()
+        self.donation = randgen.generate_donation(
+            self.rand, min_amount=10, max_amount=25
+        )
+        self.donation.save()
+        self.other_donation = randgen.generate_donation(self.rand)
+        self.other_donation.save()
+        self.pending_donation = randgen.generate_donation(
+            self.rand, domain='PAYPAL', transactionstate='PENDING'
+        )
+        self.pending_donation.save()
+        self.opened_bid = randgen.generate_bid(
+            self.rand,
+            event=self.event,
+            state='OPENED',
+            allow_children=True,
+            allowuseroptions=True,
+        )[0]
+        self.opened_bid.save()
+        self.opened_child = randgen.generate_bid(
+            self.rand, parent=self.opened_bid, state='OPENED', allow_children=False
+        )[0]
+        self.opened_child.save()
+        self.denied_child = randgen.generate_bid(
+            self.rand, parent=self.opened_bid, state='DENIED', allow_children=False
+        )[0]
+        self.denied_child.save()
+        self.opened_child_bid = models.DonationBid.objects.create(
+            donation=self.donation,
+            bid=self.opened_child,
+            amount=Decimal(self.rand.uniform(5.0, 9.5)),
+        )
+        self.denied_child_bid = models.DonationBid.objects.create(
+            donation=self.donation,
+            bid=self.denied_child,
+            amount=self.donation.amount - self.opened_child_bid.amount,
+        )
+        self.other_child_bid = models.DonationBid.objects.create(
+            donation=self.other_donation,
+            bid=self.opened_child,
+            amount=self.other_donation.amount / 3,
+        )
+        self.hidden_bid, hidden_children = randgen.generate_bid(
+            self.rand,
+            event=self.event,
+            min_children=1,
+            max_children=1,
+            state='HIDDEN',
+            allow_children=True,
+            allowuseroptions=True,
+        )
+        self.hidden_child = hidden_children[0][0]
+        self.hidden_bid.save()
+        self.hidden_child.save()
+        self.hidden_denied_child = randgen.generate_bid(
+            self.rand, parent=self.hidden_bid, state='DENIED', allow_children=False
+        )[0]
+        self.hidden_denied_child.save()
+        self.hidden_child_bid = models.DonationBid.objects.create(
+            donation=self.other_donation,
+            bid=self.hidden_child,
+            amount=self.other_donation.amount / 3,
+        )
+        self.hidden_denied_child_bid = models.DonationBid.objects.create(
+            donation=self.other_donation,
+            bid=self.hidden_denied_child,
+            amount=self.other_donation.amount / 3,
+        )
+        self.pending_donation_bid = models.DonationBid.objects.create(
+            donation=self.pending_donation,
+            bid=self.opened_child,
+            amount=self.pending_donation.amount,
+        )
+
+    def test_fetch(self):
+        with self.saveSnapshot():
+            with self.subTest('via donation'):
+                data = self.get_noun(
+                    'bids', self.donation, model_name='donations', user=self.view_user
+                )
+                self.assertExactV2Models([self.opened_child_bid], data['results'])
+
+                data = self.get_noun(
+                    'bids',
+                    self.donation,
+                    data={'all': ''},
+                    model_name='donations',
+                    user=self.view_user,
+                )
+                self.assertExactV2Models(
+                    [self.opened_child_bid, self.denied_child_bid], data['results']
+                )
+
+                data = self.get_noun(
+                    'bids',
+                    self.other_donation,
+                    data={'all': ''},
+                    model_name='donations',
+                    user=self.view_user,
+                )
+                self.assertExactV2Models(
+                    [
+                        self.other_child_bid,
+                        self.hidden_child_bid,
+                        self.hidden_denied_child_bid,
+                    ],
+                    data['results'],
+                )
+
+            with self.subTest('via parent bid'):
+                data = self.get_noun(
+                    'donations',
+                    self.opened_bid,
+                    model_name='bid',
+                    user=self.view_user,
+                )
+                self.assertExactV2Models(
+                    [self.opened_child_bid, self.other_child_bid], data['results']
+                )
+
+                data = self.get_noun(
+                    'donations',
+                    self.opened_bid,
+                    data={'all': ''},
+                    model_name='bid',
+                    user=self.view_user,
+                )
+                self.assertExactV2Models(
+                    [
+                        self.opened_child_bid,
+                        self.denied_child_bid,
+                        self.other_child_bid,
+                    ],
+                    data['results'],
+                )
+
+                data = self.get_noun(
+                    'donations',
+                    self.hidden_bid,
+                    model_name='bid',
+                    user=self.view_user,
+                )
+                self.assertExactV2Models(
+                    [self.hidden_child_bid, self.hidden_denied_child_bid],
+                    data['results'],
+                )
+
+            with self.subTest('via child bid'):
+                data = self.get_noun(
+                    'donations',
+                    self.opened_child,
+                    model_name='bid',
+                    user=self.view_user,
+                )
+                self.assertExactV2Models(
+                    [self.opened_child_bid, self.other_child_bid], data['results']
+                )
+
+                data = self.get_noun(
+                    'donations',
+                    self.denied_child,
+                    model_name='bid',
+                    user=self.view_user,
+                )
+                self.assertExactV2Models([self.denied_child_bid], data['results'])
+
+                data = self.get_noun(
+                    'donations',
+                    self.hidden_child,
+                    model_name='bid',
+                    user=self.view_user,
+                )
+                self.assertExactV2Models([self.hidden_child_bid], data['results'])
+
+        with self.subTest('error cases'):
+            # strictly speaking, 403, but easier to write the permission check this way
+            self.get_noun(
+                'bids',
+                self.donation,
+                data={'all': ''},
+                model_name='donations',
+                user=None,
+                status_code=404,
+            )
+            self.get_noun(
+                'bids',
+                self.pending_donation,
+                model_name='donations',
+                user=None,
+                status_code=404,
+            )
+            self.get_noun(
+                'donations',
+                self.opened_bid,
+                data={'all': ''},
+                model_name='bid',
+                user=None,
+                status_code=404,
+            )
+            self.get_noun(
+                'donations',
+                self.denied_child,
+                model_name='bid',
+                user=None,
+                status_code=404,
+            )
+            self.get_noun(
+                'donations',
+                self.hidden_bid,
+                model_name='bid',
+                user=None,
+                status_code=404,
+            )
+
+    def test_serializer(self):
+        with self.assertRaises(AssertionError):
+            print(DonationBidSerializer(self.hidden_child_bid).data)
+
+        data = DonationBidSerializer(
+            self.hidden_child_bid, with_permissions=('tracker.view_hidden_bid')
+        ).data
+        self.assertEqual(data, self._format_donation_bid(self.hidden_child_bid))
+
+        data = DonationBidSerializer(
+            [self.opened_child_bid, self.other_child_bid], many=True
+        ).data
+        self.assertEqual(data[0], self._format_donation_bid(self.opened_child_bid))
+        self.assertEqual(data[1], self._format_donation_bid(self.other_child_bid))
diff --git a/tests/randgen.py b/tests/randgen.py
index 1718eb4ab..805c853f9 100644
--- a/tests/randgen.py
+++ b/tests/randgen.py
@@ -284,6 +284,7 @@ def generate_bid(
     rand,
     *,
     allow_children=None,
+    allowuseroptions=None,
     min_children=2,
     max_children=5,
     max_depth=2,
@@ -299,6 +300,8 @@ def generate_bid(
     bid = Bid()
     bid.description = random_bid_description(rand, bid.name)
     assert run or event or parent, 'Need at least one of run, event, or parent'
+    if allowuseroptions is not None:
+        bid.allowuseroptions = allowuseroptions
     if parent:
         bid.parent = parent
         bid.speedrun = parent.speedrun
@@ -411,12 +414,12 @@ def generate_donation(
         ), 'Local donations must be specified as COMPLETED'
 
     if not no_donor:
-        if not donor:
+        if donor is None:
             if donors:
                 donor = rand.choice(donors)
             else:
+                assert Donor.objects.exists(), 'No donor provided and none exist'
                 donor = rand.choice(Donor.objects.all())
-        assert donor, 'No donor provided and none exist'
         donation.donor = donor
     donation.clean()
     return donation
diff --git a/tests/util.py b/tests/util.py
index b7eca2078..0b5090f1e 100644
--- a/tests/util.py
+++ b/tests/util.py
@@ -223,6 +223,7 @@ class APITestCase(TransactionTestCase, AssertionHelpers):
     fixtures = ['countries']
     model_name = None
     serializer_class = None
+    extra_serializer_kwargs = {}
     format_model = None
     view_user_permissions = []  # trickles to add_user and locked_user
     add_user_permissions = []  # trickles to locked_user
@@ -705,7 +706,8 @@ def assertV2ModelPresent(
             ), 'no serializer_class provided and raw model was passed'
             expected_model.refresh_from_db()
             expected_model = self.serializer_class(
-                expected_model, **serializer_kwargs or {}
+                expected_model,
+                **{**(serializer_kwargs or {}), **self.extra_serializer_kwargs},
             ).data
             # FIXME: gross hack
             from tracker.api.serializers import EventNestedSerializerMixin
@@ -717,8 +719,8 @@ def assertV2ModelPresent(
                 (
                     m
                     for m in data
-                    if expected_model['type'] == m['type']
-                    and expected_model['id'] == m['id']
+                    if expected_model['type'] == m.get('type', None)
+                    and expected_model['id'] == m.get('id', None)
                 ),
                 None,
             )
@@ -748,15 +750,17 @@ def assertV2ModelNotPresent(self, unexpected_model, data):
             assert hasattr(
                 self, 'serializer_class'
             ), 'no serializer_class provided and raw model was passed'
-            unexpected_model = self.serializer_class(unexpected_model).data
+            unexpected_model = self.serializer_class(
+                unexpected_model, **self.extra_serializer_kwargs
+            ).data
         if (
             next(
                 (
                     model
                     for model in data
                     if (
-                        model['id'] == unexpected_model['id']
-                        and model['type'] == unexpected_model['type']
+                        model.get('id', None) == unexpected_model['id']
+                        and model.get('type', None) == unexpected_model['type']
                     )
                 ),
                 None,
@@ -768,6 +772,46 @@ def assertV2ModelNotPresent(self, unexpected_model, data):
                 % (unexpected_model['type'], unexpected_model['id'])
             )
 
+    def assertExactV2Models(
+        self,
+        expected_models,
+        unexpected_models,
+        data=None,
+        *,
+        exact_count=True,
+        msg=None,
+        **kwargs,
+    ):
+        """similar to V2ModelPresent, but allows you to explicitly check that certain models are not present
+        by default it also asserts exact count, but you can turn that off if you want
+        """
+        problems = []
+        if data is None:
+            data = unexpected_models
+            unexpected_models = []
+        if exact_count and len(data) != len(expected_models):
+            problems.append(
+                f'Data length mismatch, expected {len(expected_models)}, got {len(data)}'
+            )
+        for m in expected_models:
+            try:
+                self.assertV2ModelPresent(m, data, **kwargs)
+            except AssertionError as e:
+                problems.append(str(e))
+        for m in unexpected_models:
+            try:
+                self.assertV2ModelNotPresent(m, data)
+            except AssertionError as e:
+                problems.append(str(e))
+        if problems:
+            parts = []
+            if msg:
+                parts.append(msg)
+            parts.append(f'Had {len(problems)} problem(s) asserting model data:')
+            parts.extend(problems)
+
+            self.fail('\n'.join(parts))
+
     def assertLogEntry(self, model_name: str, pk: int, change_type, message: str):
         from django.contrib.admin.models import LogEntry
 
diff --git a/tracker/api/permissions.py b/tracker/api/permissions.py
index 98728e9cd..45cc2b7f4 100644
--- a/tracker/api/permissions.py
+++ b/tracker/api/permissions.py
@@ -82,6 +82,26 @@ def has_object_permission(self, request: Request, view: t.Callable, obj: t.Any):
         )
 
 
+class DonationBidStatePermission(BasePermission):
+    PUBLIC_STATES = models.Bid.PUBLIC_STATES
+    message = messages.GENERIC_NOT_FOUND
+    code = messages.UNAUTHORIZED_OBJECT_CODE
+
+    def has_permission(self, request, view):
+        has_perm = any(
+            request.user.has_perm(f'tracker.{p}')
+            for p in ('view_hidden_bid', 'change_bid', 'view_bid')
+        )
+        return (
+            super().has_permission(request, view)
+            and has_perm
+            or (
+                ((view.bid is None or view.bid.state in self.PUBLIC_STATES))
+                and ('all' not in request.query_params)
+            )
+        )
+
+
 class TechNotesPermission(BasePermission):
     message = messages.UNAUTHORIZED_FIELD
     code = messages.UNAUTHORIZED_FIELD_CODE
diff --git a/tracker/api/serializers.py b/tracker/api/serializers.py
index 64ec5a04b..4419def92 100644
--- a/tracker/api/serializers.py
+++ b/tracker/api/serializers.py
@@ -77,7 +77,7 @@ def _coalesce_validation_errors(errors, ignored=None):
         raise ValidationError(all_errors)
 
 
-class WithPermissionsSerializerMixin:
+class SerializerWithPermissionsMixin:
     def __init__(self, *args, with_permissions=(), **kwargs):
         if isinstance(with_permissions, str):
             with_permissions = (with_permissions,)
@@ -360,7 +360,7 @@ def validate(self, data):
 
 
 class BidSerializer(
-    WithPermissionsSerializerMixin, EventNestedSerializerMixin, TrackerModelSerializer
+    SerializerWithPermissionsMixin, EventNestedSerializerMixin, TrackerModelSerializer
 ):
     type = ClassNameField()
 
@@ -505,19 +505,39 @@ def validate(self, attrs):
             return super().validate(attrs)
 
 
-class DonationBidSerializer(serializers.ModelSerializer):
+class DonationBidSerializer(SerializerWithPermissionsMixin, TrackerModelSerializer):
     type = ClassNameField()
     bid_name = serializers.SerializerMethodField()
+    bid_state = serializers.SerializerMethodField()
 
     class Meta:
         model = DonationBid
-        fields = ('type', 'id', 'donation', 'bid', 'bid_name', 'amount')
+        fields = ('type', 'id', 'donation', 'bid', 'bid_name', 'bid_state', 'amount')
 
     def get_bid_name(self, donation_bid: DonationBid):
         return donation_bid.bid.fullname()
 
+    def get_bid_state(self, donation_bid: DonationBid):
+        return donation_bid.bid.state
 
-class DonationSerializer(WithPermissionsSerializerMixin, serializers.ModelSerializer):
+    def _has_permission(self, instance):
+        return (
+            any(
+                f'tracker.{p}' in self.permissions
+                for p in ('view_hidden_bid', 'change_bid', 'view_bid')
+            )
+            or instance.bid.state in Bid.PUBLIC_STATES
+        )
+
+    def to_representation(self, instance):
+        # final check
+        assert self._has_permission(
+            instance
+        ), f'tried to serialize a hidden donation bid without permission {self.permissions}'
+        return super().to_representation(instance)
+
+
+class DonationSerializer(SerializerWithPermissionsMixin, serializers.ModelSerializer):
     type = ClassNameField()
     donor_name = serializers.SerializerMethodField()
     bids = DonationBidSerializer(many=True, read_only=True)
@@ -613,7 +633,7 @@ def get_amount(self, obj):
 class TalentSerializer(
     PrimaryOrNaturalKeyLookup,
     TrackerModelSerializer,
-    WithPermissionsSerializerMixin,
+    SerializerWithPermissionsMixin,
     EventNestedSerializerMixin,
 ):
     type = ClassNameField()
@@ -689,7 +709,7 @@ def to_internal_value(self, data):
 
 class SpeedRunSerializer(
     PrimaryOrNaturalKeyLookup,
-    WithPermissionsSerializerMixin,
+    SerializerWithPermissionsMixin,
     EventNestedSerializerMixin,
     TrackerModelSerializer,
 ):
@@ -863,7 +883,7 @@ class Meta:
 
 
 class MilestoneSerializer(
-    WithPermissionsSerializerMixin, EventNestedSerializerMixin, TrackerModelSerializer
+    SerializerWithPermissionsMixin, EventNestedSerializerMixin, TrackerModelSerializer
 ):
     type = ClassNameField()
     event = EventSerializer()
diff --git a/tracker/api/views/bids.py b/tracker/api/views/bids.py
index e47194a9c..bc3e96bb9 100644
--- a/tracker/api/views/bids.py
+++ b/tracker/api/views/bids.py
@@ -15,6 +15,7 @@
     TrackerFullViewSet,
     WithSerializerPermissionsMixin,
 )
+from tracker.api.views.donation_bids import DonationBidViewSet
 from tracker.models import Bid, SpeedRun
 
 logger = logging.getLogger(__name__)
@@ -86,3 +87,9 @@ def tree(self, *args, **kwargs):
         page = self.paginate_queryset(queryset)
         serializer = self.get_serializer(page, tree=True, many=True)
         return self.get_paginated_response(serializer.data)
+
+    @action(detail=True, methods=['get'])
+    def donations(self, request, *args, **kwargs):
+        viewset = DonationBidViewSet(request=request, bid=self.get_object())
+        viewset.initial(request, *args, **kwargs)
+        return viewset.list(request, *args, **kwargs)
diff --git a/tracker/api/views/donation_bids.py b/tracker/api/views/donation_bids.py
new file mode 100644
index 000000000..5b10bfdcc
--- /dev/null
+++ b/tracker/api/views/donation_bids.py
@@ -0,0 +1,43 @@
+from django.db.models import Q
+
+from tracker import models
+from tracker.api.pagination import TrackerPagination
+from tracker.api.permissions import DonationBidStatePermission
+from tracker.api.serializers import DonationBidSerializer
+from tracker.api.views import TrackerReadViewSet, WithSerializerPermissionsMixin
+
+
+class DonationBidViewSet(WithSerializerPermissionsMixin, TrackerReadViewSet):
+    serializer_class = DonationBidSerializer
+    pagination_class = TrackerPagination
+    permission_classes = [DonationBidStatePermission]
+    queryset = models.DonationBid.objects.select_related('bid')
+
+    def __init__(self, *args, donation=None, bid=None, **kwargs):
+        self.donation = donation
+        self.bid = bid
+        super().__init__(*args, **kwargs)
+
+    def filter_queryset(self, queryset):
+        # this can be filtered in multiple ways
+        # - by donation, which excludes hidden children unless explicitly asked for
+        # - by exact bid, which includes the descendant tree if there is one, excluding
+        #   hidden descendants unless explicitly asked for, or if the parent itself is hidden
+        # note that we NEVER return bids attached to pending donations from this endpoint, if
+        #  you really need that, you can look at the admin page
+        queryset = queryset.filter(donation__transactionstate='COMPLETED')
+        assert self.donation or self.bid, 'did not get either donation or bid'
+        state_filter = Q()
+        if 'all' not in self.request.query_params:
+            state_filter = Q(bid__state__in=models.Bid.PUBLIC_STATES)
+        if self.donation:
+            queryset = queryset.filter(Q(donation=self.donation) & state_filter)
+        if self.bid:
+            if self.bid.state not in models.Bid.PUBLIC_STATES:
+                # if we're requesting a specific bid that's not public, just assume we want to view all states,
+                #  since we would have gotten a 404 by now if we didn't already have permission
+                state_filter = Q()
+            queryset = queryset.filter(
+                (Q(bid=self.bid) | Q(bid__in=self.bid.get_descendants()) & state_filter)
+            )
+        return queryset
diff --git a/tracker/api/views/donations.py b/tracker/api/views/donations.py
index 81b7f514d..e738fd980 100644
--- a/tracker/api/views/donations.py
+++ b/tracker/api/views/donations.py
@@ -12,6 +12,7 @@
 from tracker.api.permissions import CanSendToReader, tracker_permission
 from tracker.api.serializers import DonationSerializer
 from tracker.api.views import EventNestedMixin
+from tracker.api.views.donation_bids import DonationBidViewSet
 from tracker.consumers.processing import broadcast_processing_action
 from tracker.models import Donation
 
@@ -349,3 +350,9 @@ def comment(self, request, pk):
             data = self.get_serializer(donation).data
 
         return Response(data)
+
+    @action(detail=True, methods=['get'])
+    def bids(self, request, *args, **kwargs):
+        viewset = DonationBidViewSet(request=request, donation=self.get_object())
+        viewset.initial(request, *args, **kwargs)
+        return viewset.list(request, *args, **kwargs)

From d6e7dbb500f64bb4f4bfb5c09e7bfa6d8dedeb3d Mon Sep 17 00:00:00 2001
From: Benjamin Cutler <uraniumanchor@users.noreply.github.com>
Date: Tue, 12 Nov 2024 16:41:56 -0700
Subject: [PATCH 32/40] add Country/Region to V2 (#739)

[#184870680]
---
 tests/apiv2/test_countries.py | 80 +++++++++++++++++++++++++++++++++++
 tests/util.py                 | 28 ++++++++----
 tracker/api/serializers.py    | 48 ++++++++++++++++++++-
 tracker/api/urls.py           | 14 +++++-
 tracker/api/views/country.py  | 51 ++++++++++++++++++++++
 5 files changed, 210 insertions(+), 11 deletions(-)
 create mode 100644 tests/apiv2/test_countries.py
 create mode 100644 tracker/api/views/country.py

diff --git a/tests/apiv2/test_countries.py b/tests/apiv2/test_countries.py
new file mode 100644
index 000000000..65bee73f1
--- /dev/null
+++ b/tests/apiv2/test_countries.py
@@ -0,0 +1,80 @@
+from tests.util import APITestCase
+from tracker import models
+from tracker.api.serializers import CountryRegionSerializer, CountrySerializer
+
+
+class TestCountry(APITestCase):
+    serializer_class = CountrySerializer
+    model_name = 'country'
+    lookup_key = 'numeric_or_alpha'
+    id_field = 'alpha2'
+
+    def test_fetch(self):
+        with self.saveSnapshot():
+            country = models.Country.objects.first()
+            data = self.get_list()
+            self.assertEqual(
+                data['count'],
+                models.Country.objects.count(),
+                msg='Country count did not match',
+            )
+            self.assertV2ModelPresent(country, data['results'])
+
+            with self.subTest('via numeric code'):
+                data = self.get_detail(
+                    country, kwargs={'numeric_or_alpha': country.numeric}
+                )
+                self.assertV2ModelPresent(country, data)
+
+            with self.subTest('via alpha2'):
+                data = self.get_detail(
+                    country, kwargs={'numeric_or_alpha': country.alpha2}
+                )
+                self.assertV2ModelPresent(country, data)
+
+            with self.subTest('via alpha3'):
+                data = self.get_detail(
+                    country, kwargs={'numeric_or_alpha': country.alpha3}
+                )
+                self.assertV2ModelPresent(country, data)
+
+        with self.subTest('error cases'):
+            self.get_detail(None, kwargs={'numeric_or_alpha': '00'}, status_code=404)
+            self.get_detail(None, kwargs={'numeric_or_alpha': '000'}, status_code=404)
+            self.get_detail(None, kwargs={'numeric_or_alpha': 'XX'}, status_code=404)
+            self.get_detail(None, kwargs={'numeric_or_alpha': 'XXX'}, status_code=404)
+            self.get_detail(
+                None, kwargs={'numeric_or_alpha': 'foobar'}, status_code=404
+            )
+
+
+class TestCountryRegions(APITestCase):
+    serializer_class = CountryRegionSerializer
+    model_name = 'countryregion'
+
+    def test_fetch(self):
+        region = models.CountryRegion.objects.create(
+            name='Test Region', country=models.Country.objects.first()
+        )
+
+        with self.saveSnapshot():
+            data = self.get_list(model_name='region')
+            self.assertEqual(
+                data['count'],
+                models.CountryRegion.objects.count(),
+                msg='Region count did not match',
+            )
+            self.assertV2ModelPresent(region, data['results'])
+
+            data = self.get_detail(region, model_name='region')
+            self.assertV2ModelPresent(region, data)
+
+            with self.subTest('via country'):
+                data = self.get_noun(
+                    'regions',
+                    region.country,
+                    lookup_key='numeric_or_alpha',
+                    model_name='country',
+                    kwargs={'numeric_or_alpha': region.country.alpha3},
+                )
+                self.assertV2ModelPresent(region, data['results'])
diff --git a/tests/util.py b/tests/util.py
index 0b5090f1e..7c3a193e7 100644
--- a/tests/util.py
+++ b/tests/util.py
@@ -228,7 +228,9 @@ class APITestCase(TransactionTestCase, AssertionHelpers):
     view_user_permissions = []  # trickles to add_user and locked_user
     add_user_permissions = []  # trickles to locked_user
     locked_user_permissions = []
+    lookup_key = 'pk'
     encoder = DjangoJSONEncoder()
+    id_field = 'id'
 
     def parseJSON(self, response, status_code=200):
         self.assertEqual(
@@ -278,11 +280,15 @@ def get_detail(
             self.client.force_authenticate(user=other_kwargs['user'])
         model_name = model_name or self.model_name
         assert model_name is not None
-        pk = obj if isinstance(obj, int) else obj.pk
+        lookup_kwargs = {**kwargs}
+        if self.lookup_key == 'pk':
+            pk = obj if isinstance(obj, int) else obj.pk
+            lookup_kwargs['pk'] = pk
         url = reverse(
             self._get_viewname(model_name, 'detail', **kwargs),
-            kwargs={'pk': pk, **kwargs},
+            kwargs=lookup_kwargs,
         )
+
         with self._snapshot('GET', url, data) as snapshot:
             response = self.client.get(
                 url,
@@ -336,10 +342,13 @@ def get_noun(
         status_code=200,
         data=None,
         kwargs=None,
+        lookup_key=None,
         **other_kwargs,
     ):
         kwargs = kwargs or {}
-        if obj is not None:
+        if lookup_key is None:
+            lookup_key = self.lookup_key
+        if obj is not None and lookup_key == 'pk':
             kwargs['pk'] = obj.pk
         if 'user' in other_kwargs:
             self.client.force_authenticate(user=other_kwargs['user'])
@@ -720,14 +729,14 @@ def assertV2ModelPresent(
                     m
                     for m in data
                     if expected_model['type'] == m.get('type', None)
-                    and expected_model['id'] == m.get('id', None)
+                    and expected_model[self.id_field] == m.get(self.id_field, None)
                 ),
                 None,
             )
         ) is None:
             self.fail(
                 'Could not find model "%s:%s" in data'
-                % (expected_model['type'], expected_model['id'])
+                % (expected_model['type'], expected_model[self.id_field])
             )
         problems = self._compare_model(
             expected_model, found_model, partial, missing_ok=missing_ok
@@ -738,7 +747,7 @@ def assertV2ModelPresent(
                 % (
                     f'{msg}\n' if msg else '',
                     expected_model['type'],
-                    expected_model['id'],
+                    expected_model[self.id_field],
                     '\n'.join(problems),
                 )
             )
@@ -759,8 +768,8 @@ def assertV2ModelNotPresent(self, unexpected_model, data):
                     model
                     for model in data
                     if (
-                        model.get('id', None) == unexpected_model['id']
-                        and model.get('type', None) == unexpected_model['type']
+                        unexpected_model['type'] == model['type']
+                        and unexpected_model[self.id_field] == model[self.id_field]
                     )
                 ),
                 None,
@@ -769,7 +778,7 @@ def assertV2ModelNotPresent(self, unexpected_model, data):
         ):
             self.fail(
                 'Found model "%s:%s" in data'
-                % (unexpected_model['type'], unexpected_model['id'])
+                % (unexpected_model['type'], unexpected_model[self.id_field])
             )
 
     def assertExactV2Models(
@@ -902,6 +911,7 @@ def _snapshot(self, method, url, data):
                 self._snapshot_num = 1
 
             # obscure ids from url since they can drift depending on test order/results, remove leading tracker since it's redundant, and slugify everything else
+            # FIXME: this doesn't quite work for Country since we don't use PK lookups in the urls
             pieces += [
                 f'S{self._snapshot_num}',
                 re.sub(
diff --git a/tracker/api/serializers.py b/tracker/api/serializers.py
index 4419def92..8ea0f328e 100644
--- a/tracker/api/serializers.py
+++ b/tracker/api/serializers.py
@@ -17,10 +17,11 @@
 from rest_framework.validators import UniqueTogetherValidator
 
 from tracker.api import messages
-from tracker.models import Ad, Interstitial, Interview
 from tracker.models.bid import Bid, DonationBid
+from tracker.models.country import Country, CountryRegion
 from tracker.models.donation import Donation, Donor, Milestone
 from tracker.models.event import Event, SpeedRun, Tag, Talent, VideoLink, VideoLinkType
+from tracker.models.interstitial import Ad, Interstitial, Interview
 
 log = logging.getLogger(__name__)
 
@@ -298,6 +299,46 @@ def to_representation(self, obj):
         return obj.__class__.__name__.lower()
 
 
+class CountrySerializer(PrimaryOrNaturalKeyLookup, TrackerModelSerializer):
+    type = ClassNameField()
+
+    class Meta:
+        model = Country
+        fields = (
+            'type',
+            'name',
+            'alpha2',
+            'alpha3',
+            'numeric',
+        )
+
+    def to_representation(self, instance):
+        if self.root == self or getattr(self.root, 'child', None) == self:
+            return super().to_representation(instance)
+        else:
+            return instance.alpha3
+
+
+class CountryRegionSerializer(PrimaryOrNaturalKeyLookup, TrackerModelSerializer):
+    type = ClassNameField()
+    country = CountrySerializer()
+
+    class Meta:
+        model = CountryRegion
+        fields = (
+            'type',
+            'id',
+            'name',
+            'country',
+        )
+
+    def to_representation(self, instance):
+        if self.root == self or getattr(self.root, 'child', None) == self:
+            return super().to_representation(instance)
+        else:
+            return [instance.name, instance.country.alpha3]
+
+
 class EventNestedSerializerMixin:
     event_move = False
 
@@ -582,6 +623,9 @@ def get_donor_name(self, donation: Donation):
 
 class EventSerializer(PrimaryOrNaturalKeyLookup, TrackerModelSerializer):
     type = ClassNameField()
+    # include these later
+    # allowed_prize_countries = CountrySerializer(many=True)
+    # disallowed_prize_regions = CountryRegionSerializer(many=True)
     timezone = serializers.SerializerMethodField()
     amount = serializers.SerializerMethodField()
     donation_count = serializers.SerializerMethodField()
@@ -604,6 +648,8 @@ class Meta:
             'datetime',
             'timezone',
             'use_one_step_screening',
+            # 'allowed_prize_countries',
+            # 'disallowed_prize_regions',
         )
 
     def get_fields(self):
diff --git a/tracker/api/urls.py b/tracker/api/urls.py
index bf3cc26e9..dddf9dbf4 100644
--- a/tracker/api/urls.py
+++ b/tracker/api/urls.py
@@ -4,7 +4,17 @@
 from rest_framework import routers
 
 from tracker.api import views
-from tracker.api.views import ad, bids, donations, interview, me, milestone, run, talent
+from tracker.api.views import (
+    ad,
+    bids,
+    country,
+    donations,
+    interview,
+    me,
+    milestone,
+    run,
+    talent,
+)
 
 router = routers.DefaultRouter()
 
@@ -34,6 +44,8 @@ def event_nested_route(path, viewset, *, basename=None, feed=False):
 event_nested_route(r'milestones', milestone.MilestoneViewSet)
 router.register(r'donations', donations.DonationViewSet, basename='donations')
 router.register(r'me', me.MeViewSet, basename='me')
+router.register(r'countries', country.CountryViewSet)
+router.register(r'regions', country.CountryRegionViewSet, basename='region')
 
 # use the router-generated URLs, and also link to the browsable API
 urlpatterns = [
diff --git a/tracker/api/views/country.py b/tracker/api/views/country.py
new file mode 100644
index 000000000..c613bc9c3
--- /dev/null
+++ b/tracker/api/views/country.py
@@ -0,0 +1,51 @@
+import re
+
+from django.db.models import Q
+from rest_framework.decorators import action
+from rest_framework.exceptions import NotFound
+from rest_framework.generics import get_object_or_404
+
+from tracker.api.pagination import TrackerPagination
+from tracker.api.serializers import CountryRegionSerializer, CountrySerializer
+from tracker.api.views import TrackerReadViewSet
+from tracker.models import Country, CountryRegion
+
+
+class CountryViewSet(TrackerReadViewSet):
+    serializer_class = CountrySerializer
+    pagination_class = TrackerPagination
+    queryset = Country.objects.all()
+    lookup_field = 'numeric_or_alpha'
+
+    def get_object(self):
+        queryset = self.get_queryset()
+        pk = self.kwargs['numeric_or_alpha']
+        if re.match('[0-9]{3}', pk):
+            return get_object_or_404(queryset, numeric=pk)
+        elif re.match('[A-Z]{2,3}', pk):
+            return get_object_or_404(queryset, Q(alpha2=pk) | Q(alpha3=pk))
+        raise NotFound(
+            detail='Provide either an ISO 3166-1 numeric, alpha2, or alpha3 code',
+            code='invalid_lookup',
+        )
+
+    @action(detail=True)
+    def regions(self, request, *args, **kwargs):
+        viewset = CountryRegionViewSet(request=request, country=self.get_object())
+        viewset.initial(request, *args, **kwargs)
+        return viewset.list(request, *args, **kwargs)
+
+
+class CountryRegionViewSet(TrackerReadViewSet):
+    serializer_class = CountryRegionSerializer
+    pagination_class = TrackerPagination
+    queryset = CountryRegion.objects.select_related('country')
+
+    def __init__(self, country=None, *args, **kwargs):
+        self.country = country
+        super().__init__(*args, **kwargs)
+
+    def filter_queryset(self, queryset):
+        if self.country:
+            queryset = queryset.filter(country=self.country)
+        return queryset

From 1690e5c8f9a8dd7a7ec687e6b33208a4a8ee929a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 28 Nov 2024 23:17:38 -0700
Subject: [PATCH 33/40] Bump selenium from 4.26.1 to 4.27.1 (#743)

Bumps [selenium](https://github.com/SeleniumHQ/Selenium) from 4.26.1 to 4.27.1.
- [Release notes](https://github.com/SeleniumHQ/Selenium/releases)
- [Commits](https://github.com/SeleniumHQ/Selenium/commits)

---
updated-dependencies:
- dependency-name: selenium
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 tests/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index 91be5b262..4ae28699f 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -19,6 +19,6 @@ webpack-manifest==2.1.1
 daphne==4.1.2
 lxml==4.9.4 ; python_version<"3.10" # azure issue?
 responses~=0.25.3
-selenium==4.26.1
+selenium==4.27.1
 tblib==3.0.0
 unittest-xml-reporting==3.2.0

From df5e59471709aabc6618aa3c6975d101ead278be Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 11 Dec 2024 11:04:10 -0700
Subject: [PATCH 34/40] Bump pre-commit from 3.8.0 to 4.0.1 (#727)

Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 3.8.0 to 4.0.1.
- [Release notes](https://github.com/pre-commit/pre-commit/releases)
- [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md)
- [Commits](https://github.com/pre-commit/pre-commit/compare/v3.8.0...v4.0.1)

---
updated-dependencies:
- dependency-name: pre-commit
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 tests/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index 4ae28699f..5345b359d 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -10,7 +10,7 @@ django-post-office==3.6.0
 django-timezone-field==7.0
 djangorestframework==3.15.2
 pre-commit==3.5.0 ; python_version<"3.9"
-pre-commit==3.8.0 ; python_version>="3.9"
+pre-commit==4.0.1 ; python_version>="3.9"
 python-dateutil==2.8.2
 backports.zoneinfo==0.2.1 ; python_version<"3.9"
 python-dateutil==2.8.2 ; python_version<"3.11"

From d4b6e670c58c9c3e1b2c06150c7f67e31742dfb9 Mon Sep 17 00:00:00 2001
From: Benjamin Cutler <uraniumanchor@users.noreply.github.com>
Date: Wed, 11 Dec 2024 17:41:42 -0700
Subject: [PATCH 35/40] update pre-commit config for 4.x (#745)

[#188679632]
---
 .pre-commit-config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index b882de3c6..bd8991fb8 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,4 +1,4 @@
-default_stages: [commit]
+default_stages: [pre-commit]
 exclude: (migrations/|static/(jquery.*|main.css))
 repos:
 - repo: https://github.com/psf/black
@@ -38,7 +38,7 @@ repos:
       name: typescript
       entry: yarn tsc
       language: system
-      stages: [push]
+      stages: [pre-push]
       files: (.*)\.(jsx?|tsx?)$
       pass_filenames: false
 - repo: https://github.com/pre-commit/pre-commit-hooks

From cddb9350284f1469a2dd1b5f2fc997ad406a47f0 Mon Sep 17 00:00:00 2001
From: Benjamin Cutler <uraniumanchor@users.noreply.github.com>
Date: Wed, 11 Dec 2024 17:52:48 -0700
Subject: [PATCH 36/40] do not override filter_queryset on viewsets (#746)

[#188679583]
---
 tracker/api/views/country.py       | 3 ++-
 tracker/api/views/donation_bids.py | 3 ++-
 tracker/api/views/milestone.py     | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/tracker/api/views/country.py b/tracker/api/views/country.py
index c613bc9c3..d1641ad91 100644
--- a/tracker/api/views/country.py
+++ b/tracker/api/views/country.py
@@ -45,7 +45,8 @@ def __init__(self, country=None, *args, **kwargs):
         self.country = country
         super().__init__(*args, **kwargs)
 
-    def filter_queryset(self, queryset):
+    def get_queryset(self):
+        queryset = super().get_queryset()
         if self.country:
             queryset = queryset.filter(country=self.country)
         return queryset
diff --git a/tracker/api/views/donation_bids.py b/tracker/api/views/donation_bids.py
index 5b10bfdcc..468228702 100644
--- a/tracker/api/views/donation_bids.py
+++ b/tracker/api/views/donation_bids.py
@@ -18,7 +18,8 @@ def __init__(self, *args, donation=None, bid=None, **kwargs):
         self.bid = bid
         super().__init__(*args, **kwargs)
 
-    def filter_queryset(self, queryset):
+    def get_queryset(self):
+        queryset = super().get_queryset()
         # this can be filtered in multiple ways
         # - by donation, which excludes hidden children unless explicitly asked for
         # - by exact bid, which includes the descendant tree if there is one, excluding
diff --git a/tracker/api/views/milestone.py b/tracker/api/views/milestone.py
index f1d3935bc..98f325dee 100644
--- a/tracker/api/views/milestone.py
+++ b/tracker/api/views/milestone.py
@@ -26,8 +26,8 @@ def _include_hidden(self, instance=None):
             isinstance(instance, Milestone) and instance.visible
         ) or 'all' in self.request.query_params
 
-    def filter_queryset(self, queryset):
+    def get_queryset(self):
         queryset = super().get_queryset()
         if not (self.detail or 'all' in self.request.query_params):
             queryset = queryset.filter(visible=True)
-        return super().filter_queryset(queryset)
+        return queryset

From 9bd37f2e025b91fbb2b496817b179dd348b61d47 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 11 Dec 2024 23:14:12 -0700
Subject: [PATCH 37/40] Bump channels from 4.1.0 to 4.2.0 (#740)

Bumps [channels](https://github.com/django/channels) from 4.1.0 to 4.2.0.
- [Changelog](https://github.com/django/channels/blob/main/CHANGELOG.txt)
- [Commits](https://github.com/django/channels/compare/4.1.0...4.2.0)

---
updated-dependencies:
- dependency-name: channels
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 tests/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index 5345b359d..d6bec5d94 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,6 +1,6 @@
 # base
 celery==5.4.0
-channels==4.1.0
+channels==4.2.0
 # django explicitly not listed here because azure installs a particular series immediately after
 django-ical==1.9.2
 django-paypal==1.1.2

From 2fe74d1b7a22efd99a63392c24c767ef0a4b52a3 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Sun, 15 Dec 2024 15:50:11 +0100
Subject: [PATCH 38/40] Update from main

---
 tracker/migrations/0049_merge_20241215_1449.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 tracker/migrations/0049_merge_20241215_1449.py

diff --git a/tracker/migrations/0049_merge_20241215_1449.py b/tracker/migrations/0049_merge_20241215_1449.py
new file mode 100644
index 000000000..fa9286202
--- /dev/null
+++ b/tracker/migrations/0049_merge_20241215_1449.py
@@ -0,0 +1,14 @@
+# Generated by Django 5.1.2 on 2024-12-15 14:49
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tracker', '0048_merge_20241014_0900'),
+        ('tracker', '0048_remove_old_ad_permission'),
+    ]
+
+    operations = [
+    ]

From f80a3ac96a336c92388e6996b4a527101eb8082d Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Sun, 19 Jan 2025 11:23:10 +0100
Subject: [PATCH 39/40] Make merge migration

---
 tracker/migrations/0055_merge_20250119_1022.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 tracker/migrations/0055_merge_20250119_1022.py

diff --git a/tracker/migrations/0055_merge_20250119_1022.py b/tracker/migrations/0055_merge_20250119_1022.py
new file mode 100644
index 000000000..74eb85e58
--- /dev/null
+++ b/tracker/migrations/0055_merge_20250119_1022.py
@@ -0,0 +1,14 @@
+# Generated by Django 5.1.2 on 2025-01-19 10:22
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tracker', '0049_merge_20241215_1449'),
+        ('tracker', '0054_delete_event_targetamount'),
+    ]
+
+    operations = [
+    ]

From 1e900714b4dfad2290472cc3a9d8ff6de1d3a486 Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Sun, 19 Jan 2025 11:36:24 +0100
Subject: [PATCH 40/40] Remove duped code

---
 tests/apiv2/test_bids.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tests/apiv2/test_bids.py b/tests/apiv2/test_bids.py
index 8e627a7e1..0f23b31d8 100644
--- a/tests/apiv2/test_bids.py
+++ b/tests/apiv2/test_bids.py
@@ -369,10 +369,6 @@ def test_patch(self):
             data = self.patch_detail(self.challenge, data={'name': 'Challenge Updated'})
             self.assertV2ModelPresent(self.challenge, data)
 
-        with self.saveSnapshot(), self.assertLogsChanges(1):
-            data = self.patch_detail(self.challenge, data={'name': 'Challenge Updated'})
-            self.assertV2ModelPresent(self.challenge, data)
-
         with self.assertLogsChanges(3), self.subTest('changing to hidden states'):
             data = self.patch_detail(self.challenge, data={'state': 'HIDDEN'})
             self.assertV2ModelPresent(