Skip to content

Commit 039602e

Browse files
authored
Merge pull request #112 from codeit-garden/#5.2
feat: 메인페이지 게이지바 수치 추가
2 parents 8cc9f17 + dd804dd commit 039602e

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

src/services/memberService.js

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,19 @@ const getMemberInfo = async (memberId) => {
131131
ORDER BY "total_time" ASC
132132
LIMIT 1
133133
`;
134-
134+
135+
member.currentTotalTime = convertSecondsToHHMM(member.currentTotalTime)
135136
// 쿼리 결과가 있을 경우 해당 집중시간 총합을, 없으면 null로 추가
136137
// BigInt → Number 변환 후 연산
137-
member.nextTotalTime = result[0]?.total_time ? convertSecondsToHHMM(Number(result[0].total_time) - currentTotalTime) : null;
138-
member.currentTotalTime = convertSecondsToHHMM(member.currentTotalTime)
138+
//게이지 퍼센트
139+
if(result[0]?.total_time){
140+
member.nextTotalTime = convertSecondsToHHMM(Number(result[0].total_time) - currentTotalTime);
141+
member.percent = Math.floor((currentTotalTime / Number(result[0].total_time)) * 100);
142+
}
143+
else{
144+
member.nextTotalTime = "1등입니다!";
145+
member.percent = 100;
146+
}
139147

140148
const { focusTimes, ...data } = member;
141149

0 commit comments

Comments
 (0)