Merge pull request #305 from mash-up-kr/feature/update-schedule

스케줄 주소 키값 변경 대응
mash-up-kr · Jun 17, 2024 · c4ca16e · c4ca16e
2 parents 534cdf9 + 00cf270
commit c4ca16e
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 45 deletions.
diff --git a/src/components/Schedule/ScheduleTemplate/ScheduleTemplate.component.tsx b/src/components/Schedule/ScheduleTemplate/ScheduleTemplate.component.tsx
@@ -64,15 +64,14 @@ const ScheduleTemplate = () => {
           y: latitude,
           building_name: buildingName,
         } = json.documents[0].road_address;
-        const placeName = buildingName || address;
+        const placeName = buildingName || '';
 
         setValue('locationInfo', {
-          address,
+          roadAddress: address,
           latitude,
           longitude,
-          placeName,
+          detailAddress: placeName,
         });
-        setValue('placeName', placeName);
       },
     }).open();
   };
@@ -129,8 +128,11 @@ const ScheduleTemplate = () => {
               <Styled.InputWithButton>
                 <InputField
                   $size="md"
-                  placeholder="장소"
-                  {...register('placeName', { required: locationType === LocationType.OFFLINE })}
+                  placeholder="주소"
+                  disabled={false}
+                  {...register('locationInfo.roadAddress', {
+                    required: locationType === LocationType.OFFLINE,
+                  })}
                 />
                 <Button shape="primaryLine" $size="md" onClick={handleClickAddressSearch}>
                   주소 검색
@@ -139,7 +141,7 @@ const ScheduleTemplate = () => {
               <InputField
                 $size="md"
                 placeholder="상세 주소를 입력해 주세요 (ex. 동, 호, 층 등)"
-                {...register('detailAddress')}
+                {...register('locationInfo.detailAddress')}
               />
             </Styled.LocationWrapper>
           )}

diff --git a/src/components/ScheduleDetail/ScheduleInfoList/ScheduleInfoList.component.tsx b/src/components/ScheduleDetail/ScheduleInfoList/ScheduleInfoList.component.tsx
@@ -12,8 +12,8 @@ interface ScheduleInfoListProps {
   publishedAt?: string;
   status: ValueOf<typeof ScheduleStatus>;
   location: {
-    address: string | null;
-    placeName: string;
+    roadAddress?: string | null;
+    detailAddress: string;
   };
 }
 
@@ -47,9 +47,11 @@ const ScheduleInfoList = ({
       {
         label: '장소',
         value:
-          location.address === null
-            ? location.placeName
-            : `${location.placeName}, ${location.address}`,
+          location.roadAddress === null
+            ? location.detailAddress // ZOOM
+            : `${location.roadAddress}${
+                location.detailAddress ? `, ${location.detailAddress}` : ''
+              }`,
       },
       {
         label: '배포 일시',

diff --git a/src/types/dto/schedule.ts b/src/types/dto/schedule.ts
@@ -25,28 +25,27 @@ export interface ContentsCreateRequest {
   desc: string;
 }
 
-export interface ScheduleCreateRequest {
+interface Location {
+  roadAddress?: string | null;
+  latitude?: number | null;
+  longitude?: number | null;
+  detailAddress?: string;
+}
+
+export interface ScheduleCreateRequest extends Location {
   generationNumber?: number;
   endedAt: string;
   name: string;
   startedAt: string;
   eventsCreateRequests: EventCreateRequest[];
-  address?: string;
-  latitude?: number;
-  longitude?: number;
-  placeName?: string;
 }
 
-export interface ScheduleUpdateRequest {
+export interface ScheduleUpdateRequest extends Location {
   generationNumber?: number;
   endedAt: string;
   name: string;
   startedAt: string;
   eventsCreateRequests: EventCreateRequest[];
-  address?: string;
-  latitude?: number;
-  longitude?: number;
-  placeName?: string;
 }
 
 export interface ScheduleResponse {
@@ -59,12 +58,7 @@ export interface ScheduleResponse {
   publishedAt?: string;
   eventList: Session[];
   status: ValueOf<typeof ScheduleStatus>;
-  location: {
-    address: string | null;
-    latitude: number | null;
-    longitude: number | null;
-    placeName: string;
-  };
+  location: { detailAddress: string } & Omit<Location, 'detailAddress'>;
 }
 
 export interface QRCodeRequest {

diff --git a/src/utils/schedule.ts b/src/utils/schedule.ts
@@ -20,14 +20,12 @@ export interface ScheduleFormValues {
   date: Dayjs;
   sessions: EventCreateRequest[];
   locationType: ValueOf<typeof LocationType>;
-  placeName?: string;
   locationInfo?: {
-    address: string;
+    roadAddress: string;
     latitude: string;
     longitude: string;
-    placeName: string;
+    detailAddress: string;
   };
-  detailAddress?: string;
 }
 
 export const getScheduleStatusText = (status: ValueOf<typeof ScheduleStatus>) => {
@@ -49,7 +47,7 @@ export const parseScheduleResponseToFormValues = (
     generationNumber,
     startedAt,
     eventList,
-    location: { address, placeName, latitude, longitude },
+    location: { roadAddress, detailAddress, latitude, longitude },
   } = response;
 
   const date: Dayjs = dayjs(startedAt, 'YYYY-MM-DD').startOf('day');
@@ -65,23 +63,18 @@ export const parseScheduleResponseToFormValues = (
     })),
   }));
 
-  if (address) {
-    // address의 형식: 주소 (상세주소)
-    const baseAddress = address.replace(/\s*\(.*?\)\s*/g, '');
-    const [, detailAddress] = address.match(/\(([^)]+)\)/) ?? [];
+  if (roadAddress) {
     return {
       name,
       generationNumber,
       date,
       sessions,
       locationType: LocationType.OFFLINE,
-      placeName,
-      detailAddress,
       locationInfo: {
-        address: baseAddress,
+        roadAddress,
         latitude: String(latitude),
         longitude: String(longitude),
-        placeName,
+        detailAddress: detailAddress ?? '',
       },
     };
   }
@@ -98,8 +91,7 @@ export const parseScheduleResponseToFormValues = (
 export const parseFormValuesToScheduleRequest = (
   formValues: ScheduleFormValues,
 ): ScheduleCreateRequest | ScheduleUpdateRequest => {
-  const { generationNumber, date, sessions, name, locationType, locationInfo, detailAddress } =
-    formValues;
+  const { generationNumber, date, sessions, name, locationType, locationInfo } = formValues;
 
   const formattedDate = date.format('YYYY-MM-DD');
 
@@ -125,10 +117,10 @@ export const parseFormValuesToScheduleRequest = (
   };
 
   if (locationType === LocationType.OFFLINE && locationInfo) {
-    scheduleRequest.address = `${locationInfo.address}${detailAddress ? `(${detailAddress})` : ''}`;
+    scheduleRequest.roadAddress = locationInfo.roadAddress;
     scheduleRequest.latitude = Number(locationInfo.latitude);
     scheduleRequest.longitude = Number(locationInfo.longitude);
-    scheduleRequest.placeName = locationInfo.placeName;
+    scheduleRequest.detailAddress = locationInfo.detailAddress;
   }
 
   return scheduleRequest;