fixed read_gym() method using copy.deepcopy() on workout zone objects

EsatGokcen · Dec 31, 2024 · 66daaaa · 66daaaa
1 parent a21fa99
commit 66daaaa
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/src/config.py b/src/config.py
@@ -3,7 +3,7 @@
 from src.controller.gym_controller import GymController
 from src.controller.member_controller import MemberController
 from src.controller.workout_zone_controller import WorkoutZoneController
-
+import copy
 
 def create_workout_zone_data():
     # WORKOUT ZONE 1 - Strength Training
@@ -189,10 +189,10 @@ def create_gym_data():
     gym1.create_member(members[4])
 
     # WORKOUT ZONE ADDITION
-    gym1.add_workout_zone(workout_zones[0])
-    gym1.add_workout_zone(workout_zones[1])
-    gym1.add_workout_zone(workout_zones[2])
-    gym1.add_workout_zone(workout_zones[4])
+    gym1.add_workout_zone(copy.deepcopy(workout_zones[0]))
+    gym1.add_workout_zone(copy.deepcopy(workout_zones[1]))
+    gym1.add_workout_zone(copy.deepcopy(workout_zones[2]))
+    gym1.add_workout_zone(copy.deepcopy(workout_zones[4]))
 
     # CREATE A CLASS FOR GYM
     bench_press_class = ClassesController()
@@ -221,11 +221,11 @@ def create_gym_data():
     gym2.create_member(members[5])
 
     # WORKOUT ZONE ADDITION
-    gym1.add_workout_zone(workout_zones[0])
-    gym1.add_workout_zone(workout_zones[1])
-    gym1.add_workout_zone(workout_zones[2])
-    gym1.add_workout_zone(workout_zones[3])
-    gym1.add_workout_zone(workout_zones[5])
+    gym2.add_workout_zone(copy.deepcopy(workout_zones[0]))
+    gym2.add_workout_zone(copy.deepcopy(workout_zones[1]))
+    gym2.add_workout_zone(copy.deepcopy(workout_zones[2]))
+    gym2.add_workout_zone(copy.deepcopy(workout_zones[3]))
+    gym2.add_workout_zone(copy.deepcopy(workout_zones[5]))
 
     # CLASS CREATION
     cardio_class = ClassesController()

diff --git a/src/controller/gym_controller.py b/src/controller/gym_controller.py
@@ -11,9 +11,6 @@
 from src.view.gym_view import GymView
 from typing import Type
 
-from src.view.tkinter.login_window import LoginWindow
-
-
 class GymController:
 
     def __init__(self):

diff --git a/src/model/equipment_model.py b/src/model/equipment_model.py
@@ -8,6 +8,9 @@ def __init__(self, name: str, type: str):
     def __str__(self):
         return f"\n{self.__name} for {self.__type}"
 
+    def __repr__(self):
+        return f"\n{self.__name} for {self.__type}"
+
     def get_equipment_name(self) -> str:
         return self.__name
 

diff --git a/src/model/gym_model.py b/src/model/gym_model.py
@@ -36,8 +36,8 @@ def get_gym_workout_zones(self) -> list[WorkoutZoneModel]:
     def get_equipments_for_workout_zones(self) -> list[EquipmentModel]:
         equipment_list = []
         for workout_zone in self.__workout_zones:
-             equipment_list.append(workout_zone.get_list_of_equipments())
-        return equipment_list # BROKEN
+            equipment_list.append(workout_zone.get_list_of_equipments())
+        return equipment_list
 
     def get_list_of_staff(self) -> list[StaffModel]:
         return self.__list_of_staff