Add more Ruff rules (#891)

* ruff: apply rule F

* ruff: apply rule E

* ruff: apply rule SIM

* ruff: apply rule TCH

* ruff: apply rule ERA

* ruff: apply rule PLW

* ruff: apply rule FLY

* ruff: apply rule PERF

* ruff: apply rules FURB & RUF

counter/admin.py

@@ -15,7 +15,19 @@
 from django.contrib import admin
 from haystack.admin import SearchModelAdmin
 
-from counter.models import *
+from counter.models import (
+    AccountDump,
+    BillingInfo,
+    CashRegisterSummary,
+    Counter,
+    Customer,
+    Eticket,
+    Permanency,
+    Product,
+    ProductType,
+    Refilling,
+    Selling,
+)
 
 
 @admin.register(Product)

counter/models.py

@@ -154,7 +154,7 @@ class Customer(models.Model):
         self.save()
 
     def get_full_url(self):
-        return "".join(["https://", settings.SITH_URL, self.get_absolute_url()])
+        return f"https://{settings.SITH_URL}{self.get_absolute_url()}"
 
 
 class BillingInfo(models.Model):
@@ -287,9 +287,7 @@ class ProductType(models.Model):
         """Method to see if that object can be edited by the given user."""
         if user.is_anonymous:
             return False
-        if user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID):
-            return True
-        return False
+        return user.is_in_group(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)
 
 
 class Product(models.Model):
@@ -346,21 +344,19 @@ class Product(models.Model):
 
     @property
     def is_record_product(self):
-        return settings.SITH_ECOCUP_CONS == self.id
+        return self.id == settings.SITH_ECOCUP_CONS
 
     @property
     def is_unrecord_product(self):
-        return settings.SITH_ECOCUP_DECO == self.id
+        return self.id == settings.SITH_ECOCUP_DECO
 
     def is_owned_by(self, user):
         """Method to see if that object can be edited by the given user."""
         if user.is_anonymous:
             return False
