round 2

models/child.py

@@ -1,24 +1,18 @@
 from dataclasses import dataclass, field
-import uuid
+from models.base import BaseModel
 
 @dataclass
-class Child:
+class Child(BaseModel):
     name: str
     age: int | None = None
     tasks: list[str] = field(default_factory=list)
     rewards: list[str] = field(default_factory=list)
     points: int = 0
     image_id: str | None = None
-    id: str | None = None
-
-    def __post_init__(self):
-        if self.id is None:
-            self.id = str(uuid.uuid4())
 
     @classmethod
     def from_dict(cls, d: dict):
-        return cls(
-            id=d.get('id'),
+        obj = cls(
             name=d.get('name'),
             age=d.get('age'),
             tasks=d.get('tasks', []),
@@ -26,14 +20,16 @@ class Child:
             points=d.get('points', 0),
             image_id=d.get('image_id')
         )
+        return cls._apply_base_fields(obj, d)
 
     def to_dict(self):
-        return {
-            'id': self.id,
+        base = super().to_dict()
+        base.update({
             'name': self.name,
             'age': self.age,
             'tasks': self.tasks,
             'rewards': self.rewards,
             'points': self.points,
             'image_id': self.image_id
-        }
+        })
+        return base