Merge pull request #15 from SlimusMinus/add_role-post

added role for posts

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));
   }
 

src/main/java/com/krylov/refound/controller/PostController.java

@@ -80,10 +80,7 @@ public class PostController {
   }
 
   @PatchMapping("/{id}/status")
-  public PostResponse updateStatus(
+  public PostResponse updateStatus(@PathVariable Long id, @RequestBody StatusUpdateRequest request) {
-      @PathVariable Long id,
-      @RequestBody StatusUpdateRequest request
-  ) {
     return service.updateStatus(id, request.getStatus());
   }
 }

src/main/java/com/krylov/refound/dto/PostResponse.java

@@ -2,6 +2,7 @@ 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;
@@ -24,4 +25,5 @@ public class PostResponse {
     private boolean isFavorite;
     private Long userId;
     private Long likeCount;
+    private Role userRole;
   }

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;
 }

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
 }

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();