ratings added, comment & review updated

src/main/java/com/passionproject/project_spitball20/controller/RatingController.java

@@ -0,0 +1,10 @@
+package com.passionproject.project_spitball20.controller;
+
+
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RestController;
+
+@CrossOrigin(origins = "http://localhost:8100")
+@RestController
+public class RatingController {
+}

src/main/java/com/passionproject/project_spitball20/controller/UserController.java

@@ -10,9 +10,9 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-@CrossOrigin
+@CrossOrigin(origins = "http://localhost:8100")
 @RestController
-@RequestMapping("user_profile")
+//@RequestMapping("user_profile")
 public class UserController {
 
     @Autowired
@@ -21,11 +21,11 @@ public class UserController {
     public static final Logger logger = LoggerFactory.getLogger(UserController.class);
 
 
-    @RequestMapping(value = "/register", method = RequestMethod.POST)
+    @RequestMapping(value = "/register_user", method = RequestMethod.POST)
     public ResponseEntity<User> registerUser(@RequestBody User newUser) {
         User user = new User();
         HttpStatus status = HttpStatus.CONFLICT;
-        if(userService.findEmail(newUser.getEmail()).equals(null)) { //&& userService.findName(newUser.getDisplayName()).equals(null)) {
+        if(userService.findEmail(newUser.getEmail()) == null){ //&& userService.findName(newUser.getDisplayName()).equals(null)) {
             user = userService.save(newUser);
             status  = HttpStatus.CREATED;
         }
@@ -33,4 +33,10 @@ public class UserController {
         return new ResponseEntity<>(user, new HttpHeaders(), status);
 
     }
+
+    @RequestMapping(value = "/delete_profile", method = RequestMethod.DELETE)
+    public ResponseEntity<User> deleteMessage(@RequestBody User user) {
+        userService.delete(user);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
 }

src/main/java/com/passionproject/project_spitball20/controller/messages/CommentController.java

@@ -0,0 +1,12 @@
+package com.passionproject.project_spitball20.controller.messages;
+
+
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@CrossOrigin
+@RestController
+@RequestMapping("comments")
+public class CommentController {
+}

src/main/java/com/passionproject/project_spitball20/controller/messages/ReviewController.java

@@ -0,0 +1,56 @@
+package com.passionproject.project_spitball20.controller.messages;
+
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.passionproject.project_spitball20.model.messages.Review;
+import com.passionproject.project_spitball20.service.messages.ReviewService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@CrossOrigin
+@RestController
+@RequestMapping("reviews")
+public class ReviewController {
+
+    @Autowired
+    ReviewService reviewService;
+
+    @RequestMapping(value = "/post", method = RequestMethod.POST)
+    public ResponseEntity<Review> postMessage(@RequestBody Review newReview) {
+        HttpStatus httpStatus = HttpStatus.CREATED;
+        Review content = this.reviewService.save(newReview);
+
+        return new ResponseEntity<>(content, new HttpHeaders(), httpStatus);
+    }
+
+    @RequestMapping(value = "/update", method = RequestMethod.PUT)
+    public ResponseEntity<Review> updateMessage(@RequestBody Review review) {
+        HttpStatus httpStatus = HttpStatus.CREATED;
+        review = (Review) this.reviewService.update(review);
+
+        return new ResponseEntity<>(review, new HttpHeaders(), httpStatus);
+    }
+
+    @RequestMapping(value = "/get_reviews", method = RequestMethod.GET)
+    public ResponseEntity<?> getAllMessages() throws JsonProcessingException {
+        ObjectMapper objectMapper = new ObjectMapper();
+        HttpStatus httpStatus = HttpStatus.CREATED;
+        HttpHeaders header = new HttpHeaders();
+
+        String messageJSON = objectMapper.writeValueAsString(this.reviewService.getAllReviews());
+        header.setContentType(MediaType.APPLICATION_JSON);
+
+        return new ResponseEntity<>(messageJSON, header, httpStatus);
+    }
+
+    @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
+    public ResponseEntity<Review> deleteMessage(@RequestBody Review review) {
+        reviewService.delete(review);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+}

src/main/java/com/passionproject/project_spitball20/model/Rating.java

@@ -0,0 +1,41 @@
+package com.passionproject.project_spitball20.model;
+
+import javax.persistence.*;
+
+
+@Entity
+public class Rating {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+
+    Long teacherId;
+
+    Integer rating;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(Long teacherId) {
+        this.teacherId = teacherId;
+    }
+
+    public Integer getRating() {
+        return rating;
+    }
+
+    public void setRating(Integer rating) {
+        this.rating = rating;
+    }
+
+}

src/main/java/com/passionproject/project_spitball20/model/Teacher.java

@@ -1,6 +1,9 @@
 package com.passionproject.project_spitball20.model;
 
+import org.hibernate.engine.internal.Cascade;
+
 import javax.persistence.*;
+import java.util.List;
 
 @Entity
 @Table
@@ -15,6 +18,11 @@ public class Teacher {
     String email;
     String password;
 
+    @OneToMany(cascade = CascadeType.ALL)
+    @JoinColumn(name = "teacherId")
+    private List<Rating> ratings;
+
+
     public Long getId() {
         return id;
     }
@@ -58,4 +66,12 @@ public class Teacher {
     public String getFullName() {
         return firstName + lastName;
     }
+
+    public List<Rating> getRatings() {
+        return ratings;
+    }
+
+    public void setRatings(List<Rating> ratings) {
+        this.ratings = ratings;
+    }
 }

src/main/java/com/passionproject/project_spitball20/model/messages/Comment.java

@@ -0,0 +1,15 @@
+package com.passionproject.project_spitball20.model.messages;
+
+
+import javax.persistence.*;
+
+
+@Entity
+@Table
+public class Comment extends Review {
+
+
+
+
+
+}

src/main/java/com/passionproject/project_spitball20/model/messages/Review.java

@@ -0,0 +1,62 @@
+package com.passionproject.project_spitball20.model.messages;
+
+import javax.persistence.*;
+import java.util.Date;
+
+@Entity
+@Table
+public class Review {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+
+    private Long userId;
+
+    private Date created;
+
+    private Date updated;
+
+    String review;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Date getCreated() {
+        return created;
+    }
+
+    public void setCreated(Date created) {
+        this.created = created;
+    }
+
+    public Date getUpdated() {
+        return updated;
+    }
+
+    public void setUpdated(Date updated) {
+        this.updated = updated;
+    }
+
+    public String getReview() {
+        return review;
+    }
+
+    public void setReview(String review) {
+        this.review = review;
+    }
+}
+

src/main/java/com/passionproject/project_spitball20/repositories/RatingRepository.java

@@ -0,0 +1,10 @@
+package com.passionproject.project_spitball20.repositories;
+
+import com.passionproject.project_spitball20.model.Rating;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+
+@Repository
+public interface RatingRepository extends JpaRepository<Rating, Long> {
+}

src/main/java/com/passionproject/project_spitball20/repositories/messages/CommentRepository.java

@@ -0,0 +1,11 @@
+package com.passionproject.project_spitball20.repositories.messages;
+
+
+import com.passionproject.project_spitball20.model.messages.Comment;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface CommentRepository extends JpaRepository<Comment, Long> {
+
+}

src/main/java/com/passionproject/project_spitball20/repositories/messages/ReviewRepository.java

@@ -0,0 +1,10 @@
+package com.passionproject.project_spitball20.repositories.messages;
+
+
+import com.passionproject.project_spitball20.model.messages.Review;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ReviewRepository extends JpaRepository<Review, Long> {
+}

src/main/java/com/passionproject/project_spitball20/service/RatingService.java

@@ -0,0 +1,32 @@
+package com.passionproject.project_spitball20.service;
+
+import com.passionproject.project_spitball20.model.Rating;
+import com.passionproject.project_spitball20.repositories.RatingRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class RatingService {
+
+
+    @Autowired
+    RatingRepository ratingRepository;
+
+    public Rating save(Rating rating) {
+        return ratingRepository.saveAndFlush(rating);
+    }
+
+    public Rating update(Rating rating) {
+        return ratingRepository.save(rating);
+    }
+
+    public void delete(Rating rating) {
+        ratingRepository.delete(rating);
+    }
+
+    public Rating find(Long id) {
+        return ratingRepository.findById(id).get();
+    }
+
+
+}

src/main/java/com/passionproject/project_spitball20/service/UserService.java

@@ -20,14 +20,14 @@ public class UserService {
         return userRepository.save(user);
     }
 
+    public void delete(User user) {
+        userRepository.delete(user);
+    }
+
     public User findEmail(String email) {
         return userRepository.findByEmail(email);
     }
 
-//    public User findName(String displayName) {
-//        return userRepository.findByName(displayName);
-//    }
-
     public User find(Long id) {
         return userRepository.findById(id).get();
     }

src/main/java/com/passionproject/project_spitball20/service/messages/CommentService.java

@@ -0,0 +1,38 @@
+package com.passionproject.project_spitball20.service.messages;
+
+
+import com.passionproject.project_spitball20.model.messages.Comment;
+import com.passionproject.project_spitball20.repositories.messages.CommentRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+@Service
+public class CommentService {
+
+    @Autowired
+    CommentRepository commentRepository;
+
+
+    public Comment save(Comment comment) {
+        comment.setCreated(new Date());
+        return commentRepository.save(comment);
+    }
+
+    public Comment update(Comment comment) {
+        Comment update = commentRepository.findById(comment.getId()).get();
+        update.setUpdated(new Date());
+        update.setReview(comment.getReview());
+        return commentRepository.save(update);
+
+    }
+
+    public Iterable<Comment> getAllComments() {
+        return commentRepository.findAll();
+    }
+
+    public void delete(Comment comment) {
+        commentRepository.delete(comment);
+    }
+}

src/main/java/com/passionproject/project_spitball20/service/messages/ReviewService.java

@@ -0,0 +1,39 @@
+package com.passionproject.project_spitball20.service.messages;
+
+
+import com.passionproject.project_spitball20.model.messages.Review;
+import com.passionproject.project_spitball20.repositories.messages.ReviewRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+@Service
+public class ReviewService {
+
+
+    @Autowired
+    ReviewRepository reviewRepository;
+
+
+    public Review save(Review review) {
+        review.setCreated(new Date());
+        return reviewRepository.save(review);
+    }
+
+    public Review update(Review review) {
+        Review update = reviewRepository.findById(review.getId()).get();
+        update.setUpdated(new Date());
+        update.setReview(review.getReview());
+        return reviewRepository.save(update);
+
+    }
+
+    public Iterable<Review> getAllReviews() {
+        return reviewRepository.findAll();
+    }
+
+    public void delete(Review review) {
+        reviewRepository.delete(review);
+    }
+}