[feat] 사용자 가입승인 기능 구현

src/main/java/wanted/media/user/config/SecurityConfig.java

@@ -1,7 +1,33 @@
 package wanted.media.user.config;
 
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.web.SecurityFilterChain;
 
 @EnableWebSecurity
+@Configuration
 public class SecurityConfig {
+    // 비밀번호 암호화 기능
+    @Bean
+    public BCryptPasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
+
+    // 임시 설정
+    @Bean
+    public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
+        http
+                .authorizeRequests(authorizeRequests ->
+                        authorizeRequests
+                                .anyRequest().permitAll()  // 모든 요청 허용
+                )
+                .csrf().disable()  // CSRF 보호 비활성화 (테스트 목적으로만 사용)
+                .formLogin().disable()  // 로그인 폼 비활성화
+                .httpBasic().disable();  // HTTP Basic 인증 비활성화
+
+        return http.build();
+    }
 }

src/main/java/wanted/media/user/controller/UserController.java

@@ -1,14 +1,41 @@
 package wanted.media.user.controller;
 
 import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import wanted.media.user.dto.SignUpRequest;
+import wanted.media.user.dto.SignUpResponse;
+import wanted.media.user.dto.VerifyRequest;
+import wanted.media.user.dto.VerifyResponse;
 import wanted.media.user.service.UserService;
 
 @RestController
-@RequestMapping("/user")
+@RequestMapping("/api/user")
 @RequiredArgsConstructor
 public class UserController {
 
     private final UserService userService;
+
+    // 회원가입 API
+    @PostMapping("/sign-up")
+    public ResponseEntity<SignUpResponse> signUp(@Validated @RequestBody SignUpRequest request) {
+        SignUpResponse response = userService.signUp(request);
+        return ResponseEntity.status(HttpStatus.CREATED).body(response);
+    }
+
+    /*
+     * 가입승인 API
+     * 회원등급 (normal -> premium)
+     * */
+    @PostMapping("/approve")
+    public ResponseEntity<VerifyResponse> approveSignUp(@RequestBody VerifyRequest request) {
+        VerifyResponse response = userService.approveSignUp(request);
+        return ResponseEntity.status(HttpStatus.CREATED).body(response);
+    }
+
 }

src/main/java/wanted/media/user/domain/Code.java

@@ -3,6 +3,7 @@
 import jakarta.persistence.*;
 import jakarta.validation.constraints.Size;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.springframework.data.annotation.CreatedDate;
