Deprecate event registrants from query

beingnoble03 · Sep 18, 2023 · ed12705 · ed12705
1 parent 0deca89
commit ed12705
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 53 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/GraphQl/Queries/Queries.ts b/src/GraphQl/Queries/Queries.ts
@@ -657,10 +657,8 @@ export const ORGANIZATION_EVENTS_CONNECTION = gql`
         firstName
         lastName
       }
-      registrants {
-        user {
-          _id
-        }
+      attendees {
+        _id
       }
     }
   }

diff --git a/src/screens/UserPortal/Events/Events.test.tsx b/src/screens/UserPortal/Events/Events.test.tsx
@@ -55,20 +55,14 @@ const MOCKS = [
               lastName: 'Mittal',
               __typename: 'User',
             },
-            registrants: [
+            attendees: [
               {
-                user: {
-                  _id: '63d649417ffe6e4d5174ea32',
-                  __typename: 'User',
-                },
-                __typename: 'UserAttende',
+                _id: '63d649417ffe6e4d5174ea32',
+                __typename: 'User',
               },
               {
-                user: {
-                  _id: '63d6064458fce20ee25c3bf7',
-                  __typename: 'User',
-                },
-                __typename: 'UserAttende',
+                _id: '63d6064458fce20ee25c3bf7',
+                __typename: 'User',
               },
             ],
             __typename: 'Event',
@@ -92,27 +86,18 @@ const MOCKS = [
               lastName: 'Mittal',
               __typename: 'User',
             },
-            registrants: [
+            attendees: [
               {
-                user: {
-                  _id: '63d649417ffe6e4d5174ea32',
-                  __typename: 'User',
-                },
-                __typename: 'UserAttende',
+                _id: '63d649417ffe6e4d5174ea32',
+                __typename: 'User',
               },
               {
-                user: {
-                  _id: '63dd52bbe69f63814b0a5dd4',
-                  __typename: 'User',
-                },
-                __typename: 'UserAttende',
+                _id: '63dd52bbe69f63814b0a5dd4',
+                __typename: 'User',
               },
               {
-                user: {
-                  _id: '63d6064458fce20ee25c3bf7',
-                  __typename: 'User',
-                },
-                __typename: 'UserAttende',
+                _id: '63d6064458fce20ee25c3bf7',
+                __typename: 'User',
               },
             ],
             __typename: 'Event',
@@ -151,20 +136,14 @@ const MOCKS = [
               lastName: 'Mittal',
               __typename: 'User',
             },
-            registrants: [
+            attendees: [
               {
-                user: {
-                  _id: '63d649417ffe6e4d5174ea32',
-                  __typename: 'User',
-                },
-                __typename: 'UserAttende',
+                _id: '63d649417ffe6e4d5174ea32',
+                __typename: 'User',
               },
               {
-                user: {
-                  _id: '63d6064458fce20ee25c3bf7',
-                  __typename: 'User',
-                },
-                __typename: 'UserAttende',
+                _id: '63d6064458fce20ee25c3bf7',
+                __typename: 'User',
               },
             ],
             __typename: 'Event',

diff --git a/src/screens/UserPortal/Events/Events.tsx b/src/screens/UserPortal/Events/Events.tsx
@@ -263,14 +263,14 @@ export default function events(): JSX.Element {
                         )
                       : /* istanbul ignore next */
                         events
-                    ).map((event: any, index) => {
-                      const registrants: any = [];
-                      event.registrants.forEach((registrant: any) => {
+                    ).map((event: any) => {
+                      const attendees: any = [];
+                      event.attendees.forEach((attendee: any) => {
                         const r = {
-                          id: registrant.user._id,
+                          id: attendee._id,
                         };
 
-                        registrants.push(r);
+                        attendees.push(r);
                       });
 
                       const creator: any = {};
@@ -291,11 +291,11 @@ export default function events(): JSX.Element {
                         startTime: event.startTime,
                         recurring: event.recurring,
                         allDay: event.allDay,
-                        registrants,
+                        registrants: attendees,
                         creator,
                       };
 
-                      return <EventCard key={index} {...cardProps} />;
+                      return <EventCard key={event._id} {...cardProps} />;
                     })
                   ) : (
                     <span>{t('nothingToShow')}</span>