Skip to content

Commit 5deb47b

Browse files
committed
fix: 다가오는 일정 가져오는 메서드에서 undefined 가능성 오류 처리
1 parent c0edc05 commit 5deb47b

1 file changed

Lines changed: 12 additions & 3 deletions

File tree

services/plans/planManageService.service.ts

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -295,9 +295,18 @@ export const fetchUpcomingPlanItems = async (
295295
});
296296

297297
//정렬
298-
items.sort(
299-
(a, b) => +a.deadline - +b.deadline || +a.createdAt - +b.createdAt
300-
);
298+
items.sort((a, b) => {
299+
const deadlineA = a.deadline ? a.deadline.getTime() : Infinity;
300+
const deadlineB = b.deadline ? b.deadline.getTime() : Infinity;
301+
302+
// deadline이 다르면 deadline으로 정렬
303+
if (deadlineA !== deadlineB) {
304+
return deadlineA - deadlineB;
305+
}
306+
307+
// deadline이 같거나 둘 다 없으면 createdAt으로 정렬
308+
return +a.createdAt - +b.createdAt;
309+
});
301310

302311
return items;
303312
};

0 commit comments

Comments
 (0)