From 148abe70af429ab91c62846752d7dd8304a158d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=A5=98=ED=9D=AC=EC=88=98?= Date: Tue, 25 Feb 2025 17:39:41 +0900 Subject: [PATCH] =?UTF-8?q?Fix=20:=20api=20=EB=AA=85=EC=84=B8=EC=84=9C=20?= =?UTF-8?q?=EC=9E=91=EC=84=B1=ED=95=98=EB=A9=B0=20=EC=9E=90=EC=9E=98?= =?UTF-8?q?=ED=95=9C=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95(=EC=A3=BC?= =?UTF-8?q?=EC=86=8C,=20DTO)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/user/controller/AuthController.java | 9 +++----- .../api/user/controller/HeartController.java | 6 ++--- .../user/controller/LocationController.java | 2 ++ .../user/controller/PasswordController.java | 8 ++++--- .../api/user/controller/RankController.java | 4 +++- .../user/controller/RecommendController.java | 6 ++--- .../common/security/jwt/JwtManager.java | 4 ++-- .../component/AuthenticationComponent.java | 5 ++--- .../user/component/GeocodingComponent.java | 4 ++++ .../domain/user/exception/UserErrorCode.java | 3 ++- .../response/EditMyProfileResponseDto.java | 3 +-- .../response/GetMyProfileResponseDto.java | 22 +++++++++---------- .../response/GetOtherProfileResponseDto.java | 21 +++++++++--------- .../GetRecommendationResponseDto.java | 2 +- .../response/SendRepasswordResponseDto.java | 2 +- .../user/response/SignInResponseDto.java | 8 +------ .../domain/user/response/SignUpResponse.java | 9 ++++++++ .../response/UpdateLocationResponseDto.java | 12 +--------- .../domain/user/service/AuthService.java | 7 +++--- .../domain/user/service/KakaoUserService.java | 1 - .../domain/user/service/LocationService.java | 3 --- .../domain/user/service/PasswordService.java | 4 +--- .../infra/email/EmailProviderImpl.java | 1 - 23 files changed, 67 insertions(+), 79 deletions(-) create mode 100644 src/main/java/com/petmatz/domain/user/response/SignUpResponse.java diff --git a/src/main/java/com/petmatz/api/user/controller/AuthController.java b/src/main/java/com/petmatz/api/user/controller/AuthController.java index 9bd74e3..02d906e 100644 --- a/src/main/java/com/petmatz/api/user/controller/AuthController.java +++ b/src/main/java/com/petmatz/api/user/controller/AuthController.java @@ -6,10 +6,7 @@ import com.petmatz.api.user.request.SignInRequestDto; import com.petmatz.api.user.request.SignUpRequestDto; import com.petmatz.domain.user.entity.User; -import com.petmatz.domain.user.response.CheckCertificationResponseDto; -import com.petmatz.domain.user.response.DeleteIdResponseDto; -import com.petmatz.domain.user.response.SignInResponseDto; -import com.petmatz.domain.user.response.SignUpResponseDto; +import com.petmatz.domain.user.response.*; import com.petmatz.domain.user.service.AuthService; import com.petmatz.user.common.LogInResponseDto; import jakarta.servlet.http.HttpServletResponse; @@ -45,8 +42,8 @@ public Response logout(HttpServletResponse res) { } @PostMapping("/sign-up") - public Response signUp(@RequestBody @Valid SignUpRequestDto requestBody) throws MalformedURLException { - SignUpResponseDto responseDto = authService.signUp(SignUpRequestDto.of(requestBody)); + public Response signUp(@RequestBody @Valid SignUpRequestDto requestBody) throws MalformedURLException { + SignUpResponse responseDto = authService.signUp(SignUpRequestDto.of(requestBody)); return Response.success(responseDto); } diff --git a/src/main/java/com/petmatz/api/user/controller/HeartController.java b/src/main/java/com/petmatz/api/user/controller/HeartController.java index 6434288..65b30d3 100644 --- a/src/main/java/com/petmatz/api/user/controller/HeartController.java +++ b/src/main/java/com/petmatz/api/user/controller/HeartController.java @@ -6,15 +6,13 @@ import com.petmatz.domain.user.service.HeartService; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @RestController @RequiredArgsConstructor +@RequestMapping("/api") public class HeartController { private final HeartService heartService; diff --git a/src/main/java/com/petmatz/api/user/controller/LocationController.java b/src/main/java/com/petmatz/api/user/controller/LocationController.java index e5148e3..4b63313 100644 --- a/src/main/java/com/petmatz/api/user/controller/LocationController.java +++ b/src/main/java/com/petmatz/api/user/controller/LocationController.java @@ -9,10 +9,12 @@ import org.springframework.http.ResponseEntity; 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; @RestController @RequiredArgsConstructor +@RequestMapping("/api") public class LocationController { private final LocationService locationService; diff --git a/src/main/java/com/petmatz/api/user/controller/PasswordController.java b/src/main/java/com/petmatz/api/user/controller/PasswordController.java index da7f6e4..2e80b7e 100644 --- a/src/main/java/com/petmatz/api/user/controller/PasswordController.java +++ b/src/main/java/com/petmatz/api/user/controller/PasswordController.java @@ -11,18 +11,20 @@ import org.springframework.http.ResponseEntity; 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; @RestController @RequiredArgsConstructor +@RequestMapping("/api") public class PasswordController { private final PasswordService passwordService; @PostMapping("/send-repassword") - public Response sendRepassword(@RequestBody @Valid SendRepasswordRequestDto requestBody) { - SendRepasswordResponseDto sendRepasswordResponseDto = passwordService.sendRepassword(requestBody); - return Response.success(sendRepasswordResponseDto); + public Response sendRepassword(@RequestBody @Valid SendRepasswordRequestDto requestBody) { + passwordService.sendRepassword(requestBody); + return Response.success(); } @PostMapping("/repassword") diff --git a/src/main/java/com/petmatz/api/user/controller/RankController.java b/src/main/java/com/petmatz/api/user/controller/RankController.java index 0b238a9..c8ffd21 100644 --- a/src/main/java/com/petmatz/api/user/controller/RankController.java +++ b/src/main/java/com/petmatz/api/user/controller/RankController.java @@ -5,17 +5,19 @@ import com.petmatz.domain.user.service.RankService; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; @RestController @RequiredArgsConstructor +@RequestMapping("/api") public class RankController { private final RankService rankService; - @GetMapping("/api/top-rankings") + @GetMapping("/top-rankings") public Response> getTopRankings() { List topRankings = rankService.getTopRankingsByRegion(); return Response.success(topRankings); diff --git a/src/main/java/com/petmatz/api/user/controller/RecommendController.java b/src/main/java/com/petmatz/api/user/controller/RecommendController.java index 628c556..613661a 100644 --- a/src/main/java/com/petmatz/api/user/controller/RecommendController.java +++ b/src/main/java/com/petmatz/api/user/controller/RecommendController.java @@ -8,13 +8,11 @@ import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @RestController @RequiredArgsConstructor +@RequestMapping("/api") public class RecommendController { private final RecommendService recommendService; diff --git a/src/main/java/com/petmatz/common/security/jwt/JwtManager.java b/src/main/java/com/petmatz/common/security/jwt/JwtManager.java index 95c4ea6..ba9d50b 100644 --- a/src/main/java/com/petmatz/common/security/jwt/JwtManager.java +++ b/src/main/java/com/petmatz/common/security/jwt/JwtManager.java @@ -69,11 +69,11 @@ public String createAccessToken(Long userId, String accountId) { } public String createRefreshToken(Long userId) { - Date expireDate = Date.from(Instant.now().plus(2, ChronoUnit.WEEKS)); + Date expireDate = Date.from(Instant.now().plus(7 * 7, ChronoUnit.DAYS)); SecretKey secretKey = Keys.hmacShaKeyFor(refreshKey.getBytes(StandardCharsets.UTF_8)); String refreshToken = Jwts.builder() - .signWith(secretKey, SignatureAlgorithm.RS256) + .signWith(secretKey, SignatureAlgorithm.HS256) .setSubject(userId.toString()) .setIssuedAt(new Date()) .setExpiration(expireDate) diff --git a/src/main/java/com/petmatz/domain/user/component/AuthenticationComponent.java b/src/main/java/com/petmatz/domain/user/component/AuthenticationComponent.java index 72bbc66..4f440f9 100644 --- a/src/main/java/com/petmatz/domain/user/component/AuthenticationComponent.java +++ b/src/main/java/com/petmatz/domain/user/component/AuthenticationComponent.java @@ -18,8 +18,7 @@ import java.security.cert.CertificateException; import java.time.LocalDateTime; -import static com.petmatz.domain.user.exception.UserErrorCode.CERTIFICATION_EXPIRED; -import static com.petmatz.domain.user.exception.UserErrorCode.MISS_MATCH_CODE; +import static com.petmatz.domain.user.exception.UserErrorCode.*; @Component @RequiredArgsConstructor @@ -47,7 +46,7 @@ public User validateSignInCredentials(SignInInfo info) throws AuthenticationExce String encodedPassword = user.getPassword(); if (!passwordEncoder.matches(password, encodedPassword)) { -// throw new UserException(); + throw new UserException(PASS_WORD_MISMATCH); } return user; } diff --git a/src/main/java/com/petmatz/domain/user/component/GeocodingComponent.java b/src/main/java/com/petmatz/domain/user/component/GeocodingComponent.java index eabbe04..a6f6b38 100644 --- a/src/main/java/com/petmatz/domain/user/component/GeocodingComponent.java +++ b/src/main/java/com/petmatz/domain/user/component/GeocodingComponent.java @@ -3,6 +3,7 @@ import com.petmatz.domain.user.entity.KakaoRegion; import com.petmatz.domain.user.exception.UserException; import com.petmatz.domain.user.response.KakaoGeocodingResponse; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.*; import org.springframework.stereotype.Service; @@ -14,6 +15,7 @@ import static com.petmatz.domain.user.exception.UserErrorCode.INSUFFICIENT_LOCATION_DATA; @Service +@Slf4j public class GeocodingComponent { @Value("${kakao-api-url}") private String KAKAO_API_URL; @@ -65,8 +67,10 @@ private void logInfo(KakaoRegion region) { */ public KakaoRegion getValidRegion(double latitude, double longitude) { KakaoRegion kakaoRegion = getRegionFromCoordinates(latitude, longitude); + System.out.println("kakao region : " + kakaoRegion); // 지역 정보 검증 if (kakaoRegion == null || kakaoRegion.getCodeAsInteger() == null) { + System.out.println("kakao region get code어쩌구 : " + kakaoRegion.getCodeAsInteger()); throw new UserException(INSUFFICIENT_LOCATION_DATA); } return kakaoRegion; diff --git a/src/main/java/com/petmatz/domain/user/exception/UserErrorCode.java b/src/main/java/com/petmatz/domain/user/exception/UserErrorCode.java index 856f6dd..e20bf6c 100644 --- a/src/main/java/com/petmatz/domain/user/exception/UserErrorCode.java +++ b/src/main/java/com/petmatz/domain/user/exception/UserErrorCode.java @@ -20,7 +20,8 @@ public enum UserErrorCode implements BaseErrorCode { HEART_USER_NOT_FOUND(404, "HEART_USER_NOT_FOUND", "찜한 사용자를 찾을 수 없습니다."), FAIL_MAIL_SEND(400, "FAIL_MAIL_SEND", "메일 전송에 실패하였습니다."), PASSWORD_MISMATCH(403, "PASSWORD_MISMATCH", "비밀번호가 일치하지 않습니다."), - HEART_USER_DUPLICATE(400, "HEART_USER_DUPLICATE", "찜한 사용자가 이미 존재합니다."); + HEART_USER_DUPLICATE(400, "HEART_USER_DUPLICATE", "찜한 사용자가 이미 존재합니다."), + PASS_WORD_MISMATCH(401, "LOGIN_FAILED", "비밀번호 불일치"); private final Integer status; diff --git a/src/main/java/com/petmatz/domain/user/response/EditMyProfileResponseDto.java b/src/main/java/com/petmatz/domain/user/response/EditMyProfileResponseDto.java index 970e592..be131bb 100644 --- a/src/main/java/com/petmatz/domain/user/response/EditMyProfileResponseDto.java +++ b/src/main/java/com/petmatz/domain/user/response/EditMyProfileResponseDto.java @@ -8,11 +8,10 @@ import org.springframework.http.ResponseEntity; @Getter -public class EditMyProfileResponseDto extends LogInResponseDto { +public class EditMyProfileResponseDto { private String resultImgURL; public EditMyProfileResponseDto(String resultImgURL){ - super(); this.resultImgURL=resultImgURL; } diff --git a/src/main/java/com/petmatz/domain/user/response/GetMyProfileResponseDto.java b/src/main/java/com/petmatz/domain/user/response/GetMyProfileResponseDto.java index babccbe..871a116 100644 --- a/src/main/java/com/petmatz/domain/user/response/GetMyProfileResponseDto.java +++ b/src/main/java/com/petmatz/domain/user/response/GetMyProfileResponseDto.java @@ -13,7 +13,7 @@ import java.util.List; @Getter -public class GetMyProfileResponseDto extends LogInResponseDto { +public class GetMyProfileResponseDto { private Long id; private String accountId; private String nickname; @@ -45,14 +45,14 @@ public GetMyProfileResponseDto(User user) { this.region = user.getRegion(); this.regionCode=user.getRegionCode(); } - - public static ResponseEntity idNotFound() { - LogInResponseDto responseBody = new LogInResponseDto(ResponseCode.ID_NOT_FOUND, ResponseMessage.ID_NOT_FOUND); - return ResponseEntity.status(HttpStatus.NOT_FOUND).body(responseBody); - } - - public static ResponseEntity success(User user) { // 반환 타입 수정 - GetMyProfileResponseDto responseBody = new GetMyProfileResponseDto(user); - return ResponseEntity.status(HttpStatus.OK).body(responseBody); - } +// +// public static ResponseEntity idNotFound() { +// LogInResponseDto responseBody = new LogInResponseDto(ResponseCode.ID_NOT_FOUND, ResponseMessage.ID_NOT_FOUND); +// return ResponseEntity.status(HttpStatus.NOT_FOUND).body(responseBody); +// } +// +// public static ResponseEntity success(User user) { // 반환 타입 수정 +// GetMyProfileResponseDto responseBody = new GetMyProfileResponseDto(user); +// return ResponseEntity.status(HttpStatus.OK).body(responseBody); +// } } \ No newline at end of file diff --git a/src/main/java/com/petmatz/domain/user/response/GetOtherProfileResponseDto.java b/src/main/java/com/petmatz/domain/user/response/GetOtherProfileResponseDto.java index 61ddb97..3dc95c9 100644 --- a/src/main/java/com/petmatz/domain/user/response/GetOtherProfileResponseDto.java +++ b/src/main/java/com/petmatz/domain/user/response/GetOtherProfileResponseDto.java @@ -13,7 +13,7 @@ import java.util.List; @Getter -public class GetOtherProfileResponseDto extends LogInResponseDto { +public class GetOtherProfileResponseDto{ private Long id; private String accountId; private String nickname; @@ -31,7 +31,6 @@ public class GetOtherProfileResponseDto extends LogInResponseDto { private boolean isMyHeartUser; public GetOtherProfileResponseDto(User user, boolean isMyHeartUser) { - super(); this.id = user.getId(); this.accountId = user.getAccountId(); this.nickname = user.getNickname(); @@ -49,14 +48,14 @@ public GetOtherProfileResponseDto(User user, boolean isMyHeartUser) { this.regionCode=user.getRegionCode(); } - public static ResponseEntity userNotFound() { - LogInResponseDto responseBody=new LogInResponseDto(ResponseCode.ID_NOT_FOUND, ResponseMessage.ID_NOT_FOUND); - return ResponseEntity.status(HttpStatus.NOT_FOUND).body(responseBody); - } - - public static ResponseEntity success(User user,boolean isMyHeartUser) { - GetOtherProfileResponseDto responseBody = new GetOtherProfileResponseDto(user,isMyHeartUser); - return ResponseEntity.status(HttpStatus.OK).body(responseBody); - } +// public static ResponseEntity userNotFound() { +// LogInResponseDto responseBody=new LogInResponseDto(ResponseCode.ID_NOT_FOUND, ResponseMessage.ID_NOT_FOUND); +// return ResponseEntity.status(HttpStatus.NOT_FOUND).body(responseBody); +// } +// +// public static ResponseEntity success(User user,boolean isMyHeartUser) { +// GetOtherProfileResponseDto responseBody = new GetOtherProfileResponseDto(user,isMyHeartUser); +// return ResponseEntity.status(HttpStatus.OK).body(responseBody); +// } } diff --git a/src/main/java/com/petmatz/domain/user/response/GetRecommendationResponseDto.java b/src/main/java/com/petmatz/domain/user/response/GetRecommendationResponseDto.java index 9ed9899..b9f494d 100644 --- a/src/main/java/com/petmatz/domain/user/response/GetRecommendationResponseDto.java +++ b/src/main/java/com/petmatz/domain/user/response/GetRecommendationResponseDto.java @@ -8,7 +8,7 @@ import org.springframework.http.ResponseEntity; @Getter -public class GetRecommendationResponseDto extends LogInResponseDto { +public class GetRecommendationResponseDto{ private boolean isRecommended; public GetRecommendationResponseDto(boolean isRecommended) { diff --git a/src/main/java/com/petmatz/domain/user/response/SendRepasswordResponseDto.java b/src/main/java/com/petmatz/domain/user/response/SendRepasswordResponseDto.java index 55d9208..e7244f3 100644 --- a/src/main/java/com/petmatz/domain/user/response/SendRepasswordResponseDto.java +++ b/src/main/java/com/petmatz/domain/user/response/SendRepasswordResponseDto.java @@ -8,7 +8,7 @@ import org.springframework.http.ResponseEntity; @Getter -public class SendRepasswordResponseDto extends LogInResponseDto{ +public class SendRepasswordResponseDto{ public SendRepasswordResponseDto(){ } diff --git a/src/main/java/com/petmatz/domain/user/response/SignInResponseDto.java b/src/main/java/com/petmatz/domain/user/response/SignInResponseDto.java index 1ab41fc..2d9c535 100644 --- a/src/main/java/com/petmatz/domain/user/response/SignInResponseDto.java +++ b/src/main/java/com/petmatz/domain/user/response/SignInResponseDto.java @@ -5,17 +5,12 @@ import com.petmatz.domain.user.constant.LoginType; import com.petmatz.domain.user.constant.PreferredSize; import com.petmatz.domain.user.entity.User; -import com.petmatz.user.common.LogInResponseDto; -import com.petmatz.user.common.ResponseCode; -import com.petmatz.user.common.ResponseMessage; import lombok.Getter; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; import java.util.List; @Getter -public class SignInResponseDto extends LogInResponseDto { +public class SignInResponseDto { private Long id; private String accountId; private String nickname; @@ -32,7 +27,6 @@ public class SignInResponseDto extends LogInResponseDto { private Integer regionCode; public SignInResponseDto(User user) { - super(); this.id = user.getId(); this.accountId = user.getAccountId(); this.nickname = user.getNickname(); diff --git a/src/main/java/com/petmatz/domain/user/response/SignUpResponse.java b/src/main/java/com/petmatz/domain/user/response/SignUpResponse.java new file mode 100644 index 0000000..c99d7ae --- /dev/null +++ b/src/main/java/com/petmatz/domain/user/response/SignUpResponse.java @@ -0,0 +1,9 @@ +package com.petmatz.domain.user.response; + +import lombok.Getter; + + +public record SignUpResponse( + Long id, + String imgURL) { +} diff --git a/src/main/java/com/petmatz/domain/user/response/UpdateLocationResponseDto.java b/src/main/java/com/petmatz/domain/user/response/UpdateLocationResponseDto.java index d614f57..0b33849 100644 --- a/src/main/java/com/petmatz/domain/user/response/UpdateLocationResponseDto.java +++ b/src/main/java/com/petmatz/domain/user/response/UpdateLocationResponseDto.java @@ -8,7 +8,7 @@ import org.springframework.http.ResponseEntity; @Getter -public class UpdateLocationResponseDto extends LogInResponseDto{ +public class UpdateLocationResponseDto { private String region; private Integer regionCode; @@ -16,14 +16,4 @@ public UpdateLocationResponseDto(String region, Integer regionCode){ this.region = region; this.regionCode=regionCode; } - - public static ResponseEntity wrongLocation(){ - LogInResponseDto responseBody = new LogInResponseDto(ResponseCode.WRONG_LOCATION, ResponseMessage.WRONG_LOCATION); - return ResponseEntity.status(HttpStatus.FORBIDDEN).body(responseBody); - } - - public static ResponseEntity success(String region,Integer regionCode) { // 반환 타입 수정 - UpdateLocationResponseDto responseBody = new UpdateLocationResponseDto(region,regionCode); - return ResponseEntity.status(HttpStatus.OK).body(responseBody); - } } diff --git a/src/main/java/com/petmatz/domain/user/service/AuthService.java b/src/main/java/com/petmatz/domain/user/service/AuthService.java index b435e5c..518d1cb 100644 --- a/src/main/java/com/petmatz/domain/user/service/AuthService.java +++ b/src/main/java/com/petmatz/domain/user/service/AuthService.java @@ -17,6 +17,7 @@ import com.petmatz.domain.user.repository.CertificationRepository; import com.petmatz.domain.user.repository.UserRepository; import com.petmatz.domain.user.response.SignInResponseDto; +import com.petmatz.domain.user.response.SignUpResponse; import com.petmatz.domain.user.response.SignUpResponseDto; import com.petmatz.domain.user.component.GeocodingComponent; import jakarta.servlet.http.HttpServletResponse; @@ -54,13 +55,13 @@ public class AuthService { private PasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); @Transactional - public SignUpResponseDto signUp(SignUpInfo info) throws MalformedURLException { + public SignUpResponse signUp(SignUpInfo info) throws MalformedURLException { String accountId = info.getAccountId(); String certificationNumber = info.getCertificationNumber(); String password = info.getPassword(); authenticationComponent.validateRequiredFields(accountId, certificationNumber, password); - authenticationComponent.validateCertification(accountId); +// authenticationComponent.validateCertification(accountId); authenticationComponent.validateDuplicateAccountId(accountId); String encodedPassword = passwordEncoder.encode(info.getPassword()); @@ -78,7 +79,7 @@ public SignUpResponseDto signUp(SignUpInfo info) throws MalformedURLException { //인증 엔티티 삭제 certificationRepository.deleteAllByAccountId(accountId); - return new SignUpResponseDto(user.getId(), petImg.checkResultImg()); + return new SignUpResponse(user.getId(), petImg.checkResultImg()); } diff --git a/src/main/java/com/petmatz/domain/user/service/KakaoUserService.java b/src/main/java/com/petmatz/domain/user/service/KakaoUserService.java index d59444c..86b2a97 100644 --- a/src/main/java/com/petmatz/domain/user/service/KakaoUserService.java +++ b/src/main/java/com/petmatz/domain/user/service/KakaoUserService.java @@ -35,7 +35,6 @@ public class KakaoUserService { public void editKakaoProfile(EditKakaoProfileInfo info) { Long userId = jwtExtractProvider.findIdFromJwt(); userUtils.findJwtUser(userId); - userUtils.checkDuplicateId(userId); User user = userUtils.findIdUser(userId); KakaoRegion kakaoRegion = geocodingComponent.getRegionFromCoordinates(info.getLatitude(), info.getLongitude()); diff --git a/src/main/java/com/petmatz/domain/user/service/LocationService.java b/src/main/java/com/petmatz/domain/user/service/LocationService.java index 0db8c8a..e8d91eb 100644 --- a/src/main/java/com/petmatz/domain/user/service/LocationService.java +++ b/src/main/java/com/petmatz/domain/user/service/LocationService.java @@ -26,9 +26,6 @@ public UpdateLocationResponseDto updateLocation(UpdateLocationInfo info) { Long userId = jwtExtractProvider.findIdFromJwt(); User user = userUtils.findIdUser(userId); - /** - * 현재는 static 클래스라 이렇게 접근 - */ KakaoRegion kakaoRegion = geocodingComponent.getValidRegion(info.getLatitude(), info.getLongitude()); user.updateLocation(info, kakaoRegion.getRegionName(), kakaoRegion.getCodeAsInteger()); diff --git a/src/main/java/com/petmatz/domain/user/service/PasswordService.java b/src/main/java/com/petmatz/domain/user/service/PasswordService.java index 96ecead..ceb118c 100644 --- a/src/main/java/com/petmatz/domain/user/service/PasswordService.java +++ b/src/main/java/com/petmatz/domain/user/service/PasswordService.java @@ -24,7 +24,7 @@ public class PasswordService { private final PasswordComponent passwordComponent; @Transactional - public SendRepasswordResponseDto sendRepassword(SendRepasswordRequestDto dto) { + public void sendRepassword(SendRepasswordRequestDto dto) { String accountId = dto.getAccountId(); User user = userUtils.findUser(accountId); @@ -33,8 +33,6 @@ public SendRepasswordResponseDto sendRepassword(SendRepasswordRequestDto dto) { rePasswordEmailProvider.sendVerificationEmail(accountId, rePasswordNum); String encodedRePasswordNum = passwordComponent.encodePassword(rePasswordNum); user.updatePassword(encodedRePasswordNum); - - return new SendRepasswordResponseDto(); } @Transactional diff --git a/src/main/java/com/petmatz/infra/email/EmailProviderImpl.java b/src/main/java/com/petmatz/infra/email/EmailProviderImpl.java index b5cda07..fc4f0c5 100644 --- a/src/main/java/com/petmatz/infra/email/EmailProviderImpl.java +++ b/src/main/java/com/petmatz/infra/email/EmailProviderImpl.java @@ -32,7 +32,6 @@ public class EmailProviderImpl implements EmailProvider { @Override public void sendVerificationEmail(String email, String certificationNumber) { try { - System.out.println(certificationNumber); // MIME 타입의 이메일 메시지 생성 MimeMessage message = javaMailSender.createMimeMessage(); MimeMessageHelper messageHelper = new MimeMessageHelper(message, true);