Merge pull request #986 from vitalik/fields-optional

Fields not generated when Meta.fields_optional = '__all__'
vitalik · Dec 7, 2023 · ff26a9b · ff26a9b
2 parents fdc82ee + 838e6ab
commit ff26a9b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/ninja/orm/factory.py b/ninja/orm/factory.py
@@ -55,7 +55,7 @@ def create_schema(
         if key in self.schemas:
             return self.schemas[key]
 
-        model_fields_list = self._selected_model_fields(model, fields, exclude)
+        model_fields_list = list(self._selected_model_fields(model, fields, exclude))
         if optional_fields:
             if optional_fields == "__all__":
                 optional_fields = [f.name for f in model_fields_list]

diff --git a/tests/test_orm_metaclass.py b/tests/test_orm_metaclass.py
@@ -101,6 +101,7 @@ def test_optional():
     class OptModel(models.Model):
         title = models.CharField()
         other = models.CharField(null=True)
+        extra = models.IntegerField()
 
         class Meta:
             app_label = "tests"
@@ -117,9 +118,21 @@ class Meta:
             fields = "__all__"
             fields_optional = "__all__"
 
-    assert OptSchema.json_schema().get("required") is None
+    assert OptSchema.json_schema().get("required") == ["extra"]
+    assert OptSchema.json_schema()["properties"] == {
+        "id": {"anyOf": [{"type": "integer"}, {"type": "null"}], "title": "ID"},
+        "title": {"anyOf": [{"type": "string"}, {"type": "null"}], "title": "Title"},
+        "other": {"anyOf": [{"type": "string"}, {"type": "null"}], "title": "Other"},
+        "extra": {"title": "Extra", "type": "integer"},
+    }
 
     assert OptSchema2.json_schema().get("required") is None
+    assert OptSchema2.json_schema()["properties"] == {
+        "id": {"anyOf": [{"type": "integer"}, {"type": "null"}], "title": "ID"},
+        "title": {"anyOf": [{"type": "string"}, {"type": "null"}], "title": "Title"},
+        "other": {"anyOf": [{"type": "string"}, {"type": "null"}], "title": "Other"},
+        "extra": {"anyOf": [{"type": "integer"}, {"type": "null"}], "title": "Extra"},
+    }
 
 
 def test_fields_all():