From 8351a0ed469605af99421964f5fda0482ff7476b Mon Sep 17 00:00:00 2001
From: Agus Makmun <agus@practical-devsecops.com>
Date: Thu, 7 Apr 2022 10:25:45 +0700
Subject: [PATCH] feat: added optional feedback text & fix url
---
.../ratings/migrations/0004_rating_feedback.py | 18 ++++++++++++++++++
pinax/ratings/models.py | 1 +
pinax/ratings/tests/test_models.py | 3 ++-
pinax/ratings/tests/urls.py | 7 ++++++-
pinax/ratings/urls.py | 5 ++++-
5 files changed, 31 insertions(+), 3 deletions(-)
create mode 100644 pinax/ratings/migrations/0004_rating_feedback.py
diff --git a/pinax/ratings/migrations/0004_rating_feedback.py b/pinax/ratings/migrations/0004_rating_feedback.py
new file mode 100644
index 0000000..6fba9df
--- /dev/null
+++ b/pinax/ratings/migrations/0004_rating_feedback.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.0.3 on 2022-04-07 03:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('ratings', '0003_auto_20170819_1127'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='rating',
+ name='feedback',
+ field=models.TextField(blank=True, default=''),
+ ),
+ ]
diff --git a/pinax/ratings/models.py b/pinax/ratings/models.py
index 5584f58..7dd791d 100644
--- a/pinax/ratings/models.py
+++ b/pinax/ratings/models.py
@@ -39,6 +39,7 @@ class Rating(models.Model):
content_object = GenericForeignKey()
user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
rating = models.IntegerField()
+ feedback = models.TextField(blank=True, default="")
timestamp = models.DateTimeField(default=timezone.now)
category = models.CharField(max_length=250, blank=True, choices=RATING_CATEGORY_CHOICES)
diff --git a/pinax/ratings/tests/test_models.py b/pinax/ratings/tests/test_models.py
index 20f79da..81c4474 100644
--- a/pinax/ratings/tests/test_models.py
+++ b/pinax/ratings/tests/test_models.py
@@ -29,7 +29,8 @@ def setUp(self):
content_type=ContentType.objects.get_for_model(self.expedition),
user=self.paltman,
category=self.speed,
- rating=5
+ rating=5,
+ feedback="Ford expedition is very good!"
)
self.overall_rating_object = OverallRating.objects.create(
object_id=self.expedition.pk,
diff --git a/pinax/ratings/tests/urls.py b/pinax/ratings/tests/urls.py
index 0e7be9f..419a14d 100644
--- a/pinax/ratings/tests/urls.py
+++ b/pinax/ratings/tests/urls.py
@@ -1,4 +1,9 @@
-from django.conf.urls import include, url
+try:
+ from django.conf.urls import url
+except ImportError:
+ from django.urls import re_path as url
+
+from django.conf.urls import include
urlpatterns = [
url(r"^", include("pinax.ratings.urls", namespace="pinax_ratings")),
diff --git a/pinax/ratings/urls.py b/pinax/ratings/urls.py
index ef1c89b..5d35932 100644
--- a/pinax/ratings/urls.py
+++ b/pinax/ratings/urls.py
@@ -1,4 +1,7 @@
-from django.conf.urls import url
+try:
+ from django.conf.urls import url
+except ImportError: # pragma: no cover
+ from django.urls import re_path as url # pragma: no cover
from pinax.ratings import views