Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
Expand Down Expand Up @@ -115,10 +116,12 @@ public ApiResponse<OlderMyPageResDto> mypageOlder(
public ApiResponse<ProtectorMyPageResDto> mypageProtector(
@AuthenticationPrincipal CustomUserDetails customUserDetails
) {
User user = userService.findByUserName(customUserDetails.getUsername());
userService.validateProtector(user);
User protector = userService.findByUserName(customUserDetails.getUsername());
userService.validateProtector(protector);
List<User> olders = protector.getOlders();

return ApiResponse.onSuccess(SuccessCode.USER_MYPAGE_VIEW_SUCCESS, UserConverter.protectorMyPageResDto(user));
return ApiResponse.onSuccess(SuccessCode.USER_MYPAGE_VIEW_SUCCESS,
UserConverter.protectorMyPageResDto(protector, olders));
}

@Operation(summary = "보호자의 노인 연결", description = "보호자가 관리할 노인을 연결하는 메서드입니다.")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
import com.example.silverbridgeX_user.user.domain.User;
import com.example.silverbridgeX_user.user.dto.JwtDto;
import com.example.silverbridgeX_user.user.dto.UserRequestDto;
import com.example.silverbridgeX_user.user.dto.UserResponseDto.OlderInfoDto;
import com.example.silverbridgeX_user.user.dto.UserResponseDto.OlderMyPageResDto;
import com.example.silverbridgeX_user.user.dto.UserResponseDto.ProtectorMyPageResDto;
import java.util.List;

public class UserConverter {
public static User saveUser(UserRequestDto.UserReqDto userReqDto, String key) {
Expand Down Expand Up @@ -35,14 +37,21 @@ public static OlderMyPageResDto olderMyPageResDto(User user) {
.build();
}

public static ProtectorMyPageResDto protectorMyPageResDto(User user) {
public static ProtectorMyPageResDto protectorMyPageResDto(User user, List<User> olders) {
List<OlderInfoDto> olderInfoDtos = olders.stream()
.map(older -> OlderInfoDto.builder()
.nickname(older.getNickname())
.key(older.getUsername())
.build())
.toList();

return ProtectorMyPageResDto.builder()
.key(user.getUsername())
.nickname(user.getNickname())
.address(user.getStreetAddress())
.email(user.getEmail())
.olderInfoDtos(olderInfoDtos)
.build();
}



}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.example.silverbridgeX_user.user.dto;

import io.swagger.v3.oas.annotations.media.Schema;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
Expand Down Expand Up @@ -48,6 +49,23 @@ public static class ProtectorMyPageResDto {

@Schema(description = "email")
private String email;

@Schema(description = "olders")
private List<OlderInfoDto> olderInfoDtos;
}

@Schema(description = "OlderInfoDto")
@Getter
@Setter
@Builder
@AllArgsConstructor
@NoArgsConstructor
public static class OlderInfoDto {
@Schema(description = "닉네임")
private String nickname;

@Schema(description = "key")
private String key;
}

}
Expand Down