refactor: posts

apps/admin/src/entities/check-post/api/changeEvidenceState.ts

@@ -1,5 +1,5 @@
 import instance from "@repo/api/axios";
-import type { postState } from "@repo/types/evidences";
+import type { PostStatus } from "@repo/types/evidences";
 
 interface ChangeEvidenceStateResponse {
   status: number;
@@ -8,11 +8,11 @@ interface ChangeEvidenceStateResponse {
 
 export const changeEvidenceState = async (
   evidenceId: number,
-  status: postState,
+  status: PostStatus
 ): Promise<ChangeEvidenceStateResponse> => {
   const response = await instance.patch<ChangeEvidenceStateResponse>(
     `/evidence/${evidenceId}/status`,
-    { status },
+    { status }
   );
   return response;
 };

apps/admin/src/entities/check-post/ui/post.tsx

@@ -1,13 +1,13 @@
 "use client";
 
-import type { post } from "@repo/types/evidences";
+import type { PostType } from "@repo/types/evidences";
 import { getCategoryName } from "@repo/utils/handleCategory";
 import { isActivity, isOthers, isReading } from "@repo/utils/handlePost";
 import { handleState, handleStateColor } from "@repo/utils/handleState";
 import Image from "next/image";
 
 interface PostProps {
-  data: post;
+  data: PostType;
   onClick?: () => void;
 }
 

apps/admin/src/entities/score/ui/checkbox.tsx

@@ -1,8 +1,7 @@
 "use client";
 
-import { useCallback, useState } from "react";
-
 import Checked from "@shared/asset/svg/checked";
+import { useCallback, useState } from "react";
 
 interface CheckboxProps {
   check?: boolean;

apps/admin/src/views/change-password/index.tsx

@@ -1,20 +1,21 @@
 "use client";
 
+import { patchPassword } from "@/shared/api/patchPassword";
+import type {
+  ChangePasswordForm,
+  ChangePasswordProps,
+} from "@/shared/model/changePWForm";
+import ChangePassword from "@/widgets/changePassword/ui";
 import { Button } from "@repo/shared/button";
 import { useMutation } from "@tanstack/react-query";
+import { AuthForm } from "@widgets/auth/ui";
 import { useRouter } from "next/navigation";
 import { useCallback } from "react";
 import { useForm } from "react-hook-form";
 
-import { patchPassword } from "@/shared/api/patchPassword";
 import type { ServerResponse } from "@/shared/model/AuthForm";
-import type {
-  ChangePasswordForm,
-  ChangePasswordProps,
-} from "@/shared/model/changePWForm";
 import type { HttpError } from "@/shared/types/error";
-import ChangePassword from "@/widgets/changePassword/ui";
-import { AuthForm } from "@widgets/auth/ui";
+
 
 const ChangePasswordView = () => {
   const router = useRouter();

apps/admin/src/views/check-post/api/getPosts.ts

@@ -1,12 +1,8 @@
 import instance from "@repo/api/axios";
-import type { EvidenceResponse, postState } from "@repo/types/evidences";
-import type { AxiosResponse } from "axios";
+import type { PostResponse, PostStatus } from "@repo/types/evidences";
 
-export const getPosts = async (
-  email: string,
-  status: postState | null,
-): Promise<AxiosResponse<EvidenceResponse>> => {
-  return await instance.get<EvidenceResponse>(
-    `/evidence/${decodeURIComponent(email).split("@")[0]?.slice(1)}?status=${status}`,
+export const getPosts = async (email: string, status: PostStatus | null) => {
+  return await instance.get<PostResponse>(
+    `/evidence/${decodeURIComponent(email).split("@")[0]?.slice(1)}?status=${status}`
   );
 };

apps/admin/src/views/check-post/model/useChangeEvidenceState.ts

@@ -1,4 +1,4 @@
-import type { postState } from "@repo/types/evidences";
+import type { PostStatus } from "@repo/types/evidences";
 import { useQueryClient } from "@tanstack/react-query";
 import { useCallback } from "react";
 import { toast } from "sonner";
@@ -9,7 +9,7 @@ export function useChangeEvidenceState(postId: number) {
   const queryClient = useQueryClient();
 
   const updatePostState = useCallback(
-    async (state: postState) => {
+    async (state: PostStatus) => {
       try {
         if (postId) {
           const res = await changeEvidenceState(postId, state);
@@ -28,15 +28,15 @@ export function useChangeEvidenceState(postId: number) {
         toast.error("게시글 상태 변경에 실패했습니다.");
       }
     },
-    [postId, queryClient],
+    [postId, queryClient]
   );
 
   const handlePostState = useCallback(
-    (state: postState) => (e: React.MouseEvent) => {
+    (state: PostStatus) => (e: React.MouseEvent) => {
       e.stopPropagation();
       void updatePostState(state);
     },
-    [updatePostState],
+    [updatePostState]
   );
 
   return { handlePostState };

apps/admin/src/views/check-post/model/useGetPosts.ts

@@ -1,13 +1,25 @@
-import type { postState } from "@repo/types/evidences";
+import type { PostStatus, PostType } from "@repo/types/evidences";
 import { useQuery } from "@tanstack/react-query";
 
 import { getPosts } from "../api/getPosts";
 
-export const useGetPosts = (email: string, status: postState | null) => {
-  return useQuery({
+export const useGetPosts = (email: string, status: PostStatus | null) => {
+  const query = useQuery({
     queryKey: ["posts", email, status],
     queryFn: () => getPosts(email, status),
     staleTime: 1000 * 60 * 5,
     gcTime: 1000 * 60 * 30,
   });
+
+  const posts: PostType[] = [
+    ...(query.data?.data.majorActivityEvidence ?? []),
+    ...(query.data?.data.humanitiesActivityEvidence ?? []),
+    ...(query.data?.data.readingEvidence ?? []),
+    ...(query.data?.data.otherEvidence ?? []),
+  ];
+
+  return {
+    ...query,
+    posts,
+  };
 };

apps/admin/src/views/detail/ui/index.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import type { post, postState } from "@repo/types/evidences";
+import type { PostStatus } from "@repo/types/evidences";
 import { getCategoryName } from "@repo/utils/handleCategory";
 import { isActivity, isOthers, isReading } from "@repo/utils/handlePost";
 import Image from "next/image";
@@ -19,11 +19,12 @@ export default function DetailView() {
   const { handlePostState } = useChangeEvidenceState(Number(id));
   const searchParams = useSearchParams();
   const email = searchParams.get("email");
-  const status = searchParams.get("status") as postState | null;
+  const status = searchParams.get("status") as PostStatus | null;
+
   const { data: studentData, isError: isStudentError } = useGetStudent(
     decodeURIComponent(String(student?.email ?? email)),
   );
-  const { data: studentPost, isError: isPostError } = useGetPosts(
+  const { posts, isError: isPostError } = useGetPosts(
     String(student?.email ?? email),
     status,
   );
@@ -42,13 +43,6 @@ export default function DetailView() {
     toast.error("회원 정보를 불러오지 못했습니다.");
   }
 
-  const posts: post[] = [
-    ...(studentPost?.data.majorActivityEvidence ?? []),
-    ...(studentPost?.data.humanitiesActivityEvidence ?? []),
-    ...(studentPost?.data.readingEvidence ?? []),
-    ...(studentPost?.data.otherEvidence ?? []),
-  ];
-
   const post = posts.find((post) => post.id === Number(id));
 
   let title = "Title";
@@ -86,9 +80,9 @@ export default function DetailView() {
 
         <main className="flex flex-col gap-12">
           {post &&
-          isActivity(post) &&
-          post.imageUri != null &&
-          post.imageUri !== "" ? (
+            isActivity(post) &&
+            post.imageUri != null &&
+            post.imageUri !== "" ? (
             <div className="max-h-[21.215rem]  w-full aspect-video bg-slate-600">
               <Image
                 alt={post.title}

apps/admin/src/views/member/ui/index.tsx

@@ -4,17 +4,17 @@ import { Button } from "@repo/shared/button";
 import Card from "@repo/shared/card";
 import List from "@repo/shared/list";
 import type { Member } from "@repo/types/member";
+import Question from "@shared/asset/svg/question";
+import Header from "@shared/ui/header";
+import { getMember } from "@widgets/member/api/getMember";
+import { useGetMember } from "@widgets/member/model/useGetMember";
+import { Filter } from "@widgets/member/ui/filter";
 import { useState, useCallback } from "react";
 import { toast } from "sonner";
 
 import { getSearchedMembers } from "@/entities/member/api/getSearchedMembers";
 import { useMember } from "@/entities/member/model/memberContext";
 import Information from "@/widgets/member/ui/information";
-import Question from "@shared/asset/svg/question";
-import Header from "@shared/ui/header";
-import { getMember } from "@widgets/member/api/getMember";
-import { useGetMember } from "@widgets/member/model/useGetMember";
-import { Filter } from "@widgets/member/ui/filter";
 
 const MemberView = () => {
   const [click, setClick] = useState<string | null>(null);
@@ -104,8 +104,8 @@ const MemberView = () => {
                     Pending={member.hasPendingEvidence}
                     back={Number(
                       String(member.grade) +
-                        String(member.classNumber) +
-                        String(member.number).padStart(2, "0"),
+                      String(member.classNumber) +
+                      String(member.number).padStart(2, "0"),
                     )}
                     className={
                       click === member.email

apps/admin/src/views/score/api/featScore.ts → apps/admin/src/views/score/api/patchScore.ts

@@ -1,28 +1,23 @@
 import instance from "@repo/api/axios";
 import { isAxiosError, type AxiosResponse } from "axios";
 
-interface FeatScoreResponse {
+interface PatchScore {
   categoryName: string;
   value: number;
 }
 
-interface FeatScoreRequest {
-  categoryName: string;
-  value: number;
-}
-
-export const featScore = async (
+export const patchScore = async (
   email: string,
   category: string,
   score: number
-): Promise<AxiosResponse<FeatScoreResponse>> => {
-  const data: FeatScoreRequest = {
+): Promise<AxiosResponse> => {
+  const data: PatchScore = {
     categoryName: category,
     value: Number(score),
   };
   try {
     const id = email.split("@")[0]?.slice(1);
-    return await instance.patch<FeatScoreResponse>(`/score/${id}`, data);
+    return await instance.patch<PatchScore>(`/score/${id}`, data);
   } catch (error) {
     if (isAxiosError(error) && error.response) {
       throw error;

apps/admin/src/views/score/model/score.ts

@@ -4,9 +4,11 @@ export interface Score {
 }
 
 export interface ScoreFormType {
-  activity: number | null;
-  oneSemester: number | null;
-  twoSemester: number | null;
-  newrrow: number | null;
-  checkbox: boolean | undefined;
+  activity: number;
+  inAward: number;
+  outAward: number;
+  oneSemester: number;
+  twoSemester: number;
+  newrrow: number;
+  checkbox: boolean;
 }

apps/admin/src/views/score/model/score_category.ts

@@ -0,0 +1,44 @@
+export const SCORE_CATEGORIES = {
+  AWARD_IN: {
+    value: "HUMANITIES-AWARD_CAREER-HUMANITY-IN_SCHOOL",
+    message: "교내인성영역관련수상",
+    field: "inAward",
+    isCheckbox: false,
+  },
+  AWARD_OUT: {
+    field: "outAward",
+    value: "HUMANITIES-AWARD_CAREER-HUMANITY-OUT_SCHOOL",
+    message: "교외인성영역관련수상",
+    isCheckbox: false,
+  },
+  ACTIVITY: {
+    value: "HUMANITIES-SERVICE-ACTIVITY",
+    message: "봉사활동",
+    field: "activity",
+    isCheckbox: false,
+  },
+  SEMESTER_1: {
+    value: "HUMANITIES-SERVICE-CLUB_SEMESTER_1",
+    message: "1학기 봉사 시간",
+    field: "oneSemester",
+    isCheckbox: false,
+  },
+  SEMESTER_2: {
+    value: "HUMANITIES-SERVICE-CLUB_SEMESTER_2",
+    message: "2학기 봉사 시간",
+    field: "twoSemester",
+    isCheckbox: false,
+  },
+  NEWRROW: {
+    value: "HUMANITIES-ACTIVITIES-NEWRROW_S",
+    message: "뉴로우 참여 횟수",
+    field: "newrrow",
+    isCheckbox: false,
+  },
+  TOEIC: {
+    value: "FOREIGN_LANG-ATTENDANCE-TOEIC_ACADEMY_STATUS",
+    message: "TOEIC 사관 학교 참여 여부",
+    field: "checkbox",
+    isCheckbox: true,
+  },
+} as const;