Fix test and reorganize attributes

wger-project · Feb 2, 2025 · d6d841d · d6d841d
1 parent 5751e0f
commit d6d841d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/wger/manager/dataclasses.py b/wger/manager/dataclasses.py
@@ -47,21 +47,23 @@ class SetConfigData:
     exercise: int
 
     weight: Decimal | int | None = None
+    max_weight: Decimal | int | None = None
+    weight_unit: int | None = 1
+    weight_rounding: Decimal | int | None = None
+
     repetitions: Decimal | int | None = None
-    rir: Decimal | int | None = None
-    rest: int | None = None
+    max_repetitions: Decimal | int | None = None
+    repetitions_unit: int | None = 1
+    repetitions_rounding: Decimal | int | None = None
 
+    rir: Decimal | int | None = None
     max_rir: Decimal | int | None = None
-    max_weight: Decimal | int | None = None
-    max_repetitions: Decimal | int | None = None
-    max_rest: int | None = None
-    max_sets: int | None = None
+
+    rest: Decimal | int | None = None
+    max_rest: Decimal | int | None = None
 
     sets: int = 1
-    weight_unit: int | None = 1
-    repetitions_unit: int | None = 1
-    weight_rounding: Decimal | int | None = None
-    repetitions_rounding: Decimal | int | None = None
+    max_sets: int | None = None
 
     comment: str = ''
     type: str = 'normal'

diff --git a/wger/manager/tests/test_slot_entry.py b/wger/manager/tests/test_slot_entry.py
@@ -315,10 +315,10 @@ def test_requirements_sets_met(self):
             SetConfigData(
                 slot_entry_id=self.slot_entry.pk,
                 exercise=1,
-                sets=1,
+                sets=5,
                 weight=Decimal(50),
                 weight_rounding=Decimal(2.5),
-                rest=90,
+                rest=Decimal(90),
             ).__dict__,
         )
 
@@ -331,7 +331,7 @@ def test_requirements_sets_met(self):
                 sets=6,
                 weight=Decimal(50),
                 weight_rounding=Decimal(2.5),
-                rest=90,
+                rest=Decimal(90),
             ).__dict__,
         )