refactor: tanstack query 관련 파일명 변경

yewonJin · yewonJin · commit f32311b69407 · 2024-12-02T17:04:37.000+09:00
diff --git a/apps/frontend/src/features/auth/index.ts b/apps/frontend/src/features/auth/index.ts
@@ -1,6 +1,5 @@
-export * from "./api/authApi";
+export { useLogout } from "./model/authMutations";
+export { useGetUser } from "./model/authQueries";
 
-export * from "./model/useAuth";
-
-export * from "./ui/LoginForm";
-export * from "./ui/Logout";
+export { LoginForm } from "./ui/LoginForm";
+export { Logout } from "./ui/Logout";
diff --git a/apps/frontend/src/features/auth/model/authMutations.ts b/apps/frontend/src/features/auth/model/authMutations.ts
@@ -1,15 +1,6 @@
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
 
-import { getUser, logout } from "@/features/auth";
-
-export const useGetUser = () => {
-  return useQuery({
-    queryKey: ["user"],
-    queryFn: getUser,
-    retry: false,
-    refetchOnWindowFocus: false,
-  });
-};
+import { logout } from "../api/authApi";
 
 export const useLogout = () => {
   const queryClient = useQueryClient();
diff --git a/apps/frontend/src/features/auth/model/authQueries.ts b/apps/frontend/src/features/auth/model/authQueries.ts
@@ -0,0 +1,12 @@
+import { useQuery } from "@tanstack/react-query";
+
+import { getUser } from "../api/authApi";
+
+export const useGetUser = () => {
+  return useQuery({
+    queryKey: ["user"],
+    queryFn: getUser,
+    retry: false,
+    refetchOnWindowFocus: false,
+  });
+};
diff --git a/apps/frontend/src/features/auth/ui/Logout/index.tsx b/apps/frontend/src/features/auth/ui/Logout/index.tsx
@@ -1,6 +1,6 @@
 import { LogOut } from "lucide-react";
 
-import { useLogout } from "../../model/useAuth";
+import { useLogout } from "../../model/authMutations";
 import { Button } from "@/shared/ui";
 import { usePopover } from "@/shared/model";
 
diff --git a/apps/frontend/src/features/editor/api/uploadApi.ts b/apps/frontend/src/features/editor/api/uploadApi.ts
@@ -5,7 +5,7 @@ type UploadImageResponse = {
   url: string;
 };
 
-export const onUpload = async (file: File) => {
+export const onUploadImage = async (file: File) => {
   const url = `/api/upload/image`;
 
   const formData = new FormData();
diff --git a/apps/frontend/src/features/editor/index.ts b/apps/frontend/src/features/editor/index.ts
@@ -1,4 +1,4 @@
-export { onUpload } from "./api/imageUpload";
+export { onUploadImage } from "./api/uploadApi";
 
 export { useEditorStore } from "./model/editorStore";
 
diff --git a/apps/frontend/src/features/editor/model/upload.ts b/apps/frontend/src/features/editor/model/upload.ts
@@ -1,10 +1,10 @@
 import { createImageUpload } from "novel/plugins";
 
-// TODO: 수정해야할듯
-import { onUpload } from "@/features/editor";
+import { onUploadImage } from "../api/uploadApi";
 
+// TODO: validateFn 수정해야할듯?
 export const uploadFn = createImageUpload({
-  onUpload,
+  onUpload: onUploadImage,
   validateFn: (file) => {
     if (!file.type.includes("image/")) {
       console.log("File type not supported.");
diff --git a/apps/frontend/src/features/editor/ui/Editor/slash-commands.tsx b/apps/frontend/src/features/editor/ui/Editor/slash-commands.tsx
@@ -15,7 +15,7 @@ import {
 import { createSuggestionItems } from "novel/extensions";
 import { Command, renderItems } from "novel/extensions";
 
-import { onUpload } from "@/features/editor";
+import { onUploadImage } from "@/features/editor";
 
 export const suggestionItems = createSuggestionItems([
   {
@@ -137,7 +137,7 @@ export const suggestionItems = createSuggestionItems([
       input.onchange = async () => {
         if (input.files?.length) {
           const file = input.files[0];
-          const url = await onUpload(file);
+          const url = await onUploadImage(file);
 
           editor.commands.setImage({
             src: url as string,
diff --git a/apps/frontend/src/features/workspace/index.ts b/apps/frontend/src/features/workspace/index.ts
@@ -1,4 +1,4 @@
-export { useUserWorkspace } from "./model/useWorkspace";
+export { useUserWorkspace } from "./model/workspaceQuries";
 
 export { ShareTool } from "./ui/ShareTool";
 export { WorkspaceAddButton } from "./ui/WorkspaceAddButton";
diff --git a/apps/frontend/src/features/workspace/model/inviteLinkStore.ts b/apps/frontend/src/features/workspace/model/inviteLinkStore.ts
diff --git a/apps/frontend/src/features/workspace/model/useWorkspace.ts b/apps/frontend/src/features/workspace/model/useWorkspace.ts
diff --git a/apps/frontend/src/features/workspace/model/useWorkspaceInvite.ts b/apps/frontend/src/features/workspace/model/useWorkspaceInvite.ts
diff --git a/apps/frontend/src/features/workspace/model/useWorkspaceStatus.ts b/apps/frontend/src/features/workspace/model/useWorkspaceStatus.ts
@@ -1,10 +1,4 @@
-import { useMutation, useQueryClient } from "@tanstack/react-query";
-
-import {
-  setWorkspaceStatusToPrivate,
-  setWorkspaceStatusToPublic,
-} from "../api/workspaceStatusApi";
-import { useUserWorkspace } from "../model/useWorkspace";
+import { useUserWorkspace } from "./workspaceQuries";
 import { useWorkspace } from "@/shared/lib";
 
 export const useWorkspaceStatus = () => {
@@ -16,28 +10,3 @@ export const useWorkspaceStatus = () => {
     (workspace) => workspace.workspaceId === currentWorkspaceId,
   )?.visibility;
 };
-
-export const useToggleWorkspaceStatus = (
-  currentStatus: "public" | "private" | undefined,
-) => {
-  const queryClient = useQueryClient();
-  const currentWorkspaceId = useWorkspace();
-
-  return useMutation({
-    mutationFn: () => {
-      if (currentStatus === undefined) {
-        throw new Error("Workspace status is undefined");
-      }
-
-      const toggleFn =
-        currentStatus === "public"
-          ? setWorkspaceStatusToPrivate
-          : setWorkspaceStatusToPublic;
-
-      return toggleFn(currentWorkspaceId);
-    },
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ["userWorkspace"] });
-    },
-  });
-};
diff --git a/apps/frontend/src/features/workspace/model/workspaceMutations.ts b/apps/frontend/src/features/workspace/model/workspaceMutations.ts
@@ -0,0 +1,72 @@
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+
+import { createWorkspace, removeWorkspace } from "../api/workspaceApi";
+import {
+  setWorkspaceStatusToPrivate,
+  setWorkspaceStatusToPublic,
+} from "../api/workspaceStatusApi";
+import {
+  createWorkspaceInviteLink,
+  validateWorkspaceInviteLink,
+} from "../api/worskspaceInviteApi";
+
+// response로 workspaceId가 오는데 userWorkspace를 어떻게 invalidate 할까?
+// login state에 있는 userId로?
+export const useCreateWorkspace = () => {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: createWorkspace,
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ["userWorkspace"] });
+    },
+  });
+};
+
+export const useRemoveWorkspace = () => {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: removeWorkspace,
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ["userWorkspace"] });
+    },
+  });
+};
+
+export const useCreateWorkspaceInviteLink = () => {
+  return useMutation({
+    mutationFn: (id: string) => createWorkspaceInviteLink(id),
+  });
+};
+
+export const useValidateWorkspaceInviteLink = () => {
+  return useMutation({
+    mutationFn: (token: string) => validateWorkspaceInviteLink(token),
+  });
+};
+
+export const useToggleWorkspaceStatus = (
+  currentStatus: "public" | "private" | undefined,
+  currentWorkspaceId: string,
+) => {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: () => {
+      if (currentStatus === undefined) {
+        throw new Error("Workspace status is undefined");
+      }
+
+      const toggleFn =
+        currentStatus === "public"
+          ? setWorkspaceStatusToPrivate
+          : setWorkspaceStatusToPublic;
+
+      return toggleFn(currentWorkspaceId);
+    },
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ["userWorkspace"] });
+    },
+  });
+};
diff --git a/apps/frontend/src/features/workspace/model/workspaceQuries.ts b/apps/frontend/src/features/workspace/model/workspaceQuries.ts
@@ -0,0 +1,10 @@
+import { useQuery } from "@tanstack/react-query";
+
+import { getUserWorkspaces } from "../api/workspaceApi";
+
+export const useUserWorkspace = () => {
+  return useQuery({
+    queryKey: ["userWorkspace"],
+    queryFn: getUserWorkspaces,
+  });
+};
diff --git a/apps/frontend/src/features/workspace/ui/ShareTool/ShareButton.tsx b/apps/frontend/src/features/workspace/ui/ShareTool/ShareButton.tsx
@@ -1,7 +1,7 @@
 // TODO: admin이 아니라면 tooltip 추가 "권한이 없습니다."
 
 import { useWorkspace } from "@/shared/lib";
