🎨 로그인 시 member_id 반환 (#60)

* 🎨 돌봄 목록 최신순 정렬

* 🎨 로그인 시 member_id 반환

Author: Juye0nLee

src/main/java/com/ivory/ivory/dto/TokenDto.java

@@ -11,14 +11,16 @@
 @NoArgsConstructor
 public class TokenDto {
 
+    private Long id;
     private String authority;
     private String grantType;
     private String accessToken;
     private Long accessTokenExpiresIn;
     private String refreshToken;
 
     @Builder
-    public TokenDto(String authority, String grantType, String accessToken, Long accessTokenExpiresIn, String refreshToken) {
+    public TokenDto(Long id, String authority, String grantType, String accessToken, Long accessTokenExpiresIn, String refreshToken) {
+        this.id = id;
         this.authority = authority;
         this.grantType = grantType;
         this.accessToken = accessToken;

src/main/java/com/ivory/ivory/repository/ApplyRepository.java

@@ -15,5 +15,6 @@ public interface ApplyRepository extends JpaRepository<Apply, Long> {
     Apply findFirstByChild_IdOrderByCreateAt(Long childID);
     Optional<Apply> findFirstByStatusOrderByCreateAtDesc(Status status);
     List<Apply> findAllByStatus(Status status);
+    List<Apply> findAllByOrderByCreateAtDesc();
 
 }

src/main/java/com/ivory/ivory/service/AuthService.java

@@ -71,15 +71,22 @@ public TokenDto login(MemberRequestDto memberRequestDto) {
         // 4. JWT 토큰 생성
         TokenDto tokenDto = tokenProvider.generateTokenDto(authentication);
 
-        // 5. RefreshToken 저장
+        // 5. Authentication 객체에서 기본키 추출
+        Long id = Long.valueOf(authentication.getName());
+
+
+        // 6. RefreshToken 저장
         RefreshToken refreshToken = RefreshToken.builder()
                 .key(username)
                 .value(tokenDto.getRefreshToken())
                 .build();
 
         refreshTokenRepository.save(refreshToken);
 
-        // 6. 토큰 발급
+        // 7. 유저 기본키를 TokenDto에 추가
+        tokenDto.setId(id);
+
+        // 8. 토큰 발급
         return tokenDto;
     }
 

src/main/java/com/ivory/ivory/service/CaregiverService.java

@@ -37,7 +37,7 @@ public CustomApiResponse<?> getCareList(Long currentMemberId) {
         if(caregiver.isEmpty()) {
             throw new ResponseStatusException(HttpStatus.BAD_REQUEST,"돌보미만 조회가 가능합니다.");
         }
-        List<Apply> applyList = applyRepository.findAll();
+        List<Apply> applyList = applyRepository.findAllByOrderByCreateAtDesc();
         List<CareListDto> careListDto = new ArrayList<>();
         applyList.forEach(apply -> {
             Long applyId = apply.getId();

src/main/java/com/ivory/ivory/service/CustomUserDetailsService.java

@@ -35,12 +35,11 @@ public UserDetails loadUserByUsername(String username) throws UsernameNotFoundEx
     }
 
 
-    // DB 에 User 값이 존재한다면 UserDetails 객체로 만들어서 리턴
     private UserDetails createUserDetails(Member member) {
         GrantedAuthority grantedAuthority = new SimpleGrantedAuthority(member.getAuthority().toString());
 
         return new User(
-                String.valueOf(member.getId()),
+                String.valueOf(member.getId()), // ID를 username 필드에 저장
                 member.getPassword(),
                 Collections.singleton(grantedAuthority)
         );
@@ -50,10 +49,11 @@ private UserDetails createUserDetails(Caregiver caregiver) {
         GrantedAuthority grantedAuthority = new SimpleGrantedAuthority(caregiver.getAuthority().toString());
 
         return new User(
-                String.valueOf(caregiver.getId()),
+                String.valueOf(caregiver.getId()), // ID를 username 필드에 저장
                 caregiver.getPassword(),
                 Collections.singleton(grantedAuthority)
         );
     }
 
+
 }