diff --git a/gateway/src/main/java/com/oing/controller/MeController.java b/gateway/src/main/java/com/oing/controller/MeController.java index 771d1d4e..1d954a21 100644 --- a/gateway/src/main/java/com/oing/controller/MeController.java +++ b/gateway/src/main/java/com/oing/controller/MeController.java @@ -43,9 +43,8 @@ public MemberResponse getMe(String loginMemberId) { } @Override - public FamilyResponse getMyFamily(String loginMemberId) { - Member member = memberService.getMemberByMemberId(loginMemberId); - Family family = familyService.getFamilyById(member.getFamilyId()); + public FamilyResponse getMyFamily(String loginFamilyId) { + Family family = familyService.getFamilyById(loginFamilyId); return FamilyResponse.of(family); } diff --git a/gateway/src/main/java/com/oing/restapi/MeApi.java b/gateway/src/main/java/com/oing/restapi/MeApi.java index ffe398bc..968f5fca 100644 --- a/gateway/src/main/java/com/oing/restapi/MeApi.java +++ b/gateway/src/main/java/com/oing/restapi/MeApi.java @@ -7,6 +7,7 @@ import com.oing.dto.response.DefaultResponse; import com.oing.dto.response.FamilyResponse; import com.oing.dto.response.MemberResponse; +import com.oing.util.security.LoginFamilyId; import com.oing.util.security.LoginMemberId; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -39,8 +40,8 @@ MemberResponse getMe( @GetMapping("/family-info") FamilyResponse getMyFamily( @Parameter(hidden = true) - @LoginMemberId - String loginMemberId + @LoginFamilyId + String loginFamilyId ); @Operation(summary = "FCM 토큰 등록", description = "FCM 토큰을 등록합니다.")