-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* chore: (#77) 코드 컨벤션 정렬 * feat: (#77) 공통 예외 처리 구현 * feat: (#77) 동적 쿼리 사용을 위한 querydsl 추가 * refactor: (#77) 레포지토리 테스트 어노테이션 리팩토링 * feat: (#77) 연령, 성별로 그룹화하여 투표 수 조회 기능 구현 * feat: (#77) 게시글 투표 옵션에 대한 투표 통계 조회 기능 구현 * feat: (#77) 게시글 투표 옵션에 대한 투표 통계 조회 API 구현 * chore: (#77) 코드 컨벤션 정렬 * refactor: (#77) querydsl 의존성 제거 * refactor: (#77) 변수 사용 시 변수명과 동일할 때 불필요한 어노테이션 제거 * refactor: (#77) 멤버 도메인 변경으로 인한 테스트 코드 수정
- Loading branch information
Showing
32 changed files
with
871 additions
and
158 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -35,3 +35,6 @@ out/ | |
|
||
### VS Code ### | ||
.vscode/ | ||
|
||
### local environment test files ### | ||
src/main/generated |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 16 additions & 0 deletions
16
...d/src/main/java/com/votogether/domain/post/dto/response/VoteCountForAgeGroupResponse.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
package com.votogether.domain.post.dto.response; | ||
|
||
import com.votogether.domain.member.entity.Gender; | ||
import java.util.Map; | ||
|
||
public record VoteCountForAgeGroupResponse(String ageGroup, int voteCount, int maleCount, int femaleCount) { | ||
|
||
public static VoteCountForAgeGroupResponse of(final String ageGroup, final Map<Gender, Long> genderGroup) { | ||
final int maleCount = genderGroup.getOrDefault(Gender.MALE, 0L).intValue(); | ||
final int femaleCount = genderGroup.getOrDefault(Gender.FEMALE, 0L).intValue(); | ||
final int voteCount = maleCount + femaleCount; | ||
|
||
return new VoteCountForAgeGroupResponse(ageGroup, voteCount, maleCount, femaleCount); | ||
} | ||
|
||
} |
56 changes: 56 additions & 0 deletions
56
...d/src/main/java/com/votogether/domain/post/dto/response/VoteOptionStatisticsResponse.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
package com.votogether.domain.post.dto.response; | ||
|
||
import com.votogether.domain.member.entity.Gender; | ||
import java.util.Arrays; | ||
import java.util.HashMap; | ||
import java.util.List; | ||
import java.util.Map; | ||
import java.util.stream.Collectors; | ||
import lombok.Getter; | ||
|
||
public record VoteOptionStatisticsResponse( | ||
int totalVoteCount, | ||
int totalMaleCount, | ||
int totalFemaleCount, | ||
List<VoteCountForAgeGroupResponse> ageGroup | ||
) { | ||
|
||
public static VoteOptionStatisticsResponse from(final Map<String, Map<Gender, Long>> voteStatusGroup) { | ||
final List<VoteCountForAgeGroupResponse> ageGroupStatistics = Arrays.stream(AgeBracket.values()) | ||
.map(ageBracket -> { | ||
final Map<Gender, Long> genderVotes = | ||
voteStatusGroup.getOrDefault(ageBracket.getAge(), new HashMap<>()); | ||
return VoteCountForAgeGroupResponse.of(ageBracket.getBracket(), genderVotes); | ||
}) | ||
.collect(Collectors.toList()); | ||
|
||
final int totalVoteCount = ageGroupStatistics.stream().mapToInt(VoteCountForAgeGroupResponse::voteCount).sum(); | ||
final int totalMaleCount = ageGroupStatistics.stream().mapToInt(VoteCountForAgeGroupResponse::maleCount).sum(); | ||
final int totalFemaleCount = | ||
ageGroupStatistics.stream().mapToInt(VoteCountForAgeGroupResponse::femaleCount).sum(); | ||
|
||
return new VoteOptionStatisticsResponse(totalVoteCount, totalMaleCount, totalFemaleCount, ageGroupStatistics); | ||
} | ||
|
||
@Getter | ||
enum AgeBracket { | ||
|
||
UNDER_TEN("1~9", "10대 미만"), | ||
TEN("10~19", "10대"), | ||
TWENTY("20~29", "20대"), | ||
THIRTY("30~39", "30대"), | ||
FORTY("40~49", "40대"), | ||
FIFTY("50~59", "50대"), | ||
OVER_SIXTY("60~", "60 이상"), | ||
; | ||
|
||
private final String age; | ||
private final String bracket; | ||
|
||
AgeBracket(final String age, final String bracket) { | ||
this.age = age; | ||
this.bracket = bracket; | ||
} | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
backend/src/main/java/com/votogether/domain/post/exception/PostExceptionType.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
package com.votogether.domain.post.exception; | ||
|
||
import com.votogether.exception.ExceptionType; | ||
import lombok.Getter; | ||
|
||
@Getter | ||
public enum PostExceptionType implements ExceptionType { | ||
|
||
POST_NOT_FOUND(1000, "해당 게시글이 존재하지 않습니다."), | ||
POST_OPTION_NOT_FOUND(1001, "해당 게시글 투표 옵션이 존재하지 않습니다."), | ||
UNRELATED_POST_OPTION(1002, "게시글 투표 옵션이 게시글과 연관되어 있지 않습니다."), | ||
; | ||
|
||
private final int code; | ||
private final String message; | ||
|
||
PostExceptionType(final int code, final String message) { | ||
this.code = code; | ||
this.message = message; | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
backend/src/main/java/com/votogether/domain/vote/dto/VoteStatus.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
package com.votogether.domain.vote.dto; | ||
|
||
import com.votogether.domain.member.entity.Gender; | ||
|
||
public record VoteStatus(String ageRange, Gender gender, long count) { | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.