Skip to content

fix: 게임1 로직 수정 #118

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

Merged
brothergiven merged 5 commits into from
Nov 26, 2025
Merged

fix: 게임1 로직 수정 #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
89464c2
fix: 추측 종료 시간 1분으로 수정
brothergiven Nov 26, 2025
e6b7897
fix: 추측 request 시 대기시간 추가
brothergiven Nov 26, 2025
f9fb486
fix: Lock 관련 코드 전면 주석 처리
brothergiven Nov 26, 2025
36b129a
fix: 추측 request시 대기시간 추가
brothergiven Nov 26, 2025
81a3616
fix: 그림 제출 기한 1분으로 수정
brothergiven Nov 26, 2025
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
63 changes: 32 additions & 31 deletions gotcha-socket/src/main/java/socket_server/domain/game/repository/GameRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
public class GameRepository {

private final RedisTemplate<String, String> redisTemplate;
//todo: Lock 관련 코드 전면 수정
private final RedissonClient redissonClient;

public GameRepository(@Qualifier("socketStringRedisTemplate") RedisTemplate<String, String> redisTemplate, RedissonClient redissonClient) {
Expand All @@ -39,11 +40,11 @@ public static String getGameKey(String roomId) {
*/
public void saveGameMeta(GameMeta gameMeta) {
String redisKey = getGameKey(gameMeta.getRoomId()); // Redis 해시 키
String lockKey = "lock:" + redisKey; // 락 키

RLock lock = redissonClient.getLock(lockKey);
try {
if (lock.tryLock(1, 5, TimeUnit.SECONDS)) { // 1초 기다리고, 5초 동안 유지
// String lockKey = "lock:" + redisKey; // 락 키
//
// RLock lock = redissonClient.getLock(lockKey);
// try {
// if (lock.tryLock(1, 5, TimeUnit.SECONDS)) { // 1초 기다리고, 5초 동안 유지
Map<String, Object> gameData = Map.of(
"gameType", gameMeta.getGameType().name(),
"difficulty", gameMeta.getDifficulty().name(),
Expand All @@ -55,40 +56,40 @@ public void saveGameMeta(GameMeta gameMeta) {
"playerWon", String.valueOf(gameMeta.getPlayerWon())
);
redisTemplate.opsForHash().putAll(getGameKey(gameMeta.getRoomId()), gameData);
} else {
throw new SocketCustomException(ErrorType.GAME, GameExceptionCode.LOCK_ACQUISITION_FAILED);
}
} catch (InterruptedException e) {
Thread.currentThread().interrupt(); //
throw new SocketCustomException(ErrorType.GAME, GameExceptionCode.LOCK_INTERRUPTED);
} finally {
if (lock.isHeldByCurrentThread()) {
lock.unlock();
}
}
// } else {
// throw new SocketCustomException(ErrorType.GAME, GameExceptionCode.LOCK_ACQUISITION_FAILED);
// }
// } catch (InterruptedException e) {
// Thread.currentThread().interrupt(); //
// throw new SocketCustomException(ErrorType.GAME, GameExceptionCode.LOCK_INTERRUPTED);
// } finally {
// if (lock.isHeldByCurrentThread()) {
// lock.unlock();
// }
// }
}

/**
* Game 메타데이터만 조회
*/
public Map<Object, Object> findGameMeta(String roomId) {
String redisKey = getGameKey(roomId);
String lockKey = "lock:" + redisKey;
RLock lock = redissonClient.getLock(lockKey);
try {
if (lock.tryLock(1, 5, TimeUnit.SECONDS)) { // 1초 기다리고, 5초 동안 유지
// String lockKey = "lock:" + redisKey;
// RLock lock = redissonClient.getLock(lockKey);
// try {
// if (lock.tryLock(1, 5, TimeUnit.SECONDS)) { // 1초 기다리고, 5초 동안 유지
return redisTemplate.opsForHash().entries(redisKey);
} else {
throw new SocketCustomException(ErrorType.GAME, GameExceptionCode.LOCK_ACQUISITION_FAILED);
}
} catch (InterruptedException e) {
Thread.currentThread().interrupt(); //
throw new SocketCustomException(ErrorType.GAME, GameExceptionCode.LOCK_INTERRUPTED);
} finally {
if (lock.isHeldByCurrentThread()) {
lock.unlock();
}
}
// } else {
// throw new SocketCustomException(ErrorType.GAME, GameExceptionCode.LOCK_ACQUISITION_FAILED);
// }
// } catch (InterruptedException e) {
// Thread.currentThread().interrupt(); //
// throw new SocketCustomException(ErrorType.GAME, GameExceptionCode.LOCK_INTERRUPTED);
// } finally {
// if (lock.isHeldByCurrentThread()) {
// lock.unlock();
// }
// }
}

public void deleteGameMeta(String roomId){
Expand Down
Loading
Loading