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

@@ -0,0 +1,57 @@
+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.PostRepository;
+import com.ziplinegreen.vault.Repository.UserRepository;
+import com.ziplinegreen.vault.Service.PostService;
+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.*;
+
+import javax.validation.Valid;
+import java.util.Set;
+
+@RestController
+public class PostController {
+
+    private PostService postService;
+    private UserController userController;
+
+    @Autowired
+    public PostController(PostService postService) {
+        this.postService = postService;
+    }
+
+    @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);
+    }
+
+    @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);
+    }
+
+}

src/main/java/com/ziplinegreen/vault/Controller/UserController.java → server/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 → server/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; }
 
 }

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

@@ -0,0 +1,61 @@
+package com.ziplinegreen.vault.Model;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.hibernate.annotations.OnDelete;
+import org.hibernate.annotations.OnDeleteAction;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Table(name = "user")
+public class User extends AuditModel{
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+    @NotNull
+    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 User(){}
+    public User(@NotNull String username, String email, String password) {
+        this.username = username;
+        this.email = email;
+        this.password = password;
+    }
+
+    public Long getId() { return id; }
+
+    public String getEmail() { return email;}
+
+    public void setEmail(String email) { this.email = email; }
+
+    public String getPassword() { return password; }
+
+    public void setPassword(String password) { this.password = password; }
+
+    public String getUsername() { return 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 → server/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);
+
 }

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

@@ -0,0 +1,58 @@
+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(Long userId, String message){
+        Post post = new Post(message,userId);
+        return new ResponseEntity<>(postRepository.save(post), HttpStatus.CREATED);
+    }
+
+    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);
+    }
+
+}
+

src/main/java/com/ziplinegreen/vault/Service/UserService.java → server/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);
-    }
+
+
+
+
+
+
 }
 
 

server/src/main/resources/application.properties

@@ -0,0 +1,26 @@
+# H2
+spring.h2.console.enabled=true
+spring.h2.console.path=/h2
+
+# Datasource
+spring.datasource.url=jdbc:h2:file:~/test
+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
+#spring.datasource.password=Calcifer1650
+#
+## The SQL dialect makes Hibernate generate better SQL for the chosen database
+#spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDialect
+#
+## Hibernate ddl auto (create, create-drop, validate, update)
+#spring.jpa.hibernate.ddl-auto = update
+#
+#logging.level.org.hibernate.SQL=DEBUG
+#logging.level.org.hibernate.type=TRACE

src/main/resources/application.properties → server/target/classes/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

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

@@ -1,77 +0,0 @@
-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.PostRepository;
-import com.ziplinegreen.vault.Repository.UserRepository;
-import com.ziplinegreen.vault.Service.PostService;
-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.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import java.util.Set;
-
-
-public class PostController {
-
-    private PostService postService;
-    private UserController userController;
-
-    @Autowired
-    public PostController(PostService postService) {
-        this.postService = postService;
-    }
-
-    @PostMapping("/posts/{userId}")
-    public ResponseEntity createPost(@PathVariable Long userId, @RequestBody Post post) {
-        userController.updatePosts(userId,post);
-        return new ResponseEntity(HttpStatus.OK);
-
-    }
-
-
-    @GetMapping("/posts/{userId}")
-    public ResponseEntity<Iterable<Post>> getAllPostsByUserId(@PathVariable Long userId) {
-        return postService.findByUserId(userId);
-    }
-
-//    @PutMapping("/users/{userId/posts")
-//    public ResponseEntity<Post> updatePost(@PathVariable Long userId, @RequestBody Post post){
-//        return postService.updatePost(userId, post);
-//    }
-
-
-
-//    @PutMapping("/users/{userId}/posts/{postId}")
-//    public Post updateComment(@PathVariable (value = "userId") Long userId,
-//                                 @PathVariable (value = "postId") Long postId,
-//                                 @Valid @RequestBody Post postRequest) {
-//        if(!userRepository.existsById(userId)) {
-//            throw new ResourceNotFoundException("UserId " + userId + " not found");
-//        }
-//
-//        return postRepository.findById(postId).map(post -> {
-//            post.setMessage(postRequest.getMessage());
-//            return postRepository.save(post);
-//        }).orElseThrow(() -> new ResourceNotFoundException("PostId " + postId + "not found"));
-//    }
-//
-//    @DeleteMapping("/posts/{postId}/comments/{commentId}")
-//    public ResponseEntity<?> deleteComment(@PathVariable (value = "userId") Long userId,
-//                                           @PathVariable (value = "postId") Long postId) {
-//        if(!userRepository.existsById(userId)) {
-//            throw new ResourceNotFoundException("UserId " + userId + " not found");
-//        }
-//
-//        return postRepository.findById(postId).map(post -> {
-//            postRepository.delete(post);
-//            return ResponseEntity.ok().build();
-//        }).orElseThrow(() -> new ResourceNotFoundException("PostId " + postId + " not found"));
-//    }
-}

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

@@ -1,78 +0,0 @@
-package com.ziplinegreen.vault.Model;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.hibernate.annotations.OnDelete;
-import org.hibernate.annotations.OnDeleteAction;
-
-import javax.persistence.*;
-import javax.validation.constraints.NotNull;
-import java.util.ArrayList;
-import java.util.List;
-
-@Entity
-@Table(name = "user")
-public class User extends AuditModel{
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-    @NotNull
-    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;
-    }
-
-    public User(){}
-    public User(@NotNull String username, String email, String password) {
-        this.username = username;
-        this.email = email;
-        this.password = password;
-    }
-
-    public void setPosts(List<Post> posts) {
-        this.posts = posts;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-}

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

@@ -1,39 +0,0 @@
-package com.ziplinegreen.vault.Service;
-
-
-import com.ziplinegreen.vault.Model.Post;
-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;
-
-@Service
-public class PostService {
-
-    private PostRepository postRepository;
-
-    @Autowired
-    public PostService(PostRepository postRepository) {
-        this.postRepository = postRepository;
-    }
-
-    public ResponseEntity<Post> createPost(Post post){
-        return new ResponseEntity<>(postRepository.save(post), HttpStatus.CREATED);
-    }
-
-    public ResponseEntity<Post> deletePost(Long id){
-        Post post = postRepository.getOne(id);
-        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) {
-//
-//    }
-}
-