Refactor/#1 user

src/main/java/com/petmatz/api/user/controller/AuthController.java

@@ -0,0 +1,59 @@
+package com.petmatz.api.user.controller;
+
+import com.petmatz.api.global.dto.Response;
+import com.petmatz.api.user.request.CheckCertificationRequestDto;
+import com.petmatz.api.user.request.DeleteIdRequestDto;
+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.service.AuthService;
+import com.petmatz.domain.user.service.UserService;
+import com.petmatz.user.common.LogInResponseDto;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+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;
+
+import javax.naming.AuthenticationException;
+import java.net.MalformedURLException;
+import java.security.cert.CertificateException;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/auth")
+public class AuthController {
+
+    private final AuthService authService;
+
+    @PostMapping("/sign-in")
+    public Response<SignInResponseDto> signIn(@RequestBody @Valid SignInRequestDto requestBody, HttpServletResponse response) throws AuthenticationException {
+        SignInResponseDto result = authService.signIn(SignInRequestDto.of(requestBody), response);
+        return Response.success(result);
+    }
+
+    @PostMapping("/logout")
+    public Response<Void> logout(HttpServletResponse res) {
+        authService.logout(res);
+        return Response.success();
+    }
+
+    @PostMapping("/sign-up")
+    public Response<SignUpResponseDto> signUp(@RequestBody @Valid SignUpRequestDto requestBody) throws MalformedURLException {
+        SignUpResponseDto responseDto = authService.signUp(SignUpRequestDto.of(requestBody));
+        return Response.success(responseDto);
+    }
+
+    @PostMapping("/check-certification")
+    public Response<Void> checkCertification(@RequestBody @Valid CheckCertificationRequestDto requestBody) throws CertificateException {
+        authService.checkCertification(CheckCertificationRequestDto.of(requestBody));
+        return Response.success();
+    }
+}

src/main/java/com/petmatz/api/user/controller/EmailController.java

@@ -0,0 +1,28 @@
+package com.petmatz.api.user.controller;
+
+import com.petmatz.api.global.dto.Response;
+import com.petmatz.api.user.request.EmailCertificationRequestDto;
+import com.petmatz.domain.user.response.EmailCertificationResponseDto;
+import com.petmatz.domain.user.service.EmailService;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+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/auth")
+public class EmailController {
+
+    private final EmailService emailService;
+
+    @PostMapping("/email-certification")
+    public Response<Void> emailCertification(@RequestBody @Valid EmailCertificationRequestDto requestBody) {
+        emailService.emailCertification(requestBody);
+        return Response.success();
+    }
+
+}

src/main/java/com/petmatz/api/user/controller/HeartController.java

@@ -0,0 +1,33 @@
+package com.petmatz.api.user.controller;
+
+import com.petmatz.api.global.dto.Response;
+import com.petmatz.api.user.request.HeartedUserDto;
+import com.petmatz.api.user.request.HeartingRequestDto;
+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 java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+public class HeartController {
+
+    private final HeartService heartService;
+
+    @PostMapping("/hearting")
+    public Response<Void> hearting(@RequestBody @Valid HeartingRequestDto requestBody) {
+        heartService.hearting(requestBody);
+        return Response.success();
+    }
+
+    @GetMapping("/get-heartlist") // 이거 테스트 필요
+    public Response<List<HeartedUserDto>> getHeartedList() {
+        List<HeartedUserDto> heartedList = heartService.getHeartedList();
+        return Response.success(heartedList);
+    }
+}

src/main/java/com/petmatz/api/user/controller/LocationController.java

