@@ -52,18 +52,18 @@ public void initialize(StatWithNicknameAndUserId stat) {
5252 hashOps .put (statUserKey , "winningGames" , stat .winningGames ());
5353
5454 // stat:rank
55- zSetOps .add (STAT_RANK , statUserKey , stat .score ());
55+ zSetOps .add (STAT_RANK , stat . userId () , stat .score ());
5656
5757 // stat:{nickname}
58- valueOps .set (statNicknameKey , statUserKey );
58+ valueOps .set (statNicknameKey , stat . userId () );
5959 }
6060
6161 public void removeUser (long userId ) {
6262 String statUserKey = getStatUserKey (userId );
6363 String nickname = (String ) hashOps .get (statUserKey , "nickname" );
64- redisTemplate .delete (getStatUserKey ( userId ) );
64+ redisTemplate .delete (statUserKey );
6565 valueOps .getAndDelete (getStatNickname (nickname ));
66- zSetOps .remove (STAT_RANK , statUserKey );
66+ zSetOps .remove (STAT_RANK , userId );
6767 }
6868
6969 public StatPageResponse findAllStatsWithUser (Pageable pageable ) {
@@ -86,8 +86,8 @@ public StatPageResponse findAllStatsWithUser(Pageable pageable) {
8686 }
8787
8888 public Pageable getPageableFromNickname (String nickname , int pageSize ) {
89- String statUserKey = getStatUserKeyFromNickname (nickname );
90- long rowNum = requireNonNull (zSetOps .reverseRank (STAT_RANK , statUserKey )) + 1 ;
89+ long userId = getUserIdFromNickname (nickname );
90+ long rowNum = requireNonNull (zSetOps .reverseRank (STAT_RANK , userId )) + 1 ;
9191 int pageNumber = rowNum > 0 ? (int ) (rowNum / pageSize ) : 0 ;
9292 return PageRequest .of (pageNumber , pageSize , Sort .by (Direction .DESC , "score" ));
9393 }
@@ -109,7 +109,7 @@ private Set<TypedTuple<Object>> getRankSet(long startIdx, int size) {
109109 public void updateRank (long userId , boolean win , int deltaScore ) {
110110 String statUserKey = getStatUserKey (userId );
111111
112- zSetOps .incrementScore (STAT_RANK , getStatUserKey ( userId ) , deltaScore );
112+ zSetOps .incrementScore (STAT_RANK , userId , deltaScore );
113113 hashOps .increment (statUserKey , "totalGames" , 1 );
114114 if (win ) {
115115 hashOps .increment (statUserKey , "winningGames" , 1 );
@@ -118,7 +118,7 @@ public void updateRank(long userId, boolean win, int deltaScore) {
118118
119119 public void updateNickname (long userId , String newNickname ) {
120120 String statUserKey = getStatUserKey (userId );
121- valueOps .set (getStatNickname (newNickname ), statUserKey );
121+ valueOps .set (getStatNickname (newNickname ), userId );
122122
123123 String oldNickname = (String ) hashOps .get (statUserKey , "nickname" );
124124 valueOps .getAndDelete (getStatNickname (oldNickname ));
@@ -127,8 +127,8 @@ public void updateNickname(long userId, String newNickname) {
127127 }
128128
129129 private StatResponse convertToStatResponse (TypedTuple <Object > rank , int rankValue ) {
130- String statUserKey = (String ) requireNonNull (rank .getValue ());
131- Map <Object , Object > statUserMap = hashOps .entries (statUserKey );
130+ long userId = (( Number ) requireNonNull (rank .getValue ())). longValue ( );
131+ Map <Object , Object > statUserMap = hashOps .entries (getStatUserKey ( userId ) );
132132
133133 return new StatResponse (
134134 rankValue ,
@@ -146,7 +146,7 @@ private static String getStatNickname(String nickname) {
146146 return String .format (STAT_NICKNAME , nickname );
147147 }
148148
149- private String getStatUserKeyFromNickname (String nickname ) {
150- return (String ) requireNonNull (valueOps .get (getStatNickname (nickname )));
149+ private long getUserIdFromNickname (String nickname ) {
150+ return (( Number ) requireNonNull (valueOps .get (getStatNickname (nickname )))). longValue ( );
151151 }
152152}
0 commit comments