Merge remote-tracking branch 'origin/review-votes' into develop

backend/postings/api/urls.py

@@ -10,6 +10,8 @@ urlpatterns = [
 	# /api/postings/reviews/1/ Returns data for one Review.
 	path('reviews/<int:pk>', ReviewView.as_view(), name='review'),
 
+	path('reviews/<int:review_id>/helpful_vote/', review_helpful_vote, name='review_helpful_vote'),
+
 	# /api/postings/universities/ Lists all university objects.
 	path('universities/', UniversitiesView.as_view(), name='universities'),
 	# /api/postings/universities/1/ Returns data for one University.

backend/postings/api/views.py

@@ -1,5 +1,5 @@
 from rest_framework import generics, mixins
-from postings.models import UniversityReview, Review
+from postings.models import UniversityReview, Review, ReviewHelpfulVote
 from .serializers import *
 from django.db.models import Q
 
@@ -65,4 +65,23 @@ class ProfessorsView(generics.ListAPIView):
 # The view for an individual Professor.
 class ProfessorView(generics.RetrieveUpdateDestroyAPIView):
 	queryset = Professor.objects.all()
-	serializer_class = ProfessorSerializer
+	serializer_class = ProfessorSerializer
+
+def review_helpful_vote(request, review_id):
+	if request.method == 'POST':
+		helpful = request.POST.get('helpful')
+		if helpful is None:
+			return HttpResponseBadRequest("Bad Request")
+		helpful = True if helpful == 'true' else False
+
+		try:
+			review = Review.objects.get(pk=review_id)
+		except Review.DoesNotExist:
+			raise HttpResponseBadRequest("Bad Request: Invalid review id.")
+
+		vote = ReviewHelpfulVote.objects.create(
+			review=review,
+			helpful=helpful
+		)
+
+	return HttpResponseBadRequest("Bad Request")

backend/postings/models.py

@@ -63,11 +63,11 @@ class Review(models.Model):
 
 	# Gets the total number of votes which marked this review as 'helpful'.
 	def getHelpfulVoteCount(self):
-		ReviewHelpfulVote.objects.filter(pk=self.pk, helpful=True).count()
+		return ReviewHelpfulVote.objects.filter(pk=self.pk, helpful=True).count()
 
 	# Gets the total number of votes which marked this review as 'unhelpful'.
 	def getUnhelpfulVoteCount(self):
-		ReviewHelpfulVote.objects.filter(pk=self.pk, helpful=False).count()
+		return ReviewHelpfulVote.objects.filter(pk=self.pk, helpful=False).count()
 
 # A vote for a review as either positive or negative.
 class ReviewHelpfulVote(models.Model):

backend/postings/templates/postings/frontend/entity.html

@@ -162,7 +162,7 @@
                                             <a class="btn btn-danger btn-sm" href="#" id="close-review-box" style="display:none; margin-right: 10px;">
                                                 <span class="glyphicon glyphicon-remove"></span>Cancel</a>
                                             <input type="hidden"  id="rating_input" name="rating" value="1">
-                                            {% csrf_token %}
+                                            <div id="csrf-token">{% csrf_token %}</div>
                                             <input type="hidden" name="entity_id" value="{{ entity.pk }}">
                                             <button class="btn btn-success btn-lg" type="submit">Save</button>
                                         </div>
@@ -193,5 +193,6 @@
 
 <!-- Custom scripts -->
 <script src="js/main.js"></script>
+<script src="js/voting.js"></script>
 </body>
 </html>

backend/postings/templates/postings/frontend/review.html

@@ -11,10 +11,18 @@
     <div class="col-sm-9">
         <div class="review-block-rate" data-rating="{{ review.rating }}">
             <div class="clearfix"></div>
-
-
         </div>
         <div class="review-block-title">{{ review.title }}</div>
         <div class="review-block-description">{{ review.content }}</div>
+
+        <div id="review-votes-{{ review.pk }}">
+            <div class="review-vote-buttons">
+                Was this review helpful?
+                <a data-review-id="{{ review.pk }}" class="btn btn-light btn-sm vote-up"><span class="glyphicon glyphicon-thumbs-up"></span> Yes</a>
+                <a data-review-id="{{ review.pk }}" class="btn btn-light btn-sm vote-down"><span class="glyphicon glyphicon-thumbs-down"></span> No</a>
+            </div>
+            <span title="{{ review.getHelpfulVoteCount }} people found this review helpful"><span class="votes-helpful">{{ review.getHelpfulVoteCount }}</span> <span class="glyphicon glyphicon-thumbs-up"></span></span> /
+            <span title="{{ review.getUnhelpfulVoteCount }} people found this review unhelpful"><span class="votes-unhelpful">{{ review.getUnhelpfulVoteCount }}</span> <span class="glyphicon glyphicon-thumbs-down"></span></span>
+        </div>
     </div>
 </div>

frontpage/rateables/js/voting.js

@@ -0,0 +1,34 @@
+$(function() {
+    var csrftoken = $("#csrf-token input").val();
+
+	$(".vote-up").click(function() {
+		var reviewId = $(this).attr("data-review-id");
+		var data = {
+			'csrfmiddlewaretoken': csrftoken,
+			'helpful': true
+		};
+		// Vote up
+		$.post(
+			'/api/postings/reviews/' + reviewId + '/helpful_vote/',
+			data,
+			function(result) { console.log(result); }
+		);
+		// Hide vote buttons
+		$("#review-votes-" + reviewId + " .review-vote-buttons").hide();
+	});
+	$(".vote-down").click(function() {
+		var reviewId = $(this).attr("data-review-id");
+		var data = {
+			'csrfmiddlewaretoken': csrftoken,
+			'helpful': false
+		};
+		// Vote down
+		$.post(
+			'/api/postings/reviews/' + reviewId + '/helpful_vote/',
+			data,
+			function(result) { console.log(result); }
+		);
+		// Hide vote buttons
+		$("#review-votes-" + reviewId + " .review-vote-buttons").hide();
+	});
+});