@@ -0,0 +1,25 @@
+package com.petmatz.api.user.controller;
+
+import com.petmatz.api.global.dto.Response;
+import com.petmatz.api.user.request.UpdateLocationRequestDto;
+import com.petmatz.domain.user.response.UpdateLocationResponseDto;
+import com.petmatz.domain.user.service.LocationService;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+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.RestController;
+
+@RestController
+@RequiredArgsConstructor
+public class LocationController {
+
+    private final LocationService locationService;
+
+    @PostMapping("/update-location")
+    public Response<UpdateLocationResponseDto> updateLocation(@RequestBody @Valid UpdateLocationRequestDto requestBody) {
+        UpdateLocationResponseDto updateLocationResponseDto = locationService.updateLocation(UpdateLocationRequestDto.of(requestBody));
+        return Response.success(updateLocationResponseDto);
+    }
+}

src/main/java/com/petmatz/api/user/controller/PageController.java

@@ -0,0 +1,39 @@
+package com.petmatz.api.user.controller;
+
+import com.petmatz.api.global.dto.Response;
+import com.petmatz.api.user.request.EditMyProfileRequestDto;
+import com.petmatz.domain.user.service.PageService;
+import com.petmatz.domain.user.response.EditMyProfileResponseDto;
+import com.petmatz.domain.user.response.GetMyProfileResponseDto;
+import com.petmatz.domain.user.response.GetOtherProfileResponseDto;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.net.MalformedURLException;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/auth")
+public class PageController {
+
+    private final PageService pageService;
+
+    @GetMapping("/get-myprofile")
+    public Response<GetMyProfileResponseDto> getMypage() {
+        GetMyProfileResponseDto myPage = pageService.getMypage();
+        return Response.success(myPage);
+    }
+
+    @GetMapping("/get-otherprofile")
+    public Response<GetOtherProfileResponseDto> getOtherMypage(@RequestParam @Valid Long userId) {
+        GetOtherProfileResponseDto otherMypage = pageService.getOtherMypage(userId);
+        return Response.success(otherMypage);
+    }
+
+    @PostMapping("/edit-myprofile")
+    public Response<EditMyProfileResponseDto> editMyProfile(@RequestBody @Valid EditMyProfileRequestDto requestBody) throws MalformedURLException {
+        EditMyProfileResponseDto editMyProfileResponseDto = pageService.editMyProfile(EditMyProfileRequestDto.of(requestBody));
+        return Response.success(editMyProfileResponseDto);
+    }
+}

src/main/java/com/petmatz/api/user/controller/PasswordController.java

@@ -0,0 +1,34 @@
+package com.petmatz.api.user.controller;
+
+import com.petmatz.api.global.dto.Response;
+import com.petmatz.api.user.request.RepasswordRequestDto;
+import com.petmatz.api.user.request.SendRepasswordRequestDto;
+import com.petmatz.domain.user.component.PasswordService;
+import com.petmatz.domain.user.response.RepasswordResponseDto;
+import com.petmatz.domain.user.response.SendRepasswordResponseDto;
+import com.petmatz.domain.user.service.PasswordService;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+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.RestController;
+
+@RestController
+@RequiredArgsConstructor
+public class PasswordController {
+
+    private final PasswordService passwordService;
+
+    @PostMapping("/send-repassword")
+    public Response<SendRepasswordResponseDto> sendRepassword(@RequestBody @Valid SendRepasswordRequestDto requestBody) {
+        SendRepasswordResponseDto sendRepasswordResponseDto = passwordService.sendRepassword(requestBody);
+        return Response.success(sendRepasswordResponseDto);
+    }
+
+    @PostMapping("/repassword")
+    public Response<Void> repassword(@RequestBody @Valid RepasswordRequestDto requestBody) {
+        passwordService.repassword(RepasswordRequestDto.of(requestBody));
+        return Response.success();
+    }
+}

src/main/java/com/petmatz/api/user/controller/PastUserController.java

