updated users

src/main/java/com/ziplinegreen/vault/Controller/PostController.java

@@ -5,7 +5,7 @@ import com.ziplinegreen.vault.Exception.ResourceNotFoundException;
 import com.ziplinegreen.vault.Model.Post;
 import com.ziplinegreen.vault.Model.User;
 import com.ziplinegreen.vault.Repository.PostRepository;
-import com.ziplinegreen.vault.Repository.UserRepository;
+import com.ziplinegreen.vault.Repository.UsersRepository;
 import com.ziplinegreen.vault.Service.PostService;
 import com.ziplinegreen.vault.Service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,40 +22,32 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import java.util.Set;
 
-@Controller
+@RestController
 public class PostController {
 
-    @Autowired
     private PostService postService;
-    @Autowired
     private UserController userController;
-
-    @Autowired
     private PostRepository repository;
 
     @Autowired
-    public PostController(PostService postService) {
+    public PostController(PostService postService, UserController userController, PostRepository repository) {
         this.postService = postService;
+        this.userController = userController;
+        this.repository = repository;
+    }
+
+    @PostMapping("/posts")
+    public ResponseEntity createPost(@RequestBody Post post) {
+        return new ResponseEntity(repository.save(post), HttpStatus.CREATED);
+
     }
 
-//    @PostMapping("/posts/{userId}")
-//    public ResponseEntity createPost(@PathVariable Long userId, @RequestBody Post post) {
-//        //userController.updatePosts(userId,post);
-//        return new ResponseEntity(userController.updatePosts(userId, post), HttpStatus.OK);
-//
-//    }
 
     @MessageMapping("/posts/{userId}")
-    //@MessageMapping("/posts")
     @SendTo("/topic/posts")
     public Post createPost(@DestinationVariable("userId") Long userId, @RequestBody Post post) {
-    //public Post createPost(@RequestBody Post post) {
-        System.out.println(post.getMessage());
-        post.setUserName(userController.getUserById(userId).getBody().getUsername());
-        //return userController.updatePosts(userId,post);
+        post.setUserName(userController.getUserById(userId).getUsername());
         return repository.save(post);
-        //return post;
-        //return new ResponseEntity(userController.updatePosts(userId, post), HttpStatus.OK);
 
     }
 
@@ -67,7 +59,6 @@ public class PostController {
 
 
     @GetMapping("/posts/{userId}")
-    //@SendTo("/topic/posts")
     public ResponseEntity<Iterable<Post>> getAllPostsByUserId(@PathVariable Long userId) {
         return postService.findByUserId(userId);
     }

src/main/java/com/ziplinegreen/vault/Controller/UserController.java

@@ -3,7 +3,7 @@ package com.ziplinegreen.vault.Controller;
 import com.ziplinegreen.vault.Exception.ResourceNotFoundException;
 import com.ziplinegreen.vault.Model.Post;
 import com.ziplinegreen.vault.Model.User;
-import com.ziplinegreen.vault.Repository.UserRepository;
+import com.ziplinegreen.vault.Repository.UsersRepository;
 import com.ziplinegreen.vault.Service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -27,30 +27,32 @@ public class UserController {
     }
 
     @PostMapping("/users")
-    public ResponseEntity<User> createUser(@RequestBody User user) {
+    public User createUser(@RequestBody User user) {
         return userService.createUser(user);
     }
 
     @GetMapping("/users/{userId}")
-    public ResponseEntity<User> getUserById(@PathVariable Long userId) {
+    public User getUserById(@PathVariable Long userId) {
         return userService.findUserById(userId);
     }
 
     @PutMapping("/users/{userId}")
-    public ResponseEntity<User> updateUsername(@PathVariable Long userId, @Valid @RequestBody User userRequest) {
-        return new ResponseEntity<>(userService.updateUsername(userId,userRequest), HttpStatus.OK);
+    public User updateUsername(@PathVariable Long userId, @RequestBody String username) {
+        return userService.updateUsername(userId,username);
     }
 
-
     @DeleteMapping("/users/{userId}")
     public ResponseEntity<?> deleteUser(@PathVariable Long userId) {
         return userService.deleteUser(userId);
     }
 
-    @PutMapping("/users/{userId}/updatepost")
-    public ResponseEntity<?> updatePosts(@PathVariable Long userId, @RequestBody Post post){
-        return userService.updatePosts(userId, post);
-    }
+
+
+
+//    @PutMapping("/users/{userId}/updatepost")
+//    public ResponseEntity<?> updatePosts(@PathVariable Long userId, @RequestBody Post post){
+//        return userService.updatePosts(userId, post);
+//    }
 
 
 }

src/main/java/com/ziplinegreen/vault/Model/Post.java

@@ -17,10 +17,8 @@ public class Post extends AuditModel{
     private Long Id;
 
     @NotNull
-    @Lob
     private String message;
     @OnDelete(action = OnDeleteAction.CASCADE)
-    @JsonIgnore
     private Long userId;
     private String userName;
 

src/main/java/com/ziplinegreen/vault/Model/User.java

@@ -19,13 +19,11 @@ public class User extends AuditModel{
     private String username;
     private String email;
     private String password;
-    @OneToMany(fetch = FetchType.LAZY,
+    @OneToMany(
             cascade= {
                 CascadeType.PERSIST,
                 CascadeType.MERGE
-            })
-    @JoinTable(name = "user_posts",
-            joinColumns = {@JoinColumn(name = "user_id")})
+            }, mappedBy = "userId")
     private List<Post> posts = new ArrayList<>();
 
     public List<Post> getPosts() {

src/main/java/com/ziplinegreen/vault/Repository/UserRepository.java

@@ -1,10 +0,0 @@
-package com.ziplinegreen.vault.Repository;
-
-import com.ziplinegreen.vault.Model.User;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.rest.core.annotation.RepositoryRestResource;
-import org.springframework.stereotype.Repository;
-
-@RepositoryRestResource
-public interface UserRepository extends JpaRepository<User,Long> {
-}

src/main/java/com/ziplinegreen/vault/Repository/UsersRepository.java

@@ -0,0 +1,7 @@
+package com.ziplinegreen.vault.Repository;
+
+import com.ziplinegreen.vault.Model.User;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface UsersRepository extends JpaRepository<User, Long> {
+}

src/main/java/com/ziplinegreen/vault/Service/UserService.java

@@ -4,7 +4,7 @@ import com.ziplinegreen.vault.Controller.PostController;
 import com.ziplinegreen.vault.Exception.ResourceNotFoundException;
 import com.ziplinegreen.vault.Model.Post;
 import com.ziplinegreen.vault.Model.User;
-import com.ziplinegreen.vault.Repository.UserRepository;
+import com.ziplinegreen.vault.Repository.UsersRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -18,41 +18,39 @@ import java.util.List;
 public class UserService {
 
     @Autowired
-    private UserRepository userRepository;
+    private UsersRepository userRepository;
     //private PostController postController;
 
     @Autowired
-    public UserService(UserRepository userRepository) {
+    public UserService(UsersRepository userRepository) {
         this.userRepository = userRepository;
     }
 
-    public ResponseEntity<User> createUser(User user){
-        return new ResponseEntity<>(userRepository.save(user), HttpStatus.CREATED);
+    public User createUser(User user){
+        return userRepository.save(user);
     }
 
-    public ResponseEntity<User> findUserById(Long id){
-        return new ResponseEntity<>(userRepository.findById(id).get(),HttpStatus.OK);
+    public User findUserById(Long id){
+        return userRepository.findById(id).get();
     }
 
-    public User updateUsername(Long id, User updatedUser){return userRepository.findById(id).map(user -> {
-        user.setUsername(updatedUser.getUsername());
+    public User updateUsername(Long userId, String username){
+        User user = findUserById(userId);
+        user.setUsername(username);
         return userRepository.save(user);
-    }).orElseThrow(() -> new ResourceNotFoundException("UserId " + id + " not found"));
     }
 
-    public ResponseEntity deleteUser(Long id){return userRepository.findById(id).map(user -> {
-        userRepository.delete(user);
+    public ResponseEntity deleteUser(Long id){
+        userRepository.delete(userRepository.findById(id).get());
         return new ResponseEntity(HttpStatus.OK);
-    }).orElseThrow(() -> new ResourceNotFoundException("UserId " + id + " not found"));
-
     }
 
-    public ResponseEntity<User> updatePosts(Long userId, Post post) {
-        User user = findUserById(userId).getBody();
-        List<Post> posts = user.getPosts();
-        posts.add(post);
-        return new ResponseEntity<>(userRepository.save(user), HttpStatus.OK);
-    }
+//    public ResponseEntity<User> updatePosts(Long userId, Post post) {
+//        User user = findUserById(userId).getBody();
+//        List<Post> posts = user.getPosts();
+//        posts.add(post);
+//        return new ResponseEntity<>(userRepository.save(user), HttpStatus.OK);
+//    }
 }