Skip to content

Commit

Permalink
refactor: ToprankingResponses 응답 객체 반환명 TopRankingResponse로 변경
Browse files Browse the repository at this point in the history
  • Loading branch information
parksey committed Nov 30, 2023
1 parent 286820b commit 431c95b
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import com.moabam.api.dto.ranking.RankingInfo;
import com.moabam.api.dto.ranking.TopRankingInfo;
import com.moabam.api.dto.ranking.TopRankingResponses;
import com.moabam.api.dto.ranking.TopRankingResponse;
import com.moabam.api.dto.ranking.UpdateRanking;

import lombok.AccessLevel;
Expand Down Expand Up @@ -33,9 +33,9 @@ public static TopRankingInfo topRankingResponse(int rank, UpdateRanking updateRa
.build();
}

public static TopRankingResponses topRankingResponses(TopRankingInfo myRanking,
public static TopRankingResponse topRankingResponses(TopRankingInfo myRanking,
List<TopRankingInfo> topRankings) {
return TopRankingResponses.builder()
return TopRankingResponse.builder()
.topRankings(topRankings)
.myRanking(myRanking)
.build();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.moabam.api.dto.ranking.RankingInfo;
import com.moabam.api.dto.ranking.TopRankingInfo;
import com.moabam.api.dto.ranking.TopRankingResponses;
import com.moabam.api.dto.ranking.TopRankingResponse;
import com.moabam.api.dto.ranking.UpdateRanking;
import com.moabam.api.infrastructure.redis.ZSetRedisRepository;

Expand Down Expand Up @@ -47,7 +47,7 @@ public void removeRanking(RankingInfo rankingInfo) {
zSetRedisRepository.delete(RANKING, rankingInfo);
}

public TopRankingResponses getMemberRanking(UpdateRanking myRankingInfo) {
public TopRankingResponse getMemberRanking(UpdateRanking myRankingInfo) {
List<TopRankingInfo> topRankings = getTopRankings();
Long myRanking = zSetRedisRepository.reverseRank(RANKING, myRankingInfo.rankingInfo());
TopRankingInfo myRankingInfoResponse =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import com.moabam.api.application.member.MemberService;
import com.moabam.api.application.ranking.RankingService;
import com.moabam.api.dto.ranking.TopRankingResponses;
import com.moabam.api.dto.ranking.TopRankingResponse;
import com.moabam.api.dto.ranking.UpdateRanking;
import com.moabam.global.auth.annotation.Auth;
import com.moabam.global.auth.model.AuthMember;
Expand All @@ -25,7 +25,7 @@ public class RankingController {

@GetMapping
@ResponseStatus(HttpStatus.OK)
public TopRankingResponses getRanking(@Auth AuthMember authMember) {
public TopRankingResponse getRanking(@Auth AuthMember authMember) {
UpdateRanking rankingInfo = memberService.getRankingInfo(authMember);

return rankingService.getMemberRanking(rankingInfo);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import com.moabam.api.domain.member.Member;
import com.moabam.api.dto.ranking.RankingInfo;
import com.moabam.api.dto.ranking.TopRankingInfo;
import com.moabam.api.dto.ranking.TopRankingResponses;
import com.moabam.api.dto.ranking.TopRankingResponse;
import com.moabam.api.dto.ranking.UpdateRanking;
import com.moabam.api.infrastructure.redis.ZSetRedisRepository;
import com.moabam.global.config.EmbeddedRedisConfig;
Expand Down Expand Up @@ -211,11 +211,11 @@ void getTopRankings() {
.rankingInfo(RankingInfo.builder().nickname("Hello1").memberId(1L).image("123").build())
.build();
// When
TopRankingResponses topRankingResponses = rankingService.getMemberRanking(myRanking);
TopRankingResponse topRankingResponse = rankingService.getMemberRanking(myRanking);

// Then
List<TopRankingInfo> topRankings = topRankingResponses.topRankings();
TopRankingInfo myRank = topRankingResponses.myRanking();
List<TopRankingInfo> topRankings = topRankingResponse.topRankings();
TopRankingInfo myRank = topRankingResponse.myRanking();
assertAll(() -> assertThat(topRankings).hasSize(10), () -> assertThat(myRank.score()).isEqualTo(1),
() -> assertThat(topRankings.get(0).rank()).isEqualTo(1),
() -> assertThat(topRankings.get(1).rank()).isEqualTo(1),
Expand Down

0 comments on commit 431c95b

Please sign in to comment.