@@ -0,0 +1,149 @@
+//package com.petmatz.api.user.controller;
+//
+//import com.petmatz.api.user.request.*;
+//import com.petmatz.domain.user.service.AuthService;
+//import com.petmatz.domain.user.response.*;
+//import com.petmatz.domain.user.service.UserService;
+//import com.petmatz.user.common.LogInResponseDto;
+//import jakarta.servlet.http.HttpServletResponse;
+//import jakarta.validation.Valid;
+//import lombok.RequiredArgsConstructor;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.http.ResponseEntity;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.net.MalformedURLException;
+//
+//@Slf4j
+//@RestController
+//@RequiredArgsConstructor
+//@RequestMapping("/api/auth")
+//public class PastUserController {
+//    private final UserService userService;
+//    private final AuthService authService;
+//
+//    @PostMapping("/email-certification")
+//    public ResponseEntity<? super EmailCertificationResponseDto> emailCertification(@RequestBody @Valid EmailCertificationRequestDto requestBody) {
+//        ResponseEntity<? super EmailCertificationResponseDto> response = userService.emailCertification(requestBody);
+//        log.info("[emailCertification]: { accountId: " + requestBody.getAccountId() + "}");
+//        return response;
+//    } // 하나 했음
+//
+//    @PostMapping("/check-certification")
+//    public ResponseEntity<? super CheckCertificationResponseDto> checkCertification(@RequestBody @Valid CheckCertificationRequestDto requestBody) {
+//        ResponseEntity<? super CheckCertificationResponseDto> response = userService.checkCertification(CheckCertificationRequestDto.of(requestBody));
+//        log.info("[checkCertification]: {accountId: " + requestBody.getAccountId() + ", certificationNumber: " + requestBody.getCertificationNumber() + "}");
+//        return response;
+//    } // 했음
+//
+//    @PostMapping("/sign-up")
+//    public ResponseEntity<SignUpResponseDto> signUp(@RequestBody @Valid SignUpRequestDto requestBody) throws MalformedURLException {
+//        SignUpResponseDto responseDto = authService.signUp(SignUpRequestDto.of(requestBody));
+//        log.info("[signUp]: { accountId: " + requestBody.getAccountId() + ", password: " + requestBody.getPassword());
+//        return ResponseEntity.ok(responseDto);
+//    } // o
+//
+//    @PostMapping("/sign-in")
+//    public ResponseEntity<? super SignInResponseDto> signIn(
+//            @RequestBody @Valid SignInRequestDto requestBody,
+//            HttpServletResponse response) {
+//
+//        ResponseEntity<? super SignInResponseDto> result = userService.signIn(SignInRequestDto.of(requestBody), response);
+//        log.info("[signIn]: { accountId: " + requestBody.getAccountId() + ", result: " + result.getStatusCode() + " }");
+//        return result;
+//    } // o
+//
+//    @PostMapping("/delete-user")
+//    public ResponseEntity<? super DeleteIdResponseDto> deleteUser(@RequestBody @Valid DeleteIdRequestDto requestBody) {
+//        ResponseEntity<? super DeleteIdResponseDto> response = userService.deleteId(requestBody);
+//        log.info("[deleteUser]:{password: " + requestBody.getPassword() + "}");
+//        return response;
+//    } // o
+//
+//    //---------------------------------------------------------------------------------------------------------------------------------//
+//    @GetMapping("/get-myprofile")
+//    public ResponseEntity<? super GetMyProfileResponseDto> getMypage() {
+//        ResponseEntity<? super GetMyProfileResponseDto> response = userService.getMypage();
+//        log.info("[getMypage]");
+//        return response;
+//    } // o
+//
+//    @GetMapping("/get-otherprofile")
+//    public ResponseEntity<? super GetOtherProfileResponseDto> getOtherMypage(@RequestParam @Valid Long userId) {
+//        ResponseEntity<? super GetOtherProfileResponseDto> response = userService.getOtherMypage(userId);
+//        log.info("[getOtherMypage]");
+//        return response;
+//    } // o
+//
+//    @PostMapping("/edit-myprofile")
+//    public ResponseEntity<? super EditMyProfileResponseDto> editMyProfile(@RequestBody @Valid EditMyProfileRequestDto requestBody) {
+//        ResponseEntity<? super EditMyProfileResponseDto> response = userService.editMyProfile(EditMyProfileRequestDto.of(requestBody));
+//        log.info("[editMyProfile]");
+//        return response;
+//    } // o
+//
+//    @PostMapping("/send-repassword")
+//    public ResponseEntity<? super SendRepasswordResponseDto> sendRepassword(@RequestBody @Valid SendRepasswordRequestDto requestBody) {
+//        ResponseEntity<? super SendRepasswordResponseDto> response = userService.sendRepassword(requestBody);
+//        log.info("[sendRepassword]: {accountId: " + requestBody.getAccountId() + "}");
+//        return response;
+//    } // o
+//
+//    @PostMapping("/repassword")
+//    public ResponseEntity<? super RepasswordResponseDto> repassword(@RequestBody @Valid RepasswordRequestDto requestBody) {
+//        ResponseEntity<? super RepasswordResponseDto> response = userService.repassword(RepasswordRequestDto.of(requestBody));
+//        log.info("[repassword]: {currentPassword: " + requestBody.getCurrentPassword() + ", newPassword: " + requestBody.getNewPassword() + "}");
+//        return response;
+//    } // o
+//
+//    //---------------------------------------------------------------------------------------------------------------------------------------------------------------
+//    @PostMapping("/hearting")
+//    public ResponseEntity<? super HeartingResponseDto> hearting(@RequestBody @Valid HeartingRequestDto requestBody) {
+//        ResponseEntity<? super HeartingResponseDto> response = userService.hearting(requestBody);
+//        log.info("[hearting]: {heartedId: " + requestBody.getHeartedId() + "}");
+//        return response;
+//    } // o
+//
+//    @GetMapping("/get-heartlist")
+//    public ResponseEntity<? super GetHeartingListResponseDto> getHeartedList() {
+//        ResponseEntity<? super GetHeartingListResponseDto> response = userService.getHeartedList();
+//        log.info("[getHeartedList]");
+//        return response;
+//    } // o
+//
+//    @PostMapping("/update-location")
+//    public ResponseEntity<? super UpdateLocationResponseDto> updateLocation(@RequestBody @Valid UpdateLocationRequestDto requestBody) {
+//        ResponseEntity<? super UpdateLocationResponseDto> response = userService.updateLocation(UpdateLocationRequestDto.of(requestBody));
+//        log.info("[updateLocation]");
+//        return response;
+//    } // o
+//
+//    @PostMapping("/update-recommendation")
+//    public ResponseEntity<? super UpdateRecommendationResponseDto> updateRecommend(@RequestBody @Valid UpdateRecommendationRequestDto requestBody) {
+//        ResponseEntity<? super UpdateRecommendationResponseDto> response = userService.updateRecommend(requestBody);
+//        log.info("[updateRecommend]");
+//        return response;
+//    }
+//
+//    @GetMapping("/get-recommended")
+//    public ResponseEntity<? super GetRecommendationResponseDto> getRecommend(@RequestBody @Valid UpdateRecommendationRequestDto requestBody) {
+//        ResponseEntity<? super GetRecommendationResponseDto> response = userService.getRecommend(requestBody);
+//        log.info("[getRecommend]");
+//        return response;
+//    }
+//
+//    @PostMapping("/logout")
+//    public ResponseEntity<? super LogInResponseDto> logout(HttpServletResponse res) {
+//        ResponseEntity<? super LogInResponseDto> response = userService.logout(res);
+//        log.info("[logout]");
+//        return response;
+//    }
+//
+//    @PostMapping("/edit-kakaoprofile")
+//    public ResponseEntity<? super EditKakaoProfileResponseDto> editKakaoProfile(@RequestBody @Valid EditKakaoProfileRequestDto requestBody) {
+//        ResponseEntity<? super EditKakaoProfileResponseDto> response = userService.editKakaoProfile(EditKakaoProfileRequestDto.of(requestBody));
+//        log.info("[editKakaoProfile]");
+//        return response;
+//    }
+//}
+//