chore(api): regenerated API client

src/app/App.test.tsx

@@ -13,6 +13,7 @@ import { renderWithProviders, screen, setupMockServer } from "@/testing/utils";
 
 setupMockServer(
   authResolvers.getCurrentUser.handler(),
+  authResolvers.getMeStatistics.handler(),
   authResolvers.createSession.handler(),
   notificationResolvers.listNotifications.handler()
 );

src/app/api/query/auth.ts

@@ -4,14 +4,12 @@ import { useMutation, useQueryClient } from "@tanstack/react-query";
 import { useDispatch } from "react-redux";
 
 import { useWebsocketAwareQuery } from "@/app/api/query/base";
+import type { UserWithStatistics } from "@/app/api/query/users";
 import {
   mutationOptionsWithHeaders,
   queryOptionsWithHeaders,
 } from "@/app/api/utils";
 import type {
-  HandleOauthCallbackResponses,
-  HandleOauthCallbackErrors,
-  HandleOauthCallbackData,
   CompleteIntroData,
   CompleteIntroErrors,
   CompleteIntroResponses,
@@ -24,48 +22,58 @@ import type {
   DeleteOauthProviderData,
   DeleteOauthProviderErrors,
   DeleteOauthProviderResponses,
-  GetMeWithSummaryData,
-  GetMeWithSummaryErrors,
-  GetMeWithSummaryResponses,
+  ExtendSessionData,
+  ExtendSessionErrors,
+  ExtendSessionResponses,
+  GetMeStatisticsData,
+  GetMeStatisticsError,
+  GetMeStatisticsErrors,
+  GetMeStatisticsResponses,
   GetOauthProviderData,
   GetOauthProviderErrors,
   GetOauthProviderResponses,
+  GetUserInfoData,
+  GetUserInfoError,
+  GetUserInfoErrors,
+  GetUserInfoResponses,
+  HandleOauthCallbackData,
+  HandleOauthCallbackErrors,
+  HandleOauthCallbackResponses,
+  InitiateAuthFlowData,
+  InitiateAuthFlowErrors,
+  InitiateAuthFlowResponses,
   LoginData,
+  LoginError,
   LoginErrors,
   LoginResponses,
   Options,
-  UpdateOauthProviderData,
-  UpdateOauthProviderErrors,
-  UpdateOauthProviderResponses,
   PreLoginData,
-  PreLoginResponses,
   PreLoginErrors,
+  PreLoginResponses,
   TokenResponse,
-  LoginError,
-  ExtendSessionResponses,
-  ExtendSessionErrors,
-  ExtendSessionData,
-  InitiateAuthFlowData,
-  InitiateAuthFlowResponses,
-  InitiateAuthFlowErrors,
+  UpdateOauthProviderData,
+  UpdateOauthProviderErrors,
+  UpdateOauthProviderResponses,
 } from "@/app/apiclient";
 import {
-  deleteOauthProvider,
-  updateOauthProvider,
-  createOauthProvider,
   completeIntro,
-  getOauthProvider,
-  getMeWithSummary,
-  login,
+  createOauthProvider,
   createSession,
-  preLogin,
+  deleteOauthProvider,
   extendSession,
-  initiateAuthFlow,
+  getMeStatistics,
+  getOauthProvider,
+  getUserInfo,
   handleOauthCallback,
+  initiateAuthFlow,
+  login,
+  preLogin,
+  updateOauthProvider,
 } from "@/app/apiclient";
 import {
-  getMeWithSummaryQueryKey,
+  getMeStatisticsQueryKey,
   getOauthProviderQueryKey,
+  getUserInfoQueryKey,
   handleOauthCallbackQueryKey,
   initiateAuthFlowQueryKey,
 } from "@/app/apiclient/@tanstack/react-query.gen";
@@ -236,24 +244,55 @@ export const useExtendSession = (
   });
 };
 
