Merge pull request #309 from mash-up-kr/feature/schedule-notice

모든 스케줄에 공지 추가 작업
mash-up-kr · Aug 16, 2024 · 435aeea · 435aeea
2 parents 29ae79a + 636627c
commit 435aeea
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 51 deletions.
diff --git a/src/components/Schedule/ScheduleTemplate/ScheduleTemplate.component.tsx b/src/components/Schedule/ScheduleTemplate/ScheduleTemplate.component.tsx
@@ -204,9 +204,7 @@ const ScheduleTemplate = () => {
             </Styled.LocationWrapper>
           )}
         </div>
-        {scheduleType === ScheduleType.PLATFORM && (
-          <Textarea label="공지" {...register('notice')} />
-        )}
+        <Textarea label="공지" {...register('notice')} />
       </Styled.ScheduleContent>
       <Styled.SessionContent>
         <Styled.Title>세션 정보</Styled.Title>

diff --git a/src/components/ScheduleDetail/ScheduleInfoList/ScheduleInfoList.component.tsx b/src/components/ScheduleDetail/ScheduleInfoList/ScheduleInfoList.component.tsx
@@ -30,54 +30,62 @@ const ScheduleInfoList = ({
   location,
   notice,
 }: ScheduleInfoListProps) => {
-  const baseScheduleInfoListItem = [
-    {
-      label: '스케줄 명',
-      value: name,
-    },
-    {
-      label: '기수',
-      value: `${generationNumber}기`,
-    },
-    {
-      label: '구분',
-      value: getScheduleType(scheduleType),
-    },
-    {
-      label: '스케줄 일시',
-      value: formatDate(startedAt, 'YYYY년 M월 D일 A hh시 mm분'),
-    },
-    {
-      label: '등록 일시',
-      value: formatDate(createdAt, 'YYYY년 M월 D일 A hh시 mm분'),
-    },
-    {
-      label: '장소',
-      value:
-        location.roadAddress === null
-          ? location.detailAddress // ZOOM
-          : `${location.roadAddress}${location.detailAddress ? `, ${location.detailAddress}` : ''}`,
-    },
-    {
-      label: '공지',
-      value: notice ?? '-',
-    },
-    {
-      label: '배포 일시',
-      value: formatDate(publishedAt, 'YYYY년 M월 D일 A hh시 mm분'),
-    },
-    {
-      label: '배포 상태',
-      value: getScheduleStatusText(status),
-    },
-  ];
-
   const scheduleInfoListItem = useMemo(() => {
-    if (getScheduleType(scheduleType) === '전체') {
-      return baseScheduleInfoListItem.filter((i) => i.label !== '공지');
-    }
-    return baseScheduleInfoListItem;
-  }, [baseScheduleInfoListItem, scheduleType]);
+    return [
+      {
+        label: '스케줄 명',
+        value: name,
+      },
+      {
+        label: '기수',
+        value: `${generationNumber}기`,
+      },
+      {
+        label: '구분',
+        value: getScheduleType(scheduleType),
+      },
+      {
+        label: '스케줄 일시',
+        value: formatDate(startedAt, 'YYYY년 M월 D일 A hh시 mm분'),
+      },
+      {
+        label: '등록 일시',
+        value: formatDate(createdAt, 'YYYY년 M월 D일 A hh시 mm분'),
+      },
+      {
+        label: '장소',
+        value:
+          location.roadAddress === null
+            ? location.detailAddress // ZOOM
+            : `${location.roadAddress}${
+                location.detailAddress ? `, ${location.detailAddress}` : ''
+              }`,
+      },
+      {
+        label: '공지',
+        value: notice || '-',
+      },
+      {
+        label: '배포 일시',
+        value: formatDate(publishedAt, 'YYYY년 M월 D일 A hh시 mm분'),
+      },
+      {
+        label: '배포 상태',
+        value: getScheduleStatusText(status),
+      },
+    ];
+  }, [
+    createdAt,
+    generationNumber,
+    location.detailAddress,
+    location.roadAddress,
+    name,
+    notice,
+    publishedAt,
+    scheduleType,
+    startedAt,
+    status,
+  ]);
 
   return (
     <Styled.ScheduleInfoList>

diff --git a/src/utils/schedule.ts b/src/utils/schedule.ts
@@ -176,7 +176,7 @@ export const parseFormValuesToScheduleRequest = (
     startedAt,
     endedAt,
     eventsCreateRequests,
-    notice: formScheduleType === ScheduleType.ALL ? '' : notice,
+    notice,
   };
 
   if (locationType === LocationType.OFFLINE && locationInfo) {