Sourcery Starbot ⭐ refactored BQBB/05-commerce

account/forms.py

@@ -85,7 +85,7 @@ def clean_email(self):
                 User.objects.exclude(pk=self.instance.pk).get(email=email)
             except User.DoesNotExist:
                 return email
-            raise forms.ValidationError("Email '%s' already in use." % email)
+            raise forms.ValidationError(f"Email '{email}' already in use.")
 
 
 class UserAdminCreationForm(forms.ModelForm):

account/models.py

@@ -9,7 +9,7 @@
 
 class CustomUserManager(UserManager):
     def get_by_natural_key(self, username):
-        case_insensitive_username_field = '{}__iexact'.format(self.model.USERNAME_FIELD)
+        case_insensitive_username_field = f'{self.model.USERNAME_FIELD}__iexact'
         return self.get(**{case_insensitive_username_field: username})
 
     def create_user(self, first_name, last_name, email, password=None):

commerce/controllers.py

@@ -109,8 +109,9 @@ def list_products(
 @check_pk
 def list_addresses(request):
 
-    addresses = Address.objects.select_related('city', 'user').filter(user=User.objects.get(id=request.auth['pk']))
-    if addresses:
+    if addresses := Address.objects.select_related('city', 'user').filter(
+        user=User.objects.get(id=request.auth['pk'])
+    ):
         return addresses
     return 404, {'detail': 'No addresses found'}
 
@@ -125,9 +126,7 @@ def list_addresses(request):
     404: MessageOut
 })
 def list_cities(request):
-    cities_qs = City.objects.all()
-
-    if cities_qs:
+    if cities_qs := City.objects.all():
         return cities_qs
 
     return 404, {'detail': 'No cities found'}
@@ -188,9 +187,9 @@ def delete_city(request, id: UUID4):
 @check_pk
 def view_cart(request):
 
-    cart_items = Item.objects.filter(user=User.objects.get(id=request.auth['pk']), ordered=False)
-
-    if cart_items:
+    if cart_items := Item.objects.filter(
+        user=User.objects.get(id=request.auth['pk']), ordered=False
+    ):
         return cart_items
 
     return 404, {'detail': 'Your cart is empty, go shop like crazy!'}

commerce/models.py

@@ -127,9 +127,7 @@ class Category(Entity):
 
 
     def __str__(self):
-        if self.parent:
-            return f'-   {self.name}'
-        return f'{self.name}'
+        return f'-   {self.name}' if self.parent else f'{self.name}'
 
     class Meta:
         verbose_name = 'category'