Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

성공, 도전일자 수정 #100

Merged
merged 2 commits into from
Sep 11, 2023
Merged

성공, 도전일자 수정 #100

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb8f927
[ fix ] 성공 일자 계산
NeatKYU Sep 11, 2023
61ffe5a
[ chore ] console.log 제거
NeatKYU Sep 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 27 additions & 15 deletions src/pages/home/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ export default function HomePage() {
}, [selectedDate]);

useEffect(() => {
setMarkerDateObj(handleStatusModeration(moderations));
}, [moderations]);

const handleStatusModeration = (moderations: ModerationType[]) => {
const obj = moderations.reduce((acc, moderation) => {
const dateString = dateToyyyymmdd(new Date(moderation.regDtm), '-');
acc[dateString] = acc[dateString] || [];
Expand Down Expand Up @@ -86,23 +90,22 @@ export default function HomePage() {
return acc;
}, {} as MarkerDate);

setMarkerDateObj(markerObject);
}, [moderations]);
return markerObject;
};

const fetchNotToDos = async () => {
const data = await getNottodoList('in_close');
setFormattedNotToDoList(
data
.filter((item) => item.progressState === 'IN_PROGRESS')
.map((item) => ({
id: item.notToDoId,
title: item.notToDoText,
description: item.goal,
// TODO 성공일자 날짜 계산 해야함
success: diffDay(item.endDate, item.startDate),
totalDate: diffDay(new Date(), item.startDate),
})),
);
const formatDataPromise = data
.filter((item) => item.progressState === 'IN_PROGRESS')
.map(async (item) => ({
id: item.notToDoId,
title: item.notToDoText,
description: item.goal,
success: await getSuccessDay(item.notToDoId, item.endDate, item.startDate),
totalDate: diffDay(new Date(), item.startDate),
}));
const formatData = await Promise.all(formatDataPromise);
setFormattedNotToDoList(formatData);
};

const fetchModerationList = async () => {
Expand All @@ -129,7 +132,6 @@ export default function HomePage() {
const handleInputValue = (e: React.ChangeEvent<HTMLInputElement>) => {
setInputValue(e.target.value);
if (e.target.value.length >= 4) {
console.log('warnnig false');
setInputWarning(false);
}
};
Expand All @@ -142,6 +144,16 @@ export default function HomePage() {
setInputValue('');
};

const getSuccessDay = async (id: number, startDate: string, endDate: string) => {
const list = await getModerationList(dateToyyyymmdd(new Date(endDate)), dateToyyyymmdd(new Date(startDate)));
if (list) {
const statusList = handleStatusModeration(list.filter((item) => item.notToDoId === id));
return Object.values(statusList).filter((status) => status === 'success').length;
} else {
return 0;
}
};

const handleSubmitRecord = async () => {
if (inputValue.length < 4) {
setInputWarning(true);
Expand Down