feat: 유저 초기 설정 변경 (#118)

ddoed · web-flow · commit 38b2d23f349d · 2025-12-06T05:52:47.000+09:00
- 초기 설정에서 권한 설정 삭제
- SetupStep 추가 및 설정 단계 저장
diff --git a/backend/src/main/java/com/cmg/comtogether/certification/service/CertificationService.java b/backend/src/main/java/com/cmg/comtogether/certification/service/CertificationService.java
@@ -22,6 +22,7 @@ public class CertificationService {
     private final UserService userService;
     private final S3Service s3Service;
 
+    @Transactional
     public CertificationResponseDto createCertification(Long userId, String fileKey) {
         String publicUrl = s3Service.getPublicUrl(fileKey);
 
@@ -33,6 +34,7 @@ public CertificationResponseDto createCertification(Long userId, String fileKey)
                 .build();
 
         certificationRepository.save(cert);
+        userService.updateCertificationUploaded(userId);
 
         return CertificationResponseDto.fromEntity(cert, publicUrl);
     }
@@ -92,5 +94,7 @@ public void deleteCertification(Long certificationId, Long userId) {
         }
 
         certificationRepository.delete(c);
+
+        userService.updateCertificationNotStarted(userId);
     }
 }
diff --git a/backend/src/main/java/com/cmg/comtogether/user/controller/UserController.java b/backend/src/main/java/com/cmg/comtogether/user/controller/UserController.java
@@ -4,7 +4,7 @@
 import com.cmg.comtogether.common.security.CustomUserDetails;
 import com.cmg.comtogether.jwt.dto.TokenDto;
 import com.cmg.comtogether.user.dto.LoginRequestDto;
-import com.cmg.comtogether.user.dto.UserInitializeRequestDto;
+import com.cmg.comtogether.user.dto.UserInterestInitializeDto;
 import com.cmg.comtogether.user.dto.UserResponseDto;
 import com.cmg.comtogether.user.entity.User;
 import com.cmg.comtogether.user.service.UserService;