@@ -12,6 +13,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Getter
+@Builder
 @Entity
 @Table(name = "codes")
 public class Code {
@@ -21,7 +23,7 @@ public class Code {
     @Column(nullable = false)
     private Long codeId;
 
-    @OneToOne
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "user_id")
     private User user;
 

src/main/java/wanted/media/user/dto/SignUpRequest.java

@@ -0,0 +1,22 @@
+package wanted.media.user.dto;
+
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+
+@Data
+public class SignUpRequest {
+    @NotBlank
+    @Size(max = 50)
+    private String account;
+
+    @NotBlank
+    @Email
+    @Size(max = 50)
+    private String email;
+
+    @NotBlank
+    @Size(min = 10, max = 200, message = "비밀번호는 최소 10자리 이상으로 설정해주세요.")
+    private String password;
+}

src/main/java/wanted/media/user/dto/SignUpResponse.java

@@ -0,0 +1,14 @@
+package wanted.media.user.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+@AllArgsConstructor
+@Getter
+public class SignUpResponse {
+    private String message;
+    private UserInfoDto userInfoDto; // 사용자 정보 DTO
+    private String authCode; // 사용자 인증코드
+}

src/main/java/wanted/media/user/dto/UserInfoDto.java

@@ -0,0 +1,15 @@
+package wanted.media.user.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import wanted.media.user.domain.Grade;
+
+@NoArgsConstructor
+@AllArgsConstructor
+@Getter
+public class UserInfoDto {
+    private String account;
+    private String email;
+    private Grade grade; // 현재 회원등급
+}

src/main/java/wanted/media/user/dto/VerifyRequest.java

@@ -0,0 +1,20 @@
+package wanted.media.user.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+
+@Data
+public class VerifyRequest {
+    @NotBlank
+    @Size(max = 50)
+    private String account;
+
+    @NotBlank
+    @Size(min = 10, max = 200)
+    private String password;
+
+    @NotBlank
+    @Size(max = 10)
+    private String inputCode; //사용자 입력 인증코드
+}

src/main/java/wanted/media/user/dto/VerifyResponse.java

@@ -0,0 +1,13 @@
+package wanted.media.user.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+@AllArgsConstructor
+@Getter
+public class VerifyResponse {
+    private String message;
+    private UserInfoDto userInfo; //사용자 정보
+}

src/main/java/wanted/media/user/repository/CodeRepository.java

@@ -0,0 +1,15 @@
+package wanted.media.user.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import wanted.media.user.domain.Code;
+import wanted.media.user.domain.User;
+
+import java.util.Optional;
+
+public interface CodeRepository extends JpaRepository<Code, Long> {
+    //인증코드 검증
+    Optional<Code> findByUserAndAuthCode(User user, String authCode);
+
+    //사용자가 발급받은 인증코드 삭제
+    void deleteByUser(User user);
+}

src/main/java/wanted/media/user/repository/UserRepository.java

@@ -1,9 +1,24 @@
 package wanted.media.user.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import wanted.media.user.domain.Grade;
 import wanted.media.user.domain.User;
 
+import java.util.Optional;
 import java.util.UUID;
 
 public interface UserRepository extends JpaRepository<User, UUID> {
+    // 사용자 계정으로 회원 조회
+    Optional<User> findByAccount(String account);
+
+    // 사용자 이메일로 회원 조회
+    Optional<User> findByEmail(String email);
+
+    // 가입인증 회원 등급 변경
+    @Modifying
+    @Query("UPDATE User u SET u.grade = :grade WHERE u.account = :account")
+    void updateUserGrade(@Param("account") String account, @Param("grade") Grade grade);
 }

src/main/java/wanted/media/user/service/GenerateCode.java

@@ -0,0 +1,24 @@
+package wanted.media.user.service;
+
+import org.springframework.stereotype.Component;
+
+import java.util.Random;
+
+@Component
+public class GenerateCode {
+    private int codeLength = 6; //6자리 코드
+    private final char[] characterTable = {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
+            'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+            '1', '2', '3', '4', '5', '6', '7', '8', '9', '0'};
+
+    public String codeGenerate() {
+        Random random = new Random(System.currentTimeMillis());
+        int tableLength = characterTable.length;
+        StringBuilder code = new StringBuilder();
+
+        for (int i = 0; i < codeLength; i++) {
+            code.append(characterTable[random.nextInt(tableLength)]);
+        }
+        return code.toString();
+    }
+}

src/main/java/wanted/media/user/service/UserService.java

@@ -1,12 +1,89 @@
 package wanted.media.user.service;
 
+import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
+import wanted.media.user.domain.Code;
+import wanted.media.user.domain.Grade;
+import wanted.media.user.domain.User;
+import wanted.media.user.dto.*;
+import wanted.media.user.repository.CodeRepository;
 import wanted.media.user.repository.UserRepository;
 
+import java.time.LocalDateTime;
+
 @Service
 @RequiredArgsConstructor
+@Transactional
 public class UserService {
 
     private final UserRepository userRepository;
+    private final CodeRepository codeRepository;
+    private final BCryptPasswordEncoder passwordEncoder;
+    private final UserValidator userValidator;
+    private final GenerateCode generateCode;
+
+
+    //회원가입
+    public SignUpResponse signUp(SignUpRequest request) {
+        // 1. 사용자 입력내용 검증
+        userValidator.validateRequest(request);
+        // 2. 비밀번호 암호화
+        String encodedPassword = passwordEncoder.encode(request.getPassword());
+        // 3. 인증코드 생성
+        String verificationCode = generateCode.codeGenerate();
+        // 4. User 객체 생성
+        User user = User.builder()
+                .account(request.getAccount())
+                .email(request.getEmail())
+                .password(encodedPassword)
+                .grade(Grade.NORMAL_USER)
+                .build();
+        // 5. 사용자 db 저장
+        userRepository.save(user);
+        // 6. Code 객체 생성
+        Code code = Code.builder()
+                .user(user)
+                .authCode(verificationCode)
+                .createdTime(LocalDateTime.now())
+                .build();
+        // 7. 인증코드 db 저장
+        codeRepository.save(code);
+        // 8. UserInfoDto 생성
+        UserInfoDto userInfoDto = new UserInfoDto(user.getAccount(), user.getEmail(), user.getGrade());
+        // 9. SignUpResponse 생성
+        SignUpResponse signUpResponse = new SignUpResponse("회원가입이 성공적으로 완료됐습니다.", userInfoDto, verificationCode);
+
+        return signUpResponse;
+    }
+
+    //가입승인
+    public VerifyResponse approveSignUp(VerifyRequest verifyRequest) {
+        // 1. account로 사용자 조회
+        User user = userRepository.findByAccount(verifyRequest.getAccount())
+                .orElseThrow(() -> new RuntimeException("사용자를 찾을 수 없습니다."));
+        // 2. 비밀번호 검증
+        if (!passwordEncoder.matches(verifyRequest.getPassword(), user.getPassword())) {
+            throw new RuntimeException("비밀번호가 일치하지 않습니다.");
+        }
+        // 3. 사용자 인증코드 검증
+        Code code = codeRepository.findByUserAndAuthCode(user, verifyRequest.getInputCode())
+                .orElseThrow(() -> new RuntimeException("인증코드가 일치하지 않습니다."));
+        // 4. 인증코드 유효성 검증 (유효시간 15분)
+        if (code.getCreatedTime().plusMinutes(15).isBefore(LocalDateTime.now())) {
+            throw new RuntimeException("만료된 인증코드입니다.");
+        }
+        // 5. 인증 완료 -> 회원 등급 변경 (normal -> premium)
+        userRepository.updateUserGrade(user.getAccount(), Grade.PREMIUM_USER);
+        // 6. 인증 완료 회원 인증코드 삭제
+        codeRepository.deleteByUser(user);
+        // 7. 변경된 사용자정보 다시 조회
+        User updateUserInfo = userRepository.findByAccount(user.getAccount())
+                .orElseThrow(() -> new RuntimeException("사용자를 찾을 수 없습니다."));
+
+        return new VerifyResponse("인증이 성공적으로 완료되었습니다!",
+                new UserInfoDto(updateUserInfo.getAccount(), updateUserInfo.getEmail(), updateUserInfo.getGrade()));
+    }
+
 }