spring server start

pom.xml

@@ -34,21 +34,21 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <scope>runtime</scope>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>mysql</groupId>-->
+            <!--<artifactId>mysql-connector-java</artifactId>-->
+            <!--<scope>runtime</scope>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-rest</artifactId>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>com.h2database</groupId>-->
-            <!--<artifactId>h2</artifactId>-->
-            <!--<scope>runtime</scope>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

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

@@ -2,64 +2,76 @@ 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 {
 
-    @Autowired
-    private PostRepository postRepository;
+    private PostService postService;
+    private UserController userController;
 
     @Autowired
-    private UserRepository userRepository;
-
-    @GetMapping("/users/{userId}/posts")
-    public Page<Post> getAllPostsByUserId(@PathVariable(value = "userId") Long userId,
-                                             Pageable pageable) {
-        return postRepository.findByUserId(userId, pageable);
+    public PostController(PostService postService) {
+        this.postService = postService;
     }
 
-    @PostMapping("/users/{userId}/posts")
-    public Post createPost(@PathVariable (value = "userId") Long userId,
-                                 @Valid @RequestBody Post post) {
-        return userRepository.findById(userId).map(user -> {
-            post.setUser(user);
-            return postRepository.save(post);
-        }).orElseThrow(() -> new ResourceNotFoundException("UserId " + userId + " not found"));
+    @PostMapping("/posts/{userId}")
+    public ResponseEntity createPost(@PathVariable Long userId, @RequestBody Post post) {
+        userController.updatePosts(userId,post);
+        return new ResponseEntity(HttpStatus.OK);
+
     }
 
-    @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"));
+    @GetMapping("/posts/{userId}")
+    public ResponseEntity<Iterable<Post>> getAllPostsByUserId(@PathVariable Long userId) {
+        return postService.findByUserId(userId);
     }
 
-    @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");
-        }
+//    @PutMapping("/users/{userId/posts")
+//    public ResponseEntity<Post> updatePost(@PathVariable Long userId, @RequestBody Post post){
+//        return postService.updatePost(userId, post);
+//    }
 
-        return postRepository.findById(postId).map(post -> {
-            postRepository.delete(post);
-            return ResponseEntity.ok().build();
-        }).orElseThrow(() -> new ResourceNotFoundException("PostId " + postId + " not found"));
-    }
+
+
+//    @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/Controller/UserController.java

@@ -1,47 +1,56 @@
 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.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.List;
+import java.util.Set;
 
 @RestController
 public class UserController {
 
-    @Autowired
     private UserService userService;
 
-    @GetMapping("/users")
-    public Page<User> getAllPosts(Pageable pageable) {
-        return userRepository.findAll(pageable);
+    @Autowired
+    public UserController(UserService userService) {
+        this.userService = userService;
     }
 
     @PostMapping("/users")
-    public User createPost(@Valid @RequestBody User user) {
-        return userRepository.save(user);
+    public ResponseEntity<User> createUser(@RequestBody User user) {
+        return userService.createUser(user);
+    }
+
+    @GetMapping("/users/{userId}")
+    public ResponseEntity<User> getUserById(@PathVariable Long userId) {
+        return userService.findUserById(userId);
     }
 
     @PutMapping("/users/{userId}")
-    public User updatePost(@PathVariable Long userId, @Valid @RequestBody User userRequest) {
-        return userRepository.findById(userId).map(user -> {
-            user.setUsername(userRequest.getUsername());
-            return userRepository.save(user);
-        }).orElseThrow(() -> new ResourceNotFoundException("UserId " + userId + " not found"));
+    public ResponseEntity<User> updateUsername(@PathVariable Long userId, @Valid @RequestBody User userRequest) {
+        return new ResponseEntity<>(userService.updateUsername(userId,userRequest), HttpStatus.OK);
     }
 
 
     @DeleteMapping("/users/{userId}")
-    public ResponseEntity<?> deletePost(@PathVariable Long userId) {
-        return userRepository.findById(userId).map(user -> {
-            userRepository.delete(user);
-            return ResponseEntity.ok().build();
-        }).orElseThrow(() -> new ResourceNotFoundException("UserId " + userId + " not found"));
+    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

@@ -13,26 +13,27 @@ import javax.validation.constraints.NotNull;
 public class Post extends AuditModel{
 
     @Id
-    @GeneratedValue
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long Id;
 
     @NotNull
     @Lob
     private String message;
+    private Long userId;
+//    @OnDelete(action = OnDeleteAction.CASCADE)
+//    @JsonIgnore
 
-    @ManyToOne(fetch = FetchType.LAZY, optional = false)
-    @JoinColumn(name = "user_id", nullable = false)
-    @OnDelete(action = OnDeleteAction.CASCADE)
-    @JsonIgnore
-    private User user;
+    public Post(){
+    }
+    public Post(@NotNull String message, Long userId) {
+        this.message = message;
+        this.userId = userId;
+    }
 
     public Long getId() {
         return Id;
     }
 
-    public void setId(Long id) {
-        Id = id;
-    }
 
     public String getMessage() {
         return message;
@@ -42,11 +43,8 @@ public class Post extends AuditModel{
         this.message = message;
     }
 
-    public User getUser() {
-        return user;
+    public Long getUserId() {
+        return userId;
     }
 
-    public void setUser(User user) {
-        this.user = user;
-    }
 }

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

@@ -1,20 +1,51 @@
 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
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
-
-//    @NotNull
-    @Column(name ="USER_USERNAME")
+    @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;
@@ -43,4 +74,5 @@ public class User extends AuditModel{
     public void setUsername(String username) {
         this.username = username;
     }
+
 }

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

@@ -12,6 +12,6 @@ import org.springframework.stereotype.Repository;
 @RepositoryRestResource
 public interface PostRepository extends JpaRepository<Post,Long> {
 
-    @Query("select postcontent,timestamp from Post where user_id = :userId")
-    Page<Post> findByUserId(@Param("userId")Long userId, Pageable pageable);
+    //@Query("select postcontent,timestamp from Post where user_id = :userId")
+    Iterable<Post> findByUserId(Long userId);
 }

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

@@ -27,5 +27,13 @@ public class PostService {
         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) {
+//
+//    }
 }
 

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

@@ -1,6 +1,7 @@
 package com.ziplinegreen.vault.Service;
 
 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;
@@ -8,34 +9,49 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
+import org.springframework.web.server.ResponseStatusException;
 
 import javax.xml.ws.Response;
+import java.util.List;
 
 @Service
 public class UserService {
 
     private UserRepository userRepository;
-    private PostController postController;
+    //private PostController postController;
 
     @Autowired
-    public UserService(UserRepository userRepository, PostController postController) {
+    public UserService(UserRepository userRepository) {
         this.userRepository = userRepository;
-        this.postController = postController;
     }
 
     public ResponseEntity<User> createUser(User user){
         return new ResponseEntity<>(userRepository.save(user), HttpStatus.CREATED);
     }
 
-    public ResponseEntity<User> deleteUser(Long id){
-        User user = userRepository.getOne(id);
-        userRepository.delete(user);
-        return new ResponseEntity<>(HttpStatus.OK);
+    public ResponseEntity<User> findUserById(Long id){
+        return new ResponseEntity<>(userRepository.findById(id).get(),HttpStatus.OK);
     }
 
-//    public ResponseEntity<User> updatePost(Long userId){
-//        User user = userRepository.getOne(userId);
-//
-//    }
+    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 deleteUser(Long id){return userRepository.findById(id).map(user -> {
+        userRepository.delete(user);
+        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

@@ -1,23 +1,23 @@
-## 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
-
-
-spring.datasource.url=jdbc:mysql://localhost:3306/zipLine?useSSL=false
-spring.datasource.username=root
-spring.datasource.password=Calcifer1650
+# H2
+spring.h2.console.enabled=true
+spring.h2.console.path=/h2
 
-# The SQL dialect makes Hibernate generate better SQL for the chosen database
-spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5InnoDBDialect
+# Datasource
+spring.datasource.url=jdbc:h2:file:~/test
+spring.datasource.username=sa
+spring.datasource.password=
+spring.datasource.driver-class-name=org.h2.Driver
 
-# 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
+#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