Skip to content
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.

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

[PC-684] 유저 기본 정보 조회 API 추가 #68

Merged
merged 4 commits into from
Feb 27, 2025
Merged
Show file tree
Hide file tree
Changes from 3 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
134 changes: 70 additions & 64 deletions api/src/main/java/org/yapp/domain/user/application/UserService.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,84 +16,90 @@
import org.yapp.domain.user.dao.UserDeleteReasonRepository;
import org.yapp.domain.user.dao.UserRejectHistoryRepository;
import org.yapp.domain.user.dao.UserRepository;
import org.yapp.domain.user.presentation.dto.response.UserBasicInfoResponse;
import org.yapp.domain.user.presentation.dto.response.UserRejectHistoryResponse;

@Service
@RequiredArgsConstructor
public class UserService {

private final UserRepository userRepository;
private final UserRejectHistoryRepository userRejectHistoryRepository;
private final UserDeleteReasonRepository userDeleteReasonRepository;
private final AuthTokenGenerator authTokenGenerator;
private final UserRepository userRepository;
private final UserRejectHistoryRepository userRejectHistoryRepository;
private final UserDeleteReasonRepository userDeleteReasonRepository;
private final AuthTokenGenerator authTokenGenerator;

/**
* Role을 USER로 바꾸고 변경된 토큰을 반환한다.
*
* @return 액세스토큰과 리프레시 토큰
*/
@Transactional
public OauthLoginResponse completeProfileInitialize(Long userId, Profile profile) {
User user =
userRepository.findById(userId)
.orElseThrow(() -> new ApplicationException(UserErrorCode.NOTFOUND_USER));
user.setProfile(profile);
user.updateUserRole(RoleStatus.PENDING.getStatus());
String oauthId = user.getOauthId();
AuthToken authToken = authTokenGenerator.generate(userId, oauthId, user.getRole());
return new OauthLoginResponse(RoleStatus.PENDING.getStatus(), authToken.accessToken(),
authToken.refreshToken());
}

public User getUserById(Long userId) {
return userRepository.findById(userId)
/**
* Role을 USER로 바꾸고 변경된 토큰을 반환한다.
*
* @return 액세스토큰과 리프레시 토큰
*/
@Transactional
public OauthLoginResponse completeProfileInitialize(Long userId, Profile profile) {
User user =
userRepository.findById(userId)
.orElseThrow(() -> new ApplicationException(UserErrorCode.NOTFOUND_USER));
}
user.setProfile(profile);
user.updateUserRole(RoleStatus.PENDING.getStatus());
String oauthId = user.getOauthId();
AuthToken authToken = authTokenGenerator.generate(userId, oauthId, user.getRole());
return new OauthLoginResponse(RoleStatus.PENDING.getStatus(), authToken.accessToken(),
authToken.refreshToken());
}

/**
* Role을 Register로 바꾸고 변경된 토큰을 반환한다.
*
* @return 액세스토큰과 리프레시 토큰
*/
@Transactional
public OauthLoginResponse registerPhoneNumber(Long userId, String phoneNumber) {
User user =
userRepository.findById(userId)
.orElseThrow(() -> new ApplicationException(UserErrorCode.NOTFOUND_USER));
user.updateUserRole(RoleStatus.REGISTER.getStatus());
user.initializePhoneNumber(phoneNumber);
String oauthId = user.getOauthId();
AuthToken authToken = authTokenGenerator.generate(userId, oauthId, user.getRole());
return new OauthLoginResponse(RoleStatus.REGISTER.getStatus(), authToken.accessToken(),
authToken.refreshToken());
}
public User getUserById(Long userId) {
return userRepository.findById(userId)
.orElseThrow(() -> new ApplicationException(UserErrorCode.NOTFOUND_USER));
}

@Transactional(readOnly = true)
public UserRejectHistoryResponse getUserRejectHistoryLatest(Long userId) {
User user = this.getUserById(userId);
Profile profile = user.getProfile();
/**
* Role을 Register로 바꾸고 변경된 토큰을 반환한다.
*
* @return 액세스토큰과 리프레시 토큰
*/
@Transactional
public OauthLoginResponse registerPhoneNumber(Long userId, String phoneNumber) {
User user =
userRepository.findById(userId)
.orElseThrow(() -> new ApplicationException(UserErrorCode.NOTFOUND_USER));
user.updateUserRole(RoleStatus.REGISTER.getStatus());
user.initializePhoneNumber(phoneNumber);
String oauthId = user.getOauthId();
AuthToken authToken = authTokenGenerator.generate(userId, oauthId, user.getRole());
return new OauthLoginResponse(RoleStatus.REGISTER.getStatus(), authToken.accessToken(),
authToken.refreshToken());
}

boolean reasonImage = false;
boolean reasonDescription = false;
@Transactional(readOnly = true)
public UserRejectHistoryResponse getUserRejectHistoryLatest(Long userId) {
User user = this.getUserById(userId);
Profile profile = user.getProfile();

UserRejectHistory userRejectHistory = userRejectHistoryRepository.findTopByUserIdOrderByCreatedAtDesc(
userId).orElse(null);
boolean reasonImage = false;
boolean reasonDescription = false;

if (userRejectHistory != null) {
reasonImage = userRejectHistory.isReasonImage();
reasonDescription = userRejectHistory.isReasonDescription();
}
UserRejectHistory userRejectHistory = userRejectHistoryRepository.findTopByUserIdOrderByCreatedAtDesc(
userId).orElse(null);

return new UserRejectHistoryResponse(
profile.getProfileStatus(),
reasonImage,
reasonDescription
);
if (userRejectHistory != null) {
reasonImage = userRejectHistory.isReasonImage();
reasonDescription = userRejectHistory.isReasonDescription();
}

@Transactional
public void deleteUser(Long userId, String reason) {
userDeleteReasonRepository.save(new UserDeleteReason(userId, reason));
userRepository.deleteById(userId);
}
return new UserRejectHistoryResponse(
profile.getProfileStatus(),
reasonImage,
reasonDescription
);
}

@Transactional
public void deleteUser(Long userId, String reason) {
userDeleteReasonRepository.save(new UserDeleteReason(userId, reason));
userRepository.deleteById(userId);
}

public UserBasicInfoResponse getUserBasicInfo(Long userId) {
User user = this.getUserById(userId);
return new UserBasicInfoResponse(userId, user.getRole());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import org.yapp.domain.user.application.UserService;
import org.yapp.domain.user.presentation.dto.request.OauthUserDeleteRequest;
import org.yapp.domain.user.presentation.dto.request.UserDeleteRequest;
import org.yapp.domain.user.presentation.dto.response.UserBasicInfoResponse;
import org.yapp.domain.user.presentation.dto.response.UserRejectHistoryResponse;
import org.yapp.format.CommonResponse;

Expand All @@ -24,39 +25,48 @@
@RequestMapping("/api/users")
public class UserController {

private final UserService userService;
private final OauthService oauthService;

@GetMapping("/reject")
@PreAuthorize(value = "hasAnyAuthority('PENDING')")
@Operation(summary = "사용자 거절 사유 조회", description = "사용자의 최근 거절 사유를 조회합니다.", tags = {"사용자"})
public ResponseEntity<CommonResponse<UserRejectHistoryResponse>> getUserRejectHistory(
@AuthenticationPrincipal Long userId) {
UserRejectHistoryResponse response = userService.getUserRejectHistoryLatest(
userId);

return ResponseEntity.status(HttpStatus.OK)
.body(CommonResponse.createSuccess(response));
}

@DeleteMapping
@PreAuthorize(value = "hasAnyAuthority('REGISTER','PENDING','USER')")
@Operation(summary = "회원 탈퇴", description = "회원 탈퇴합니다.", tags = {"사용자"})
public ResponseEntity<CommonResponse<Void>> deleteUser(
@RequestBody @Valid UserDeleteRequest request,
@AuthenticationPrincipal Long userId) {
userService.deleteUser(userId, request.getReason());
return ResponseEntity.ok(CommonResponse.createSuccessWithNoContent());
}

@DeleteMapping("/oauth")
@PreAuthorize(value = "hasAnyAuthority('REGISTER','PENDING','USER')")
@Operation(summary = "회원 탈퇴", description = "회원 탈퇴합니다.", tags = {"사용자"})
public ResponseEntity<CommonResponse<Void>> deleteUser(
@RequestBody @Valid OauthUserDeleteRequest request,
@AuthenticationPrincipal Long userId) {

oauthService.withdraw(request, userId);
return ResponseEntity.ok(CommonResponse.createSuccessWithNoContent());
}
private final UserService userService;
private final OauthService oauthService;

@GetMapping("/reject")
@PreAuthorize(value = "hasAnyAuthority('PENDING')")
@Operation(summary = "사용자 거절 사유 조회", description = "사용자의 최근 거절 사유를 조회합니다.", tags = {"사용자"})
public ResponseEntity<CommonResponse<UserRejectHistoryResponse>> getUserRejectHistory(
@AuthenticationPrincipal Long userId) {
UserRejectHistoryResponse response = userService.getUserRejectHistoryLatest(
userId);

return ResponseEntity.status(HttpStatus.OK)
.body(CommonResponse.createSuccess(response));
}

@DeleteMapping
@PreAuthorize(value = "hasAnyAuthority('REGISTER','PENDING','USER')")
@Operation(summary = "회원 탈퇴", description = "회원 탈퇴합니다.", tags = {"사용자"})
public ResponseEntity<CommonResponse<Void>> deleteUser(
@RequestBody @Valid UserDeleteRequest request,
@AuthenticationPrincipal Long userId) {
userService.deleteUser(userId, request.getReason());
return ResponseEntity.ok(CommonResponse.createSuccessWithNoContent());
}

@DeleteMapping("/oauth")
@PreAuthorize(value = "hasAnyAuthority('REGISTER','PENDING','USER')")
@Operation(summary = "회원 탈퇴", description = "회원 탈퇴합니다.", tags = {"사용자"})
public ResponseEntity<CommonResponse<Void>> deleteUser(
@RequestBody @Valid OauthUserDeleteRequest request,
@AuthenticationPrincipal Long userId) {

oauthService.withdraw(request, userId);
return ResponseEntity.ok(CommonResponse.createSuccessWithNoContent());
}

@GetMapping("/info")
@PreAuthorize(value = "hasAnyAuthority('NONE', 'REGISTER', 'PENDING', 'USER')")
@Operation(summary = "회원 기본정보 확인", description = "회원의 기본 정보를 확인합니다", tags = {"사용자"})
public ResponseEntity<CommonResponse<UserBasicInfoResponse>> getUserBasicInfo(
@AuthenticationPrincipal Long userId) {
UserBasicInfoResponse userBasicInfo = userService.getUserBasicInfo(userId);
return ResponseEntity.ok(CommonResponse.createSuccess(userBasicInfo));
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package org.yapp.domain.user.presentation.dto.response;


public record UserBasicInfoResponse(Long userId, String role) {

}
Loading