Skip to content

Commit 179086e

Browse files
committed
refactor: 코드스멜 제거
1 parent 4d4facf commit 179086e

File tree

2 files changed

+12
-18
lines changed

2 files changed

+12
-18
lines changed

src/main/java/org/dfbf/soundlink/domain/chat/service/ChatRoomService.java

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,13 @@ public class ChatRoomService {
1717
private final RedisTemplate<String, Object> redisTemplate;
1818
private final EmotionRecordRepository emotionRecordRepository;
1919

20+
private final static String CHAT_REQUEST_KEY = "chatRequest";
21+
2022
// 요청을 Redis에 저장 (TTL: 60초)
21-
public ResponseResult saveRequestToRedis(Long requestUserId, Long EmotionRecordId) {
23+
public ResponseResult saveRequestToRedis(Long requestUserId, Long emotionRecordId) {
2224
try {
2325
// 응답자의 ID를 EmotionRecord에서 가져옴
24-
Long responseUserId = emotionRecordRepository.findById(EmotionRecordId)
26+
Long responseUserId = emotionRecordRepository.findById(emotionRecordId)
2527
.orElseThrow(EmotionRecordNotFoundException::new)
2628
.getUser()
2729
.getUserId();
@@ -32,15 +34,15 @@ public ResponseResult saveRequestToRedis(Long requestUserId, Long EmotionRecordI
3234
}
3335

3436
// Redis에 이미 requestUserId가 포함되어 있는 경우
35-
if (!redisTemplate.keys("chatRequest" + requestUserId + "to*").isEmpty()) {
36-
String firstKey = redisTemplate.keys("chatRequest" + requestUserId + "to*").iterator().next(); // 첫 번째 키 가져오기
37+
if (!redisTemplate.keys(CHAT_REQUEST_KEY + requestUserId + "to*").isEmpty()) {
38+
String firstKey = redisTemplate.keys(CHAT_REQUEST_KEY + requestUserId + "to*").iterator().next(); // 첫 번째 키 가져오기
3739
Long ttl = redisTemplate.getExpire(firstKey);
3840
return new ResponseResult(400, ttl + "초 후에 다시 시도해주세요.");
3941
}
4042

4143
// Key & Request 객체 생성
42-
String key = "chatRequest" + requestUserId + "to" + EmotionRecordId;
43-
ChatRequest chatRequest = new ChatRequest(requestUserId, responseUserId, EmotionRecordId);
44+
String key = CHAT_REQUEST_KEY + requestUserId + "to" + emotionRecordId;
45+
ChatRequest chatRequest = new ChatRequest(requestUserId, responseUserId, emotionRecordId);
4446

4547
// Redis 저장
4648
redisTemplate.opsForValue().set(key, chatRequest, Duration.ofSeconds(61));
@@ -54,19 +56,13 @@ public ResponseResult saveRequestToRedis(Long requestUserId, Long EmotionRecordI
5456
}
5557

5658
// 요청을 삭제
57-
public ResponseResult deleteRequestFromRedis(Long requestUserId, Long EmotionRecordId) {
59+
public ResponseResult deleteRequestFromRedis(Long requestUserId, Long emotionRecordId) {
5860
try {
59-
// 응답자의 ID를 EmotionRecord에서 가져옴
60-
Long responseUserId = emotionRecordRepository.findById(EmotionRecordId)
61-
.orElseThrow(EmotionRecordNotFoundException::new)
62-
.getUser()
63-
.getUserId();
64-
6561
// Key 생성
66-
String key = "chatRequest" + requestUserId + "to" + EmotionRecordId;
62+
String key = CHAT_REQUEST_KEY + requestUserId + "to" + emotionRecordId;
6763

6864
// Redis에 Key가 존재하는 경우 삭제 (KEY가 없는 경우 400)
69-
if (redisTemplate.hasKey(key)) {
65+
if (Boolean.TRUE.equals(redisTemplate.hasKey(key))) {
7066
redisTemplate.delete(key);
7167
return new ResponseResult(ErrorCode.SUCCESS);
7268
} else {

src/main/java/org/dfbf/soundlink/domain/user/service/UserService.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -360,9 +360,7 @@ public ResponseResult reissueToken(HttpServletRequest request, HttpServletRespon
360360
responseBody.put("accessToken", newAccessToken);
361361

362362
// Redis에서 user::userID TTL을 30분으로 다시 갱신
363-
redisTemplate.expire("user::" + userId, 30 * 60, TimeUnit.SECONDS);
364-
365-
363+
redisTemplate.expire("user::" + userId, 30L * 60, TimeUnit.SECONDS);
366364

367365
return new ResponseResult(ErrorCode.SUCCESS, responseBody);
368366
} else {

0 commit comments

Comments
 (0)