@@ -47,9 +47,9 @@ public ResponseEntity<ApiResponse<UserResponseDto>> getUserInfo(@AuthenticationP
     @PutMapping("/initialize")
     public ResponseEntity<ApiResponse<UserResponseDto>> initializeUser(
             @AuthenticationPrincipal CustomUserDetails userDetails,
-            @Valid @RequestBody UserInitializeRequestDto request
+            @Valid @RequestBody UserInterestInitializeDto request
     ) {
-        UserResponseDto userResponseDto = userService.initializeUser(userDetails.getUser().getUserId(), request);
+        UserResponseDto userResponseDto = userService.initializeUserInterest(userDetails.getUser().getUserId(), request);
         return ResponseEntity.ok(ApiResponse.success(userResponseDto));
     }
 
diff --git a/backend/src/main/java/com/cmg/comtogether/user/dto/UserInterestInitializeDto.java b/backend/src/main/java/com/cmg/comtogether/user/dto/UserInterestInitializeDto.java
@@ -1,8 +1,6 @@
 package com.cmg.comtogether.user.dto;
 
-import com.cmg.comtogether.user.entity.Role;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -14,10 +12,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class UserInitializeRequestDto {
-
-    @NotNull(message = "역할(role)은 필수 값입니다.")
-    private Role role;
+public class UserInterestInitializeDto {
 
     @JsonProperty("interest_ids")
     private List<Long> interestIds;
diff --git a/backend/src/main/java/com/cmg/comtogether/user/dto/UserResponseDto.java b/backend/src/main/java/com/cmg/comtogether/user/dto/UserResponseDto.java
@@ -2,6 +2,7 @@
 
 import com.cmg.comtogether.interest.dto.InterestDto;
 import com.cmg.comtogether.user.entity.Role;
+import com.cmg.comtogether.user.entity.SetupStep;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -18,7 +19,7 @@ public class UserResponseDto {
     private Role role;
     private Integer point;
     private String profileImageUrl;
-    private boolean initialized;
+    private SetupStep setupStep;
     private List<InterestDto> interests;
 }
 
diff --git a/backend/src/main/java/com/cmg/comtogether/user/entity/SetupStep.java b/backend/src/main/java/com/cmg/comtogether/user/entity/SetupStep.java
@@ -0,0 +1,8 @@
+package com.cmg.comtogether.user.entity;
+
+public enum SetupStep {
+    NOT_STARTED,
+    CERTIFICATION_UPLOADED,
+    COMPLETED
+}
+
diff --git a/backend/src/main/java/com/cmg/comtogether/user/entity/User.java b/backend/src/main/java/com/cmg/comtogether/user/entity/User.java
@@ -43,21 +43,15 @@ public class User {
 
     private String profileImageUrl;
 
+    @Enumerated(EnumType.STRING)
     @Builder.Default
-    private boolean initialized = false;
+    @Column(nullable = false)
+    private SetupStep setupStep = SetupStep.NOT_STARTED;
 
     @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
     @Builder.Default
     private Set<UserInterest> interests = new HashSet<>();;
 
-    public void updateRole(Role role) {
-        this.role = role;
-    }
-
-    public void completeInitialization() {
-        this.initialized = true;
-    }
-
     public void updateInterests(List<Interest> newInterests) {
         this.interests.clear();
         for (Interest interest : newInterests) {
@@ -68,4 +62,8 @@ public void updateInterests(List<Interest> newInterests) {
     public void changeRole(Role role) {
         this.role = role;
     }
+
+    public void updateSetupStep(SetupStep setupStep) {
+        this.setupStep = setupStep;
+    }
 }
diff --git a/backend/src/main/java/com/cmg/comtogether/user/mapper/UserMapper.java b/backend/src/main/java/com/cmg/comtogether/user/mapper/UserMapper.java
@@ -24,7 +24,7 @@ public UserResponseDto toResponse(User user) {
                 .role(user.getRole())
                 .point(user.getPoint())
                 .profileImageUrl(user.getProfileImageUrl())
-                .initialized(user.isInitialized())
+                .setupStep(user.getSetupStep())
                 .interests(interests)
                 .build();
     }
diff --git a/backend/src/main/java/com/cmg/comtogether/user/service/UserService.java b/backend/src/main/java/com/cmg/comtogether/user/service/UserService.java
@@ -6,9 +6,10 @@
 import com.cmg.comtogether.interest.service.InterestService;
 import com.cmg.comtogether.jwt.dto.TokenDto;
 import com.cmg.comtogether.jwt.service.JwtService;
-import com.cmg.comtogether.user.dto.UserInitializeRequestDto;
+import com.cmg.comtogether.user.dto.UserInterestInitializeDto;
 import com.cmg.comtogether.user.dto.UserResponseDto;
 import com.cmg.comtogether.user.entity.Role;
+import com.cmg.comtogether.user.entity.SetupStep;
 import com.cmg.comtogether.user.entity.User;
 import com.cmg.comtogether.user.mapper.UserMapper;
 import com.cmg.comtogether.user.repository.UserRepository;
@@ -47,11 +48,10 @@ public UserResponseDto getUserInfo(Long userId) {
     }
 
     @Transactional
-    public UserResponseDto initializeUser(Long userId, UserInitializeRequestDto requestDto) {
+    public UserResponseDto initializeUserInterest(Long userId, UserInterestInitializeDto requestDto) {
         User user = userRepository.findById(userId)
                 .orElseThrow(() -> new BusinessException(ErrorCode.USER_NOT_FOUND));
 
-        user.updateRole(requestDto.getRole());
         List<Interest> interests = new ArrayList<>();
 
         if (requestDto.getInterestIds() != null) {
@@ -62,7 +62,8 @@ public UserResponseDto initializeUser(Long userId, UserInitializeRequestDto requ
         }
 
         user.updateInterests(interests);
-        user.completeInitialization();
+        user.updateSetupStep(SetupStep.COMPLETED);
+        
         return userMapper.toResponse(user);
     }
 
@@ -90,10 +91,27 @@ public TokenDto login(String email, String password) {
         return jwtService.generateToken(user);
     }
 
+    @Transactional
     public void updateRoleToExpert(Long userId) {
         User user = userRepository.findById(userId)
                 .orElseThrow(() -> new BusinessException(ErrorCode.USER_NOT_FOUND));
 
         user.changeRole(Role.EXPERT);
     }
+
+    @Transactional
+    public void updateCertificationUploaded(Long userId) {
+        User user = userRepository.findById(userId)
+                .orElseThrow(() -> new BusinessException(ErrorCode.USER_NOT_FOUND));
+
+        user.updateSetupStep(SetupStep.CERTIFICATION_UPLOADED);
+    }
+
+    @Transactional
+    public void updateCertificationNotStarted(Long userId) {
+        User user = userRepository.findById(userId)
+                .orElseThrow(() -> new BusinessException(ErrorCode.USER_NOT_FOUND));
+
+        user.updateSetupStep(SetupStep.NOT_STARTED);
+    }
 }
diff --git a/backend/src/main/resources/data.sql b/backend/src/main/resources/data.sql
@@ -3,12 +3,12 @@ INSERT INTO interest (name, is_custom) VALUES ('디자인', false);
 INSERT INTO interest (name, is_custom) VALUES ('게임', false);
 INSERT INTO interest (name, is_custom) VALUES ('커스텀', true);
 
-INSERT INTO user (name, email, password, role, social_type, social_id, point, profile_image_url, initialized)
-VALUES ('admin01', 'admin01@comtogether.com','$2a$10$bfTyi9V6o3kaOJnehJufCeLinAOXzkZrqdLOmMV9rFWj.SmHCo3Vy', 'ADMIN', NULL, NULL, 0, NULL,TRUE);
-INSERT INTO user (name, email, password, role, social_type, social_id, point, profile_image_url, initialized)
-VALUES ('expert01', 'expert01@comtogether.com', '$2a$10$aBLIdWBNt5te1Rf57lh/b.XYs9pshgW9xj.E3JI5w.BGg8x8j/N8O', 'EXPERT', NULL, NULL, 0, NULL, TRUE);
-INSERT INTO user (name, email, password, role, social_type, social_id, point, profile_image_url, initialized)
-VALUES ('beginner01', 'beginner01@comtogether.com', '$2a$10$q2cPZqXqu04FzPBV7Np94OtEi9M1P3q7/keSVGwPVZSonutRdWggm', 'BEGINNER', NULL, NULL, 0, NULL, TRUE);
+INSERT INTO user (name, email, password, role, social_type, social_id, point, profile_image_url, setup_step)
+VALUES ('admin01', 'admin01@comtogether.com','$2a$10$bfTyi9V6o3kaOJnehJufCeLinAOXzkZrqdLOmMV9rFWj.SmHCo3Vy', 'ADMIN', NULL, NULL, 0, NULL,'COMPLETED');
+INSERT INTO user (name, email, password, role, social_type, social_id, point, profile_image_url, setup_step)
+VALUES ('expert01', 'expert01@comtogether.com', '$2a$10$aBLIdWBNt5te1Rf57lh/b.XYs9pshgW9xj.E3JI5w.BGg8x8j/N8O', 'EXPERT', NULL, NULL, 0, NULL, 'COMPLETED');
+INSERT INTO user (name, email, password, role, social_type, social_id, point, profile_image_url, setup_step)
+VALUES ('beginner01', 'beginner01@comtogether.com', '$2a$10$q2cPZqXqu04FzPBV7Np94OtEi9M1P3q7/keSVGwPVZSonutRdWggm', 'BEGINNER', NULL, NULL, 0, NULL, 'COMPLETED');
 
 -- Guide 테이블 샘플 데이터
 INSERT INTO guide (category, intro, detail, caution, beginner) VALUES
diff --git a/backend/src/test/java/com/cmg/comtogether/user/service/UserServiceTest.java b/backend/src/test/java/com/cmg/comtogether/user/service/UserServiceTest.java
@@ -5,7 +5,7 @@
 import com.cmg.comtogether.interest.dto.InterestDto;
 import com.cmg.comtogether.jwt.entity.RefreshToken;
 import com.cmg.comtogether.jwt.repository.RefreshTokenRepository;
-import com.cmg.comtogether.user.dto.UserInitializeRequestDto;
+import com.cmg.comtogether.user.dto.UserInterestInitializeDto;
 import com.cmg.comtogether.user.dto.UserResponseDto;
 import com.cmg.comtogether.user.entity.Role;
 import com.cmg.comtogether.user.entity.SocialType;
@@ -92,17 +92,16 @@ void getUserInfo_fail_notfound() {
 
     @Test
     @DisplayName("성공 - 유저 초기화 성공 (관심사 포함)")
-    void initializeUser_success() {
+    void initializeUser_Interest_success() {
         // given
         User user = createUser();
 
-        UserInitializeRequestDto requestDto = UserInitializeRequestDto.builder()
-                .role(Role.EXPERT)
+        UserInterestInitializeDto requestDto = UserInterestInitializeDto.builder()
                 .interestIds(List.of(1L, 2L))
                 .build();
 
         // when
-        UserResponseDto response = userService.initializeUser(user.getUserId(), requestDto);
+        UserResponseDto response = userService.initializeUserInterest(user.getUserId(), requestDto);
 
         // then
         assertThat(response.getRole()).isEqualTo(Role.EXPERT);

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ public class CertificationService {`
`22`	`22`	`private final UserService userService;`
`23`	`23`	`private final S3Service s3Service;`
`24`	`24`
	`25`	`+ @Transactional`
`25`	`26`	`public CertificationResponseDto createCertification(Long userId, String fileKey) {`
`26`	`27`	`String publicUrl = s3Service.getPublicUrl(fileKey);`
`27`	`28`
`@@ -33,6 +34,7 @@ public CertificationResponseDto createCertification(Long userId, String fileKey)`
`33`	`34`	`.build();`
`34`	`35`
`35`	`36`	`certificationRepository.save(cert);`
	`37`	`+ userService.updateCertificationUploaded(userId);`
`36`	`38`
`37`	`39`	`return CertificationResponseDto.fromEntity(cert, publicUrl);`
`38`	`40`	`}`
`@@ -92,5 +94,7 @@ public void deleteCertification(Long certificationId, Long userId) {`
`92`	`94`	`}`
`93`	`95`
`94`	`96`	`certificationRepository.delete(c);`
	`97`	`+`
	`98`	`+ userService.updateCertificationNotStarted(userId);`
`95`	`99`	`}`
`96`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public UserResponseDto toResponse(User user) {`
`24`	`24`	`.role(user.getRole())`
`25`	`25`	`.point(user.getPoint())`
`26`	`26`	`.profileImageUrl(user.getProfileImageUrl())`
`27`		`- .initialized(user.isInitialized())`
	`27`	`+ .setupStep(user.getSetupStep())`
`28`	`28`	`.interests(interests)`
`29`	`29`	`.build();`
`30`	`30`	`}`