Merge pull request #45 from Grow-Fit/feat/44-logout

로그아웃 기능 구현

Author: haennni

src/main/java/com/project/growfit/domain/Diet/service/impl/DietServiceImpl.java

@@ -207,7 +207,7 @@ public ResultResponse<?> uploadPhoto(Long dietId, MultipartFile image) {
         Diet diet = getDietOrThrow(dietId);
         String imageUrl = s3UploadService.saveFile(image, imageUploadPath);
         diet.updateImage(imageUrl);
-        return ResultResponse.of(ResultCode.CHILD_PHOTO_UPLOAD_SUCCESS, null);
+        return ResultResponse.of(ResultCode.DIET_ADD_IMAGE_SUCCESS, null);
     }
 
     @Override
@@ -235,7 +235,7 @@ public ResultResponse<?> updateDietTime(Long dietId, String newTime) {
         authenticatedProvider.getAuthenticatedParent();
         Diet diet = getDietOrThrow(dietId);
         diet.updateTime(parseTimeOrThrow(newTime));
-        return ResultResponse.of(ResultCode.DIET_TIME_UPDATE_SUCCESS, null);
+        return ResultResponse.of(ResultCode.DIET_EDIT_SUCCESS, null);
     }
 
 

src/main/java/com/project/growfit/domain/Diet/service/impl/DietSetServiceImpl.java

@@ -87,7 +87,7 @@ public ResultResponse<?> getDietSetDetail(Long dietSetId) {
         ).toList();
 
         DietSetDetailResponseDto response = new DietSetDetailResponseDto(set.getSetName(), foodDetails);
-        return ResultResponse.of(ResultCode.DIET_SET_DETAIL_SUCCESS, response);
+        return ResultResponse.of(ResultCode.DIET_SET_RETRIEVAL_SUCCESS, response);
     }
 
     @Override

src/main/java/com/project/growfit/domain/Goal/entity/Certification.java

@@ -16,7 +16,7 @@
 
 @Getter
 @Entity
