round 3

models/base.py

@@ -1,18 +1,13 @@
+# python
 from dataclasses import dataclass, field
 import uuid
 import time
 
-@dataclass
+@dataclass(kw_only=True)
 class BaseModel:
-    id: str = field(init=False)
-    created_at: float = field(init=False)
-    updated_at: float = field(init=False)
-
-    def __post_init__(self):
-        self.id = str(uuid.uuid4())
-        now = time.time()
-        self.created_at = now
-        self.updated_at = now
+    id: str = field(default_factory=lambda: str(uuid.uuid4()))
+    created_at: float = field(default_factory=time.time)
+    updated_at: float = field(default_factory=time.time)
 
     def touch(self):
         self.updated_at = time.time()
@@ -23,10 +18,3 @@ class BaseModel:
             'created_at': self.created_at,
             'updated_at': self.updated_at
         }
-
-    @classmethod
-    def _apply_base_fields(cls, obj, d: dict):
-        obj.id = d.get('id', obj.id)
-        obj.created_at = d.get('created_at', obj.created_at)
-        obj.updated_at = d.get('updated_at', obj.updated_at)
-        return obj

models/child.py

@@ -12,15 +12,18 @@ class Child(BaseModel):
 
     @classmethod
     def from_dict(cls, d: dict):
-        obj = cls(
+        return cls(
             name=d.get('name'),
             age=d.get('age'),
             tasks=d.get('tasks', []),
             rewards=d.get('rewards', []),
             points=d.get('points', 0),
-            image_id=d.get('image_id')
+            image_id=d.get('image_id'),
+            id=d.get('id'),
+            created_at=d.get('created_at'),
+            updated_at=d.get('updated_at')
+
         )
-        return cls._apply_base_fields(obj, d)
 
     def to_dict(self):
         base = super().to_dict()

models/image.py

@@ -1,3 +1,4 @@
+# python
 from dataclasses import dataclass
 from models.base import BaseModel
 
@@ -9,12 +10,15 @@ class Image(BaseModel):
 
     @classmethod
     def from_dict(cls, d: dict):
-        obj = cls(
+        # Supports overriding base fields (id, created_at, updated_at) if present
+        return cls(
             type=d.get('type'),
             extension=d.get('extension'),
-            permanent=d.get('permanent', False)
+            permanent=d.get('permanent', False),
+            id=d.get('id'),
+            created_at=d.get('created_at'),
+            updated_at=d.get('updated_at')
         )
-        return cls._apply_base_fields(obj, d)
 
     def to_dict(self):
         base = super().to_dict()

models/reward.py

@@ -1,3 +1,4 @@
+# python
 from dataclasses import dataclass
 from models.base import BaseModel
 
@@ -10,13 +11,16 @@ class Reward(BaseModel):
 
     @classmethod
     def from_dict(cls, d: dict):
-        obj = cls(
+        # Base fields are keyword-only; can be overridden if provided
+        return cls(
             name=d.get('name'),
             description=d.get('description'),
             cost=d.get('cost', 0),
-            image_id=d.get('image_id')
+            image_id=d.get('image_id'),
+            id=d.get('id'),
+            created_at=d.get('created_at'),
+            updated_at=d.get('updated_at')
         )
-        return cls._apply_base_fields(obj, d)
 
     def to_dict(self):
         base = super().to_dict()

models/task.py

@@ -10,13 +10,15 @@ class Task(BaseModel):
 
     @classmethod
     def from_dict(cls, d: dict):
-        obj = cls(
+        return cls(
             name=d.get('name'),
             points=d.get('points', 0),
             is_good=d.get('is_good', True),
-            image_id=d.get('image_id')
+            image_id=d.get('image_id'),
+            id=d.get('id'),
+            created_at=d.get('created_at'),
+            updated_at=d.get('updated_at')
         )
-        return cls._apply_base_fields(obj, d)
 
     def to_dict(self):
         base = super().to_dict()