Merge pull request #131 from mekanix/feature/optional-fields

Work around optional fields

freenit/models/ormar/role.py

@@ -1,10 +1,12 @@
-from ..metaclass import AllOptional
 from .base import OrmarBaseModel, OrmarRoleMixin, ormar_config
 
 
 class Role(OrmarBaseModel, OrmarRoleMixin):
     ormar_config = ormar_config.copy()
 
 
-class RoleOptional(Role, metaclass=AllOptional):
-    ormar_config = ormar_config.copy()
+class RoleOptional(Role):
+    pass
+
+for field_name in RoleOptional.model_fields:
+    RoleOptional.model_fields[field_name].default = None

freenit/models/ormar/theme.py

@@ -1,6 +1,5 @@
 import ormar
 
-from ..metaclass import AllOptional
 from .base import OrmarBaseModel, ormar_config
 
 
@@ -25,5 +24,8 @@ class Theme(OrmarBaseModel):
     font_family_mono: str = ormar.Text()
 
 
-class ThemeOptional(Theme, metaclass=AllOptional):
+class ThemeOptional(Theme):
     pass
+
+for field_name in ThemeOptional.model_fields:
+    ThemeOptional.model_fields[field_name].default = None

freenit/models/ormar/user.py

@@ -1,11 +1,11 @@
 from __future__ import annotations
+from copy import deepcopy
 
 import ormar
 import ormar.exceptions
 from fastapi import HTTPException
 
 from freenit.auth import verify
-from freenit.models.metaclass import AllOptional
 from freenit.models.ormar.base import OrmarBaseModel, OrmarUserMixin, ormar_config
 from freenit.models.role import Role
 
@@ -31,8 +31,11 @@ class User(BaseUser, OrmarUserMixin):
     roles = ormar.ManyToMany(Role, unique=True)
 
 
-class UserOptional(User, metaclass=AllOptional):
+class UserOptional(User):
     pass
 
+for field_name in UserOptional.model_fields:
+    UserOptional.model_fields[field_name].default = None
+
 
 UserOptionalPydantic = UserOptional.get_pydantic(exclude={"admin", "active"})