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

fix: 눈사람 확률 계산 수정 #41

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

fix: 눈사람 확률 계산 수정 #41

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d4d25ed
fix: '답변 제출(눈사람 만들기)' 확률 계산 수정 (#38)
isieun0908 Jan 12, 2023
695c2d4
Merge remote-tracking branch 'origin/feature/service' into feature/se…
isieun0908 Jan 12, 2023
7c39c3b
fix: develop token 만료 시간 1분으로 수정 (#40)
isieun0908 Jan 13, 2023
e8eed5d
fix: develop token 만료 시간 원래대로 수정 (#40)
isieun0908 Jan 13, 2023
9665aa8
Merge pull request #39 from snowballers/feature/service
isieun0908 Jan 13, 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
8 changes: 4 additions & 4 deletions src/main/java/com/snowballer/api/service/TownSnowmanService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public TownSnowmanResponse getLetter(Long id) {
townSnowmanRepository.save(townSnowman);

// town_snowman에 같은 눈사람이 몇개인지 percent 계산
Integer percent = calculatePercent(townSnowman.getTown().getId(), townSnowman.getSnowman().getId(), 0);
Integer percent = calculatePercent(townSnowman.getTown().getId(), townSnowman.getSnowman().getId());

// dto 생성 및 반환
return TownSnowmanResponse.toResponse(townSnowman, percent);
Expand Down Expand Up @@ -102,7 +102,7 @@ public ResultResponse makeSnowman(String url, SubmitAnswerRequest submitAnswerRe
townSnowmanRepository.save(townSnowman);

// town_snowman에 같은 눈사람이 몇개인지 percent 계산
Integer percent = calculatePercent(town.getId(), snowman.getId(), 1);
Integer percent = calculatePercent(town.getId(), snowman.getId());

// dto 생성 및 반환
return ResultResponse.toResponse(town.getUser(), percent, townSnowman);
Expand All @@ -114,11 +114,11 @@ public ResultResponse makeSnowman(String url, SubmitAnswerRequest submitAnswerRe
* @param snowmanId
* @return percent
*/
private Integer calculatePercent(Long townId, Long snowmanId, Integer plus) {
private Integer calculatePercent(Long townId, Long snowmanId) {

Integer totalSize = townSnowmanRepository.countByTownId(townId);
Integer typeSize = townSnowmanRepository.countByTownIdAndSnowmanId(townId, snowmanId);

return (int) Math.round((double)(typeSize + plus) / (double)(totalSize + plus) * 100);
return (int) Math.round((double)(typeSize) / (double)(totalSize) * 100);
}
}