[CHORE/128] 빠칭코에서 칸 선택한 유저의 닉네임으로 브로드캐스팅되도록 변경

.gitignore

@@ -23,6 +23,7 @@ bin/
 
 ### IntelliJ IDEA ###
 .idea
+.idea/
 *.iws
 *.iml
 *.ipr

build.gradle

@@ -44,6 +44,9 @@ dependencies {
     // coolsms sdk
     implementation 'net.nurigo:sdk:4.2.0'
 
+    // nano id
+    implementation 'com.aventrix.jnanoid:jnanoid:2.0.0'
+
     // database
     runtimeOnly 'com.mysql:mysql-connector-j'
 

src/main/java/LuckyVicky/backend/global/util/UuidGenerator.java

@@ -0,0 +1,15 @@
+package LuckyVicky.backend.global.util;
+
+import com.aventrix.jnanoid.jnanoid.NanoIdUtils;
+import java.util.UUID;
+
+public class UuidGenerator {
+
+    public static String generateNanoUuid() {
+        return NanoIdUtils.randomNanoId(NanoIdUtils.DEFAULT_NUMBER_GENERATOR, NanoIdUtils.DEFAULT_ALPHABET, 12);
+    }
+
+    public static String generateUuid() {
+        return UUID.randomUUID().toString().replace("-", "");
+    }
+}

src/main/java/LuckyVicky/backend/pachinko/handler/PachinkoWebSocketHandler.java

@@ -89,15 +89,14 @@ public void afterConnectionClosed(WebSocketSession session, CloseStatus status)
         sessions.remove(session);
     }
 
-    private void processSquareSelection(WebSocketSession session, User user, long currentRound, int selectedSquare)
-            throws IOException {
+    private void processSquareSelection(WebSocketSession session, User user, long currentRound, int selectedSquare) {
         System.out.println(pachinkoService.viewSelectedSquares() + "핸들러에서 processSquareSelection 시작지점");
 
         String result = pachinkoService.selectSquare(user, currentRound, selectedSquare);
         System.out.println(pachinkoService.viewSelectedSquares() + "핸들러에서 processSquareSelection 시작지점");
 
         if (Objects.equals(result, "정상적으로 선택 완료되었습니다.")) {
-            broadcastMessage(user.getUsername() + "가 " + selectedSquare + "을 선택했습니다.");
+            broadcastMessage(user.getNickname() + "가 " + selectedSquare + "을 선택했습니다.");
             checkGameStatusAndCloseSessionsIfNeeded();
         } else if (Objects.equals(result, "다른 사용자가 이전에 선택한 칸입니다.")) {
             sendMessage(session, selectedSquare + "번째 칸은 이미 다른 사용자에 의해 선택되었습니다.");

src/main/java/LuckyVicky/backend/user/converter/UserConverter.java

@@ -1,6 +1,5 @@
 package LuckyVicky.backend.user.converter;
 
-import LuckyVicky.backend.global.entity.Uuid;
 import LuckyVicky.backend.global.fcm.domain.UserDeviceToken;
 import LuckyVicky.backend.user.domain.User;
 import LuckyVicky.backend.user.dto.JwtDto;
@@ -12,7 +11,7 @@
 
 @NoArgsConstructor
 public class UserConverter {
-    public static User saveUser(UserRequestDto.UserReqDto userReqDto, String nick) {
+    public static User saveUser(UserRequestDto.UserReqDto userReqDto, String nick, String code) {
 
         LocalDateTime today = LocalDateTime.now();
         DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy.MM.dd");
@@ -25,7 +24,7 @@ public static User saveUser(UserRequestDto.UserReqDto userReqDto, String nick) {
                 .provider(userReqDto.getProvider())
                 .signInDate(todayDate)
                 .lastAttendanceCheckedDay(0)
-                .inviteCode(Uuid.generateUuid().getUuid())
+                .inviteCode(code)
                 .previousPachinkoRound(-1L)
                 .rouletteAvailableTime(today)
                 .advertiseTodayLeftNum(10)

src/main/java/LuckyVicky/backend/user/service/UserService.java

@@ -6,25 +6,24 @@
 import LuckyVicky.backend.aes.service.AesEncryptService;
 import LuckyVicky.backend.enhance.domain.JewelType;
 import LuckyVicky.backend.global.api_payload.ErrorCode;
-import LuckyVicky.backend.global.entity.Uuid;
 import LuckyVicky.backend.global.exception.GeneralException;
 import LuckyVicky.backend.global.fcm.domain.UserDeviceToken;
 import LuckyVicky.backend.global.fcm.repository.UserDeviceTokenRepository;
-import LuckyVicky.backend.global.repository.UuidRepository;
 import LuckyVicky.backend.global.s3.AmazonS3Manager;
+import LuckyVicky.backend.global.util.UuidGenerator;
 import LuckyVicky.backend.user.converter.UserConverter;
 import LuckyVicky.backend.user.domain.RefreshToken;
 import LuckyVicky.backend.user.domain.User;
 import LuckyVicky.backend.user.domain.UserJewel;
 import LuckyVicky.backend.user.dto.JwtDto;
 import LuckyVicky.backend.user.dto.UserRequestDto;
-import LuckyVicky.backend.user.dto.UserRequestDto.UserReqDto;
 import LuckyVicky.backend.user.jwt.JwtTokenUtils;
 import LuckyVicky.backend.user.repository.RefreshTokenRepository;
 import LuckyVicky.backend.user.repository.UserJewelRepository;
 import LuckyVicky.backend.user.repository.UserRepository;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.transaction.Transactional;
+import jakarta.validation.ConstraintViolationException;
 import java.io.IOException;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
@@ -54,7 +53,6 @@ public class UserService {
     private final JpaUserDetailsManager manager;
     private final JwtTokenUtils jwtTokenUtils;
     private final AmazonS3Manager amazonS3Manager;
-    private final UuidRepository uuidRepository;
     private final UserJewelRepository userJewelRepository;
     private final AesEncryptService aesEncryptService;
 
@@ -86,13 +84,28 @@ public Boolean checkMemberByEmail(String email) {
 
     @Transactional
     public User createUser(UserRequestDto.UserReqDto userReqDto) {
-        Uuid uuid = Uuid.generateUuid();
-        String nick = "user" + uuid.getUuid();
-        uuidRepository.save(uuid);
-        User newUser = userRepository.save(UserConverter.saveUser(userReqDto, nick));
+        int retryCount = 3; // 최대 재시도 횟수
+        User newUser = null;
+
+        for (int i = 0; i < retryCount; i++) {
+            try {
+                String nick = "user" + UuidGenerator.generateNanoUuid();
+                String code = UuidGenerator.generateUuid();
+                newUser = UserConverter.saveUser(userReqDto, nick, code);
+
+                userRepository.save(newUser); // 저장 시도
+                break;
+            } catch (ConstraintViolationException e) {
+                log.warn("UUID 충돌 발생, 재시도 ({}/{})", i + 1, retryCount);
+            }
+        }
+        if (newUser == null) {
+            log.error("최대 재시도 횟수를 초과하여 UUID를 생성하지 못했습니다.");
+            throw new RuntimeException("최대 재시도 횟수를 초과하여 UUID를 생성하지 못했습니다.");
+        }
+
+        manager.loadUserByUsername(userReqDto.getUsername()); // 저장된 사용자 정보를 다시 로드하여 동기화 시도
 
-        // 새로운 사용자 정보를 반환하기 전에 저장된 UserDetails를 다시 로드하여 동기화 시도
-        manager.loadUserByUsername(userReqDto.getUsername());
         return newUser;
     }