Skip to content

Commit 4414d0f

Browse files
Merge pull request #63 from DeveloperBlog-Devflow/feature/plan-management-page
fix: 다가오는 일정 가져오는 메서드에서 undefined 가능성 오류 처리
2 parents 92176c0 + 5deb47b commit 4414d0f

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
@@ -293,9 +293,18 @@ export const fetchUpcomingPlanItems = async (
293293
});
294294

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

300309
return items;
301310
};

0 commit comments

Comments
 (0)