Update quotes app to be pep8 compliant

Awoyalejohn · Aug 30, 2022 · 144f39d · 144f39d
1 parent 5dd19f9
commit 144f39d
Show file tree

Hide file tree

Showing 6 changed files with 352 additions and 235 deletions.
diff --git a/quotes/admin.py b/quotes/admin.py
@@ -1,20 +1,32 @@
 from django.contrib import admin
 from quotes.models import QuoteRequest, QuoteOrder, QuoteFufillment
 
-# Register your models here.
+
 @admin.register(QuoteRequest)
 class QuoteRequestAdmin(admin.ModelAdmin):
-    list_display = ('name', 'user', 'submitted', 'quote_request_number')
-    readonly_fields = ('quote_request_number',)
+    list_display = ("name", "user", "submitted", "quote_request_number")
+    readonly_fields = ("quote_request_number",)
 
 
 @admin.register(QuoteOrder)
 class QuoteOrderAdmin(admin.ModelAdmin):
-    list_display = ('quote_request_name', 'user', 'submitted', 'quote_order_number')
-    readonly_fields = ('quote_request_name', 'type', 'size', 'description',
-                       'subtotal', 'discount', 'total', 'quote_order_number')
+    list_display = (
+        "quote_request_name",
+        "user", "submitted",
+        "quote_order_number"
+    )
+    readonly_fields = (
+        "quote_request_name",
+        "type",
+        "size",
+        "description",
+        "subtotal",
+        "discount",
+        "total",
+        "quote_order_number",
+    )
 
 
 @admin.register(QuoteFufillment)
 class QuoteFufillmentAdmin(admin.ModelAdmin):
-    list_display = ('quote_order', 'image', 'status')
+    list_display = ("quote_order", "image", "status")
diff --git a/quotes/choices.py b/quotes/choices.py
@@ -1,14 +1,14 @@
 TYPE_CHOICES = [
-    ('IC', 'Icon --- £9.99'),
-    ('LG', 'Logo --- £19.99'),
-    ('PS', 'Poster --- £39.99'),
-    ('ST', 'Sticker --- £9.99'),
-    ('WP', 'Wallpaper --- £39.99'),
-    ('BN', 'Banner --- £19.99'),
+    ("IC", "Icon --- £9.99"),
+    ("LG", "Logo --- £19.99"),
+    ("PS", "Poster --- £39.99"),
+    ("ST", "Sticker --- £9.99"),
+    ("WP", "Wallpaper --- £39.99"),
+    ("BN", "Banner --- £19.99"),
 ]
 
 SIZE_CHOICES = [
-    ('S', 'Small --- £9.99'),
-    ('M', 'Medium --- £19.99'),
-    ('L', 'Large --- £29.99'),
-]
+    ("S", "Small --- £9.99"),
+    ("M", "Medium --- £19.99"),
+    ("L", "Large --- £29.99"),
+]
diff --git a/quotes/forms.py b/quotes/forms.py
@@ -6,28 +6,30 @@
 class QuoteRequestForm(forms.ModelForm):
     class Meta:
         model = QuoteRequest
-        exclude = ('user', 'quote_request_number')
+        exclude = ("user", "quote_request_number")
 
         labels = {
-            'type': 'What type of design do you need?',
-            'size': 'What size?',
+            "type": "What type of design do you need?",
+            "size": "What size?",
         }
 
     def __init__(self, *args, **kwargs):
         super(QuoteRequestForm, self).__init__(*args, **kwargs)
-        self.fields['name'].widget.attrs['placeholder'] = 'Give the design a name'
-        self.fields['description'].widget.attrs['placeholder'] = 'Write a description here'
-
-
+        self.fields["name"].widget.attrs["placeholder"] = (
+            "Give the design a name"
+        )
+        self.fields["description"].widget.attrs[
+            "placeholder"
+        ] = "Write a description here"
 
 
 class QuoteOrderForm(forms.ModelForm):
     class Meta:
         model = QuoteOrder
-        fields = ('name', 'email')
+        fields = ("name", "email")
 
 
 class QuoteFufillmentForm(forms.ModelForm):
     class Meta:
         model = QuoteFufillment
-        exclude = ('quote_order',)
+        exclude = ("quote_order",)
diff --git a/quotes/models.py b/quotes/models.py
@@ -2,12 +2,12 @@
 from profiles.models import UserProfile
 from quotes.choices import TYPE_CHOICES, SIZE_CHOICES
 
-import uuid
 
