fix: 회의록 삭제는 마지막 회차만 가능

wafflestudio · Mar 4, 2025 · f459f5c · f459f5c
1 parent 83ca9e5
commit f459f5c
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 32 deletions.
diff --git a/app/[locale]/community/council/meeting-minute/MinutePageContent.tsx b/app/[locale]/community/council/meeting-minute/MinutePageContent.tsx
@@ -11,7 +11,7 @@ import PageLayout from '@/components/layout/pageLayout/PageLayout';
 import { councilMinute } from '@/constants/segmentNode';
 import { Link } from '@/i18n/routing';
 import { getPath } from '@/utils/page';
-import { CustomError, handleServerResponse } from '@/utils/serverActionError';
+import { handleServerResponse } from '@/utils/serverActionError';
 
 import CouncilAttachment from '../components/CouncilAttachments';
 
@@ -38,8 +38,14 @@ export default function MinutePageContent({
         setSelectedTime={setSelectedYear}
       />
       <div className="mt-7">
-        {selectedContents.map((minute) => {
-          return <Minutes minute={minute} key={`${minute.year}_${minute.index}`} />;
+        {selectedContents.map((minute, i) => {
+          return (
+            <Minutes
+              minute={minute}
+              key={`${minute.year}_${minute.index}`}
+              isLast={i === selectedContents.length - 1}
+            />
+          );
         })}
       </div>
       <MinuteAddButton year={selectedYear} />
@@ -75,24 +81,7 @@ function YearAddButton() {
   );
 }
 
-function Buttons({
-  onDelete,
-  editHref,
-}: {
-  onDelete: () => Promise<CustomError | void>;
-  editHref: string;
-}) {
-  return (
-    <LoginVisible role={['ROLE_COUNCIL', 'ROLE_STAFF']}>
-      <div className="flex justify-end gap-3">
-        <DeleteButton onDelete={onDelete} />
-        <EditButton href={editHref} />
-      </div>
-    </LoginVisible>
-  );
-}
-
-function Minutes({ minute }: { minute: CouncilMeetingMinute }) {
+function Minutes({ minute, isLast }: { minute: CouncilMeetingMinute; isLast: boolean }) {
   const handleDelete = async () => {
     const resp = await deleteMinuteAction(minute.year, minute.index);
     handleServerResponse(resp, {
@@ -104,10 +93,12 @@ function Minutes({ minute }: { minute: CouncilMeetingMinute }) {
     <div className="mb-10 w-fit border-b border-neutral-200 pb-10">
       <div className="flex items-center justify-between gap-2.5 ">
         <div className="font-semibold">{minute.index}차 회의 회의록</div>
-        <Buttons
-          onDelete={handleDelete}
-          editHref={`${minutePath}/edit?year=${minute.year}&index=${minute.index}`}
-        />
+        <LoginVisible role={['ROLE_COUNCIL', 'ROLE_STAFF']}>
+          <div className="flex justify-end gap-3">
+            {isLast && <DeleteButton onDelete={handleDelete} />}
+            <EditButton href={`${minutePath}/edit?year=${minute.year}&index=${minute.index}`} />
+          </div>
+        </LoginVisible>
       </div>
       {minute.attachments.map((file) => (
         <CouncilAttachment {...file} key={file.id} />

diff --git a/app/[locale]/community/council/meeting-minute/edit/EditMinutePageContent.tsx b/app/[locale]/community/council/meeting-minute/edit/EditMinutePageContent.tsx
@@ -26,12 +26,13 @@ export default function EditMinutePageContent({
   const onCancel = () => router.push(minutePath);
 
   const onSubmit = async (requestObject: MinuteFormData) => {
-    const removeFileIds = getAttachmentDeleteIds(requestObject.file, data.attachments);
+    const deleteIds = getAttachmentDeleteIds(requestObject.file, data.attachments);
     const formData = contentToFormData(
       'EDIT',
-      { requestObject: removeFileIds, attachments: requestObject.file },
-      { request: 'removeFileIds', attachments: 'addFiles' },
+      { requestObject: deleteIds, attachments: requestObject.file },
+      { request: 'deleteIds', attachments: 'addFiles' },
     );
+
     await putMinuteAction(year, index, formData);
   };
 

diff --git a/utils/formData.ts b/utils/formData.ts
@@ -1,7 +1,7 @@
 import { Attachment } from '@/apis/types/attachment';
 import { EditorFile, EditorImage, isLocalFile, isLocalImage, isUploadedFile } from '@/types/form';
 
-import { encodeFormDataFileName } from './string';
+import { encodeFormDataFileName, FormDataFileName } from './string';
 
 export const contentToFormData = (
   type: 'CREATE' | 'EDIT',
@@ -31,13 +31,14 @@ export const contentToFormData = (
   if (attachments) {
     encodeFormDataFileName(
       formData,
-      keys?.attachments || type === 'CREATE' ? 'attachments' : 'newAttachments',
+      (keys?.attachments as FormDataFileName) ||
+        (type === 'CREATE' ? 'attachments' : 'newAttachments'),
       attachments.filter(isLocalFile).map((x) => x.file),
     );
   }
 
   if (image && isLocalImage(image)) {
-    formData.append(keys?.image || type === 'CREATE' ? 'mainImage' : 'newMainImage', image.file);
+    formData.append(keys?.image || (type === 'CREATE' ? 'mainImage' : 'newMainImage'), image.file);
   }
 
   return formData;

diff --git a/utils/string.ts b/utils/string.ts
@@ -20,6 +20,6 @@ export const encodeFormDataFileName = (
   fileList.forEach((file) => formData.append(key, file, encodeURI(file.name)));
 };
 
-type FormDataFileName = 'attachments' | 'newAttachments' | 'pdf' | 'addFiles';
+export type FormDataFileName = 'attachments' | 'newAttachments' | 'pdf' | 'addFiles';
 
 const isFile = (x: unknown): x is File => x instanceof File;