Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ bin/

### IntelliJ IDEA ###
.idea
.idea/
*.iws
*.iml
*.ipr
Expand Down
8 changes: 0 additions & 8 deletions .idea/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion .idea/.name

This file was deleted.

16 changes: 0 additions & 16 deletions .idea/compiler.xml

This file was deleted.

44 changes: 0 additions & 44 deletions .idea/dataSources.xml

This file was deleted.

19 changes: 0 additions & 19 deletions .idea/gradle.xml

This file was deleted.

20 changes: 0 additions & 20 deletions .idea/jarRepositories.xml

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/misc.xml

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/vcs.xml

This file was deleted.

3 changes: 3 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
28 changes: 0 additions & 28 deletions src/main/java/LuckyVicky/backend/global/entity/Uuid.java

This file was deleted.

This file was deleted.

15 changes: 15 additions & 0 deletions src/main/java/LuckyVicky/backend/global/util/UuidGenerator.java
Original file line number Diff line number Diff line change
@@ -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("-", "");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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 + "번째 칸은 이미 다른 사용자에 의해 선택되었습니다.");
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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");
Expand All @@ -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)
Expand Down
33 changes: 23 additions & 10 deletions src/main/java/LuckyVicky/backend/user/service/UserService.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;
}

Expand Down
Loading