-# Create your models here.
 class QuoteRequest(models.Model):
     name = models.CharField(max_length=250)
-    user =  models.ForeignKey(UserProfile, on_delete=models.SET_NULL, null=True, blank=True)
+    user = models.ForeignKey(
+        UserProfile, on_delete=models.SET_NULL, null=True, blank=True
+    )
     type = models.CharField(max_length=2, choices=TYPE_CHOICES)
     size = models.CharField(max_length=1, choices=SIZE_CHOICES)
     description = models.TextField()
@@ -19,7 +19,9 @@ def __str__(self):
 
 
 class QuoteOrder(models.Model):
-    user = models.ForeignKey(UserProfile, on_delete=models.SET_NULL, null=True, blank=True)
+    user = models.ForeignKey(
+        UserProfile, on_delete=models.SET_NULL, null=True, blank=True
+    )
     name = models.CharField(max_length=250)
     email = models.CharField(max_length=250)
     quote_request_name = models.CharField(max_length=250)
@@ -33,14 +35,20 @@ class QuoteOrder(models.Model):
     quote_order_number = models.CharField(max_length=250, unique=True)
 
     class Meta:
-        ordering = ['-submitted']
+        ordering = ["-submitted"]
 
     def __str__(self):
         return self.quote_request_name
 
 
 class QuoteFufillment(models.Model):
-    quote_order = models.OneToOneField(QuoteOrder, null=True, blank=True, related_name='quote_order_set', on_delete=models.SET_NULL)
+    quote_order = models.OneToOneField(
+        QuoteOrder,
+        null=True,
+        blank=True,
+        related_name="quote_order_set",
+        on_delete=models.SET_NULL,
+    )
     image = models.ImageField(null=True, blank=True)
     status = models.BooleanField(default=False)
 

diff --git a/quotes/urls.py b/quotes/urls.py
@@ -1,17 +1,42 @@
 from django.urls import path
 from quotes.views import (
-    QuoteRequestView, QuoteCheckoutView, QuoteCheckoutSuccess,
-    QuoteHistoryView, QuoteHistoryDetail, QuoteOrderList,
-    QuoteOrderFufillCreate, QuoteOrderFufillUpdate
-    )
+    QuoteRequestView,
+    QuoteCheckoutView,
+    QuoteCheckoutSuccess,
+    QuoteHistoryView,
+    QuoteHistoryDetail,
+    QuoteOrderList,
+    QuoteOrderFufillCreate,
+    QuoteOrderFufillUpdate,
+)
 
 urlpatterns = [
-    path('', QuoteRequestView.as_view(), name='quote_request'),
-    path('quote_orders', QuoteOrderList.as_view(), name='quote_orders'),
-    path('quote_orders/fufill/<quote_order_number>', QuoteOrderFufillCreate.as_view(), name='quote_orders_fufill'),
-    path('quote_orders/fufill/update/<quote_order_number>', QuoteOrderFufillUpdate.as_view(), name='quote_fufill_update'),
-    path('quote_history/', QuoteHistoryView.as_view(), name='quote_history'),
-    path('quote_history/<quote_order_number>', QuoteHistoryDetail.as_view(), name='quote_history_detail'),
-    path('quote_checkout/', QuoteCheckoutView.as_view(), name='quote_checkout'),
-    path('quote_checkout_success/<quote_order_number>', QuoteCheckoutSuccess.as_view(), name='quote_checkout_success'),
-]
+    path("", QuoteRequestView.as_view(), name="quote_request"),
+    path("quote_orders", QuoteOrderList.as_view(), name="quote_orders"),
+    path(
+        "quote_orders/fufill/<quote_order_number>",
+        QuoteOrderFufillCreate.as_view(),
+        name="quote_orders_fufill",
+    ),
+    path(
+        "quote_orders/fufill/update/<quote_order_number>",
+        QuoteOrderFufillUpdate.as_view(),
+        name="quote_fufill_update",
+    ),
+    path("quote_history/", QuoteHistoryView.as_view(), name="quote_history"),
+    path(
+        "quote_history/<quote_order_number>",
+        QuoteHistoryDetail.as_view(),
+        name="quote_history_detail",
+    ),
+    path(
+        "quote_checkout/",
+        QuoteCheckoutView.as_view(),
+        name="quote_checkout"
+    ),
+    path(
+        "quote_checkout_success/<quote_order_number>",
+        QuoteCheckoutSuccess.as_view(),
+        name="quote_checkout_success",
+    ),
+]