entoas: handle nillable fields (#423)

* entoas: handle nillable fields * go mod tidy * go generate
ent · Jan 2, 2023 · 9abfc72 · 9abfc72
1 parent 7ed77ac
commit 9abfc72
Show file tree

Hide file tree

Showing 15 changed files with 1,058 additions and 202 deletions.
diff --git a/entoas/generator.go b/entoas/generator.go
@@ -137,7 +137,7 @@ func addSchemaFields(s *ogen.Schema, fs []*gen.Field) error {
 		if err != nil {
 			return err
 		}
-		addProperty(s, p, !f.Optional)
+		addProperty(s, p, !(f.Optional || f.Nillable))
 	}
 	return nil
 }

diff --git a/entoas/internal/cycle/openapi.json b/entoas/internal/cycle/openapi.json
@@ -143,10 +143,10 @@
             "name": "id",
             "in": "path",
             "description": "ID of the User",
+            "required": true,
             "schema": {
               "type": "integer"
-            },
-            "required": true
+            }
           }
         ],
         "responses": {
@@ -186,10 +186,10 @@
             "name": "id",
             "in": "path",
             "description": "ID of the User",
+            "required": true,
             "schema": {
               "type": "integer"
-            },
-            "required": true
+            }
           }
         ],
         "responses": {
@@ -222,10 +222,10 @@
             "name": "id",
             "in": "path",
             "description": "ID of the User",
+            "required": true,
             "schema": {
               "type": "integer"
-            },
-            "required": true
+            }
           }
         ],
         "requestBody": {
@@ -307,10 +307,10 @@
             "name": "id",
             "in": "path",
             "description": "ID of the User",
+            "required": true,
             "schema": {
               "type": "integer"
-            },
-            "required": true
+            }
           },
           {
             "name": "page",
@@ -371,10 +371,10 @@
             "name": "id",
             "in": "path",
             "description": "ID of the User",
+            "required": true,
             "schema": {
               "type": "integer"
-            },
-            "required": true
+            }
           },
           {
             "name": "page",
@@ -435,10 +435,10 @@
             "name": "id",
             "in": "path",
             "description": "ID of the User",
+            "required": true,
             "schema": {
               "type": "integer"
-            },
-            "required": true
+            }
           },
           {
             "name": "page",
@@ -499,10 +499,10 @@
             "name": "id",
             "in": "path",
             "description": "ID of the User",
+            "required": true,
             "schema": {
               "type": "integer"
-            },
-            "required": true
+            }
           },
           {
             "name": "page",
@@ -563,10 +563,10 @@
             "name": "id",
             "in": "path",
             "description": "ID of the User",
+            "required": true,
             "schema": {
               "type": "integer"
-            },
-            "required": true
+            }
           }
         ],
         "responses": {

diff --git a/entoas/internal/oastypes/migrate/schema.go b/entoas/internal/oastypes/migrate/schema.go