diff --git a/src/hooks/class/useClassDataByParams.ts b/src/hooks/class/useClassDataByParams.ts
index 004d01af..7cd9deea 100644
--- a/src/hooks/class/useClassDataByParams.ts
+++ b/src/hooks/class/useClassDataByParams.ts
@@ -9,18 +9,18 @@ interface UseClassDataByParamsProps {
// 현재 경로에 해당하는 클래스, 서브클래스 데이터
function useClassDataByParams({ classDataList }: UseClassDataByParamsProps) {
- const { classId, subClassId } = useParams();
+ const { classId: classIdParam, subClassId: subClassIdParam } = useParams();
const currentPageClassData = useMemo(() => {
- return classDataList?.find(d => d.title === classId?.toUpperCase());
- }, [classDataList, classId]);
+ return classDataList?.find(d => d.title === classIdParam?.toUpperCase());
+ }, [classDataList, classIdParam]);
const currentPageSubClassData = useMemo(() => {
return currentPageClassData?.subClasses.find(
- d => d.orderNumber === Number(subClassId),
+ d => d.orderNumber === Number(subClassIdParam),
);
- }, [currentPageClassData, subClassId]);
+ }, [currentPageClassData, subClassIdParam]);
- const isSubClassPage = !!classId && !!subClassId;
+ const isSubClassPage = !!classIdParam && !!subClassIdParam;
return { currentPageClassData, currentPageSubClassData, isSubClassPage };
}
diff --git a/src/hooks/class/useSubClassFileInfoList.ts b/src/hooks/class/useSubClassFileInfoList.ts
index 8b05ce2e..4f4d0ab4 100644
--- a/src/hooks/class/useSubClassFileInfoList.ts
+++ b/src/hooks/class/useSubClassFileInfoList.ts
@@ -8,22 +8,20 @@ import useBoundStore from '@/stores';
import { FileInfo } from '@/types/class';
interface UseSubClassFileInfoListProps {
- subLectureId?: number;
+ subClassId?: number;
}
-function useSubClassFileInfoList({
- subLectureId,
-}: UseSubClassFileInfoListProps) {
- const { classId, subClassId } = useParams();
+function useSubClassFileInfoList({ subClassId }: UseSubClassFileInfoListProps) {
+ const { classId: classIdParam, subClassId: subClassIdParam } = useParams();
const subClassIdMap = useSubClassIdMap();
- let resolvedSubLectureId;
+ let resolvedSubClassId;
// 관리자 페이지 내에서 호출 시
- if (subLectureId && !subClassIdMap) {
- resolvedSubLectureId = subLectureId;
+ if (subClassId && !subClassIdMap) {
+ resolvedSubClassId = subClassId;
} else {
- resolvedSubLectureId =
- subClassIdMap[`${classId?.toUpperCase()}-${subClassId}`];
+ resolvedSubClassId =
+ subClassIdMap[`${classIdParam?.toUpperCase()}-${subClassIdParam}`];
}
const user = useBoundStore(state => state.user);
@@ -33,9 +31,9 @@ function useSubClassFileInfoList({
isLoading,
isError,
} = useQuery({
- queryKey: ['class', 'sub-class-file-list', resolvedSubLectureId],
- queryFn: () => ClassApi.getSubClassFileList(resolvedSubLectureId),
- enabled: !!resolvedSubLectureId,
+ queryKey: ['class', 'sub-class-file-list', resolvedSubClassId],
+ queryFn: () => ClassApi.getSubClassFileList(resolvedSubClassId),
+ enabled: !!resolvedSubClassId,
});
const findFileInfo = useMemo(() => {
diff --git a/src/pages/Admin/Class/components/FileItem.tsx b/src/pages/Admin/Class/components/FileItem.tsx
index ece8927d..c227e1b3 100644
--- a/src/pages/Admin/Class/components/FileItem.tsx
+++ b/src/pages/Admin/Class/components/FileItem.tsx
@@ -4,10 +4,10 @@ import FileUpdateModal from '@/pages/Admin/Class/components/FileUpdateModal';
import { FileInfo } from '@/types/class';
function FileItem({
- subLectureId,
+ subClassId,
fileInfo,
}: {
- subLectureId: number;
+ subClassId: number;
fileInfo: FileInfo;
}) {
const { assignmentType: fileType, assignmentFileId: fileId } = fileInfo;
@@ -57,7 +57,7 @@ function FileItem({
) : null;
diff --git a/src/pages/Admin/Class/components/FileUpdateModal.tsx b/src/pages/Admin/Class/components/FileUpdateModal.tsx
index c920e9b9..4d04374d 100644
--- a/src/pages/Admin/Class/components/FileUpdateModal.tsx
+++ b/src/pages/Admin/Class/components/FileUpdateModal.tsx
@@ -9,7 +9,7 @@ import useFileUpdateForm, {
import useFileUpdateMutation from '@/pages/Admin/Class/hooks/useFileUpdateMutation';
interface FileUpdateModalProps {
- subLectureId: number;
+ subClassId: number;
fileType: string;
fileId: number;
isVisible: boolean;
@@ -17,7 +17,7 @@ interface FileUpdateModalProps {
}
function FileUpdateModal({
- subLectureId,
+ subClassId,
fileType,
fileId,
isVisible,
@@ -25,7 +25,7 @@ function FileUpdateModal({
}: FileUpdateModalProps) {
const { register, errors, handleSubmit, fieldRules, reset } =
useFileUpdateForm();
- const { mutation } = useFileUpdateMutation({ subLectureId, fileId });
+ const { mutation } = useFileUpdateMutation({ subClassId, fileId });
const onSubmit: SubmitHandler = data => {
const result = window.confirm('파일을 수정하시겠습니까?');
diff --git a/src/pages/Admin/Class/components/FileUploadModal.tsx b/src/pages/Admin/Class/components/FileUploadModal.tsx
index d56e3b24..f40ef6a9 100644
--- a/src/pages/Admin/Class/components/FileUploadModal.tsx
+++ b/src/pages/Admin/Class/components/FileUploadModal.tsx
@@ -9,18 +9,18 @@ import useFileUploadForm, {
import useFileUploadMutation from '@/pages/Admin/Class/hooks/useFileUploadMutation';
interface FileEditorModalProps {
- subLectureId: number;
+ subClassId: number;
isVisible: boolean;
onClose: () => void;
}
function FileUploadModal({
- subLectureId,
+ subClassId,
isVisible,
onClose,
}: FileEditorModalProps) {
const { mutation } = useFileUploadMutation({
- subLectureId,
+ subClassId,
});
const { register, errors, handleSubmit, reset, fieldRules } =
diff --git a/src/pages/Admin/Class/components/SubClassCard.tsx b/src/pages/Admin/Class/components/SubClassCard.tsx
index 28c6a8b6..b571b273 100644
--- a/src/pages/Admin/Class/components/SubClassCard.tsx
+++ b/src/pages/Admin/Class/components/SubClassCard.tsx
@@ -58,11 +58,11 @@ function SubClassCard({ classTitle, subClass }: SubClassCardProps) {
>
파일 목록 확인하기
- {openFileList && }
+ {openFileList && }
diff --git a/src/pages/Admin/Class/hooks/useFileUpdateMutation.ts b/src/pages/Admin/Class/hooks/useFileUpdateMutation.ts
index b4fd7cb4..7c3f19ae 100644
--- a/src/pages/Admin/Class/hooks/useFileUpdateMutation.ts
+++ b/src/pages/Admin/Class/hooks/useFileUpdateMutation.ts
@@ -4,12 +4,12 @@ import { queryClient } from '@/libs/react-query';
import AdminClassApi from '@/services/admin/class';
interface UseFileUpdateMutationProps {
- subLectureId: number;
+ subClassId: number;
fileId: number;
}
function useFileUpdateMutation({
- subLectureId,
+ subClassId,
fileId,
}: UseFileUpdateMutationProps) {
const mutation = useMutation({
@@ -20,7 +20,7 @@ function useFileUpdateMutation({
queryKey: ['class', 'sub-class-general-file', fileId],
});
queryClient.invalidateQueries({
- queryKey: ['class', 'sub-class-file-list', subLectureId],
+ queryKey: ['class', 'sub-class-file-list', subClassId],
});
},
});
diff --git a/src/pages/Admin/Class/hooks/useFileUploadMutation.ts b/src/pages/Admin/Class/hooks/useFileUploadMutation.ts
index 8dc3e8b6..b304eca1 100644
--- a/src/pages/Admin/Class/hooks/useFileUploadMutation.ts
+++ b/src/pages/Admin/Class/hooks/useFileUploadMutation.ts
@@ -4,16 +4,16 @@ import { queryClient } from '@/libs/react-query';
import AdminClassApi from '@/services/admin/class';
interface UseFileUploadProps {
- subLectureId: number;
+ subClassId: number;
}
-function useFileUploadMutation({ subLectureId }: UseFileUploadProps) {
+function useFileUploadMutation({ subClassId }: UseFileUploadProps) {
const mutation = useMutation({
mutationFn: (data: { type: string; file: File }) =>
- AdminClassApi.uploadSubClassFile({ ...data, subLectureId }),
+ AdminClassApi.uploadSubClassFile({ ...data, subClassId }),
onSuccess: () => {
queryClient.invalidateQueries({
- queryKey: ['class', 'sub-class-file-list', subLectureId],
+ queryKey: ['class', 'sub-class-file-list', subClassId],
});
},
});
diff --git a/src/services/admin/class.ts b/src/services/admin/class.ts
index 2ab96f9c..2af7a16b 100644
--- a/src/services/admin/class.ts
+++ b/src/services/admin/class.ts
@@ -20,11 +20,11 @@ class AdminClassApi {
}
static async uploadSubClassFile({
- subLectureId,
+ subClassId,
type,
file,
}: {
- subLectureId: number;
+ subClassId: number;
type: string;
file: File;
}) {
@@ -32,7 +32,7 @@ class AdminClassApi {
formData.append('file', file);
return post(
- `/lectures/sub-lecture/${subLectureId}/file?assignmentType=${type}`,
+ `/lectures/sub-lecture/${subClassId}/file?assignmentType=${type}`,
formData,
{
headers: {
diff --git a/src/services/class.ts b/src/services/class.ts
index eb751665..2b4ee56d 100644
--- a/src/services/class.ts
+++ b/src/services/class.ts
@@ -7,9 +7,9 @@ class ClassApi {
}
static async getSubClassFileList(
- subLectureId: number,
+ subClassId: number,
): Promise<{ assignmentType: string; assignmentFileId: number }[]> {
- return get(`/lectures/sub-lecture/${subLectureId}`);
+ return get(`/lectures/sub-lecture/${subClassId}`);
}
static async getSubClassFile(