Skip to content

Commit

Permalink
#18 [Update] 코드 리팩토링
Browse files Browse the repository at this point in the history
UserController 및 Service 합치기
  • Loading branch information
Anna-Jin committed Jul 20, 2022
1 parent e04d82f commit 2158b4a
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 77 deletions.
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package com.mpnp.baechelin.user.controller;

import com.mpnp.baechelin.common.SuccessResponse;
import com.mpnp.baechelin.user.dto.UserResponseDto;
import com.mpnp.baechelin.user.service.UserService;
import com.mpnp.baechelin.util.CookieUtil;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.security.core.userdetails.User;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

Expand All @@ -21,6 +21,7 @@ public class UserController {

private final UserService userService;

@ApiOperation(value = "로그아웃")
@RequestMapping("/logout")
public SuccessResponse logout(
HttpServletRequest request,
Expand All @@ -31,4 +32,10 @@ public SuccessResponse logout(

return new SuccessResponse("로그아웃");
}

@GetMapping
@ApiOperation(value = "유저 정보를 반환합니다")
public UserResponseDto getUserInfo(@AuthenticationPrincipal User user) {
return userService.getUserInfo(user.getUsername());
}
}

This file was deleted.

26 changes: 0 additions & 26 deletions src/main/java/com/mpnp/baechelin/user/dto/UserInfoResponseDto.java

This file was deleted.

19 changes: 19 additions & 0 deletions src/main/java/com/mpnp/baechelin/user/dto/UserResponseDto.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.mpnp.baechelin.user.dto;


import com.mpnp.baechelin.user.domain.User;
import lombok.*;

@Builder
@AllArgsConstructor
@NoArgsConstructor
@Getter
public class UserResponseDto {
private String name;
private String email;

public UserResponseDto(User user) {
this.name = user.getName();
this.email = user.getEmail();
}
}
21 changes: 0 additions & 21 deletions src/main/java/com/mpnp/baechelin/user/service/UserInfoService.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.mpnp.baechelin.login.jwt.repository.UserRefreshTokenRepository;
import com.mpnp.baechelin.user.domain.User;
import com.mpnp.baechelin.user.dto.UserResponseDto;
import com.mpnp.baechelin.user.repository.UserRepository;
import com.mpnp.baechelin.util.CookieUtil;
import lombok.RequiredArgsConstructor;
Expand All @@ -22,5 +23,10 @@ public void logout(HttpServletRequest request, HttpServletResponse response, Str
userRefreshTokenRepository.deleteBySocialId(socialId);
CookieUtil.deleteCookie(request, response, "refresh_token");
}

public UserResponseDto getUserInfo(String socialId) {
User targetUser = userRepository.findBySocialId(socialId);
return new UserResponseDto(targetUser);
}
}

0 comments on commit 2158b4a

Please sign in to comment.