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

[feat]: 닉네임 중복체크 API 구현 #72

Merged
merged 1 commit into from
Feb 10, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public enum ErrorStatus implements BaseErrorCode {

// 멤버 관련 에러
USER_NOT_FOUND(HttpStatus.BAD_REQUEST, "USER4001", "사용자가 없습니다."),
NICKNAME_EXIST(HttpStatus.BAD_REQUEST, "USER4002", "이미 존재하는 닉네임입니다."),

// 오늘의 다짐 관련 에러
RESOLUTION_NOT_FOUND(HttpStatus.BAD_REQUEST, "RESOLUTION4001", "해당하는 오늘의 다짐이 없습니다."),
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/onnoff/onnoff/auth/config/WebConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ public void addInterceptors(InterceptorRegistry registry) {
registry.addInterceptor(new UserInterceptor(userService, jwtUtil))
.addPathPatterns("/**") // 스프링 경로는 /*와 /**이 다름
.excludePathPatterns("/swagger-ui/**", "/v3/api-docs/**", "/oauth2/**", "/health", "/token/**" ,
"/message/**", "/enums/**");
"/message/**", "/enums/**", "/users/nickname");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
@RequiredArgsConstructor
public class JwtAuthFilter extends OncePerRequestFilter {
private final JwtTokenProvider jwtTokenProvider;
private final static String[] ignorePrefix = {"/swagger-ui", "/v3/api-docs", "/oauth2", "/health", "/token/validate" , "/message", "/enums"};
private final static String[] ignorePrefix = {"/swagger-ui", "/v3/api-docs", "/oauth2", "/health", "/token/validate" , "/message", "/enums", "/users/nickname"};
@Override
protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
log.info("url ={}", request.getRequestURI());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import com.onnoff.onnoff.domain.user.dto.UserResponseDTO;
import com.onnoff.onnoff.domain.user.service.UserService;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;

Expand Down Expand Up @@ -35,4 +36,10 @@ public ApiResponse<UserResponseDTO.UserDetailDTO> withdrawUser(){
public ApiResponse<UserResponseDTO.UserDetailDTO> modifyUser(@RequestBody UserRequestDTO.ModifyUserDTO modifyUserDTO) {
return ApiResponse.onSuccess(UserConverter.toUserDetailDTO(userService.modifyUser(modifyUserDTO)));
}

@PostMapping("/nickname")
@Operation(summary = "닉네임 중복 체크 API")
public ApiResponse<String> checkNickname(@Valid @RequestBody UserRequestDTO.getNicknameDTO nicknameDTO){
return ApiResponse.onSuccess(userService.isExistByNickname(nicknameDTO));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,15 @@
import com.onnoff.onnoff.domain.user.enums.FieldOfWork;
import com.onnoff.onnoff.domain.user.enums.SocialType;
import com.onnoff.onnoff.domain.user.enums.Status;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.PastOrPresent;
import jakarta.validation.constraints.Size;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;

import java.time.LocalDate;
import java.time.LocalDateTime;

public class UserRequestDTO {
Expand All @@ -24,4 +28,10 @@ public static class ModifyUserDTO{
private ExperienceYear experienceYear;
}

@Getter
public static class getNicknameDTO{
@NotBlank
@Size(max = 10)
String nickname;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
public interface UserRepository extends JpaRepository<User, Long> {
Optional<User> findByOauthId(String oauthId);

Optional<User> findByNickname(String nickname);

List<User> findByPushNotificationTimeBetween(LocalTime startTime, LocalTime endTime);

List<User> findByStatusAndInactiveDateBefore(Status status, LocalDateTime oneMonthAgo);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import com.onnoff.onnoff.domain.user.User;
import com.onnoff.onnoff.domain.user.dto.UserRequestDTO;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;

Expand All @@ -15,6 +14,8 @@ public interface UserService {

public boolean isExistByOauthId(String oauthId);

String isExistByNickname(UserRequestDTO.getNicknameDTO nicknameDTO);

public User getUserByOauthId(String oauthId);

public User withdrawUser();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,14 @@ public boolean isExistByOauthId(String oauthId) {
return userRepository.findByOauthId(oauthId).isPresent();
}

@Override
public String isExistByNickname(UserRequestDTO.getNicknameDTO nicknameDTO) {
if(userRepository.findByNickname(nicknameDTO.getNickname()).isPresent()){
throw new GeneralException(ErrorStatus.NICKNAME_EXIST);
}
return "사용 가능한 닉네임입니다.";
}

@Transactional(readOnly = true)
@Override
public User getUserByOauthId(String oauthId) {
Expand Down
Loading