donation V2 touchup

- better search - better tests - better serialization - anybody on the donation socket is required to have view bid permission for incoming pending bids [#188791783]
GamesDoneQuick · Jan 18, 2025 · bd2dd08 · bd2dd08
1 parent de1c971
commit bd2dd08
Show file tree

Hide file tree

Showing 22 changed files with 516 additions and 766 deletions.
diff --git a/bundles/processing/pages/ReadDonations.tsx b/bundles/processing/pages/ReadDonations.tsx
@@ -39,6 +39,9 @@ function useDonationGroupSyncOnLoad() {
       for (const group of Object.values(groups)) {
         group.donationIds.forEach(id => ids.add(id));
       }
+      if (ids.size === 0) {
+        return;
+      }
       const donations = await APIClient.getDonations(Array.from(ids).map(String));
       loadDonations(donations);
 

diff --git a/bundles/public/api/helpers/auth.ts b/bundles/public/api/helpers/auth.ts
@@ -1,20 +1,14 @@
 import { useSelector } from 'react-redux';
 
 import { Permission } from '@common/Permissions';
+import { Me } from '@public/apiv2/APITypes';
 
-// FIXME: give these actual types
-
-export function hasPermission(user: any, permission: Permission) {
+export function hasPermission(user: Me, permission: Permission) {
   return !!user?.staff && (user.superuser || (user.permissions || []).indexOf(permission) !== -1);
 }
 
-export function usePermission(permission: Permission) {
-  const me = useSelector((state: any) => state.singletons.me);
-  return hasPermission(me, permission);
-}
-
-export function usePermissions(permissions: Permission[]) {
-  const me = useSelector((state: any) => state.singletons.me);
+export function usePermission(...permissions: Permission[]) {
+  const me = useSelector((state: any) => state.singletons.me as Me);
   return permissions.every(p => hasPermission(me, p));
 }
 

diff --git a/bundles/public/apiv2/Endpoints.tsx b/bundles/public/apiv2/Endpoints.tsx
@@ -4,9 +4,9 @@
 
 const Endpoints = {
   DONATIONS: `donations/`,
-  DONATIONS_UNPROCESSED: `donations/unprocessed/`,
-  DONATIONS_FLAGGED: `donations/flagged/`,
-  DONATIONS_UNREAD: `donations/unread/`,
+  DONATIONS_UNPROCESSED: (eventId?: number) => `${eventId == null ? '' : `events/${eventId}/`}donations/unprocessed/`,
+  DONATIONS_FLAGGED: (eventId?: number) => `${eventId == null ? '' : `events/${eventId}/`}donations/flagged/`,
+  DONATIONS_UNREAD: (eventId?: number) => `${eventId == null ? '' : `events/${eventId}/`}donations/unread/`,
   DONATIONS_UNPROCESS: (donationId: string) => `donations/${donationId}/unprocess/`,
   DONATIONS_APPROVE_COMMENT: (donationId: string) => `donations/${donationId}/approve_comment/`,
   DONATIONS_DENY_COMMENT: (donationId: string) => `donations/${donationId}/deny_comment/`,

diff --git a/bundles/public/apiv2/routes/donations.tsx b/bundles/public/apiv2/routes/donations.tsx
@@ -7,24 +7,21 @@ interface DonationsFilterOptions {
 }
 
 export async function getUnprocessedDonations(eventId: string, options: DonationsFilterOptions = {}) {
-  const response = await HTTPUtils.get<Donation[]>(Endpoints.DONATIONS_UNPROCESSED, {
-    event_id: eventId,
+  const response = await HTTPUtils.get<Donation[]>(Endpoints.DONATIONS_UNPROCESSED(+eventId), {
     after: options.after?.toISOString(),
   });
   return response.data;
 }
 
 export async function getFlaggedDonations(eventId: string, options: DonationsFilterOptions = {}) {
-  const response = await HTTPUtils.get<Donation[]>(Endpoints.DONATIONS_FLAGGED, {
-    event_id: eventId,
+  const response = await HTTPUtils.get<Donation[]>(Endpoints.DONATIONS_FLAGGED(+eventId), {
     after: options.after?.toISOString(),
   });
   return response.data;
 }
 
 export async function getUnreadDonations(eventId: string, options: DonationsFilterOptions = {}) {
-  const response = await HTTPUtils.get<Donation[]>(Endpoints.DONATIONS_UNREAD, {
-    event_id: eventId,
+  const response = await HTTPUtils.get<Donation[]>(Endpoints.DONATIONS_UNREAD(+eventId), {
     after: options.after?.toISOString(),
   });
   return response.data;
@@ -37,7 +34,7 @@ export async function getUnreadDonations(eventId: string, options: DonationsFilt
  */
 export async function getDonations(donationIds: string[]) {
   const response = await HTTPUtils.get<Donation[]>(Endpoints.DONATIONS, {
-    ids: donationIds,
+    id: donationIds,
   });
   return response.data;
 }

diff --git a/bundles/tracker/Endpoints.ts b/bundles/tracker/Endpoints.ts
@@ -18,6 +18,7 @@ export default {
     return `${apiRoot}command/`;
   },
   get ME() {
-    return `${apiRoot}me/`;
+    // FIXME: grossssss
+    return `${apiRoot}../v2/me/`;
   },
 };
diff --git a/spec/fixtures/event.ts b/spec/fixtures/event.ts
@@ -1,4 +1,4 @@
-import { Event } from '../../bundles/tracker/events/EventTypes';
+import { Event } from '@tracker/events/EventTypes';
 
 export function getFixtureEvent(overrides?: Partial<Event>): Event {
   return {

diff --git a/tests/apiv2/test_donation_bids.py b/tests/apiv2/test_donation_bids.py
@@ -105,15 +105,15 @@ 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
+                    'bids', self.donation, model_name='donation', user=self.view_user
                 )
                 self.assertExactV2Models([self.opened_child_bid], data)
 
                 data = self.get_noun(
                     'bids',
                     self.donation,
                     data={'all': ''},
-                    model_name='donations',
+                    model_name='donation',
                     user=self.view_user,
                 )
                 self.assertExactV2Models(
@@ -124,7 +124,7 @@ def test_fetch(self):
                     'bids',
                     self.other_donation,
                     data={'all': ''},
-                    model_name='donations',
+                    model_name='donation',
                     user=self.view_user,
                 )
                 self.assertExactV2Models(
@@ -207,14 +207,14 @@ def test_fetch(self):
                 'bids',
                 self.donation,
                 data={'all': ''},
-                model_name='donations',
+                model_name='donation',
                 user=None,
                 status_code=404,
             )
             self.get_noun(
                 'bids',
                 self.pending_donation,
-                model_name='donations',
+                model_name='donation',
                 user=None,
                 status_code=404,
             )