diff --git a/src/main/java/com/krylov/refound/controller/AuthController.java b/src/main/java/com/krylov/refound/controller/AuthController.java index bb542b8..dd7e094 100644 --- a/src/main/java/com/krylov/refound/controller/AuthController.java +++ b/src/main/java/com/krylov/refound/controller/AuthController.java @@ -48,7 +48,16 @@ public class AuthController { String token = jwtService.generateToken(user.getLogin()); - UserDto userDto = new UserDto(user.getId(), user.getName(), user.getLogin(), user.getEmail()); + UserDto userDto = new UserDto( + user.getId(), + user.getName(), + user.getLastName(), + user.getLogin(), + user.getEmail(), + user.getPhone(), + user.getAvatarUrl(), + user.getRole() + ); return ResponseEntity.ok(new AuthResponse(token, userDto)); } @@ -66,7 +75,16 @@ public class AuthController { String token = jwtService.generateToken(user.getLogin()); - UserDto userDto = new UserDto(user.getId(), user.getName(), user.getLogin(), user.getEmail()); + UserDto userDto = new UserDto( + user.getId(), + user.getName(), + user.getLastName(), + user.getLogin(), + user.getEmail(), + user.getPhone(), + user.getAvatarUrl(), + user.getRole() + ); return ResponseEntity.ok(new AuthResponse(token, userDto)); } diff --git a/src/main/java/com/krylov/refound/controller/PostController.java b/src/main/java/com/krylov/refound/controller/PostController.java index a208c7c..411476c 100644 --- a/src/main/java/com/krylov/refound/controller/PostController.java +++ b/src/main/java/com/krylov/refound/controller/PostController.java @@ -80,10 +80,7 @@ public class PostController { } @PatchMapping("/{id}/status") - public PostResponse updateStatus( - @PathVariable Long id, - @RequestBody StatusUpdateRequest request - ) { + public PostResponse updateStatus(@PathVariable Long id, @RequestBody StatusUpdateRequest request) { return service.updateStatus(id, request.getStatus()); } } diff --git a/src/main/java/com/krylov/refound/dto/PostResponse.java b/src/main/java/com/krylov/refound/dto/PostResponse.java index f5c6a78..532abd9 100644 --- a/src/main/java/com/krylov/refound/dto/PostResponse.java +++ b/src/main/java/com/krylov/refound/dto/PostResponse.java @@ -2,26 +2,28 @@ package com.krylov.refound.dto; import com.krylov.refound.enums.PostStatus; import com.krylov.refound.enums.PostType; +import com.krylov.refound.enums.Role; import java.time.LocalDateTime; import java.util.List; import lombok.Data; -@Data -public class PostResponse { + @Data + public class PostResponse { - private Long id; - private String title; - private String description; - private String category; - private String city; - private String district; - private PostType type; - private PostStatus status; - private LocalDateTime createdAt; - private String userEmail; - private String phone; - private List images; - private boolean isFavorite; - private Long userId; - private Long likeCount; -} + private Long id; + private String title; + private String description; + private String category; + private String city; + private String district; + private PostType type; + private PostStatus status; + private LocalDateTime createdAt; + private String userEmail; + private String phone; + private List images; + private boolean isFavorite; + private Long userId; + private Long likeCount; + private Role userRole; + } diff --git a/src/main/java/com/krylov/refound/dto/UserDto.java b/src/main/java/com/krylov/refound/dto/UserDto.java index 22ce59d..7b7707e 100644 --- a/src/main/java/com/krylov/refound/dto/UserDto.java +++ b/src/main/java/com/krylov/refound/dto/UserDto.java @@ -1,5 +1,6 @@ package com.krylov.refound.dto; +import com.krylov.refound.enums.Role; import lombok.AllArgsConstructor; import lombok.Data; @@ -8,6 +9,10 @@ import lombok.Data; public class UserDto { private Long id; private String name; + private String lastName; private String login; private String email; + private String phone; + private String avatarUrl; + private Role role; } diff --git a/src/main/java/com/krylov/refound/enums/Role.java b/src/main/java/com/krylov/refound/enums/Role.java index 1aa7413..6a53b63 100644 --- a/src/main/java/com/krylov/refound/enums/Role.java +++ b/src/main/java/com/krylov/refound/enums/Role.java @@ -1,5 +1,5 @@ package com.krylov.refound.enums; public enum Role { - ADMIN, USER + ADMIN, USER, LOST_AND_FOUND, METRO } diff --git a/src/main/java/com/krylov/refound/service/PostService.java b/src/main/java/com/krylov/refound/service/PostService.java index 3e6d982..7223795 100644 --- a/src/main/java/com/krylov/refound/service/PostService.java +++ b/src/main/java/com/krylov/refound/service/PostService.java @@ -105,6 +105,7 @@ public class PostService { PostResponse response = mapper.toResponse(post); response.setLikeCount(likeCounts.getOrDefault(post.getId(), 0L)); response.setFavorite(finalUserFavoriteIds.contains(post.getId())); + response.setUserRole(post.getUser().getRole()); return response; }) .toList();