Skip to content

[refactor] MyBarController에서 사용자 인증 정보를 처리하는 방식을 리팩토링 #163 #178

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Sep 30, 2025
Merged

[refactor] MyBarController에서 사용자 인증 정보를 처리하는 방식을 리팩토링 #163 #178

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff05562
Revert "chore: initData용 이미지 추가"
MEOHIN Sep 26, 2025
9ffd623
.
MEOHIN Sep 29, 2025
a6e1887
refactor: MyBarController에 SecurityUser 기반 로그인 처리 로직 도입
MEOHIN Sep 29, 2025
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
26 changes: 18 additions & 8 deletions src/main/java/com/back/domain/mybar/controller/MyBarController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,18 @@

import com.back.domain.mybar.dto.MyBarListResponseDto;
import com.back.domain.mybar.service.MyBarService;
import com.back.global.exception.ServiceException;
import com.back.global.rsData.RsData;
import com.back.global.security.SecurityUser;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
import lombok.RequiredArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.format.annotation.DateTimeFormat;

import java.time.LocalDateTime;

@RestController
Expand All @@ -35,16 +38,18 @@ public class MyBarController {
* @return 킵 아이템 목록과 다음 페이지 커서
*/
@GetMapping
@Operation(summary = "내 바 목록", description = "내가 킵한 칵테일 목록 조회. 무한스크롤 파라미터 지원")
@Operation(summary = "내 바 목록", description = "내가 킵한 칵테일 목록 조회. 무한 스크롤 커서 지원")
public RsData<MyBarListResponseDto> getMyBarList(
@AuthenticationPrincipal(expression = "id") Long userId,
@AuthenticationPrincipal(errorOnInvalidType = false) SecurityUser principal,
@RequestParam(required = false)
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime lastKeptAt,
@RequestParam(required = false) Long lastId,
@RequestParam(defaultValue = "20") @Min(1) @Max(100) int limit
) {
Long userId = principal != null ? principal.getId() : null;
if (userId == null) throw new ServiceException(401, "로그인이 필요합니다.");
MyBarListResponseDto body = myBarService.getMyBar(userId, lastKeptAt, lastId, limit);
return RsData.successOf(body); // code=200, message="success"
return RsData.successOf(body);
}

/**
Expand All @@ -54,11 +59,13 @@ public RsData<MyBarListResponseDto> getMyBarList(
* @return 201 kept
*/
@PostMapping("/{cocktailId}/keep")
@Operation(summary = "킵 추가/복원", description = "해당 칵테일을 내 바에 킵합니다. 이미 삭제된 경우 복원")
@Operation(summary = "킵 추가/복원", description = "해당 칵테일을 내 바에 킵합니다. 이미 삭제 상태면 복원")
public RsData<Void> keep(
@AuthenticationPrincipal(expression = "id") Long userId,
@AuthenticationPrincipal(errorOnInvalidType = false) SecurityUser principal,
@PathVariable Long cocktailId
) {
Long userId = principal != null ? principal.getId() : null;
if (userId == null) throw new ServiceException(401, "로그인이 필요합니다.");
myBarService.keep(userId, cocktailId);
return RsData.of(201, "kept"); // Aspect가 HTTP 201로 설정
}
Expand All @@ -70,12 +77,15 @@ public RsData<Void> keep(
* @return 200 deleted
*/
@DeleteMapping("/{cocktailId}/keep")
@Operation(summary = "킵 해제", description = "내 바에서 해당 칵테일 킵을 해제합니다(소프트 삭제, 멱등)")
@Operation(summary = "킵 해제", description = "내 바에서 해당 칵테일을 삭제(소프트 삭제, 멱등)")
public RsData<Void> unkeep(
@AuthenticationPrincipal(expression = "id") Long userId,
@AuthenticationPrincipal(errorOnInvalidType = false) SecurityUser principal,
@PathVariable Long cocktailId
) {
Long userId = principal != null ? principal.getId() : null;
if (userId == null) throw new ServiceException(401, "로그인이 필요합니다.");
myBarService.unkeep(userId, cocktailId);
return RsData.of(200, "deleted");
}
}