From 8a9c51e856b4fc87dd595bd3bf7066c6ba341ccc Mon Sep 17 00:00:00 2001
From: andrewlalis <andrewlalisofficial@gmail.com>
Date: Tue, 2 Oct 2018 16:27:29 +0200
Subject: [PATCH] Added average rating.

---
 backend/db.sqlite3                            | Bin 73728 -> 77824 bytes
 backend/postings/admin.py                     |   3 +-
 .../migrations/0002_auto_20181002_1338.py     |  19 ++++++++++++
 .../migrations/0003_auto_20181002_1355.py     |  25 +++++++++++++++
 backend/postings/models.py                    |  29 ++++++++++++++++--
 .../postings/entity_pages/entity.html         |   2 +-
 backend/postings/views.py                     |   1 +
 7 files changed, 75 insertions(+), 4 deletions(-)
 create mode 100644 backend/postings/migrations/0002_auto_20181002_1338.py
 create mode 100644 backend/postings/migrations/0003_auto_20181002_1355.py

diff --git a/backend/db.sqlite3 b/backend/db.sqlite3
index facb5032d3814e7c0fb359ec500d5e60b716b68e..ae677ce941400f5703b6f0150e516df40ddb6bc3 100644
GIT binary patch
delta 3924
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
G`~Lts9O>8q

delta 722
zcmY*WQAm?f6u##_S2x_6`yEbjq$3xU^Vdop3aR}T+A3&KghDV^PFuK5H<twkE*XUo
zI4<}Hy#%Y5h^Sp7Sq~-@XhIoAQ4b+|@h#}VX<*u&6xf0Darn+X-#L7DbeWF6rV}=~
zo)B_e<iF@i*3=79`8i!6C=+J#jn?E~scs(M;0$KCOb?>9*)3>Shk*K{0_s!&&KACe
zwX_r&Da0;{A<W<kKEeccVV4+dM{9`*o%+FWbT|;|k9s5is{#KAGB#?kUNRevSgH5L
zhA(?#QGWzKk`kf0BP@mJgzf&IKN1W?qk(X!$%3fpd$0IH{b8@KHy8+c2g3c^L)IOm
ze@nh%*lkZyyPngA4MX}cr73!ha@zCTz~LM^Qq&=s8-j6c=+bw<Tr7PdNV*BkkZwGU
zolK@~-hHnRif@&=bY-dvV~xYUivxakAXm;_<jO&2i@7CcuAp#@$#XI8xj!W&?Rq1E
zn_#t61a5E(FPZ`4tu5^R>RHyiTFp-8+PUHJFW|Ik!(iTpZDQ>#f%9Y*J-9B`KF4^;
z5$$UYv}jWbRBDY1xQfR5+H_@3C)`GDZ!J`@54j3<b4{lOYvEmC-l=eeC12IB&uja&
zhB_F^-zCfc`4U%DEu=t)X3eXPD`3-pD4?VrRG8%1M3aX|q>8{(0XAYwsusR9tsoU5
z&%{|z()*~eYXT@Q__T$bp4!xz_K4#XL{g!HB+w;Z#du=wfdt=0`7M1xGMmGsfMf}}
zq!G9-9U@uLSmfE|yC4z5hO%#q;+-dSWkD6<L3U=|&UzLersz7=OE^hz0Vlak$B|8L
Ng|`3hB^Y7L@&}9b#329x

diff --git a/backend/postings/admin.py b/backend/postings/admin.py
index 5961a97..f33fcd3 100644
--- a/backend/postings/admin.py
+++ b/backend/postings/admin.py
@@ -9,4 +9,5 @@ admin.site.register(RateableEntity)
 admin.site.register(ReviewHelpfulVote)
 admin.site.register(University)
 admin.site.register(Professor)
-admin.site.register(Course)
\ No newline at end of file
+admin.site.register(Course)
+admin.site.register(User)
\ No newline at end of file
diff --git a/backend/postings/migrations/0002_auto_20181002_1338.py b/backend/postings/migrations/0002_auto_20181002_1338.py
new file mode 100644
index 0000000..04aacfd
--- /dev/null
+++ b/backend/postings/migrations/0002_auto_20181002_1338.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.1.1 on 2018-10-02 13:38
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('postings', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='review',
+            name='author',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='postings.User'),
+        ),
+    ]
diff --git a/backend/postings/migrations/0003_auto_20181002_1355.py b/backend/postings/migrations/0003_auto_20181002_1355.py
new file mode 100644
index 0000000..dc0361f
--- /dev/null
+++ b/backend/postings/migrations/0003_auto_20181002_1355.py
@@ -0,0 +1,25 @@
+# Generated by Django 2.1.1 on 2018-10-02 13:55
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('postings', '0002_auto_20181002_1338'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='reviewhelpfulvote',
+            name='user',
+            field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='postings.User'),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='review',
+            name='author',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='postings.User'),
+        ),
+    ]
diff --git a/backend/postings/models.py b/backend/postings/models.py
index 70049a5..ce3fb64 100644
--- a/backend/postings/models.py
+++ b/backend/postings/models.py
@@ -7,6 +7,10 @@ class User(models.Model):
 	# The user's birth date.
 	birth_date = models.DateField()
 
+	# Returns the name as the string representation of the user.
+	def __str__(self):
+		return self.name
+
 # Represents any object for which reviews can be made. (Universities, Professors, etc.)
 class RateableEntity(models.Model):
 	# Constants defined for types of rateable entities.
@@ -26,6 +30,18 @@ class RateableEntity(models.Model):
 	# The type of entity this is.
 	entity_type = models.SmallIntegerField(choices=TYPE_CHOICES)
 
+	# Gets the average of all the reviews.
+	def getAverageRating(self):
+		reviews = self.review_set.select_related()
+		rating_sum = 0
+		for review in reviews:
+			rating_sum += review.rating
+		return rating_sum / reviews.count()
+
+	# Simply returns the name as the string representation.
+	def __str__(self):
+		return self.name
+
 # A review represents any single data entry to the database.
 class Review(models.Model):
 	# An integer rating in the domain [1, 5]
@@ -41,7 +57,15 @@ class Review(models.Model):
 	# The date and time at which the last modification to this review was published.
 	last_updated_date = models.DateTimeField(auto_now=True)
 	# A reference to the person who created this review.
-	author = models.ForeignKey('postings.User', on_delete=models.PROTECT)
+	author = models.ForeignKey('postings.User', on_delete=models.PROTECT, null=True, blank=True)
+
+	# Gets the total number of votes which marked this review as 'helpful'.
+	def getHelpfulVoteCount(self):
+		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()
 
 # A vote for a review as either positive or negative.
 class ReviewHelpfulVote(models.Model):
@@ -49,7 +73,8 @@ class ReviewHelpfulVote(models.Model):
 	review = models.ForeignKey('postings.Review', on_delete=models.CASCADE)
 	# Whether or not the referenced review was helpful.
 	helpful = models.BooleanField()
-	# TODO: Add a reference to the user who voted. The whole purpose of a separate vote object is to track who votes for what.
+	# The user who made this vote.
+	user = models.ForeignKey('postings.User', on_delete=models.CASCADE)
 
 # A RateableEntity for universities.
 class University(RateableEntity):
diff --git a/backend/postings/templates/postings/entity_pages/entity.html b/backend/postings/templates/postings/entity_pages/entity.html
index b066368..24d220b 100644
--- a/backend/postings/templates/postings/entity_pages/entity.html
+++ b/backend/postings/templates/postings/entity_pages/entity.html
@@ -4,7 +4,7 @@
 
 {% block content %}
 
-<h2>Name: {{ entity.name }}</h2>
+<h2>Name: {{ entity.name }}</h2> Average rating: {{ entity.average_rating }}
 
 {% block entity_info %}
 {% endblock %}
diff --git a/backend/postings/views.py b/backend/postings/views.py
index 61c25b9..d8ae6df 100644
--- a/backend/postings/views.py
+++ b/backend/postings/views.py
@@ -24,6 +24,7 @@ def universities(request):
 def university_entity(request, university_id):
 	try:
 		university = University.objects.get(pk=university_id)
+		university.average_rating = university.getAverageRating()
 	except University.DoesNotExist:
 		raise Http404("University does not exist")
 	return render(request, 'postings/entity_pages/university.html', {'entity': university})