-export const useGetCurrentUser = (options?: Options<GetMeWithSummaryData>) => {
-  return useWebsocketAwareQuery({
+export const useGetCurrentUser = (
+  options?: Options<GetUserInfoData>
+): {
+  data: UserWithStatistics | undefined;
+  isPending: boolean;
+  isSuccess: boolean;
+  isError: boolean;
+  error: GetUserInfoError | null;
+  statisticsError: GetMeStatisticsError | null;
+} => {
+  const userInfo = useWebsocketAwareQuery({
     ...queryOptionsWithHeaders<
-      GetMeWithSummaryResponses,
-      GetMeWithSummaryErrors,
-      GetMeWithSummaryData
-    >(options, getMeWithSummary, getMeWithSummaryQueryKey(options)),
+      GetUserInfoResponses,
+      GetUserInfoErrors,
+      GetUserInfoData
+    >(options, getUserInfo, getUserInfoQueryKey(options)),
     retry: false, // explicitly set retry to false
   });
+
+  const statistics = useWebsocketAwareQuery({
+    ...queryOptionsWithHeaders<
+      GetMeStatisticsResponses,
+      GetMeStatisticsErrors,
+      GetMeStatisticsData
+    >({}, getMeStatistics, getMeStatisticsQueryKey()),
+    enabled: userInfo.isSuccess,
+    retry: false,
+  });
+
+  return {
+    ...userInfo,
+    data: userInfo.data
+      ? ({
+          ...userInfo.data,
+          statistics: statistics.data,
+        } as UserWithStatistics)
+      : undefined,
+    error: userInfo.error,
+    statisticsError: statistics.error,
+  };
 };
 
-export const useGetIsSuperUser = (options?: Options<GetMeWithSummaryData>) => {
+export const useGetIsSuperUser = (options?: Options<GetUserInfoData>) => {
   return useWebsocketAwareQuery({
     ...queryOptionsWithHeaders<
-      GetMeWithSummaryResponses,
-      GetMeWithSummaryErrors,
-      GetMeWithSummaryData
-    >(options, getMeWithSummary, getMeWithSummaryQueryKey(options)),
+      GetUserInfoResponses,
+      GetUserInfoErrors,
+      GetUserInfoData
+    >(options, getUserInfo, getUserInfoQueryKey(options)),
     select: (data) => data.is_superuser,
   });
 };
@@ -270,7 +309,7 @@ export const useCompleteIntro = (
     >(mutationOptions, completeIntro),
     onSuccess: () => {
       return queryClient.invalidateQueries({
-        queryKey: getMeWithSummaryQueryKey(),
+        queryKey: getUserInfoQueryKey(),
       });
     },
   });

src/app/api/query/users.test.ts

@@ -5,9 +5,15 @@ import {
   useUpdateUser,
   useUserCount,
   useUsers,
+  useUsersStatistics,
 } from "@/app/api/query/users";
 import type { UserCreateRequest, UserUpdateRequest } from "@/app/apiclient";
-import { mockUsers, usersResolvers } from "@/testing/resolvers/users";
+import { authResolvers } from "@/testing/resolvers/auth";
+import {
+  mockUsers,
+  mockUsersStatistics,
+  usersResolvers,
+} from "@/testing/resolvers/users";
 import {
   renderHookWithProviders,
   setupMockServer,
@@ -16,10 +22,12 @@ import {
 
 const mockServer = setupMockServer(
   usersResolvers.listUsers.handler(),
+  usersResolvers.listUsersStatistics.handler(),
   usersResolvers.getUser.handler(),
   usersResolvers.createUser.handler(),
   usersResolvers.updateUser.handler(),
-  usersResolvers.deleteUser.handler()
+  usersResolvers.deleteUser.handler(),
+  authResolvers.getCurrentUser.handler()
 );
 
 describe("useUsers", () => {
@@ -32,6 +40,16 @@ describe("useUsers", () => {
   });
 });
 
+describe("useUsersStatistics", () => {
+  it("should return users statistics data", async () => {
+    const { result } = renderHookWithProviders(() => useUsersStatistics());
+    await waitFor(() => {
+      expect(result.current.isSuccess).toBe(true);
+    });
+    expect(result.current.data).toMatchObject(mockUsersStatistics);
+  });
+});
+
 describe("useUserCount", () => {
   it("should return correct count", async () => {
     const { result } = renderHookWithProviders(() => useUserCount());

src/app/api/query/users.ts

@@ -1,6 +1,8 @@
+import type { UseQueryResult } from "@tanstack/react-query";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 
 import { useWebsocketAwareQuery } from "@/app/api/query/base";
+import type { WithHeaders } from "@/app/api/utils";
 import {
   mutationOptionsWithHeaders,
   queryOptionsWithHeaders,
@@ -15,43 +17,107 @@ import type {
   GetUserData,
   GetUserErrors,
   GetUserResponses,
-  ListUsersWithSummaryData,
-  ListUsersWithSummaryErrors,
-  ListUsersWithSummaryResponses,
+  ListUsersData,
+  ListUsersError,
+  ListUsersErrors,
+  ListUsersResponses,
+  ListUsersStatisticsData,
+  ListUsersStatisticsError,
+  ListUsersStatisticsErrors,
+  ListUsersStatisticsResponses,
   Options,
   UpdateUserData,
   UpdateUserErrors,
   UpdateUserResponses,
+  UserResponse,
+  UserStatisticsResponse,
 } from "@/app/apiclient";
 import {
-  deleteUser,
-  updateUser,
   createUser,
+  deleteUser,
   getUser,
-  listUsersWithSummary,
+  listUsers,
+  listUsersStatistics,
+  updateUser,
 } from "@/app/apiclient";
 import {
   getUserQueryKey,
-  listUsersWithSummaryQueryKey,
+  listUsersQueryKey,
+  listUsersStatisticsQueryKey,
 } from "@/app/apiclient/@tanstack/react-query.gen";
 
-export const useUsers = (options?: Options<ListUsersWithSummaryData>) => {
-  return useWebsocketAwareQuery(
-    queryOptionsWithHeaders<
-      ListUsersWithSummaryResponses,
-      ListUsersWithSummaryErrors,
-      ListUsersWithSummaryData
-    >(options, listUsersWithSummary, listUsersWithSummaryQueryKey(options))
+export type UserWithStatistics = WithHeaders<UserResponse> & {
+  statistics: UserStatisticsResponse | undefined;
+};
+
+export type UseUsersResult = {
+  data:
+    | {
+        items: UserWithStatistics[];
+        total: number;
+      }
+    | undefined;
+  isPending: UseQueryResult["isPending"];
+  statisticsPending: UseQueryResult["isPending"];
+  isSuccess: UseQueryResult["isSuccess"];
+  isError: UseQueryResult["isError"];
+  error: ListUsersError | null;
+  statisticsError: ListUsersStatisticsError | null;
+};
+
+export const useUsers = (options?: Options<ListUsersData>): UseUsersResult => {
+  const users = useWebsocketAwareQuery(
+    queryOptionsWithHeaders<ListUsersResponses, ListUsersErrors, ListUsersData>(
+      options,
+      listUsers,
+      listUsersQueryKey(options)
+    )
   );
+  const userIds = users.data?.items.map((user) => user.id) ?? [];
+  const statistics = useUsersStatistics({
+    query: { id: userIds },
+  });
+
+  return {
+    ...users,
+    statisticsPending: statistics.isPending,
+    data: users.data
+      ? {
+          ...users.data,
+          items: users.data.items.map((user) => ({
+            ...user,
+            statistics: statistics.data?.items.find(
+              (stat) => stat.id === user.id
+            ),
+          })),
+        }
+      : undefined,
+    error: users.error,
+    statisticsError: statistics.error,
+  };
+};
+
+export const useUsersStatistics = (
+  options?: Options<ListUsersStatisticsData>,
+  enabled?: boolean
+) => {
+  return useWebsocketAwareQuery({
+    ...queryOptionsWithHeaders<
+      ListUsersStatisticsResponses,
+      ListUsersStatisticsErrors,
+      ListUsersStatisticsData
+    >(options, listUsersStatistics, listUsersStatisticsQueryKey(options)),
+    enabled,
+  });
 };
 
-export const useUserCount = (options?: Options<ListUsersWithSummaryData>) => {
+export const useUserCount = (options?: Options<ListUsersData>) => {
   return useWebsocketAwareQuery({
     ...queryOptionsWithHeaders<
-      ListUsersWithSummaryResponses,
-      ListUsersWithSummaryErrors,
-      ListUsersWithSummaryData
-    >(options, listUsersWithSummary, listUsersWithSummaryQueryKey(options)),
+      ListUsersResponses,
+      ListUsersErrors,
+      ListUsersData
+    >(options, listUsers, listUsersQueryKey(options)),
     select: (data) => data?.total ?? 0,
   });
 };
@@ -76,7 +142,7 @@ export const useCreateUser = (mutationOptions?: Options<CreateUserData>) => {
     >(mutationOptions, createUser),
     onSuccess: () => {
       return queryClient.invalidateQueries({
-        queryKey: listUsersWithSummaryQueryKey(),
+        queryKey: listUsersQueryKey(),
       });
     },
   });
@@ -92,7 +158,7 @@ export const useUpdateUser = (mutationOptions?: Options<UpdateUserData>) => {
     >(mutationOptions, updateUser),
     onSuccess: async () => {
       return queryClient.invalidateQueries({
-        queryKey: listUsersWithSummaryQueryKey(),
+        queryKey: listUsersQueryKey(),
       });
     },
   });
@@ -108,7 +174,7 @@ export const useDeleteUser = (mutationOptions?: Options<DeleteUserData>) => {
     >(mutationOptions, deleteUser),
     onSuccess: () => {
       return queryClient.invalidateQueries({
-        queryKey: listUsersWithSummaryQueryKey(),
+        queryKey: listUsersQueryKey(),
       });
     },
   });