WIP test fixing

Author: tykling

src/shop/tests.py

@@ -714,7 +714,7 @@ def _get_form_data(
             form_data[f"ticket-{opr.id}-INITIAL_FORMS"] = "1"
             form_data[f"ticket-{opr.id}-MIN_NUM_FORMS"] = "0"
             form_data[f"ticket-{opr.id}-MAX_NUM_FORMS"] = "1000"
-            for index, ticket in enumerate(opr.shoptickets.all()):
+            for index, ticket in enumerate(opr.shoptickets.order_by("-created").all()):
                 form_data[f"ticket-{opr.id}-{index}-uuid"] = str(ticket.uuid)
                 if ticket in refund_tickets:
                     form_data[f"ticket-{opr.id}-{index}-refund"] = "on"
@@ -724,7 +724,7 @@ def _get_form_data(
             form_data[f"ticket-group-{opr.id}-INITIAL_FORMS"] = "1"
             form_data[f"ticket-group-{opr.id}-MIN_NUM_FORMS"] = "0"
             form_data[f"ticket-group-{opr.id}-MAX_NUM_FORMS"] = "1000"
-            for index, ticket_group in enumerate(opr.ticketgroups.all()):
+            for index, ticket_group in enumerate(opr.ticketgroups.order_by("-created").all()):
                 form_data[f"ticket-group-{opr.id}-{index}-uuid"] = str(
                     ticket_group.uuid,
                 )

src/tickets/models.py

@@ -246,7 +246,7 @@ def annotate_ticket_info(self):
             return self.annotate(
                 has_used_tickets=Exists(used_tickets_subquery),
                 has_tickets=Exists(tickets),
-            ).distinct("uuid")
+            ).distinct("uuid", "created")
 
     objects = QuerySet.as_manager()
 

src/utils/models.py

@@ -71,6 +71,7 @@ class Meta:
 class CreatedUpdatedModel(CleanedModel):
     class Meta:
         abstract = True
+        ordering = ["-created"]
 
     created = models.DateTimeField(auto_now_add=True)
     updated = models.DateTimeField(auto_now=True)
@@ -79,6 +80,7 @@ class Meta:
 class CreatedUpdatedUUIDModel(CleanedModel):
     class Meta:
         abstract = True
+        ordering = ["-created"]
 
     uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
     created = models.DateTimeField(auto_now_add=True)
@@ -94,6 +96,7 @@ class CampRelatedModel(CreatedUpdatedModel):
 
     class Meta:
         abstract = True
+        ordering = ["-created"]
 
     def save(self, **kwargs) -> None:
         if self.camp.read_only: