From 40f42a9ee92d3b46d15a64558f19af97afebab1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= <daniele@vigano.me>
Date: Wed, 30 Apr 2025 22:52:51 +0200
Subject: [PATCH] Reformat portal/views.py

---
 ram/portal/views.py | 67 +++++++++++++++++++++++++--------------------
 1 file changed, 37 insertions(+), 30 deletions(-)

diff --git a/ram/portal/views.py b/ram/portal/views.py
index 22d4776..9437d1b 100644
--- a/ram/portal/views.py
+++ b/ram/portal/views.py
@@ -490,11 +490,13 @@ class Manufacturers(GetData):
     item_type = "manufacturer"
 
     def get_data(self, request):
-        return Manufacturer.objects.filter(
-            self.filter
-        ).annotate(
-            num_items=Count("rollingstock") + Count("rollingclass"),
-        ).order_by("name")
+        return (
+            Manufacturer.objects.filter(self.filter)
+            .annotate(
+                num_items=Count("rollingstock") + Count("rollingclass"),
+            )
+            .order_by("name")
+        )
 
     # overload get method to filter by category
     def get(self, request, category, page=1):
@@ -510,33 +512,38 @@ class Companies(GetData):
     item_type = "company"
 
     def get_data(self, request):
-        return Company.objects.annotate(
-            num_rollingstock=(
-                Count(
-                    "rollingclass__rolling_class",
-                    filter=Q(
-                        rollingclass__rolling_class__in=(
-                            RollingStock.objects.get_published(request.user)
-                        )
-                    ),
-                    distinct=True
-                )
-            )
-        ).annotate(
-            num_consists=(
-                Count(
-                    "consist",
-                    filter=Q(
-                        consist__in=(
-                            Consist.objects.get_published(request.user)
+        return (
+            Company.objects.annotate(
+                num_rollingstock=(
+                    Count(
+                        "rollingclass__rolling_class",
+                        filter=Q(
+                            rollingclass__rolling_class__in=(
+                                RollingStock.objects.get_published(
+                                    request.user
+                                )
+                            )
                         ),
-                    ),
-                    distinct=True
+                        distinct=True,
+                    )
                 )
             )
-        ).annotate(
-            num_items=F("num_rollingstock") + F("num_consists")
-        ).order_by("name")
+            .annotate(
+                num_consists=(
+                    Count(
+                        "consist",
+                        filter=Q(
+                            consist__in=(
+                                Consist.objects.get_published(request.user)
+                            ),
+                        ),
+                        distinct=True,
+                    )
+                )
+            )
+            .annotate(num_items=F("num_rollingstock") + F("num_consists"))
+            .order_by("name")
+        )
 
 
 class Scales(GetData):
@@ -614,7 +621,7 @@ class GetBookCatalog(View):
                 "book": book,
                 "documents": documents,
                 "properties": properties,
-                "type": selector
+                "type": selector,
             },
         )