#3 fix : 응답 추가, Jwt 주석

Zatch-Team · Mar 16, 2023 · aa9c3ce · aa9c3ce
1 parent b32c578
commit aa9c3ce
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 49 deletions.
diff --git a/src/main/java/com/zatch/zatchserver/config/JwtAuthenticationFilter.java b/src/main/java/com/zatch/zatchserver/config/JwtAuthenticationFilter.java
@@ -11,13 +11,13 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
-@Slf4j
-@RequiredArgsConstructor
-@Component
+//@Slf4j
+//@RequiredArgsConstructor
+//@Component
 public class JwtAuthenticationFilter extends OncePerRequestFilter {
     private final String AUTHORIZATION_PREFIX = "Bearer ";
 
-    private final JwtProvider jwtProvider;
+//    private final JwtProvider jwtProvider;
 
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
@@ -45,7 +45,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 
     public boolean needToCheckJwt(HttpServletRequest request) {
         String requestUrl = request.getRequestURI();
-        log.info(requestUrl);
+//        log.info(requestUrl);
         if (requestUrl.startsWith("/users/new") || requestUrl.startsWith("/users/login")) {
             return false;
         }

diff --git a/src/main/java/com/zatch/zatchserver/controller/UserController.java b/src/main/java/com/zatch/zatchserver/controller/UserController.java
@@ -61,35 +61,50 @@ public ResponseEntity postUser(@RequestBody PostUserReqDto postUserReqDto) {
 
     @GetMapping("/logout")
     @ApiOperation(value="로그아웃", notes = "로그아웃 API")
-    public String logout(HttpServletRequest request) throws Exception{
-        HttpSession session = request.getSession();
-        session.invalidate();
-        return "logout";
+    public ResponseEntity logout(HttpServletRequest request) throws Exception{
+        try {
+            HttpSession session = request.getSession();
+            session.invalidate();
+            return new ResponseEntity(DefaultRes.res(StatusCode.OK, ResponseMessage.LOGIN_SUCCESS, "Success Logout"), HttpStatus.OK);
+        } catch (Exception e){
+            return new ResponseEntity(DefaultRes.res(StatusCode.INTERNAL_SERVER_ERROR, ResponseMessage.INTERNAL_SERVER_ERROR, "Error Logout"), HttpStatus.INTERNAL_SERVER_ERROR);
+        }
     }
 
     @PatchMapping("/{userId}/nickname")
     @ApiOperation(value = "회원 닉네임 수정", notes = "회원 닉네임 수정 API")
-    public PatchUserNicknameResDto patchNickname(@PathVariable("userId") Long userId
+    public ResponseEntity patchNickname(@PathVariable("userId") Long userId
             , @RequestBody PatchUserNicknameReqDto pathUserNicknameReqDto) {
-        String newNickname = pathUserNicknameReqDto.getNewNickname();
-        Long idOfModifiedUser = userId;
-
-        userService.modifyNickname(idOfModifiedUser, newNickname);
-        return new PatchUserNicknameResDto(newNickname);
+        try {
+            String newNickname = pathUserNicknameReqDto.getNewNickname();
+            Long idOfModifiedUser = userId;
+            userService.modifyNickname(idOfModifiedUser, newNickname);
+            return new ResponseEntity(DefaultRes.res(StatusCode.OK, ResponseMessage.LOGIN_SUCCESS, new PatchUserNicknameResDto(newNickname)), HttpStatus.OK);
+        } catch (Exception e){
+            return new ResponseEntity(DefaultRes.res(StatusCode.INTERNAL_SERVER_ERROR, ResponseMessage.INTERNAL_SERVER_ERROR, "Error Modify Nickname"), HttpStatus.INTERNAL_SERVER_ERROR);
+        }
     }
 
     @GetMapping("/{userId}/profile")
     @ApiOperation(value = "회원 프로필", notes = "회원 프로필 API")
-    public GetProfileResDto getProfile(@PathVariable("userId") Long userId) {
-        String userNickname = userService.profile(userId);
-        return new GetProfileResDto(userNickname);
+    public ResponseEntity getProfile(@PathVariable("userId") Long userId) {
+        try {
+            String userNickname = userService.profile(userId);
+            return new ResponseEntity(DefaultRes.res(StatusCode.OK, ResponseMessage.LOGIN_SUCCESS, new GetProfileResDto(userNickname)), HttpStatus.OK);
+        } catch (Exception e) {
+            return new ResponseEntity(DefaultRes.res(StatusCode.INTERNAL_SERVER_ERROR, ResponseMessage.INTERNAL_SERVER_ERROR, "Error Profile"), HttpStatus.INTERNAL_SERVER_ERROR);
+        }
     }
 
     @PostMapping("/{userId}/town")
     @ApiOperation(value = "회원 동네", notes = "회원 동네 API")
-    public PostUserTownReqDto postTown(@PathVariable("userId") Long userId, @RequestBody PostUserTownReqDto postUserTownReqDTO) {
-        String town = postUserTownReqDTO.getTown();
-        String userTown = userService.town(userId, town);
-        return new PostUserTownReqDto(userTown);
+    public ResponseEntity postTown(@PathVariable("userId") Long userId, @RequestBody PostUserTownReqDto postUserTownReqDTO) {
+        try {
+            String town = postUserTownReqDTO.getTown();
+            String userTown = userService.town(userId, town);
+            return new ResponseEntity(DefaultRes.res(StatusCode.OK, ResponseMessage.LOGIN_SUCCESS, new PostUserTownReqDto(userTown)), HttpStatus.OK);
+        } catch (Exception e) {
+            return new ResponseEntity(DefaultRes.res(StatusCode.INTERNAL_SERVER_ERROR, ResponseMessage.INTERNAL_SERVER_ERROR, "Error User Town"), HttpStatus.INTERNAL_SERVER_ERROR);
+        }
     }
 }
diff --git a/src/main/java/com/zatch/zatchserver/repository/JdbcUserRepository.java b/src/main/java/com/zatch/zatchserver/repository/JdbcUserRepository.java
@@ -1,7 +1,12 @@
 package com.zatch.zatchserver.repository;
 
+import com.zatch.zatchserver.DefaultRes;
+import com.zatch.zatchserver.ResponseMessage;
+import com.zatch.zatchserver.StatusCode;
 import com.zatch.zatchserver.domain.User;
+import com.zatch.zatchserver.dto.GetUserReqDto;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Repository;
 import org.springframework.web.server.ResponseStatusException;
@@ -76,41 +81,53 @@ public Long insert(User user) {
 
     @Override
     public Long modifyNickname(Long userId, String newNickname) {
-        String sql = "UPDATE user SET nickname = ? WHERE user_id = ?";
-        Object[] params = {newNickname, userId};
-        jdbcTemplate.update(sql, params);
-        System.out.println("Modify nickname sql update");
-        return userId;
+        try {
+            String sql = "UPDATE user SET nickname = ? WHERE user_id = ?";
+            Object[] params = {newNickname, userId};
+            jdbcTemplate.update(sql, params);
+            System.out.println("Modify nickname sql update");
+            return userId;
+        } catch (Exception e){
+            throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, "User Email Not Found");
+        }
     }
 
     @Override
     public List<Map<String, Object>> profile(Long userId) {
-        String sql = "SELECT nickname from user WHERE user_id = ?";
-        Object[] params = {userId};
-        System.out.println("User's profile SQL select");
-        return jdbcTemplate.queryForList(sql, params);
+        try {
+            String sql = "SELECT nickname from user WHERE user_id = ?";
+            Object[] params = {userId};
+            System.out.println("User's profile SQL select");
+            return jdbcTemplate.queryForList(sql, params);
+        } catch (Exception e){
+            throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, "User Email Not Found");
+        }
     }
 
     @Override
     public String townInsert(Long userId, String town){
-        String town1 = jdbcTemplate.queryForObject("SELECT town1 from user WHERE user_id = ?", new Object[]{userId}, String.class);
-        String town2 = jdbcTemplate.queryForObject("SELECT town2 from user WHERE user_id = ?", new Object[]{userId}, String.class);
-        String town3 = jdbcTemplate.queryForObject("SELECT town3 from user WHERE user_id = ?", new Object[]{userId}, String.class);
-        if (town1 == null){
-            jdbcTemplate.update("UPDATE user SET town1 = ? WHERE user_id = ?", town, userId);
-            System.out.println("User's town1 sql update");
-        }
-        else if (town2 == null){
-            jdbcTemplate.update("UPDATE user SET town2 = ? WHERE user_id = ?", town, userId);
-            System.out.println("User's town2 sql update");
-        }
-        else if (town3 == null){
-            jdbcTemplate.update("UPDATE user SET town3 = ? WHERE user_id = ?", town, userId);
-            System.out.println("User's town3 sql update");
-        }
-        else {
-            System.out.println("User's town over 3");
+        try {
+            String town1 = jdbcTemplate.queryForObject("SELECT town1 from user WHERE user_id = ?", new Object[]{userId}, String.class);
+            String town2 = jdbcTemplate.queryForObject("SELECT town2 from user WHERE user_id = ?", new Object[]{userId}, String.class);
+            String town3 = jdbcTemplate.queryForObject("SELECT town3 from user WHERE user_id = ?", new Object[]{userId}, String.class);
+            if (town1 == null){
+                jdbcTemplate.update("UPDATE user SET town1 = ? WHERE user_id = ?", town, userId);
+                System.out.println("User's town1 sql update");
+            }
+            else if (town2 == null){
+                jdbcTemplate.update("UPDATE user SET town2 = ? WHERE user_id = ?", town, userId);
+                System.out.println("User's town2 sql update");
+            }
+            else if (town3 == null){
+                jdbcTemplate.update("UPDATE user SET town3 = ? WHERE user_id = ?", town, userId);
+                System.out.println("User's town3 sql update");
+            }
+            else {
+                System.out.println("User's town over 3");
+            }
+            return town;
+        } catch (Exception e){
+            throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, "User Email Not Found");
         }
-        return town;
     }
 }