crud for posts and users

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

@@ -10,6 +10,7 @@ import com.ziplinegreen.vault.Service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.repository.query.Param;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -17,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import java.util.Set;
 
-
+@RestController
 public class PostController {
 
     private PostService postService;
@@ -28,17 +29,29 @@ public class PostController {
         this.postService = postService;
     }
 
-    @PostMapping("/posts/{userId}")
-    public ResponseEntity createPost(@PathVariable Long userId, @RequestBody Post post) {
-        userController.updatePosts(userId,post);
-        return new ResponseEntity(HttpStatus.OK);
+    @PostMapping("/{userId}/posts")
+    public ResponseEntity<Post> createPost(@PathVariable Long userId, @RequestBody String message){
+        return postService.createPost(userId,message);
+    }
 
+    @GetMapping("/{userId}/posts")
+    public ResponseEntity<Iterable<Post>> getAllPostsByUserId(@PathVariable Long userId) {
+        return postService.findAllByUserId(userId);
     }
 
+    @GetMapping("/{userId}/posts/{postId}")
+    public ResponseEntity<Post> getPostById(@PathVariable Long userId, @PathVariable Long postId){
+        return postService.getPostById(postId);
+    }
 
-    @GetMapping("/posts/{userId}")
-    public ResponseEntity<Iterable<Post>> getAllPostsByUserId(@PathVariable Long userId) {
-        return postService.findByUserId(userId);
+    @PutMapping("/{userId}/posts/{postId}")
+    public ResponseEntity<Post> updatePost(@PathVariable Long userId, @PathVariable Long postId, @RequestBody String message){
+        return postService.updatePost(postId, message);
+    }
+
+    @DeleteMapping("/{userId}/posts/{postId}")
+    public ResponseEntity deletePost(@PathVariable Long userId, @PathVariable Long postId){
+        return postService.deletePost(postId);
     }
 
 //    @PutMapping("/users/{userId/posts")
@@ -75,3 +88,10 @@ public class PostController {
 //        }).orElseThrow(() -> new ResourceNotFoundException("PostId " + postId + " not found"));
 //    }
 }
+
+
+//    @PutMapping("/{userId}/posts")
+//    public ResponseEntity<?> addPost(@PathVariable Long userId, @RequestBody String message){
+//        Post post = new Post(message, userId);
+//        return userService.addpost(userId, post);
+//    }

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

@@ -37,20 +37,12 @@ public class UserController {
     }
 
     @PutMapping("/users/{userId}")
-    public ResponseEntity<User> updateUsername(@PathVariable Long userId, @Valid @RequestBody User userRequest) {
-        return new ResponseEntity<>(userService.updateUsername(userId,userRequest), HttpStatus.OK);
+    public ResponseEntity<User> updateUsername(@PathVariable Long userId, @RequestBody String newUsername) {
+        return userService.updateUsername(userId,newUsername);
     }
 
-
     @DeleteMapping("/users/{userId}")
-    public ResponseEntity<?> deleteUser(@PathVariable Long 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);
-    }
-
-
 }

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

@@ -2,49 +2,40 @@ package com.ziplinegreen.vault.Model;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.hibernate.annotations.OnDelete;
 import org.hibernate.annotations.OnDeleteAction;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 
-@Entity
-@Table(name = "post")
+@Entity @Table(name = "post")
+@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
 public class Post extends AuditModel{
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long Id;
 
     @NotNull
-    @Lob
     private String message;
+
+    @NotNull
     private Long userId;
-//    @OnDelete(action = OnDeleteAction.CASCADE)
-//    @JsonIgnore
 
-    public Post(){
-    }
-    public Post(@NotNull String message, Long userId) {
+    public Post(){}
+    public Post(@NotNull String message, @NotNull Long userId) {
         this.message = message;
         this.userId = userId;
     }
 
-    public Long getId() {
-        return Id;
-    }
-
+    public Long getId() { return Id; }
 
     public String getMessage() {
         return message;
     }
 
-    public void setMessage(String message) {
-        this.message = message;
-    }
+    public void setMessage(String message) { this.message = message; }
 
-    public Long getUserId() {
-        return userId;
-    }
+    public Long getUserId() { return userId; }
 
 }

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

@@ -19,22 +19,14 @@ public class User extends AuditModel{
     private String username;
     private String email;
     private String password;
-    @OneToMany(fetch = FetchType.LAZY,
-            cascade= {
-                CascadeType.PERSIST,
-                CascadeType.MERGE
-            })
-    @JoinTable(name = "user_posts",
-            joinColumns = {@JoinColumn(name = "user_id")})
-    private List<Post> posts = new ArrayList<>();
-
-    public List<Post> getPosts() {
-        if(posts.size()==0){
-            posts = new ArrayList<>();
-            return posts;
-        }
-        return posts;
-    }
+//    @OneToMany(fetch = FetchType.LAZY,
+//            cascade= {
+//                CascadeType.PERSIST,
+//                CascadeType.MERGE
+//            })
+//    @JoinTable(name = "user_posts",
+//            joinColumns = {@JoinColumn(name = "user_id")})
+//    private List<Post> posts = new ArrayList<>();
 
     public User(){}
     public User(@NotNull String username, String email, String password) {
@@ -43,36 +35,27 @@ public class User extends AuditModel{
         this.password = password;
     }
 
-    public void setPosts(List<Post> posts) {
-        this.posts = posts;
-    }
+    public Long getId() { return id; }
 
-    public Long getId() {
-        return id;
-    }
+    public String getEmail() { return email;}
 
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
+    public void setEmail(String email) { this.email = email; }
 
-    public String getPassword() {
-        return password;
-    }
+    public String getPassword() { return password; }
 
-    public void setPassword(String password) {
-        this.password = password;
-    }
+    public void setPassword(String password) { this.password = password; }
 
-    public String getUsername() {
-        return username;
-    }
+    public String getUsername() { return username; }
 
-    public void setUsername(String username) {
-        this.username = username;
-    }
+    public void setUsername(String username) { this.username = username; }
 
+//    public List<Post> getPosts() {
+//        if(posts.size()==0){
+//            posts = new ArrayList<>();
+//            return posts;
+//        }
+//        return posts;
+//    }
+//
+//    public void setPosts(List<Post> posts) { this.posts = posts; }
 }

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

@@ -7,11 +7,12 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.data.rest.core.annotation.RepositoryRestResource;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Repository;
 
 @RepositoryRestResource
 public interface PostRepository extends JpaRepository<Post,Long> {
 
-    //@Query("select postcontent,timestamp from Post where user_id = :userId")
-    Iterable<Post> findByUserId(Long userId);
+    Iterable<Post> findAllByUserId(Long userId);
+
 }

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

@@ -1,39 +1,65 @@
 package com.ziplinegreen.vault.Service;
 
 
+import com.ziplinegreen.vault.Controller.UserController;
 import com.ziplinegreen.vault.Model.Post;
+import com.ziplinegreen.vault.Model.User;
 import com.ziplinegreen.vault.Repository.PostRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class PostService {
 
     private PostRepository postRepository;
+    private UserController userController;
 
     @Autowired
     public PostService(PostRepository postRepository) {
         this.postRepository = postRepository;
     }
 
-    public ResponseEntity<Post> createPost(Post post){
+    public ResponseEntity<Post> createPost(Long userId, String message){
+        Post post = new Post(message,userId);
         return new ResponseEntity<>(postRepository.save(post), HttpStatus.CREATED);
     }
 
-    public ResponseEntity<Post> deletePost(Long id){
-        Post post = postRepository.getOne(id);
+    public ResponseEntity<Iterable<Post>> findAllByUserId(Long userId) {
+        return new ResponseEntity<>(postRepository.findAllByUserId(userId), HttpStatus.OK);
+    }
+
+    public ResponseEntity<Post> updatePost(Long postId, String message) {
+        Post post = findById(postId);
+        post.setMessage(message);
+        return new ResponseEntity<>(postRepository.save(post), HttpStatus.OK);
+    }
+
+
+    private Post findById(Long postId) {
+        return postRepository.findById(postId).get();
+    }
+
+    public ResponseEntity<Post> getPostById(Long postId) {
+        Post post = postRepository.getOne(postId);
+        return new ResponseEntity<>(post, HttpStatus.OK);
+    }
+
+    public ResponseEntity<Post> deletePost(Long postId){
+        Post post = postRepository.getOne(postId);
         postRepository.delete(post);
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
-    public ResponseEntity<Iterable<Post>> findByUserId(Long userId) {
-        return new ResponseEntity<>(postRepository.findByUserId(userId), HttpStatus.OK);
-    }
 
-//    public ResponseEntity<Post> updatePost(Long userId, Post post) {
-//
+//    public ResponseEntity<User> addpost(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);
 //    }
 }
 

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

@@ -33,25 +33,23 @@ public class UserService {
         return new ResponseEntity<>(userRepository.findById(id).get(),HttpStatus.OK);
     }
 
-    public User updateUsername(Long id, User updatedUser){return userRepository.findById(id).map(user -> {
-        user.setUsername(updatedUser.getUsername());
-        return userRepository.save(user);
-    }).orElseThrow(() -> new ResourceNotFoundException("UserId " + id + " not found"));
+    public ResponseEntity<User> updateUsername(Long id, String newUsername) {
+        User user = findUserById(id).getBody();
+        user.setUsername(newUsername);
+        return new ResponseEntity<>(userRepository.save(user),HttpStatus.OK);
     }
 
-    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);
-    }
+
+
+
+
+
+
 }
 
 

src/main/resources/application.properties

@@ -8,6 +8,9 @@ spring.datasource.username=sa
 spring.datasource.password=
 spring.datasource.driver-class-name=org.h2.Driver
 
+#logging.level.org.springframework.web=DEBUG
+
+
 
 #spring.datasource.url=jdbc:mysql://localhost:3306/zipLine?useSSL=false
 #spring.datasource.username=root