-@Table(name = "goal")
+@Table(name = "cert_goal")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class Certification {
 

src/main/java/com/project/growfit/domain/User/controller/AuthChildController.java

@@ -42,7 +42,14 @@ public ResponseEntity<?> loginChild(@RequestBody AuthChildRequestDto request, Ht
         ResultResponse<?> resultResponse = authChildService.login(request, response);
 
         return ResponseEntity.status(HttpStatus.OK).body(resultResponse);
+    }
+
+    @Operation(summary = "아이 로그아웃")
+    @PostMapping("/logout")
+    public ResponseEntity<?> logoutChild(HttpServletResponse response) {
+        ResultResponse<String> resultResponse = authChildService.logout(response);
 
+        return ResponseEntity.status(HttpStatus.OK).body(resultResponse);
     }
 
     @Operation(summary = "아이 인증코드로 ID 찾기")
@@ -51,7 +58,6 @@ public ResponseEntity<?> findChildIdByCode(@RequestParam String code) {
         ResultResponse<?> resultResponse = authChildService.findChildID(code);
 
         return ResponseEntity.status(HttpStatus.OK).body(resultResponse);
-
     }
 
     @Operation(summary = "아이 비밀번호 재설정")

src/main/java/com/project/growfit/domain/User/controller/OAuthController.java

@@ -3,17 +3,15 @@
 import com.project.growfit.domain.User.dto.response.ParentLoginResponseDto;
 import com.project.growfit.domain.User.service.OauthService;
 import com.project.growfit.global.exception.BusinessException;
+import com.project.growfit.global.response.ResultCode;
 import com.project.growfit.global.response.ResultResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/oauth")
@@ -23,9 +21,9 @@ public class OAuthController {
 
     private final OauthService oauthService;
 
-    @Operation(summary = "카카오 소셜 로그인 콜백 컨트롤러 입니다.")
+    @Operation(summary = "카카오 소셜 로그인 API")
     @GetMapping("/callback/kakao")
-    public void getKaKaoAuthorizeCode(@RequestParam(value = "code", required = false) String code,
+    public void kakaoLogin(@RequestParam(value = "code", required = false) String code,
                                                    HttpServletResponse response) {
         if (code == null) {
             try {
@@ -57,4 +55,12 @@ public void getKaKaoAuthorizeCode(@RequestParam(value = "code", required = false
             }
         }
     }
+
+    @Operation(summary = "카카오 소셜 로그아웃 API")
+    @PostMapping("/logout")
+    public ResultResponse<String> kakaoLogout(@RequestParam(value = "code", required = false) String code,
+                                                        HttpServletResponse response) {
+        return oauthService.kakaoLogout(code, response);
+
+    }
 }

src/main/java/com/project/growfit/domain/User/controller/TestAuthController.java

@@ -38,6 +38,6 @@ public ResultResponse<?> generateToken(@RequestBody Map<String, String> request,
 
         log.info("로그인 성공: email={}, accessToken 저장 완료", email);
         ParentLoginResponseDto dto = new ParentLoginResponseDto(email, true);
-        return new ResultResponse<>(ResultCode.PARENT_LOGIN_SUCCESS, dto);
+        return new ResultResponse<>(ResultCode.LOGIN_SUCCESS, dto);
     }
 }

src/main/java/com/project/growfit/domain/User/service/AuthChildService.java

@@ -9,6 +9,7 @@ public interface AuthChildService {
     ResultResponse<?> findByCode(String code);
     ResultResponse<?> registerChildCredentials(Long child_id, AuthChildRequestDto request);
     ResultResponse<?> login(AuthChildRequestDto request, HttpServletResponse response);
+    ResultResponse<String> logout(HttpServletResponse response);
     ResultResponse<?> findChildID(String code);
     ResultResponse<?> findChildPassword(FindChildPasswordRequestDto request);
 }

src/main/java/com/project/growfit/domain/User/service/OauthService.java

@@ -13,6 +13,9 @@ public interface OauthService {
     String getKakaoAccessToken(String code);
     HashMap<String, Object> getUserKakaoInfo(String access_token);
     ResultResponse<?> kakaoLogin(String access_token, HttpServletResponse response);
+    ResultResponse<String> kakaoLogout(String access_token, HttpServletResponse response);
     ParentResponse findByUserKakaoIdentifier(String kakaoIdentifier);
     Long signUp(ParentOAuthRequestDto requestDto);
+
+
 }

src/main/java/com/project/growfit/domain/User/service/impl/AuthChildServiceImpl.java

@@ -9,6 +9,7 @@
 import com.project.growfit.domain.User.service.AuthChildService;
 import com.project.growfit.global.auth.cookie.CookieService;
 import com.project.growfit.global.auth.jwt.JwtProvider;
+import com.project.growfit.global.auth.service.AuthenticatedUserProvider;
 import com.project.growfit.global.auth.service.CustomAuthenticationProvider;
 import com.project.growfit.global.exception.BusinessException;
 import com.project.growfit.global.exception.ErrorCode;
@@ -37,14 +38,15 @@ public class AuthChildServiceImpl implements AuthChildService {
     private final JwtProvider jwtProvider;
     private final TokenRedisRepository tokenRedisRepository;
     private final CustomAuthenticationProvider authenticationProvider;
+    private final AuthenticatedUserProvider authenticatedUser;
 
     public ResultResponse<?> findByCode(String code) {
         log.info("[findByCode] 코드로 아이 정보 조회 요청: {}", code);
         Child child = getChild(code);
         Long childPid = child.getId();
 
         log.info("[findByCode] 아이 정보 PID 조회 성공: {}", childPid);
-        return new ResultResponse<>(ResultCode.CHILD_INFO_RETRIEVAL_SUCCESS, new ChildIdResponse(childPid));
+        return new ResultResponse<>(ResultCode.INFO_SUCCESS, new ChildIdResponse(childPid));
     }
 
     @Override
@@ -62,7 +64,7 @@ public ResultResponse<?> registerChildCredentials(Long child_id, AuthChildReques
         }
 
         log.info("[registerChildCredentials] 아이 계정 정보 등록 완료: child_id={}", child_id);
-        return new ResultResponse<>(ResultCode.PARENT_SIGNUP_SUCCESS, null);
+        return new ResultResponse<>(ResultCode.INFO_REGISTRATION_SUCCESS, null);
     }
 
 
@@ -95,7 +97,20 @@ public ResultResponse<?> login(AuthChildRequestDto request, HttpServletResponse
         cookieService.saveAccessTokenToCookie(response, newAccessToken);
         log.debug("[login] AccessToken을 쿠키에 저장 완료: child_login_id={}", request.childId());
 
-        return new ResultResponse<>(ResultCode.CHILD_LOGIN_SUCCESS, null);
+        return new ResultResponse<>(ResultCode.LOGIN_SUCCESS, null);
+    }
+
+    public ResultResponse<String> logout(HttpServletResponse response) {
+        String loginId = authenticatedUser.getAuthenticatedChild().getLoginId();
+        log.info("[logout] 아이 로그아웃 요청: loginId={}", loginId);
+
+        tokenRedisRepository.deleteById(loginId);
+        log.debug("[logout] Redis에서 리프레시 토큰 삭제 완료: loginId={}", loginId);
+
+        cookieService.clearCookie(response, "accessToken");
+        log.debug("[logout] accessToken 쿠키 만료 처리 완료: loginId={}", loginId);
+
+        return new ResultResponse<>(ResultCode.LOGOUT_SUCCESS, null);
     }
 
     public ResultResponse<?> findChildID(String code) {
@@ -104,7 +119,7 @@ public ResultResponse<?> findChildID(String code) {
         ChildInfoResponseDto dto = ChildInfoResponseDto.toDto(child);
 
         log.info("[findChildID] 아이 ID 찾기 성공: {}", dto);
-        return new ResultResponse<>(ResultCode.CHILD_INFO_RETRIEVAL_SUCCESS, dto);
+        return new ResultResponse<>(ResultCode.INFO_SUCCESS, dto);
     }
 
     @Override
@@ -121,7 +136,7 @@ public ResultResponse<?> findChildPassword(FindChildPasswordRequestDto request)
         childRepository.save(child);
 
         log.info("[findChildPassword] 비밀번호 변경 완료: user_id={}", request.user_id());
-        return new ResultResponse<>(ResultCode.PARENT_SIGNUP_SUCCESS, null);
+        return new ResultResponse<>(ResultCode.INFO_REGISTRATION_SUCCESS, null);
     }
 
     private Child getChild(Long child_id) {

src/main/java/com/project/growfit/domain/User/service/impl/AuthParentServiceImpl.java

@@ -56,7 +56,7 @@ public ResultResponse<?> registerChild(CustomUserDetails user, AuthParentRequest
         ChildInfoResponseDto dto = ChildInfoResponseDto.toDto(child);
 
         log.info("[registerChild] 자녀 등록 완료: child_id={}, parent_id={}", child.getId(), parent.getId());
-        return new ResultResponse<>(ResultCode.PARENT_SIGNUP_SUCCESS, dto);
+        return new ResultResponse<>(ResultCode.SIGNUP_SUCCESS, dto);
     }
 
     @Override