Use Model and Controller changes

src/main/java/xyz/subho/clone/twitter/controller/UserController.java

@@ -33,7 +33,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import xyz.subho.clone.twitter.model.UserResponse;
+import xyz.subho.clone.twitter.model.UserModel;
 import xyz.subho.clone.twitter.service.UserService;
 import xyz.subho.clone.twitter.utility.Utility;
 
@@ -48,54 +48,54 @@ public class UserController {
   @Autowired private Utility utility;
 
   @GetMapping("/{userNameOrUserId}")
-  ResponseEntity<UserResponse> getUserByUserIdOrUserName(
+  public ResponseEntity<UserModel> getUserByUserIdOrUserName(
       @PathVariable("userNameOrUserId") String userNameOrUserId) {
 
-    UserResponse userResponse;
+    UserModel userResponse;
 
     if (userNameOrUserId.startsWith("@")) {
       var username = userNameOrUserId.substring(1);
-      userResponse = new UserResponse(userService.getUserByUserName(username));
+      userResponse = userService.getUserByUserName(username);
       return new ResponseEntity<>(userResponse, HttpStatus.OK);
     }
     var userId = utility.converStringToUUID(userNameOrUserId);
-    userResponse = new UserResponse(userService.getUserByUserId(userId));
+    userResponse = userService.getUserByUserId(userId);
     return new ResponseEntity<>(userResponse, HttpStatus.OK);
   }
 
   @PostMapping
-  ResponseEntity<UserResponse> createUser(@RequestBody UserResponse userResponse) {
-    UserResponse createdUser = new UserResponse(userService.addUser(userResponse));
+  public ResponseEntity<UserModel> createUser(@RequestBody UserModel userResponse) {
+    UserModel createdUser = userService.addUser(userResponse);
     return new ResponseEntity<>(createdUser, HttpStatus.OK);
   }
 
   @PatchMapping
-  ResponseEntity<UserResponse> updateUser(@RequestBody UserResponse userResponse) {
-    UserResponse updatedUser = new UserResponse(userService.editUser(userResponse));
+  public ResponseEntity<UserModel> updateUser(@RequestBody UserModel userResponse) {
+    UserModel updatedUser = userService.editUser(userResponse);
     return new ResponseEntity<>(updatedUser, HttpStatus.OK);
   }
 
   @PutMapping("/{userId}/follow")
-  ResponseEntity<HttpStatus> addFollower(@PathVariable UUID userId) {
+  public ResponseEntity<HttpStatus> addFollower(@PathVariable UUID userId) {
     userService.addFollower(userId);
     return new ResponseEntity<>(HttpStatus.OK);
   }
 
   @DeleteMapping("/{userId}/follow")
-  ResponseEntity<HttpStatus> removeFollower(@PathVariable("userId") UUID userId) {
+  public ResponseEntity<HttpStatus> removeFollower(@PathVariable("userId") UUID userId) {
     userService.removeFollower(userId);
     return new ResponseEntity<>(HttpStatus.OK);
   }
 
   @GetMapping("/{userId}/followers")
-  ResponseEntity<List<UserResponse>> getFollowers(@PathVariable("userId") UUID userId) {
-    List<UserResponse> followers = userService.getFollowers(userId);
+  public ResponseEntity<List<UserModel>> getFollowers(@PathVariable("userId") UUID userId) {
+    List<UserModel> followers = userService.getFollowers(userId);
     return new ResponseEntity<>(followers, HttpStatus.OK);
   }
 
   @GetMapping("/{userId}/followings")
-  ResponseEntity<List<UserResponse>> getFollowings(@PathVariable("userId") UUID userId) {
-    List<UserResponse> followings = userService.getFollowings(userId);
+  public ResponseEntity<List<UserModel>> getFollowings(@PathVariable("userId") UUID userId) {
+    List<UserModel> followings = userService.getFollowings(userId);
     return new ResponseEntity<>(followings, HttpStatus.OK);
   }
 }

src/main/java/xyz/subho/clone/twitter/entity/Likes.java → src/main/java/xyz/subho/clone/twitter/entity/Like.java

@@ -31,7 +31,7 @@
 @Entity
 @Table(name = "likes")
 @Data
-public class Likes {
+public class Like {
 
   @Id
   @GeneratedValue(strategy = GenerationType.AUTO)

src/main/java/xyz/subho/clone/twitter/entity/Post.java

@@ -83,5 +83,5 @@ public class Post {
 
   @OneToMany(mappedBy = "post", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
   @JsonIgnore
-  private List<Likes> postLikes = new ArrayList<>();
+  private List<Like> postLikes = new ArrayList<>();
 }

src/main/java/xyz/subho/clone/twitter/entity/User.java

@@ -48,8 +48,6 @@ public class User {
   @Column(unique = true, length = 30)
   private String username;
 
-  private String password;
-
   @Column(length = 50)
   private String name;
 
@@ -68,7 +66,7 @@ public class User {
 
   @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
   @JsonIgnore
-  private List<Likes> userLikes = new ArrayList<>();
+  private List<Like> userLikes = new ArrayList<>();
 
   @ElementCollection Map<UUID, String> follower = new HashMap<>();
 

src/main/java/xyz/subho/clone/twitter/model/HashtagModel.java

@@ -0,0 +1,15 @@
+package xyz.subho.clone.twitter.model;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+import lombok.Data;
+
+@Data
+public class HashtagModel {
+
+  private UUID id;
+  private String tag;
+  private Long recentPostCount;
+  private List<HashtagPostModel> hashtagPosts = new ArrayList<>();
+}

src/main/java/xyz/subho/clone/twitter/model/HashtagPostModel.java

@@ -0,0 +1,12 @@
+package xyz.subho.clone.twitter.model;
+
+import java.util.UUID;
+import lombok.Data;
+
+@Data
+public class HashtagPostModel {
+
+  private UUID id;
+  private HashtagModel hashtag;
+  private PostModel post;
+}

src/main/java/xyz/subho/clone/twitter/model/LikeModel.java

@@ -0,0 +1,12 @@
+package xyz.subho.clone.twitter.model;
+
+import java.util.UUID;
+import lombok.Data;
+
+@Data
+public class LikeModel {
+
+  private UUID id;
+  private PostModel post;
+  private UserModel user;
+}

src/main/java/xyz/subho/clone/twitter/model/PostModel.java

@@ -0,0 +1,27 @@
+package xyz.subho.clone.twitter.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import lombok.Data;
+import xyz.subho.clone.twitter.entity.User;
+
+@Data
+public class PostModel {
+
+  private UUID id;
+  private String text;
+  private User user;
+  private Long likeCount;
+  private Long repostCount;
+  private UUID originalPostId;
+  private UUID replyToId;
+  private Date timestamp;
+  private Map<UUID, String> hashtags = new HashMap<>();
+  private Map<UUID, String> mentions = new HashMap<>();
+  private List<HashtagPostModel> postHashtags = new ArrayList<>();
+  private List<LikeModel> postLikes = new ArrayList<>();
+}

src/main/java/xyz/subho/clone/twitter/model/UserResponse.java → src/main/java/xyz/subho/clone/twitter/model/UserModel.java

@@ -22,12 +22,9 @@
 import java.util.List;
 import java.util.UUID;
 import lombok.Data;
-import xyz.subho.clone.twitter.entity.Likes;
-import xyz.subho.clone.twitter.entity.Post;
-import xyz.subho.clone.twitter.entity.User;
 
 @Data
-public class UserResponse {
+public class UserModel {
 
   private UUID id;
   private String username;
@@ -37,21 +34,6 @@ public class UserResponse {
   private Long followerCount;
   private Long followingCount;
   private Boolean verified;
-  private List<Likes> userLikes = new ArrayList<>();
-  private List<Post> userPosts = new ArrayList<>();
-
-  /** @param Users (Entity) */
-  public UserResponse(User userEntity) {
-
-    this.id = userEntity.getId();
-    this.username = userEntity.getUsername();
-    this.name = userEntity.getName();
-    this.avatar = userEntity.getAvatar();
-    this.bio = userEntity.getBio();
-    this.followerCount = userEntity.getFollowerCount();
-    this.followingCount = userEntity.getFollowingCount();
-    this.verified = userEntity.getVerified();
-    this.userLikes = userEntity.getUserLikes();
-    this.userPosts = userEntity.getUserPosts();
-  }
+  private List<LikeModel> userLikes = new ArrayList<>();
+  private List<PostModel> userPosts = new ArrayList<>();
 }

src/main/java/xyz/subho/clone/twitter/repository/LikesRepository.java

@@ -20,6 +20,6 @@
 
 import java.util.UUID;
 import org.springframework.data.jpa.repository.JpaRepository;
-import xyz.subho.clone.twitter.entity.Likes;
+import xyz.subho.clone.twitter.entity.Like;
 
-public interface LikesRepository extends JpaRepository<Likes, UUID> {}
+public interface LikesRepository extends JpaRepository<Like, UUID> {}

src/main/java/xyz/subho/clone/twitter/service/UserService.java

@@ -20,24 +20,23 @@
 
 import java.util.List;
 import java.util.UUID;
-import xyz.subho.clone.twitter.entity.User;
-import xyz.subho.clone.twitter.model.UserResponse;
+import xyz.subho.clone.twitter.model.UserModel;
 
 public interface UserService {
 
-  public User getUserByUserName(String username);
+  public UserModel getUserByUserName(String username);
 
-  public User getUserByUserId(UUID userId);
+  public UserModel getUserByUserId(UUID userId);
 
-  public User addUser(UserResponse user);
+  public UserModel addUser(UserModel user);
 
-  public User editUser(UserResponse user);
+  public UserModel editUser(UserModel user);
 
   public boolean addFollower(UUID followerId);
 
   public boolean removeFollower(UUID followerId);
 
-  public List<UserResponse> getFollowers(UUID userId);
+  public List<UserModel> getFollowers(UUID userId);
 
-  public List<UserResponse> getFollowings(UUID userId);
+  public List<UserModel> getFollowings(UUID userId);
 }