Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: 홈 API 리팩토링 #81

Merged
merged 4 commits into from
Sep 18, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
refactor: Home API 응답 ResponseEntity로 통일
Haewonny committed Sep 3, 2024
commit 928648cc4928246cbe992d123d6bf574f7e3ecc1
Original file line number Diff line number Diff line change
@@ -2,12 +2,11 @@

import com.on.server.domain.home.application.HomeService;
import com.on.server.domain.user.domain.User;
import com.on.server.global.common.CommonResponse;
import com.on.server.global.common.ResponseCode;
import com.on.server.global.security.SecurityService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.security.core.userdetails.UserDetails;
@@ -27,34 +26,37 @@ public class HomeController {
// [GET] 최신 정보글 조회
@GetMapping("/info/list")
@Operation(summary = "최신 정보글 조회 API", description = "홈 화면에서 최신 정보글을 조회하는 API 입니다.")
@PreAuthorize("@securityService.isActiveAndNotNoneUser() and hasAnyRole('ACTIVE', 'AWAIT', 'TEMPORARY')")
public CommonResponse<?> getInfoBoardList(@AuthenticationPrincipal UserDetails userDetails) {

@PreAuthorize("@securityService.isNotTemporaryUser()")
public ResponseEntity<?> getInfoBoardList(
@AuthenticationPrincipal UserDetails userDetails
) {
User user = securityService.getUserByUserDetails(userDetails);

return new CommonResponse<>(ResponseCode.SUCCESS, homeService.getInfoBoardList(user));
return ResponseEntity.ok(homeService.getInfoBoardList(user));
}

// [GET] 최신 자유글 조회
@GetMapping("/free/list")
@Operation(summary = "최신 자유글 조회 API", description = "홈 화면에서 최신 자유글을 조회하는 API 입니다.")
@PreAuthorize("@securityService.isActiveAndNotNoneUser() and hasAnyRole('ACTIVE', 'AWAIT', 'TEMPORARY')")
public CommonResponse<?> getFreeBoardList(@AuthenticationPrincipal UserDetails userDetails) {

@PreAuthorize("@securityService.isNotTemporaryUser()")
public ResponseEntity<?> getFreeBoardList(
@AuthenticationPrincipal UserDetails userDetails
) {
User user = securityService.getUserByUserDetails(userDetails);

return new CommonResponse<>(ResponseCode.SUCCESS, homeService.getFreeBoardList(user));
return ResponseEntity.ok(homeService.getFreeBoardList(user));
}

// [GET] 내 주변 동행글 조회
@GetMapping("/company/list")
@Operation(summary = "내 주변 동행글 조회 API", description = "홈 화면에서 내 주변 동행글 조회하는 API 입니다.")
@PreAuthorize("@securityService.isActiveAndNotNoneUser() and hasAnyRole('ACTIVE', 'AWAIT', 'TEMPORARY')")
public CommonResponse<?> getCompanyBoardList(@AuthenticationPrincipal UserDetails userDetails) {

@PreAuthorize("@securityService.isNotTemporaryUser()")
public ResponseEntity<?> getCompanyBoardList(
@AuthenticationPrincipal UserDetails userDetails
) {
User user = securityService.getUserByUserDetails(userDetails);

return new CommonResponse<>(ResponseCode.SUCCESS, homeService.getCompanyBoardList(user));
return ResponseEntity.ok(homeService.getCompanyBoardList(user));
}

}