🔀 Favorite, Member auth 추가

src/main/java/com/mycom/backenddaengplace/favorite/controller/FavoriteController.java

@@ -1,19 +1,20 @@
 package com.mycom.backenddaengplace.favorite.controller;
 
 
+import com.mycom.backenddaengplace.auth.dto.CustomOAuth2User;
 import com.mycom.backenddaengplace.common.dto.ApiResponse;
-import com.mycom.backenddaengplace.favorite.dto.request.FavoriteDeleteRequest;
-import com.mycom.backenddaengplace.favorite.dto.request.FavoriteRegisterRequest;
-import com.mycom.backenddaengplace.favorite.dto.request.FavoritesRequest;
+import com.mycom.backenddaengplace.favorite.dto.request.FavoriteRequest;
 import com.mycom.backenddaengplace.favorite.dto.response.FavoriteDeleteResponse;
 import com.mycom.backenddaengplace.favorite.dto.response.FavoriteRegisterResponse;
 import com.mycom.backenddaengplace.favorite.dto.response.FavoritesResponse;
 import com.mycom.backenddaengplace.favorite.service.FavoriteService;
+import com.mycom.backenddaengplace.member.domain.Member;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -26,30 +27,34 @@ public class FavoriteController {
 
     private final FavoriteService favoriteService;
 
-    @GetMapping("/{memberId}")
+    @GetMapping
     public ResponseEntity<ApiResponse<List<FavoritesResponse>>> getFavoritesByMember(
-            @PathVariable("memberId") Long memberId
+            @AuthenticationPrincipal CustomOAuth2User customOAuth2User
     ) {
-        log.debug("즐겨찾기 리스트 요청: {}", memberId);
-        List<FavoritesResponse> response = favoriteService.getFavoritesByMember(memberId);
+        Member member = customOAuth2User.getMember();
+        List<FavoritesResponse> response = favoriteService.getFavoritesByMember(member);
         return ResponseEntity.ok(ApiResponse.success("즐겨찾기 리스트를 조회하였습니다.", response));
     }
 
     @PutMapping
     public ResponseEntity<ApiResponse<FavoriteRegisterResponse>> registerFavorite(
-            @Valid @RequestBody FavoriteRegisterRequest request
+            @Valid @RequestBody FavoriteRequest request,
+            @AuthenticationPrincipal CustomOAuth2User customOAuth2User
     ) {
+        Member member = customOAuth2User.getMember();
         log.debug("즐겨찾기 등록 요청: {}", request);
-        FavoriteRegisterResponse response = favoriteService.registerFavorite(request);
+        FavoriteRegisterResponse response = favoriteService.registerFavorite(request, member);
         return ResponseEntity.status(HttpStatus.CREATED).body(ApiResponse.success("즐겨찾기가 등록되었습니다.", response));
     }
 
     @DeleteMapping
     public ResponseEntity<ApiResponse<FavoriteDeleteResponse>> deleteFavorite(
-            @Valid @RequestBody FavoriteDeleteRequest request
+            @Valid @RequestBody FavoriteRequest request,
+            @AuthenticationPrincipal CustomOAuth2User customOAuth2User
     ) {
+        Member member = customOAuth2User.getMember();
         log.debug("즐겨찾기 삭제 요청: {}", request);
-        favoriteService.deleteFavorite(request);
+        favoriteService.deleteFavorite(request, member);
         return ResponseEntity.ok(ApiResponse.success("즐겨찾기가 삭제되었습니다."));
     }
 

src/main/java/com/mycom/backenddaengplace/favorite/dto/request/FavoriteDeleteRequest.java → src/main/java/com/mycom/backenddaengplace/favorite/dto/request/FavoriteRequest.java

@@ -6,9 +6,8 @@
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class FavoriteDeleteRequest {
+public class FavoriteRequest {
 
-    private Long memberId;
     private Long placeId;
 
 }

src/main/java/com/mycom/backenddaengplace/favorite/service/FavoriteService.java

@@ -1,8 +1,7 @@
 package com.mycom.backenddaengplace.favorite.service;
 
 import com.mycom.backenddaengplace.favorite.domain.Favorite;
-import com.mycom.backenddaengplace.favorite.dto.request.FavoriteDeleteRequest;
-import com.mycom.backenddaengplace.favorite.dto.request.FavoriteRegisterRequest;
+import com.mycom.backenddaengplace.favorite.dto.request.FavoriteRequest;
 import com.mycom.backenddaengplace.favorite.dto.response.FavoriteRegisterResponse;
 import com.mycom.backenddaengplace.favorite.dto.response.FavoritesResponse;
 import com.mycom.backenddaengplace.favorite.exception.FavoriteAlreadyExistException;
@@ -32,23 +31,23 @@ public class FavoriteService {
     private final PlaceRepository placeRepository;
 
     @Transactional
-    public FavoriteRegisterResponse registerFavorite(FavoriteRegisterRequest request) {
-        Member member = findMemberById(request.getMemberId());
+    public FavoriteRegisterResponse registerFavorite(FavoriteRequest request, Member member) {
+        Member registerMember = findMemberById(member.getId());
         Place place = findPlaceById(request.getPlaceId());
 
-        return FavoriteRegisterResponse.from(handleRegisterFavorite(member, place));
+        return FavoriteRegisterResponse.from(handleRegisterFavorite(registerMember, place));
     }
 
     @Transactional
-    public void deleteFavorite(FavoriteDeleteRequest request) {
-        Member member = findMemberById(request.getMemberId());
+    public void deleteFavorite(FavoriteRequest request, Member member) {
+        Member deleteMember = findMemberById(member.getId());
         Place place = findPlaceById(request.getPlaceId());
-        handleDeleteFavorite(member, place);
+        handleDeleteFavorite(deleteMember, place);
 
     }
 
-    public List<FavoritesResponse> getFavoritesByMember(Long memberId) {
-        Member member = findMemberById(memberId);
+    public List<FavoritesResponse> getFavoritesByMember(Member member) {
+//        Member member = findMemberById(memberId);
         return favoriteRepository.findFavoritesByMemberId(member.getId()).stream().map(FavoritesResponse::from).collect(Collectors.toList());
     }
 

src/main/java/com/mycom/backenddaengplace/member/controller/MemberController.java

@@ -1,11 +1,13 @@
 package com.mycom.backenddaengplace.member.controller;
 
 
+import com.mycom.backenddaengplace.auth.dto.CustomOAuth2User;
 import com.mycom.backenddaengplace.common.dto.ApiResponse;
+import com.mycom.backenddaengplace.member.domain.Member;
 import com.mycom.backenddaengplace.member.dto.request.BaseEmailRequest;
 import com.mycom.backenddaengplace.member.dto.request.EmailCodeCheckRequest;
 import com.mycom.backenddaengplace.member.dto.request.MemberRegisterRequest;
-import com.mycom.backenddaengplace.member.dto.request.MemberReviseRequest;
+import com.mycom.backenddaengplace.member.dto.request.MemberUpdateRequest;
 import com.mycom.backenddaengplace.member.dto.response.EmailCodeCheckResponse;
 import com.mycom.backenddaengplace.member.dto.response.EmailDuplicateCheckResponse;
 import com.mycom.backenddaengplace.member.dto.response.BaseMemberResponse;
@@ -17,6 +19,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.UnsupportedEncodingException;
@@ -30,27 +33,35 @@ public class MemberController {
     private final MemberService memberService;
     private final EmailService emailService;
 
-    @GetMapping("/profile/{memberId}")
-    public ResponseEntity<ApiResponse<BaseMemberResponse>> getMember(@PathVariable("memberId") Long memberId) {
-        BaseMemberResponse response = memberService.getMember(memberId);
+    @GetMapping("/profile")
+    public ResponseEntity<ApiResponse<BaseMemberResponse>> getMember(
+            @AuthenticationPrincipal CustomOAuth2User customOAuth2User
+    ) {
+        Member member = customOAuth2User.getMember();
+        BaseMemberResponse response = memberService.getMember(member);
         return ResponseEntity.ok(ApiResponse.success("회원 조회가 완료되었습니다.", response));
     }
 
-    @PostMapping("/profile/{memberId}")
-    public ResponseEntity<ApiResponse<BaseMemberResponse>> reviseMember(
-            @Valid @RequestBody MemberReviseRequest request, @PathVariable("memberId") Long memberId) {
-        BaseMemberResponse response = memberService.reviseMember(request, memberId);
+    @PostMapping("/profile")
+    public ResponseEntity<ApiResponse<BaseMemberResponse>> updateMember(
+            @Valid @RequestBody MemberUpdateRequest request,
+            @AuthenticationPrincipal CustomOAuth2User customOAuth2User
+    ) {
+        Member member = customOAuth2User.getMember();
+        BaseMemberResponse response = memberService.reviseMember(request, member);
         return ResponseEntity.ok(ApiResponse.success("회원 수정이 완료되었습니다.", response));
     }
 
-    @DeleteMapping("/profile/{memberId}")
+    @DeleteMapping("/profile")
     public ResponseEntity<ApiResponse<BaseMemberResponse>> deleteMember(
-            @PathVariable("memberId") Long memberId) {
-        BaseMemberResponse response = memberService.deleteMember(memberId);
+            @AuthenticationPrincipal CustomOAuth2User customOAuth2User
+    ) {
+        Member member = customOAuth2User.getMember();
+        BaseMemberResponse response = memberService.deleteMember(member);
         return ResponseEntity.ok(ApiResponse.success("회원 삭제가 완료되었습니다.", response));
     }
 
-    @PostMapping("/profile")
+    @PostMapping("")
     public ResponseEntity<ApiResponse<BaseMemberResponse>> registerMember(
             @Valid @RequestBody MemberRegisterRequest request
     ) {

src/main/java/com/mycom/backenddaengplace/member/domain/Member.java

@@ -13,6 +13,7 @@
 
 @Entity
 @Getter
+@Setter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class Member extends BaseEntity {
 

src/main/java/com/mycom/backenddaengplace/member/dto/request/MemberReviseRequest.java → src/main/java/com/mycom/backenddaengplace/member/dto/request/MemberUpdateRequest.java

@@ -8,7 +8,7 @@
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-public class MemberReviseRequest {
+public class MemberUpdateRequest {
 
     @NotBlank(message = "별명을 입력해주세요.")
     @Size(min = 2, max = 20, message = "별명은 2자 이상 20자 이하로 입력해주세요.")

src/main/java/com/mycom/backenddaengplace/member/service/MemberService.java

@@ -3,7 +3,7 @@
 import com.mycom.backenddaengplace.member.domain.Member;
 import com.mycom.backenddaengplace.member.dto.request.BaseEmailRequest;
 import com.mycom.backenddaengplace.member.dto.request.MemberRegisterRequest;
-import com.mycom.backenddaengplace.member.dto.request.MemberReviseRequest;
+import com.mycom.backenddaengplace.member.dto.request.MemberUpdateRequest;
 import com.mycom.backenddaengplace.member.dto.response.BaseMemberResponse;
 import com.mycom.backenddaengplace.member.dto.response.EmailDuplicateCheckResponse;
 import com.mycom.backenddaengplace.member.exception.MemberNotFoundException;
@@ -25,34 +25,29 @@ public class MemberService {
 
     private final MemberRepository memberRepository;
 
-    public BaseMemberResponse getMember(Long memberId) {
-        Member member = memberRepository.findById(memberId).orElseThrow(() -> new MemberNotFoundException(memberId));
+    public BaseMemberResponse getMember(Member member) {
+//        Member member = memberRepository.findById(memberId).orElseThrow(() -> new MemberNotFoundException(memberId));
 
         return BaseMemberResponse.from(member);
     }
 
     @Transactional
-    public BaseMemberResponse reviseMember(MemberReviseRequest request, Long memberId) {
+    public BaseMemberResponse reviseMember(MemberUpdateRequest request, Member member) {
 
-        Member member = memberRepository.findById(memberId).orElseThrow(() -> new MemberNotFoundException(memberId));
+        Member updatedMember = memberRepository.findById(member.getId()).orElseThrow(() -> new MemberNotFoundException(member.getId()));
 
         LocalDateTime birthDate = parseBirthDate(request.getBirthDate());
 
-        Member revisedMember = Member.builder()
-                .email(member.getEmail())
-                .name(member.getName())
-                .nickname(request.getNickname())
-                .birthDate(birthDate)
-                .gender(request.getGender())
-                .state(request.getState())
-                .city(request.getCity())
-                .profileImageUrl(request.getProfileImageUrl())
-                .locationStatus(member.getLocationStatus())
-                .build();
+        updatedMember.setNickname(request.getNickname());
+        updatedMember.setGender(request.getGender());
+        updatedMember.setState(request.getState());
+        updatedMember.setCity(request.getCity());
+        updatedMember.setBirthDate(birthDate);
+        updatedMember.setProfileImageUrl(request.getProfileImageUrl());
 
-        memberRepository.save(revisedMember);
+        memberRepository.save(updatedMember);
 
-        return BaseMemberResponse.from(revisedMember);
+        return BaseMemberResponse.from(updatedMember);
     }
 
     @Transactional
@@ -93,10 +88,13 @@ public EmailDuplicateCheckResponse checkDuplicateEmail(BaseEmailRequest request)
         return EmailDuplicateCheckResponse.from(!isValid);
     }
 
-    public BaseMemberResponse deleteMember(Long memberId) {
-        Member member = memberRepository.findById(memberId).orElseThrow(() -> new MemberNotFoundException(memberId));
-        memberRepository.delete(member);
+    @Transactional
+    public BaseMemberResponse deleteMember(Member member) {
 
-        return BaseMemberResponse.from(member);
+        Member deletedMember = memberRepository.findById(member.getId()).orElseThrow(() -> new MemberNotFoundException(member.getId()));
+
+        memberRepository.delete(deletedMember);
+
+        return BaseMemberResponse.from(deletedMember);
     }
 }