@greatapps/common 1.1.659 → 1.1.660

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';