@greatapps/common 1.1.98 → 1.1.99

package/src/modules/auth/actions/logout.action.ts

@@ -1,11 +1,12 @@
 'use server';
 
-import { getClientInfoFromRequest } from "../../../infra/utils/client-info";
-import { LogoutResponse } from "../schema";
-import { authService } from "../services/auth.service";
+import { safeServerAction } from '../../../utils/safeServerAction';
+import { getClientInfoFromRequest } from '../../../infra/utils/client-info';
+import { authService } from '../services/auth.service';
 
-export async function logoutAction(): Promise<LogoutResponse> {
-  const clientInfo = await getClientInfoFromRequest();
-
-  return await authService.logout(clientInfo)
+export function logoutAction() {
+  return safeServerAction(async () => {
+    const clientInfo = await getClientInfoFromRequest();
+    return authService.logout(clientInfo);
+  });
 }

package/src/modules/auth/actions/register.action.ts

@@ -1,10 +1,13 @@
 'use server';
 
-import { RegisterRequest, RegisterResponse } from "../schema";
-import { authService } from "../services/auth.service";
-import { getClientInfoFromRequest } from "../../../infra/utils/client-info";
+import { safeServerAction } from '../../../utils/safeServerAction';
+import { RegisterRequest } from '../schema';
+import { authService } from '../services/auth.service';
+import { getClientInfoFromRequest } from '../../../infra/utils/client-info';
 
-export async function registerAction(data: RegisterRequest): Promise<RegisterResponse> {
-  const clientInfo = await getClientInfoFromRequest();
-  return await authService.register(data, clientInfo);
+export function registerAction(data: RegisterRequest) {
+  return safeServerAction(async () => {
+    const clientInfo = await getClientInfoFromRequest();
+    return authService.register(data, clientInfo);
+  });
 }

package/src/modules/auth/actions/verify-two-factor.action.ts

@@ -1,28 +1,15 @@
-"use server";
+'use server';
 
-import { authService } from "../services/auth.service";
-import { ApiError } from "../../../infra/api/types";
-import { getClientInfoFromRequest } from "../../../infra/utils/client-info";
+import { safeServerAction } from '../../../utils/safeServerAction';
+import { authService } from '../services/auth.service';
+import { getClientInfoFromRequest } from '../../../infra/utils/client-info';
 
-export async function verifyTwoFactorAction(
-  cookie: string,
-  code: string
-): Promise<{ status: 0 | 1; message?: string }> {
-  try {
+export function verifyTwoFactorAction(cookie: string, code: string) {
+  return safeServerAction(async () => {
     if (!/^\d{6}$/.test(code)) {
-      return { status: 0, message: "Formato inválido" };
+      throw new Error('Formato inválido');
     }
-
     const clientInfo = await getClientInfoFromRequest();
     await authService.verifyTwoFactor(cookie, code, clientInfo);
-    
-    return { status: 1 };
-  } catch (error) {
-    return {
-      status: 0,
-      message:
-        (error as ApiError).message ||
-        "Ocorreu um erro durante a verificação de dois fatores",
-    };
-  }
+  });
 }

package/src/modules/auth/hooks/logout.hook.tsx

@@ -2,9 +2,10 @@
 
 import { useMutation } from "@tanstack/react-query";
 import { logoutAction } from "../actions/logout.action";
+import { withAction } from "../../../utils/withAction";
 
 export function useLogout() {
   return useMutation({
-    mutationFn: logoutAction,
+    mutationFn: withAction(logoutAction),
   });
 }

package/src/modules/auth/hooks/register.hook.tsx

@@ -2,9 +2,10 @@
 
 import { useMutation } from "@tanstack/react-query";
 import { registerAction } from "../actions/register.action";
+import { withAction } from "../../../utils/withAction";
 
 export function useRegister() {
   return useMutation({
-    mutationFn: registerAction,
+    mutationFn: withAction(registerAction),
   });
 }

package/src/modules/auth/hooks/useUserQuery.ts

@@ -2,7 +2,7 @@
 
 import { useMutation, useQuery, useQueryClient, UseQueryOptions } from '@tanstack/react-query';
 import { User } from '../../users/schema';
-import { safeServerAction } from '../../../utils/safeServerAction';
+import { withAction } from '../../../utils/withAction';
 
 export const USER_QUERY_KEY = ['user'];
 
@@ -45,7 +45,7 @@ export function useTwoFactorVerify() {
   return useMutation({
     mutationFn: async ({ cookie, code }: { cookie: string; code: string }) => {
       const { verifyTwoFactorAction } = await import('../actions/verify-two-factor.action');
-      return safeServerAction(verifyTwoFactorAction, cookie, code);
+      return withAction(() => verifyTwoFactorAction(cookie, code))();
     },
     onSuccess: () => {
       queryClient.invalidateQueries({ queryKey: USER_QUERY_KEY });

package/src/modules/ia-credits/actions/list-ia-credits.action.ts

@@ -1,11 +1,8 @@
-'use server';
-
-import { PaginatedSuccessResult } from '../../../infra/api/types';
-import type { IaCreditOperation } from '../types';
-import { iaCreditsService } from '../services/ia-credits.service';
-
-export async function listIaCreditsAction(
-  subscriptionId: number | string
-): Promise<PaginatedSuccessResult<IaCreditOperation>> {
-  return iaCreditsService.listOperations(subscriptionId);
-}
+'use server';
+
+import { safeServerAction } from '../../../utils/safeServerAction';
+import { iaCreditsService } from '../services/ia-credits.service';
+
+export function listIaCreditsAction(subscriptionId: number | string) {
+  return safeServerAction(() => iaCreditsService.listOperations(subscriptionId));
+}

package/src/modules/ia-credits/hooks/ia-credits.hook.ts

@@ -5,6 +5,7 @@ import { useQuery } from '@tanstack/react-query';
 import { listIaCreditsAction } from '../actions/list-ia-credits.action';
 import type { IaCreditOperation, IaCreditsSummary } from '../types';
 import { useActiveSubscription } from '../../subscriptions/hooks/find-active-subscription.hook';
+import { withAction } from '../../../utils/withAction';
 
 function calculateSummary(operations: IaCreditOperation[]): IaCreditsSummary {
   const today = new Date();
@@ -74,7 +75,7 @@ export function useIaCredits() {
 
   const query = useQuery({
     queryKey: ['ia-credits', subscriptionId],
-    queryFn: () => listIaCreditsAction(subscriptionId!),
+    queryFn: withAction(() => listIaCreditsAction(subscriptionId!)),
     enabled: subscriptionId != null,
   });
 

package/src/modules/projects/actions/add-project-user.action.ts

@@ -1,8 +1,9 @@
-'use server';
-
-import { projectUsersService } from '../services/project-users.service';
-import type { AddRemoveProjectUsersParams } from '../types';
-
-export async function addProjectUserAction(params: AddRemoveProjectUsersParams): Promise<void> {
-  return projectUsersService.addToProject(params);
-}
+'use server';
+
+import { safeServerAction } from '../../../utils/safeServerAction';
+import { projectUsersService } from '../services/project-users.service';
+import type { AddRemoveProjectUsersParams } from '../types';
+
+export function addProjectUserAction(params: AddRemoveProjectUsersParams) {
+  return safeServerAction(() => projectUsersService.addToProject(params));
+}

package/src/modules/projects/actions/list-available-users.action.ts

@@ -1,8 +1,9 @@
-'use server';
-
-import { projectUsersService } from '../services/project-users.service';
-import type { AccountUser, ListUsersParams, UsersPage } from '../types';
-
-export async function listAvailableUsersAction(projectId: number, params: ListUsersParams = {}): Promise<UsersPage<AccountUser>> {
-  return projectUsersService.listNotInProject(projectId, params);
-}
+'use server';
+
+import { safeServerAction } from '../../../utils/safeServerAction';
+import { projectUsersService } from '../services/project-users.service';
+import type { ListUsersParams } from '../types';
+
+export function listAvailableUsersAction(projectId: number, params: ListUsersParams = {}) {
+  return safeServerAction(() => projectUsersService.listNotInProject(projectId, params));
+}

package/src/modules/projects/actions/list-project-users.action.ts

@@ -1,8 +1,9 @@
-'use server';
-
-import { projectUsersService } from '../services/project-users.service';
-import type { ListUsersParams, ProjectUser, UsersPage } from '../types';
-
-export async function listProjectUsersAction(projectId: number, params: ListUsersParams = {}): Promise<UsersPage<ProjectUser>> {
-  return projectUsersService.listInProject(projectId, params);
-}
+'use server';
+
+import { safeServerAction } from '../../../utils/safeServerAction';
+import { projectUsersService } from '../services/project-users.service';
+import type { ListUsersParams } from '../types';
+
+export function listProjectUsersAction(projectId: number, params: ListUsersParams = {}) {
+  return safeServerAction(() => projectUsersService.listInProject(projectId, params));
+}

package/src/modules/projects/actions/remove-project-user.action.ts

@@ -1,8 +1,9 @@
-'use server';
-
-import { projectUsersService } from '../services/project-users.service';
-import type { AddRemoveProjectUsersParams } from '../types';
-
-export async function removeProjectUserAction(params: AddRemoveProjectUsersParams): Promise<void> {
-  return projectUsersService.removeFromProject(params);
-}
+'use server';
+
+import { safeServerAction } from '../../../utils/safeServerAction';
+import { projectUsersService } from '../services/project-users.service';
+import type { AddRemoveProjectUsersParams } from '../types';
+
+export function removeProjectUserAction(params: AddRemoveProjectUsersParams) {
+  return safeServerAction(() => projectUsersService.removeFromProject(params));
+}

package/src/modules/projects/hooks/list-available-users.hook.ts

@@ -1,26 +1,33 @@
-'use client';
-
-import { useInfiniteQuery } from '@tanstack/react-query';
-import { listAvailableUsersAction } from '../actions/list-available-users.action';
-
-const PAGE_SIZE = 20;
-
-export const LIST_AVAILABLE_USERS_BASE_KEY = (projectId: number) => ['project-users', projectId, 'out'];
-export const LIST_AVAILABLE_USERS_QUERY_KEY = (projectId: number, search: string = '') => [
-  ...LIST_AVAILABLE_USERS_BASE_KEY(projectId),
-  search,
-];
-
-export function useListAvailableUsers(projectId: number, search: string = '') {
-  return useInfiniteQuery({
-    queryKey: LIST_AVAILABLE_USERS_QUERY_KEY(projectId, search),
-    queryFn: ({ pageParam }) =>
-      listAvailableUsersAction(projectId, { search: search || undefined, page: pageParam as number, limit: PAGE_SIZE }),
-    getNextPageParam: (lastPage, allPages) => {
-      const loaded = allPages.reduce((sum, p) => sum + p.data.length, 0);
-      return loaded < lastPage.total ? allPages.length + 1 : undefined;
-    },
-    initialPageParam: 1,
-    enabled: !!projectId,
-  });
-}
+'use client';
+
+import { useInfiniteQuery } from '@tanstack/react-query';
+import { listAvailableUsersAction } from '../actions/list-available-users.action';
+import { withAction } from '../../../utils/withAction';
+
+const PAGE_SIZE = 20;
+
+export const LIST_AVAILABLE_USERS_BASE_KEY = (projectId: number) => ['project-users', projectId, 'out'];
+export const LIST_AVAILABLE_USERS_QUERY_KEY = (projectId: number, search: string = '') => [
+  ...LIST_AVAILABLE_USERS_BASE_KEY(projectId),
+  search,
+];
+
+export function useListAvailableUsers(projectId: number, search: string = '') {
+  return useInfiniteQuery({
+    queryKey: LIST_AVAILABLE_USERS_QUERY_KEY(projectId, search),
+    queryFn: ({ pageParam }) =>
+      withAction(() =>
+        listAvailableUsersAction(projectId, {
+          search: search || undefined,
+          page: pageParam as number,
+          limit: PAGE_SIZE,
+        })
+      )(),
+    getNextPageParam: (lastPage, allPages) => {
+      const loaded = allPages.reduce((sum, p) => sum + p.data.length, 0);
+      return loaded < lastPage.total ? allPages.length + 1 : undefined;
+    },
+    initialPageParam: 1,
+    enabled: !!projectId,
+  });
+}

package/src/modules/projects/hooks/list-project-users.hook.ts

@@ -1,26 +1,33 @@
-'use client';
-
-import { useInfiniteQuery } from '@tanstack/react-query';
-import { listProjectUsersAction } from '../actions/list-project-users.action';
-
-const PAGE_SIZE = 20;
-
-export const LIST_PROJECT_USERS_BASE_KEY = (projectId: number) => ['project-users', projectId, 'in'];
-export const LIST_PROJECT_USERS_QUERY_KEY = (projectId: number, search: string = '') => [
-  ...LIST_PROJECT_USERS_BASE_KEY(projectId),
-  search,
-];
-
-export function useListProjectUsers(projectId: number, search: string = '') {
-  return useInfiniteQuery({
-    queryKey: LIST_PROJECT_USERS_QUERY_KEY(projectId, search),
-    queryFn: ({ pageParam }) =>
-      listProjectUsersAction(projectId, { search: search || undefined, page: pageParam as number, limit: PAGE_SIZE }),
-    getNextPageParam: (lastPage, allPages) => {
-      const loaded = allPages.reduce((sum, p) => sum + p.data.length, 0);
-      return loaded < lastPage.total ? allPages.length + 1 : undefined;
-    },
-    initialPageParam: 1,
-    enabled: !!projectId,
-  });
-}
+'use client';
+
+import { useInfiniteQuery } from '@tanstack/react-query';
+import { listProjectUsersAction } from '../actions/list-project-users.action';
+import { withAction } from '../../../utils/withAction';
+
+const PAGE_SIZE = 20;
+
+export const LIST_PROJECT_USERS_BASE_KEY = (projectId: number) => ['project-users', projectId, 'in'];
+export const LIST_PROJECT_USERS_QUERY_KEY = (projectId: number, search: string = '') => [
+  ...LIST_PROJECT_USERS_BASE_KEY(projectId),
+  search,
+];
+
+export function useListProjectUsers(projectId: number, search: string = '') {
+  return useInfiniteQuery({
+    queryKey: LIST_PROJECT_USERS_QUERY_KEY(projectId, search),
+    queryFn: ({ pageParam }) =>
+      withAction(() =>
+        listProjectUsersAction(projectId, {
+          search: search || undefined,
+          page: pageParam as number,
+          limit: PAGE_SIZE,
+        })
+      )(),
+    getNextPageParam: (lastPage, allPages) => {
+      const loaded = allPages.reduce((sum, p) => sum + p.data.length, 0);
+      return loaded < lastPage.total ? allPages.length + 1 : undefined;
+    },
+    initialPageParam: 1,
+    enabled: !!projectId,
+  });
+}

package/src/modules/subscriptions/actions/list-subscriptions.action.ts

@@ -1,11 +1,9 @@
-'use server';
-
-import { PaginatedSuccessResult } from '../../../infra/api/types';
-import type { Subscription, FindSubscriptionsParams } from '../types';
-import { subscriptionsService } from '../services/subscriptions.service';
-
-export async function listSubscriptionsAction(
-  params?: Partial<FindSubscriptionsParams>
-): Promise<PaginatedSuccessResult<Subscription>> {
-  return subscriptionsService.listSubscriptions(params);
-}
+'use server';
+
+import { safeServerAction } from '../../../utils/safeServerAction';
+import type { FindSubscriptionsParams } from '../types';
+import { subscriptionsService } from '../services/subscriptions.service';
+
+export function listSubscriptionsAction(params?: Partial<FindSubscriptionsParams>) {
+  return safeServerAction(() => subscriptionsService.listSubscriptions(params));
+}

package/src/modules/subscriptions/hooks/find-active-subscription.hook.ts

@@ -1,15 +1,19 @@
-'use client';
-
-import { useQuery } from '@tanstack/react-query';
-import { listSubscriptionsAction } from '../actions/list-subscriptions.action';
-import { parseResult } from '../../../infra/utils/parser';
-import { SubscriptionSchema } from '../types';
-import { SUBSCRIPTIONS_QUERY_KEY } from './list-subscriptions.hook';
-
-export function useActiveSubscription() {
-  return useQuery({
-    queryKey: [...SUBSCRIPTIONS_QUERY_KEY, 'active'],
-    queryFn: async () =>
-      parseResult(SubscriptionSchema, await listSubscriptionsAction({ active: true })),
-  });
-}
+'use client';
+
+import { useQuery } from '@tanstack/react-query';
+import { listSubscriptionsAction } from '../actions/list-subscriptions.action';
+import { parseResult } from '../../../infra/utils/parser';
+import { SubscriptionSchema } from '../types';
+import { SUBSCRIPTIONS_QUERY_KEY } from './list-subscriptions.hook';
+import { withAction } from '../../../utils/withAction';
+
+export function useActiveSubscription() {
+  return useQuery({
+    queryKey: [...SUBSCRIPTIONS_QUERY_KEY, 'active'],
+    queryFn: async () =>
+      parseResult(
+        SubscriptionSchema,
+        await withAction(() => listSubscriptionsAction({ active: true }))()
+      ),
+  });
+}

package/src/modules/subscriptions/hooks/list-subscriptions.hook.ts

@@ -1,15 +1,17 @@
-'use client';
-
-import { useQuery } from '@tanstack/react-query';
-import { listSubscriptionsAction } from '../actions/list-subscriptions.action';
-import { parseResult } from '../../../infra/utils/parser';
-import { SubscriptionSchema, type FindSubscriptionsParams } from '../types';
-
-export const SUBSCRIPTIONS_QUERY_KEY = ['subscriptions'];
-
-export function useSubscriptions(params?: Partial<FindSubscriptionsParams>) {
-  return useQuery({
-    queryKey: [...SUBSCRIPTIONS_QUERY_KEY, params],
-    queryFn: async () => parseResult(SubscriptionSchema, await listSubscriptionsAction(params)),
-  });
-}
+'use client';
+
+import { useQuery } from '@tanstack/react-query';
+import { listSubscriptionsAction } from '../actions/list-subscriptions.action';
+import { parseResult } from '../../../infra/utils/parser';
+import { SubscriptionSchema, type FindSubscriptionsParams } from '../types';
+import { withAction } from '../../../utils/withAction';
+
+export const SUBSCRIPTIONS_QUERY_KEY = ['subscriptions'];
+
+export function useSubscriptions(params?: Partial<FindSubscriptionsParams>) {
+  return useQuery({
+    queryKey: [...SUBSCRIPTIONS_QUERY_KEY, params],
+    queryFn: async () =>
+      parseResult(SubscriptionSchema, await withAction(() => listSubscriptionsAction(params))()),
+  });
+}

package/src/modules/users/action/find-user-by-id.action.ts

@@ -1,25 +1,8 @@
-'use server';
-
-import { userService } from '../services/user.service';
-import { User } from '../schema';
-
-export async function findUserById(): Promise<{
-  success: boolean;
-  data?: User;
-  error?: string;
-}> {
-  try {
-    const user = await userService.findById();
-
-    return {
-      success: true,
-      data: user,
-    };
-  } catch (error) {
-    console.error('[findUserById] Error:', error);
-    return {
-      success: false,
-      error: error instanceof Error ? error.message : 'Erro desconhecido',
-    };
-  }
-}
+'use server';
+
+import { safeServerAction } from '../../../utils/safeServerAction';
+import { userService } from '../services/user.service';
+
+export function findUserById() {
+  return safeServerAction(() => userService.findById());
+}

package/src/modules/users/action/list-messages.action.ts

@@ -1,10 +1,12 @@
-'use server';
-
-import { messagesService } from '../services/messages.service';
-import type { FindMessagesParams, ListMessagesApiResponse } from '../schema/messages.schema';
-
-export async function listMessagesAction(
-  params?: Partial<FindMessagesParams>
-): Promise<ListMessagesApiResponse> {
-  return messagesService.listMessages(params);
-}
+'use server';
+
+import { safeServerAction } from '../../../utils/safeServerAction';
+import { messagesService } from '../services/messages.service';
+import type { FindMessagesParams } from '../schema/messages.schema';
+
+export function listMessagesAction(params?: Partial<FindMessagesParams>) {
+  return safeServerAction(async () => {
+    const result = await messagesService.listMessages(params);
+    return { data: result.data, total: result.total, totalUnread: result.totalUnread };
+  });
+}

package/src/modules/users/action/mark-all-messages-as-read.action.ts

@@ -1,8 +1,8 @@
-'use server';
-
-import { messagesService } from '../services/messages.service';
-import type { MarkAllAsReadApiResponse } from '../schema/messages.schema';
-
-export async function markAllMessagesAsReadAction(): Promise<MarkAllAsReadApiResponse> {
-  return messagesService.markAllAsRead();
-}
+'use server';
+
+import { safeServerAction } from '../../../utils/safeServerAction';
+import { messagesService } from '../services/messages.service';
+
+export function markAllMessagesAsReadAction() {
+  return safeServerAction(() => messagesService.markAllAsRead());
+}

package/src/modules/users/action/mark-message-as-read.action.ts

@@ -1,8 +1,8 @@
-'use server';
-
-import { messagesService } from '../services/messages.service';
-import type { MarkAsReadApiResponse } from '../schema/messages.schema';
-
-export async function markMessageAsReadAction(messageId: string): Promise<MarkAsReadApiResponse> {
-  return messagesService.markAsRead(messageId);
-}
+'use server';
+
+import { safeServerAction } from '../../../utils/safeServerAction';
+import { messagesService } from '../services/messages.service';
+
+export function markMessageAsReadAction(messageId: string) {
+  return safeServerAction(() => messagesService.markAsRead(messageId));
+}