From aa1a4f4d25e43b6df08fdd33b2e05aa5d192c11a Mon Sep 17 00:00:00 2001 From: sungone <20200999@sungshin.ac.kr> Date: Sun, 26 Mar 2023 00:50:41 +0900 Subject: [PATCH] =?UTF-8?q?#3=20feat=20:=20=ED=94=84=EB=A1=9C=ED=95=84=20?= =?UTF-8?q?=EB=B3=B4=EA=B8=B0=20->=20=ED=95=9C=20=EC=A4=84=20=ED=9B=84?= =?UTF-8?q?=EA=B8=B0=20=EB=A6=AC=EC=8A=A4=ED=8A=B8(=EC=B5=9C=EC=8B=A0?= =?UTF-8?q?=EC=88=9C),=20=EB=B3=84=EC=A0=90=20get?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/zatch/zatchserver/ResponseMessage.java | 3 +++ .../com/zatch/zatchserver/controller/UserController.java | 8 ++++---- .../zatch/zatchserver/repository/JdbcUserRepository.java | 4 +++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zatch/zatchserver/ResponseMessage.java b/src/main/java/com/zatch/zatchserver/ResponseMessage.java index b141551..5e99c7e 100644 --- a/src/main/java/com/zatch/zatchserver/ResponseMessage.java +++ b/src/main/java/com/zatch/zatchserver/ResponseMessage.java @@ -8,6 +8,9 @@ public class ResponseMessage { public static final String CREATED_USER = "회원 가입 성공"; public static final String UPDATE_USER = "회원 정보 수정 성공"; public static final String DELETE_USER = "회원 탈퇴 성공"; + public static final String USER_TOWN_SUCCESS = "회원 동네 설정 성공"; + public static final String MYPAGE_SUCCESS = "마이페이지 불러오기 성공"; + public static final String USER_NICKNAME_EDIT_SUCCESS ="회원 닉네임 수정 성공"; public static final String INTERNAL_SERVER_ERROR = "서버 내부 에러"; public static final String DB_ERROR = "데이터베이스 에러"; } diff --git a/src/main/java/com/zatch/zatchserver/controller/UserController.java b/src/main/java/com/zatch/zatchserver/controller/UserController.java index 1b0d68f..7a1fb39 100644 --- a/src/main/java/com/zatch/zatchserver/controller/UserController.java +++ b/src/main/java/com/zatch/zatchserver/controller/UserController.java @@ -71,7 +71,7 @@ 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); + return new ResponseEntity(DefaultRes.res(StatusCode.OK, ResponseMessage.USER_NICKNAME_EDIT_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); } @@ -85,7 +85,7 @@ public ResponseEntity patchNickname(@PathVariable("userId") Long userId 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); + return new ResponseEntity(DefaultRes.res(StatusCode.OK, ResponseMessage.USER_NICKNAME_EDIT_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); } @@ -96,7 +96,7 @@ public ResponseEntity patchNickname(@PathVariable("userId") Long userId 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); + return new ResponseEntity(DefaultRes.res(StatusCode.OK, ResponseMessage.MYPAGE_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); } @@ -108,7 +108,7 @@ public ResponseEntity postTown(@PathVariable("userId") Long userId, @RequestBody 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); + return new ResponseEntity(DefaultRes.res(StatusCode.OK, ResponseMessage.USER_TOWN_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 index b77899e..8ea0748 100644 --- a/src/main/java/com/zatch/zatchserver/repository/JdbcUserRepository.java +++ b/src/main/java/com/zatch/zatchserver/repository/JdbcUserRepository.java @@ -90,7 +90,9 @@ public Long modifyNickname(Long userId, String newNickname) { @Override public List> profile(Long userId) { try { - String sql = "SELECT user.user_id, user.nickname, zatch.zatch_id FROM zatch.zatch LEFT JOIN zatch.user on zatch.user_id = user.user_id WHERE user.user_id = ? ORDER BY user.created_at DESC;"; + String sql = "SELECT user.user_id, user.nickname, zatch.zatch_id, zatch.item_name review_context, star_rating " + + "FROM zatch.review_star LEFT JOIN zatch.zatch on review_star.send_user_id = zatch.user_id LEFT JOIN zatch.user on zatch.user_id = user.user_id " + + "WHERE user.user_id = ? ORDER BY review_star.created_at DESC;"; Object[] params = {userId}; System.out.println("User's profile SQL select"); return jdbcTemplate.queryForList(sql, params);