Fix(client): 리마인드 수정 모달 state 오류 #156
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,54 @@ | ||
| // YYYY-MM-DD → YYYY.MM.DD | ||
| export const updateDate = (date: string) => { | ||
| if (!date) return ''; | ||
| return date.replace(/-/g, '.'); | ||
| }; | ||
|
|
||
| // HH:mm:ss → HH:mm | ||
| export const updateTime = (time: string) => { | ||
| if (!time) return ''; | ||
| return time.slice(0, 5); | ||
| }; | ||
|
|
||
| export const to24Hour = (time: string) => { | ||
| const match = time.match(/(오전|오후)\s(\d{1,2}):(\d{2})/); | ||
| if (!match) return time; | ||
|
|
||
| const [, period, hourStr, minute] = match; | ||
| let hour = parseInt(hourStr, 10); | ||
|
|
||
| if (period === '오전' && hour === 12) { | ||
| hour = 0; | ||
| } else if (period === '오후' && hour !== 12) { | ||
| hour += 12; | ||
| } | ||
|
|
||
| return `${hour.toString().padStart(2, '0')}:${minute}`; | ||
| }; | ||
|
|
||
| export const combineDateTime = (date: string, time: string) => { | ||
| if (!date || !time) return null; | ||
|
|
||
| // date가 YYYYMMDD 형태라면 가공 필요 | ||
| let formattedDate = date; | ||
| if (/^\d{8}$/.test(date)) { | ||
| const year = date.slice(0, 4); | ||
| const month = date.slice(4, 6); | ||
| const day = date.slice(6, 8); | ||
| formattedDate = `${year}-${month}-${day}`; | ||
| } else { | ||
| formattedDate = date.replace(/\./g, '-'); // YYYY.MM.DD → YYYY-MM-DD | ||
| } | ||
|
|
||
| // time이 HHmm 형태라면 HH:mm으로 변환 | ||
| let normalizedTime = time; | ||
| if (/^\d{4}$/.test(time)) { | ||
| normalizedTime = `${time.slice(0, 2)}:${time.slice(2, 4)}`; | ||
| } | ||
|
|
||
| // 24시간 포맷 변환 함수가 있다면 적용 | ||
| const to24 = to24Hour ? to24Hour(normalizedTime) : normalizedTime; | ||
| const formattedTime = to24.length === 5 ? `${to24}:00` : to24; | ||
|
|
||
| return `${formattedDate}T${formattedTime}`; | ||
| }; | ||
|
Comment on lines
+29
to
+54
There was a problem hiding this comment. 🛠️ Refactor suggestion | 🟠 Major 🧩 Analysis chaincombineDateTime: 타임존/UTC 계약 확인 필요 + 파싱 실패 가드 추가 제안
아래는 안전성 향상을 위한 최소 수정입니다(형식 검증 + 명시적 반환 타입 + 불필요 조건 제거): -export const combineDateTime = (date: string, time: string) => {
+export const combineDateTime = (date: string, time: string): string | null => {
if (!date || !time) return null;
@@
- // 24시간 포맷 변환 함수가 있다면 적용
- const to24 = to24Hour ? to24Hour(normalizedTime) : normalizedTime;
- const formattedTime = to24.length === 5 ? `${to24}:00` : to24;
+ // 24시간 포맷 변환
+ const to24 = to24Hour(normalizedTime);
+ // 유효한 HH:mm(:ss) 아니면 null
+ if (!/^\d{2}:\d{2}(?::\d{2})?$/.test(to24)) return null;
+ const formattedTime = to24.length === 5 ? `${to24}:00` : to24;
return `${formattedDate}T${formattedTime}`;
};서버가 UTC를 요구한다면 아래 대안으로 변환하십시오(로컬 해석 → UTC ISO). 유효하지 않은 날짜면 null 반환: export const combineDateTimeUTC = (date: string, time: string): string | null => {
const local = combineDateTime(date, time);
if (!local) return null;
const d = new Date(local); // 로컬로 파싱
if (Number.isNaN(d.getTime())) return null;
return d.toISOString(); // UTC ISO (Z 포함)
};검증 스크립트(레포 루트에서 실행): 🏁 Script executed: #!/bin/bash
# 1) 기존 buildUtcIso 잔존 사용처 확인
rg -nP -C2 '\bbuildUtcIso\s*\('
# 2) EditArticleRequest 내 remindTime 타입/계약 확인
rg -nPU -C3 '(?s)\binterface\s+EditArticleRequest\b.*?\{.*?\n.*remindTime.*\n.*\}'
# 3) remindTime을 서버에 전송하는 쿼리 함수 확인
rg -nP -C3 'usePutEditArticle|remindTime'
# 4) 서버가 기대하는 포맷(UTC/오프셋/로컬) 문서/주석 단서 탐색
rg -nP -C2 'remind|timezone|utc|offset|Z\b|ISO'Length of output: 289459 🏁 Script executed: #!/bin/bash
set -eo pipefail
echo "=== Show file: apps/client/src/shared/utils/datetime.ts ==="
sed -n '1,240p' apps/client/src/shared/utils/datetime.ts || true
echo
echo "=== Search for to24Hour, combineDateTime, buildUtcIso across repo ==="
rg -n --hidden --no-ignore-vcs 'to24Hour|combineDateTime|buildUtcIso' || true
echo
echo "=== Show remindTimeFormat utility (used by extension imports) if exists ==="
rg -n --hidden --no-ignore-vcs 'remindTimeFormat' -S || true
rg -n --hidden --no-ignore-vcs '@utils/remindTimeFormat' -S || trueLength of output: 2991 combineDateTime: 타임존 계약 확인 + 파싱 실패 방어(클라이언트·익스텐션 동시 수정 필요) combineDateTime은 타임존/오프셋 정보 없이 로컬 형식으로 반환하며(to24Hour 호출 후 "YYYY-MM-DDTHH:mm(:ss)" 형태), to24Hour 존재 체크는 무의미합니다. 입력 유효성(날짜/시간 파싱 실패) 처리와 명시적 반환 타입을 추가하고, 서버가 UTC를 요구하면 변환 로직을 별도 함수로 제공하세요. 수정 위치(정확한 포인트): apps/client/src/shared/utils/datetime.ts, apps/extension/src/utils/remindTimeFormat.ts 권장 최소 변경(파일 내 combineDateTime 대체안 — 유효성 검증 + 타입 명시): -export const combineDateTime = (date: string, time: string) => {
+export const combineDateTime = (date: string, time: string): string | null => {
if (!date || !time) return null;
@@
- // 24시간 포맷 변환 함수가 있다면 적용
- const to24 = to24Hour ? to24Hour(normalizedTime) : normalizedTime;
- const formattedTime = to24.length === 5 ? `${to24}:00` : to24;
+ // 24시간 포맷 변환
+ const to24 = to24Hour(normalizedTime);
+ if (!/^\d{2}:\d{2}(?::\d{2})?$/.test(to24)) return null;
+ const formattedTime = to24.length === 5 ? `${to24}:00` : to24;
return `${formattedDate}T${formattedTime}`;
};서버가 UTC ISO(Z)를 요구한다면(로컬 해석 → UTC ISO 변환) 보조 함수 추가: export const combineDateTimeUTC = (date: string, time: string): string | null => {
const local = combineDateTime(date, time);
if (!local) return null;
const d = new Date(local); // 로컬로 파싱
if (Number.isNaN(d.getTime())) return null;
return d.toISOString(); // UTC ISO (Z 포함)
};검증 요약: 리포지토리에 동일 로직이 client/extension에 존재함을 확인(동기 수정 필요). 서버가 UTC를 요구할 경우 클라이언트에서 toISOString()으로 변환해 전송하거나 서버 계약에 맞게 명확히 합의해야 합니다. |
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.