Fix fetch field errors for SlotifyGroups

Author: saths008

public/swagger/swagger.json

@@ -971,7 +971,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/UsersAndPagination"
+                  "$ref": "#/components/schemas/InvitesGroupsAndPagination"
                 }
               }
             }
@@ -1263,23 +1263,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "type": "object",
-                  "required": [
-                    "users",
-                    "nextPageToken"
-                  ],
-                  "properties": {
-                    "users": {
-                      "type": "array",
-                      "items": {
-                        "$ref": "#/components/schemas/User"
-                      }
-                    },
-                    "nextPageToken": {
-                      "type": "integer",
-                      "format": "uint32"
-                    }
-                  }
+                  "$ref": "#/components/schemas/UsersAndPagination"
                 }
               }
             }
@@ -3273,12 +3257,27 @@
           "name"
         ]
       },
-      "UsersAndPagination": {
+      "InvitesGroupsAndPagination": {
         "type": "object",
+        "properties": {
+          "invites": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/InvitesGroup"
+            }
+          },
+          "nextPageToken": {
+            "type": "integer",
+            "format": "uint32"
+          }
+        },
         "required": [
-          "users",
+          "invites",
           "nextPageToken"
-        ],
+        ]
+      },
+      "UsersAndPagination": {
+        "type": "object",
         "properties": {
           "users": {
             "type": "array",
@@ -3290,7 +3289,11 @@
             "type": "integer",
             "format": "uint32"
           }
-        }
+        },
+        "required": [
+          "users",
+          "nextPageToken"
+        ]
       }
     }
   }

shared

@@ -120,7 +120,7 @@ export default function GroupsPage() {
               limit: 10,
             },
           })
-        setMembers(slotifyGroupMemberData.users as Member[])
+        setMembers(slotifyGroupMemberData.users)
       } catch (error) {
         console.error(error)
         errorToast(error)
@@ -133,7 +133,7 @@ export default function GroupsPage() {
         return
       }
       try {
-        const invites =
+        const invitesAndPagination =
           await slotifyClient.GetAPISlotifyGroupsSlotifyGroupIDInvites({
             params: {
               slotifyGroupID: selectedSlotifyGroup.id,
@@ -143,7 +143,7 @@ export default function GroupsPage() {
             },
           })
         setGroupInvites(
-          (invites.invites as InvitesGroup[]).filter(
+          invitesAndPagination.invites.filter(
             invite => invite.status === 'pending',
           ),
         )

src/app/dashboard/groups/slotify/page.tsx

@@ -181,6 +181,10 @@ type InvitesMe = {
   fromUserFirstName: string;
   fromUserLastName: string;
 };
+type InvitesGroupsAndPagination = {
+  invites: Array<InvitesGroup>;
+  nextPageToken: number;
+};
 type UsersAndPagination = {
   users: Array<User>;
   nextPageToken: number;
@@ -307,13 +311,16 @@ const InvitesGroup: z.ZodType<InvitesGroup> = z
     createdAt: z.string().datetime({ offset: true }),
   })
   .passthrough();
-const UsersAndPagination: z.ZodType<UsersAndPagination> = z
-  .object({ users: z.array(User), nextPageToken: z.number().int() })
+const InvitesGroupsAndPagination: z.ZodType<InvitesGroupsAndPagination> = z
+  .object({ invites: z.array(InvitesGroup), nextPageToken: z.number().int() })
   .passthrough();
 const SlotifyGroup = z
   .object({ id: z.number().int(), name: z.string() })
   .passthrough();
 const SlotifyGroupCreate = z.object({ name: z.string() }).passthrough();
+const UsersAndPagination: z.ZodType<UsersAndPagination> = z
+  .object({ users: z.array(User), nextPageToken: z.number().int() })
+  .passthrough();
 const EmailAddress: z.ZodType<EmailAddress> = z
   .object({ address: z.string().email(), name: z.string() })
   .passthrough();
@@ -506,9 +513,10 @@ export const schemas = {
   InvitesMe,
   InviteCreate,
   InvitesGroup,
-  UsersAndPagination,
+  InvitesGroupsAndPagination,
   SlotifyGroup,
   SlotifyGroupCreate,
+  UsersAndPagination,
   EmailAddress,
   AttendeeBase,
   PhysicalAddress,
@@ -1718,7 +1726,7 @@ const endpoints = makeApi([
         schema: z.number().int(),
       },
     ],
-    response: UsersAndPagination,
+    response: InvitesGroupsAndPagination,
     errors: [
       {
         status: 400,
@@ -1800,9 +1808,7 @@ const endpoints = makeApi([
         schema: z.string().optional(),
       },
     ],
-    response: z
-      .object({ users: z.array(User), nextPageToken: z.number().int() })
-      .passthrough(),
+    response: UsersAndPagination,
     errors: [
       {
         status: 401,