@greatapps/common 1.1.659 → 1.1.661

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

@@ -1,8 +1,8 @@
 'use client';
 
 import { useInfiniteQuery } from '@tanstack/react-query';
-import { listProjectUsersAction } from '../actions/list-project-users.action';
-import { withAction } from '../../../utils/withAction';
+import { apiFetch } from '../../../infra/http/api-fetch';
+import type { ProjectUser, UsersPage } from '../types';
 import { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';
 
 const PAGE_SIZE = 20;
@@ -20,14 +20,15 @@ export function useListProjectUsers(projectId: number, search: string = '') {
 
   return useInfiniteQuery({
     queryKey,
-    queryFn: ({ pageParam }) =>
-      withAction(() =>
-        listProjectUsersAction(projectId, {
+    queryFn: ({ pageParam, signal }) =>
+      apiFetch<UsersPage<ProjectUser>>(`/api/projects/${projectId}/users`, {
+        params: {
           search: search || undefined,
           page: pageParam as number,
           limit: PAGE_SIZE,
-        })
-      )(),
+        },
+        signal,
+      }),
     getNextPageParam: (lastPage, allPages) => {
       const loaded = allPages.reduce((sum, p) => sum + p.data.length, 0);
       return loaded < lastPage.total ? allPages.length + 1 : undefined;

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

@@ -1,9 +1,9 @@
 'use client';
 
 import { useQuery, keepPreviousData } from '@tanstack/react-query';
-import { listProjectsAction } from '../actions/list-projects.action';
+import { apiFetch } from '../../../infra/http/api-fetch';
 import type { ListProjectsActionParams } from '../actions/list-projects.action';
-import { withAction } from '../../../utils/withAction';
+import type { ProjectsPage } from '../types';
 import { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';
 
 export const PROJECTS_BASE_KEY = ['projects'] as const;
@@ -16,7 +16,7 @@ export function useProjects(params?: ListProjectsActionParams) {
 
   return useQuery({
     queryKey,
-    queryFn: withAction(() => listProjectsAction(params)),
+    queryFn: ({ signal }) => apiFetch<ProjectsPage>('/api/projects', { params, signal }),
     staleTime: 10_000,
     placeholderData: keepPreviousData,
   });

package/src/modules/subscriptions/handlers/list-subscriptions.handler.ts

@@ -0,0 +1,17 @@
+import 'server-only';
+
+import type { NextRequest } from 'next/server';
+import { safeRouteHandler } from '../../../infra/route/safe-route-handler';
+import { searchParamsToParams } from '../../../infra/route/search-params';
+import { subscriptionsService } from '../services/subscriptions.service';
+import type { FindSubscriptionsParams } from '../types/subscription.type';
+
+export function createListSubscriptionsHandler() {
+  return async function GET(req: NextRequest) {
+    return safeRouteHandler(() =>
+      subscriptionsService.listSubscriptions(
+        searchParamsToParams<FindSubscriptionsParams>(req.nextUrl.searchParams)
+      )
+    );
+  };
+}

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

@@ -1,9 +1,10 @@
 "use client";
 
 import { useQuery } from "@tanstack/react-query";
-import { listSubscriptionsAction } from "../actions/list-subscriptions.action";
+import { apiFetch } from "../../../infra/http/api-fetch";
+import type { PaginatedSuccessResult } from "../../../infra/api/types";
+import type { Subscription } from "../types/subscription.type";
 import { SUBSCRIPTIONS_QUERY_KEY } from "../constants/query-keys.constants";
-import { withAction } from "../../../utils/withAction";
 import { useAuthQueryKey } from "../../../hooks/useAuthQueryKey";
 
 export function useActiveSubscription() {
@@ -11,9 +12,11 @@ export function useActiveSubscription() {
 
   return useQuery({
     queryKey,
-    queryFn: async () => {
-      return await withAction(listSubscriptionsAction)({ limit: 1 });
-    },
+    queryFn: ({ signal }) =>
+      apiFetch<PaginatedSuccessResult<Subscription>>('/api/subscriptions', {
+        params: { limit: 1 },
+        signal,
+      }),
     staleTime: 10_000,
   });
 }

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

@@ -1,10 +1,10 @@
 'use client';
 
 import { useQuery } from '@tanstack/react-query';
-import { listSubscriptionsAction } from '../actions/list-subscriptions.action';
+import { apiFetch } from '../../../infra/http/api-fetch';
+import type { PaginatedSuccessResult } from '../../../infra/api/types';
 import { parseResult } from '../../../infra/utils/parser';
-import { SubscriptionSchema, type FindSubscriptionsParams } from '../types/subscription.type';
-import { withAction } from '../../../utils/withAction';
+import { SubscriptionSchema, type Subscription, type FindSubscriptionsParams } from '../types/subscription.type';
 import { SUBSCRIPTIONS_QUERY_KEY } from '../constants/query-keys.constants';
 import { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';
 
@@ -13,7 +13,10 @@ export function useSubscriptions(params?: Partial<FindSubscriptionsParams>) {
 
   return useQuery({
     queryKey,
-    queryFn: async () =>
-      parseResult(SubscriptionSchema, await withAction(() => listSubscriptionsAction(params))()),
+    queryFn: async ({ signal }) =>
+      parseResult(
+        SubscriptionSchema,
+        await apiFetch<PaginatedSuccessResult<Subscription>>('/api/subscriptions', { params, signal })
+      ),
   });
 }

package/src/modules/users/handlers/list-messages.handler.ts

@@ -0,0 +1,39 @@
+import 'server-only';
+
+import type { NextRequest } from 'next/server';
+import { safeRouteHandler } from '../../../infra/route/safe-route-handler';
+import { searchParamsToParams } from '../../../infra/route/search-params';
+import { messagesService } from '../services/messages.service';
+import type { FindMessagesParams } from '../schema/messages.schema';
+import { findWhitelabel } from '../../whitelabel/actions/find-whitelabel.action';
+
+export function createListMessagesHandler() {
+  return async function GET(req: NextRequest) {
+    return safeRouteHandler(async () => {
+      const params = searchParamsToParams<FindMessagesParams>(req.nextUrl.searchParams);
+
+      const [result, whitelabel] = await Promise.all([
+        messagesService.listMessages(params),
+        findWhitelabel(),
+      ]);
+
+      const urlMap: Record<string, string> = {
+        pages_url: whitelabel?.pages_url ?? '',
+        accounts_url: whitelabel?.accounts_url ?? '',
+        editor_url: whitelabel?.editor_url ?? '',
+      };
+
+      return {
+        data: result.data.map((message) => ({
+          ...message,
+          url: message.url.replace(
+            /\{(pages_url|accounts_url|editor_url)\}/g,
+            (_, key) => urlMap[key] ?? ''
+          ),
+        })),
+        total: result.total,
+        totalUnread: result.totalUnread,
+      };
+    });
+  };
+}

package/src/modules/users/hooks/messages.hook.ts

@@ -1,11 +1,11 @@
 'use client';
 
 import { useInfiniteQuery, useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
-import { listMessagesAction } from '../action/list-messages.action';
+import { apiFetch } from '../../../infra/http/api-fetch';
 import { markMessageAsReadAction } from '../action/mark-message-as-read.action';
 import { markAllMessagesAsReadAction } from '../action/mark-all-messages-as-read.action';
 import { withAction } from '../../../utils/withAction';
-import type { FindMessagesParams } from '../schema/messages.schema';
+import type { FindMessagesParams, ListMessagesApiResponse } from '../schema/messages.schema';
 import { useAuthQueryKey } from '../../../hooks/useAuthQueryKey';
 
 export const MESSAGES_QUERY_KEY = ['messages'] as const;
@@ -17,7 +17,8 @@ export function useMessages(params?: Partial<FindMessagesParams>) {
 
   return useQuery({
     queryKey,
-    queryFn: withAction(() => listMessagesAction(params)),
+    queryFn: ({ signal }) =>
+      apiFetch<ListMessagesApiResponse>('/api/messages', { params, signal }),
   });
 }
 
@@ -26,14 +27,15 @@ export function useInfiniteMessages(params?: Partial<Omit<FindMessagesParams, 'p
 
   return useInfiniteQuery({
     queryKey,
-    queryFn: ({ pageParam }) =>
-      withAction(() =>
-        listMessagesAction({
+    queryFn: ({ pageParam, signal }) =>
+      apiFetch<ListMessagesApiResponse>('/api/messages', {
+        params: {
           ...params,
           page: pageParam as number,
           limit: INFINITE_MESSAGES_PAGE_SIZE,
-        })
-      )(),
+        },
+        signal,
+      }),
     getNextPageParam: (lastPage, allPages) => {
       const loaded = allPages.reduce((sum, p) => sum + p.data.length, 0);
       return loaded < lastPage.total ? allPages.length + 1 : undefined;

package/src/route.ts

@@ -0,0 +1,3 @@
+export { safeRouteHandler } from './infra/route/safe-route-handler';
+export { searchParamsToParams } from './infra/route/search-params';
+export { parseId } from './infra/route/parse-id';

package/src/server.ts

@@ -27,21 +27,14 @@ export { findUserById } from './modules/users/action/find-user-by-id.action';
 export { findCurrentAccount } from './modules/accounts/actions/find-current-account.action';
 export { getAccountTokenAction } from './modules/accounts/actions/get-account-token.action';
 export { listSubscriptionsAction } from './modules/subscriptions/actions/list-subscriptions.action';
-export { findPlanByIdAction } from './modules/plans/actions/find-plan-by-id.action';
-export { listPlansAction } from './modules/plans/actions/list-plans.action';
 export { calculateSubscriptionAction } from './modules/subscriptions/actions/calculate-subscription.action';
 export { updateSubscriptionPlanAction } from './modules/subscriptions/actions/update-subscription-plan.action';
 export { updateSubscriptionPaymentAction } from './modules/subscriptions/actions/update-subscription-payment.action';
-export { listCardsAction } from './modules/cards/actions/list-cards.action';
 export { createCardAction } from './modules/cards/actions/create-card.action';
 export { createSetupIntentAction } from './modules/cards/actions/create-setup-intent.action';
-export { listChargesAction } from './modules/charges/actions/list-charges.action';
-export { findChargeByIdAction } from './modules/charges/actions/find-charge-by-id.action';
 export { chargeActionAction } from './modules/charges/actions/charge-action.action';
 export { resolvePlanExtrasPrices } from './modules/subscriptions/utils/resolve-plan-extras-prices';
 export { hasSubscriptionExpired } from './modules/subscriptions/utils/has-subscription-expired';
-export { listIaCreditsAction } from './modules/ia-credits/actions/list-ia-credits.action';
-export { countPagesAction } from './modules/pages/actions/count-pages.action';
 
 // Project Services & Actions (server-only)
 export { projectsService } from './modules/projects/services/projects.service';
@@ -54,7 +47,6 @@ export { deleteProjectAction } from './modules/projects/actions/delete-project.a
 // Project Users Services & Actions (server-only)
 export { projectUsersService } from './modules/projects/services/project-users.service';
 export { listProjectUsersAction } from './modules/projects/actions/list-project-users.action';
-export { listAvailableUsersAction } from './modules/projects/actions/list-available-users.action';
 export { addProjectUserAction } from './modules/projects/actions/add-project-user.action';
 export { removeProjectUserAction } from './modules/projects/actions/remove-project-user.action';
 

package/src/modules/cards/actions/find-card-by-id.action.ts

@@ -1,8 +0,0 @@
-'use server';
-
-import { safeServerAction } from '../../../utils/safeServerAction';
-import { cardsService } from '../services/cards.service';
-
-export async function findCardByIdAction(id: number) {
-  return safeServerAction(() => cardsService.findCardById(id));
-}

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

@@ -1,8 +0,0 @@
-'use server';
-
-import { safeServerAction } from '../../../utils/safeServerAction';
-import { cardsService } from '../services/cards.service';
-
-export async function listCardsAction() {
-  return safeServerAction(() => cardsService.listCards());
-}

package/src/modules/charges/actions/find-charge-by-id.action.ts

@@ -1,8 +0,0 @@
-'use server';
-
-import { safeServerAction } from '../../../utils/safeServerAction';
-import { chargesService } from '../services/charges.service';
-
-export async function findChargeByIdAction(chargeId: string | number) {
-  return safeServerAction(() => chargesService.findChargeById(chargeId));
-}

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

@@ -1,9 +0,0 @@
-'use server';
-
-import { safeServerAction } from '../../../utils/safeServerAction';
-import type { FindChargesParams } from '../types/charge.type';
-import { chargesService } from '../services/charges.service';
-
-export async function listChargesAction(params?: Partial<FindChargesParams>) {
-  return safeServerAction(() => chargesService.listCharges(params));
-}

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

@@ -1,8 +0,0 @@
-'use server';
-
-import { safeServerAction } from '../../../utils/safeServerAction';
-import { iaCreditsService } from '../services/ia-credits.service';
-
-export async function listIaCreditsAction(subscriptionId: number | string) {
-  return safeServerAction(() => iaCreditsService.listOperations(subscriptionId));
-}

package/src/modules/pages/actions/count-pages.action.ts

@@ -1,10 +0,0 @@
-'use server';
-
-import { safeServerAction } from '../../../utils/safeServerAction';
-import { pagesService } from '../services/pages.service';
-
-export async function countPagesAction() {
-  return safeServerAction(async () => ({
-    total: await pagesService.countPages(),
-  }));
-}

package/src/modules/plans/actions/find-plan-by-id.action.ts

@@ -1,8 +0,0 @@
-'use server';
-
-import { safeServerAction } from '../../../utils/safeServerAction';
-import { plansService } from '../services/plans.service';
-
-export async function findPlanByIdAction(idPlan: number | string) {
-  return safeServerAction(() => plansService.findById(idPlan));
-}

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

@@ -1,17 +0,0 @@
-'use server';
-
-import { plansService, safeServerAction } from '@greatapps/common/server';
-
-export async function listPlansAction() {
-  return safeServerAction(async () => {
-    const { data: apiPlans } = await plansService.listPlans({
-      active: true,
-      search: 'client',
-      sort: 'id:ASC',
-    });
-
-    if (!apiPlans?.length) return [];
-
-    return [...apiPlans].sort((a, b) => a.value - b.value);
-  });
-}

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

@@ -1,9 +0,0 @@
-'use server';
-
-import { safeServerAction } from '../../../utils/safeServerAction';
-import { projectUsersService } from '../services/project-users.service';
-import type { ListUsersParams } from '../types';
-
-export async function listAllAccountUsersAction(params: ListUsersParams = {}) {
-  return safeServerAction(() => projectUsersService.listAllAccountUsers(params));
-}

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

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

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

@@ -1,26 +0,0 @@
-'use server';
-
-import { safeServerAction } from '../../../utils/safeServerAction';
-import { messagesService } from '../services/messages.service';
-import type { FindMessagesParams } from '../schema/messages.schema';
-import { findWhitelabel } from '../../whitelabel/actions/find-whitelabel.action';
-
-export async function listMessagesAction(params?: Partial<FindMessagesParams>) {
-  return safeServerAction(async () => {
-    const [result, whitelabel] = await Promise.all([
-      messagesService.listMessages(params),
-      findWhitelabel(),
-    ]);
-
-    const urlMap: Record<string, string> = {
-      pages_url: whitelabel?.pages_url ?? '',
-      accounts_url: whitelabel?.accounts_url ?? '',
-      editor_url: whitelabel?.editor_url ?? '',
-    };
-
-    return { data: result.data.map((message) => ({
-      ...message,
-      url: message.url.replace(/\{(pages_url|accounts_url|editor_url)\}/g, (_, key) => urlMap[key] ?? ''),
-    })), total: result.total, totalUnread: result.totalUnread };
-  });
-}