Merge branch 'develop'

Team-return · Nov 14, 2024 · d499b4c · d499b4c
2 parents 33bc249 + 83d15a8
commit d499b4c
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 7 deletions.
diff --git a/src/Apis/Notices/index.ts b/src/Apis/Notices/index.ts
@@ -120,6 +120,7 @@ export const useNoticeListData = () => {
 
 	useEffect(() => {
 		fetchNoticeList();
+
 	}, [fetchNoticeList]);
 
 	return { notices };

diff --git a/src/Apis/Notices/request.ts b/src/Apis/Notices/request.ts
@@ -3,7 +3,7 @@ import { AttachmentType } from "./response";
 export interface NoticeWrite {
 	title: string;
 	content: string;
-	attachments: AttachmentRequest[];
+	attachments?: AttachmentRequest[];
 }
 
 export interface NoticeEdit {

diff --git a/src/Apis/Notices/response.ts b/src/Apis/Notices/response.ts
@@ -8,7 +8,7 @@ export interface NoticeDetailResponse {
     title: string;
     content: string;
     created_at: string;
-    attachments: AttachmentResponse[];
+    attachments?: AttachmentResponse[];
 }
 
 export type AttachmentType =

diff --git a/src/Apis/Recruitments/index.ts b/src/Apis/Recruitments/index.ts
@@ -82,13 +82,22 @@ export const useGetRecruitmentForm = (
 		{
 			queryKey: ['getRecruitmentCount', searchRecruitmentFormQueryString],
 			queryFn: async () => {
-				const { winter_intern } = searchRecruitmentFormQueryString;
+				const {
+					year,
+					company_name,
+					start,
+					end,
+					status,
+					winter_intern,
+				} = searchRecruitmentFormQueryString;
 				const winterIntern =
 					winter_intern !== null
 						? `&winter_intern=${winter_intern}`
 						: '';
 				const { data } = await instance.get<{ count: number }>(
-					`${router}/count?${winterIntern}`
+					`${router}/count?year=${year}${winterIntern}&company_name=${company_name}&start=${start}&end=${end}&status=${
+						status === '전체' || status === undefined ? '' : status
+					}`
 				);
 				return data;
 			},

diff --git a/src/Pages/NoticePage/NoticeWritePage/index.tsx b/src/Pages/NoticePage/NoticeWritePage/index.tsx
@@ -18,7 +18,6 @@ export function NoticeWritePage() {
 	const navigate = useNavigate();
 
 	const { mutate: writeNotice } = useNoticeWriteData();
-
 	const { mutate: getPresignedUrl, data } = usePresignedUrl();
 
 	useEffect(() => {
@@ -91,6 +90,13 @@ export function NoticeWritePage() {
 	const handleNoticeSubmit = () => {
 		if (attachments.length > 0) {
 			getPresignedUrl(attachments);
+		} else {
+			writeNotice({
+				title,
+				content,
+				attachments: [{url: '', type: 'FILE'}],
+			});
+			navigate('/Notice')
 		}
 	};
 
@@ -136,7 +142,7 @@ export function NoticeWritePage() {
 						<_.FileWrap>
 							<_.Text>첨부파일</_.Text>
 							<_.AddFileWrapper>
-								{attachments.map(
+								{attachments?.map(
 									(file: File, index: number) => (
 										<_.AddFile key={index}>
 											{file.name}

diff --git a/src/Pages/PopUp/ApplicationPopup/index.tsx b/src/Pages/PopUp/ApplicationPopup/index.tsx
@@ -15,7 +15,7 @@ export function ApplicationPopup() {
 		student_name: '',
 		recruitment_id: id ? id : '',
 		year: date.getFullYear().toString(),
-		winter_intern: false,
+		winter_intern: true,
 	});
 
 	const {