no need for sets

laws-africa · Sep 26, 2023 · 1e1a16b · 1e1a16b
1 parent f96760d
commit 1e1a16b
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 62 deletions.
diff --git a/peachjam/views/authors.py b/peachjam/views/authors.py
@@ -26,12 +26,10 @@ def get_queryset(self):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         doc_types = list(
-            set(
-                self.form.filter_queryset(self.get_base_queryset(), exclude="doc_type")
-                .order_by()
-                .values_list("doc_type", flat=True)
-                .distinct()
-            )
+            self.form.filter_queryset(self.get_base_queryset(), exclude="doc_type")
+            .order_by()
+            .values_list("doc_type", flat=True)
+            .distinct()
         )
 
         context["author"] = self.author

diff --git a/peachjam/views/courts.py b/peachjam/views/courts.py
@@ -70,42 +70,36 @@ def get_context_data(self, **kwargs):
 
     def populate_facets(self, context):
         judges = list(
-            {
-                judge
-                for judge in self.form.filter_queryset(
-                    self.get_base_queryset(), exclude="judges"
-                )
-                .order_by()
-                .values_list("judges__name", flat=True)
-                .distinct()
-                if judge
-            }
+            judge
+            for judge in self.form.filter_queryset(
+                self.get_base_queryset(), exclude="judges"
+            )
+            .order_by()
+            .values_list("judges__name", flat=True)
+            .distinct()
+            if judge
         )
 
         attorneys = list(
-            {
-                attorney
-                for attorney in self.form.filter_queryset(
-                    self.get_base_queryset(), exclude="attorneys"
-                )
-                .order_by()
-                .values_list("attorneys__name", flat=True)
-                .distinct()
-                if attorney
-            }
+            attorney
+            for attorney in self.form.filter_queryset(
+                self.get_base_queryset(), exclude="attorneys"
+            )
+            .order_by()
+            .values_list("attorneys__name", flat=True)
+            .distinct()
+            if attorney
         )
 
         order_outcomes = list(
-            {
-                order_outcome
-                for order_outcome in self.form.filter_queryset(
-                    self.get_base_queryset(), exclude="order_outcomes"
-                )
-                .order_by()
-                .values_list("order_outcome__name", flat=True)
-                .distinct()
-                if order_outcome
-            }
+            order_outcome
+            for order_outcome in self.form.filter_queryset(
+                self.get_base_queryset(), exclude="order_outcomes"
+            )
+            .order_by()
+            .values_list("order_outcome__name", flat=True)
+            .distinct()
+            if order_outcome
         )
 
         context["facet_data"] = {

diff --git a/peachjam/views/generic_views.py b/peachjam/views/generic_views.py
@@ -86,38 +86,32 @@ def add_facets(self, context):
         authors = []
         # Initialize facet data values
         natures = list(
-            {
-                doc_n
-                for doc_n in self.form.filter_queryset(
-                    self.get_base_queryset(), exclude="natures"
-                )
-                .order_by()
-                .values_list("nature__name", flat=True)
-                .distinct()
-                if doc_n
-            }
+            doc_n
+            for doc_n in self.form.filter_queryset(
+                self.get_base_queryset(), exclude="natures"
+            )
+            .order_by()
+            .values_list("nature__name", flat=True)
+            .distinct()
+            if doc_n
         )
         if self.model in [GenericDocument, LegalInstrument]:
             authors = list(
-                {
-                    a
-                    for a in self.form.filter_queryset(
-                        self.get_base_queryset(), exclude="authors"
-                    )
-                    .order_by()
-                    .values_list("authors__name", flat=True)
-                    .distinct()
-                    if a
-                }
-            )
-
-        years = list(
-            set(
-                self.form.filter_queryset(self.get_base_queryset(), exclude="years")
+                a
+                for a in self.form.filter_queryset(
+                    self.get_base_queryset(), exclude="authors"
+                )
                 .order_by()
-                .values_list("date__year", flat=True)
+                .values_list("authors__name", flat=True)
                 .distinct()
+                if a
             )
+
+        years = list(
+            self.form.filter_queryset(self.get_base_queryset(), exclude="years")
+            .order_by()
+            .values_list("date__year", flat=True)
+            .distinct()
         )
 
         context["doc_table_show_author"] = bool(authors)