-import { useUserWorkspace } from "../../model/useWorkspace";
+import { useUserWorkspace } from "../../model/workspaceQuries";
 
 export function Sharebutton() {
   const currentWorkspaceId = useWorkspace();
diff --git a/apps/frontend/src/features/workspace/ui/WorkspaceForm/index.tsx b/apps/frontend/src/features/workspace/ui/WorkspaceForm/index.tsx
@@ -1,7 +1,7 @@
 import { useState } from "react";
 
 import { CreateWorkSpaceResquest } from "../../model/workspaceTypes";
-import { useCreateWorkspace } from "../../model/useWorkspace";
+import { useCreateWorkspace } from "../../model/workspaceMutations";
 import { Button, Dialog, FormField } from "@/shared/ui";
 
 const initialFormInput: CreateWorkSpaceResquest = {
diff --git a/apps/frontend/src/features/workspace/ui/WorkspaceList/index.tsx b/apps/frontend/src/features/workspace/ui/WorkspaceList/index.tsx
@@ -2,7 +2,8 @@ import { useState } from "react";
 import { Check, Trash2 } from "lucide-react";
 import { Link, useNavigate, useParams } from "@tanstack/react-router";
 
-import { useRemoveWorkspace, useUserWorkspace } from "../../model/useWorkspace";
+import { useRemoveWorkspace } from "../../model/workspaceMutations";
+import { useUserWorkspace } from "../../model/workspaceQuries";
 import { WorkspaceRemoveModal } from "./WorkspaceRemoveModal";
 import { usePopover } from "@/shared/model";
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-export { onUpload } from "./api/imageUpload";`
	`1`	`+export { onUploadImage } from "./api/uploadApi";`
`2`	`2`
`3`	`3`	`export { useEditorStore } from "./model/editorStore";`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-export { useUserWorkspace } from "./model/useWorkspace";`
	`1`	`+export { useUserWorkspace } from "./model/workspaceQuries";`
`2`	`2`
`3`	`3`	`export { ShareTool } from "./ui/ShareTool";`
`4`	`4`	`export { WorkspaceAddButton } from "./ui/WorkspaceAddButton";`