-        if user.is_in_group(
+        return user.is_in_group(
             pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID
-        ) or user.is_in_group(pk=settings.SITH_GROUP_COUNTER_ADMIN_ID):
-            return True
-        return False
+        ) or user.is_in_group(pk=settings.SITH_GROUP_COUNTER_ADMIN_ID)
 
     def can_be_sold_to(self, user: User) -> bool:
         """Check if whether the user given in parameter has the right to buy
@@ -392,10 +388,7 @@ class Product(models.Model):
         buying_groups = list(self.buying_groups.all())
         if not buying_groups:
             return True
-        for group in buying_groups:
-            if user.is_in_group(pk=group.id):
-                return True
-        return False
+        return any(user.is_in_group(pk=group.id) for group in buying_groups)
 
     @property
     def profit(self):
@@ -887,27 +880,19 @@ class Selling(models.Model):
             "You bought an eticket for the event %(event)s.\nYou can download it directly from this link %(eticket)s.\nYou can also retrieve all your e-tickets on your account page %(url)s."
         ) % {
             "event": event,
-            "url": "".join(
-                (
-                    '<a href="',
-                    self.customer.get_full_url(),
-                    '">',
-                    self.customer.get_full_url(),
-                    "</a>",
-                )
+            "url": (
+                f'<a href="{self.customer.get_full_url()}">'
+                f"{self.customer.get_full_url()}</a>"
             ),
-            "eticket": "".join(
-                (
-                    '<a href="',
-                    self.get_eticket_full_url(),
-                    '">',
-                    self.get_eticket_full_url(),
-                    "</a>",
-                )
+            "eticket": (
+                f'<a href="{self.get_eticket_full_url()}">'
+                f"{self.get_eticket_full_url()}</a>"
             ),
         }
         message_txt = _(
-            "You bought an eticket for the event %(event)s.\nYou can download it directly from this link %(eticket)s.\nYou can also retrieve all your e-tickets on your account page %(url)s."
+            "You bought an eticket for the event %(event)s.\n"
+            "You can download it directly from this link %(eticket)s.\n"
+            "You can also retrieve all your e-tickets on your account page %(url)s."
         ) % {
             "event": event,
             "url": self.customer.get_full_url(),
@@ -919,7 +904,7 @@ class Selling(models.Model):
 
     def get_eticket_full_url(self):
         eticket_url = reverse("counter:eticket_pdf", kwargs={"selling_id": self.id})
-        return "".join(["https://", settings.SITH_URL, eticket_url])
+        return f"https://{settings.SITH_URL}{eticket_url}"
 
 
 class Permanency(models.Model):
@@ -1019,15 +1004,15 @@ class CashRegisterSummary(models.Model):
         elif name == "hundred_euros":
             return self.items.filter(value=100, is_check=False).first()
         elif name == "check_1":
-            return checks[0] if 0 < len(checks) else None
+            return checks[0] if len(checks) > 0 else None
         elif name == "check_2":
-            return checks[1] if 1 < len(checks) else None
+            return checks[1] if len(checks) > 1 else None
         elif name == "check_3":
-            return checks[2] if 2 < len(checks) else None
+            return checks[2] if len(checks) > 2 else None
         elif name == "check_4":
-            return checks[3] if 3 < len(checks) else None
+            return checks[3] if len(checks) > 3 else None
         elif name == "check_5":
-            return checks[4] if 4 < len(checks) else None
+            return checks[4] if len(checks) > 4 else None
         else:
             return object.__getattribute__(self, name)
 
@@ -1035,9 +1020,7 @@ class CashRegisterSummary(models.Model):
         """Method to see if that object can be edited by the given user."""
         if user.is_anonymous:
             return False
-        if user.is_in_group(pk=settings.SITH_GROUP_COUNTER_ADMIN_ID):
-            return True
-        return False
+        return user.is_in_group(pk=settings.SITH_GROUP_COUNTER_ADMIN_ID)
 
     def get_total(self):
         t = 0

counter/signals.py

@@ -51,7 +51,7 @@ def write_log(instance, operation_type):
         # Return None by default
         return None
 
-    log = OperationLog(
+    OperationLog(
         label=str(instance),
         operator=get_user(),
         operation_type=operation_type,

counter/tests/test_counter.py

@@ -503,7 +503,7 @@ class TestBarmanConnection(TestCase):
         )
         response = self.client.get(reverse("counter:activity", args=[self.counter.id]))
 
-        assert not '<li><a href="/user/1/">S&#39; Kia</a></li>' in str(response.content)
+        assert '<li><a href="/user/1/">S&#39; Kia</a></li>' not in str(response.content)
 
 
 @pytest.mark.django_db
@@ -853,7 +853,7 @@ class TestCustomerAccountId(TestCase):
         number = account_id[:-1]
         assert created is True
         assert number == "12346"
-        assert 6 == len(account_id)
+        assert len(account_id) == 6
         assert account_id[-1] in string.ascii_lowercase
         assert customer.amount == 0
 

counter/urls.py

@@ -15,7 +15,40 @@
 
 from django.urls import path
 
-from counter.views import *
+from counter.views import (
+    ActiveProductListView,
+    ArchivedProductListView,
+    CashSummaryEditView,
+    CashSummaryListView,
+    CounterActivityView,
+    CounterCashSummaryView,
+    CounterClick,
+    CounterCreateView,
+    CounterDeleteView,
+    CounterEditPropView,
+    CounterEditView,
+    CounterLastOperationsView,
+    CounterListView,
+    CounterMain,
+    CounterRefillingListView,
+    CounterStatView,
+    EticketCreateView,
+    EticketEditView,
+    EticketListView,
+    EticketPDFView,
+    InvoiceCallView,
+    ProductCreateView,
+    ProductEditView,
+    ProductTypeCreateView,
+    ProductTypeEditView,
+    ProductTypeListView,
+    RefillingDeleteView,
+    SellingDeleteView,
+    StudentCardDeleteView,
+    StudentCardFormView,
+    counter_login,
+    counter_logout,
+)
 
 urlpatterns = [
     path("<int:counter_id>/", CounterMain.as_view(), name="details"),

counter/views.py

@@ -91,16 +91,10 @@ class CounterAdminMixin(View):
     edit_club = []
 
     def _test_group(self, user):
-        for grp_id in self.edit_group:
-            if user.is_in_group(pk=grp_id):
-                return True
-        return False
+        return any(user.is_in_group(pk=grp_id) for grp_id in self.edit_group)
 
     def _test_club(self, user):
-        for c in self.edit_club:
-            if c.can_be_edited_by(user):
-                return True
-        return False
+        return any(c.can_be_edited_by(user) for c in self.edit_club)
 
     def dispatch(self, request, *args, **kwargs):
         if not (
@@ -181,7 +175,7 @@ class CounterMain(
     def post(self, request, *args, **kwargs):
         self.object = self.get_object()
         if self.object.type == "BAR" and not (
-            "counter_token" in self.request.session.keys()
+            "counter_token" in self.request.session
             and self.request.session["counter_token"] == self.object.token
         ):  # Check the token to avoid the bar to be stolen
             return HttpResponseRedirect(
@@ -219,7 +213,7 @@ class CounterMain(
             kwargs["barmen"] = self.object.barmen_list
         elif self.request.user.is_authenticated:
             kwargs["barmen"] = [self.request.user]
-        if "last_basket" in self.request.session.keys():
+        if "last_basket" in self.request.session:
             kwargs["last_basket"] = self.request.session.pop("last_basket")
             kwargs["last_customer"] = self.request.session.pop("last_customer")
             kwargs["last_total"] = self.request.session.pop("last_total")
@@ -294,7 +288,7 @@ class CounterClick(CounterTabsMixin, CanViewMixin, DetailView):
 
     def get(self, request, *args, **kwargs):
         """Simple get view."""
-        if "basket" not in request.session.keys():  # Init the basket session entry
+        if "basket" not in request.session:  # Init the basket session entry
             request.session["basket"] = {}
             request.session["basket_total"] = 0
         request.session["not_enough"] = False  # Reset every variable
@@ -318,7 +312,7 @@ class CounterClick(CounterTabsMixin, CanViewMixin, DetailView):
         ):  # Check that at least one barman is logged in
             return self.cancel(request)
         if self.object.type == "BAR" and not (
-            "counter_token" in self.request.session.keys()
+            "counter_token" in self.request.session
             and self.request.session["counter_token"] == self.object.token
         ):  # Also check the token to avoid the bar to be stolen
             return HttpResponseRedirect(
@@ -329,7 +323,7 @@ class CounterClick(CounterTabsMixin, CanViewMixin, DetailView):
                 )
                 + "?bad_location"
             )
-        if "basket" not in request.session.keys():
+        if "basket" not in request.session:
             request.session["basket"] = {}
             request.session["basket_total"] = 0
         request.session["not_enough"] = False  # Reset every variable
@@ -386,13 +380,12 @@ class CounterClick(CounterTabsMixin, CanViewMixin, DetailView):
 
     def get_total_quantity_for_pid(self, request, pid):
         pid = str(pid)
-        try:
-            return (
-                request.session["basket"][pid]["qty"]
-                + request.session["basket"][pid]["bonus_qty"]
-            )
-        except:
+        if pid not in request.session["basket"]:
             return 0
+        return (
+            request.session["basket"][pid]["qty"]
+            + request.session["basket"][pid]["bonus_qty"]
+        )
 
     def compute_record_product(self, request, product=None):
         recorded = 0