[GO] Add assert constraints checks for complex types in the model tem…

…plate
OpenAPITools · May 13, 2024 · c70a002 · c70a002
1 parent 167322c
commit c70a002
Show file tree

Hide file tree

Showing 10 changed files with 131 additions and 49 deletions.
diff --git a/modules/openapi-generator/src/main/resources/go-server/model.mustache b/modules/openapi-generator/src/main/resources/go-server/model.mustache
@@ -175,61 +175,59 @@ func Assert{{classname}}Constraints(obj {{classname}}) error {
 	}
 {{/maximum}}
 {{#isNullable}}
-    {{#isModel}}
-        if obj.{{name}} != nil {
-    {{/isModel}}
-    {{#isArray}}
-        {{#items.isModel}}
-            if obj.{{name}} != nil {
-        {{/items.isModel}}
-        {{^items.isModel}}
-            {{#mostInnerItems.isModel}}
-                {{^mostInnerItems.isPrimitiveType}}
-                    if obj.{{name}} != nil {
-                {{/mostInnerItems.isPrimitiveType}}
-            {{/mostInnerItems.isModel}}
-        {{/items.isModel}}
-    {{/isArray}}
+{{#isModel}}
+    if obj.{{name}} != nil {
+{{/isModel}}
+{{#isArray}}
+{{#items.isModel}}
+    if obj.{{name}} != nil {
+{{/items.isModel}}
+{{/isArray}}
 {{/isNullable}}
 {{#isModel}}
-    {{#isNullable}}	{{/isNullable}}	if err := Assert{{baseType}}Constraints({{#isNullable}}*{{/isNullable}}obj.{{name}}); err != nil {
-    {{#isNullable}}	{{/isNullable}}		return err
-    {{#isNullable}}	{{/isNullable}}	}
+{{#isNullable}}     {{/isNullable}}	if err := Assert{{baseType}}Constraints({{#isNullable}}*{{/isNullable}}obj.{{name}}); err != nil {
+{{#isNullable}}     {{/isNullable}}		return err
+{{#isNullable}}     {{/isNullable}}	}
 {{/isModel}}
 {{#isArray}}
-    {{#items.isModel}}
-        {{#isNullable}}	{{/isNullable}}	for _, el := range {{#isNullable}}*{{/isNullable}}obj.{{name}} {
-        {{#isNullable}}	{{/isNullable}}		if err := Assert{{items.baseType}}Constraints(el); err != nil {
-        {{#isNullable}}	{{/isNullable}}			return err
-        {{#isNullable}}	{{/isNullable}}		}
-        {{#isNullable}}	{{/isNullable}}	}
-    {{/items.isModel}}
-    {{^items.isModel}}
-        {{#mostInnerItems.isModel}}
-            {{^mostInnerItems.isPrimitiveType}}
-                {{#isNullable}}	{{/isNullable}}	if err := AssertRecurseInterfaceConstraints({{#isNullable}}*{{/isNullable}}obj.{{name}}, Assert{{mostInnerItems.dataType}}Constraints); err != nil {
-                {{#isNullable}}	{{/isNullable}}		return err
-                {{#isNullable}}	{{/isNullable}}	}
-            {{/mostInnerItems.isPrimitiveType}}
-        {{/mostInnerItems.isModel}}
-    {{/items.isModel}}
+{{#items.isModel}}
+{{#isNullable}}     {{/isNullable}}	for _, el := range {{#isNullable}}*{{/isNullable}}obj.{{name}} {
+{{#isNullable}}     {{/isNullable}}		if err := Assert{{items.baseType}}Constraints(el); err != nil {
+{{#isNullable}}     {{/isNullable}}			return err
+{{#isNullable}}     {{/isNullable}}		}
+{{#isNullable}}     {{/isNullable}}	}
+{{/items.isModel}}
+{{^items.isModel}}
+{{#mostInnerItems.isModel}}
+{{^mostInnerItems.isPrimitiveType}}
+{{#isNullable}}
+    if obj.{{name}} != nil {
+{{/isNullable}}
+{{#isNullable}}     {{/isNullable}}	if err := AssertRecurseInterfaceConstraints({{#isNullable}}*{{/isNullable}}obj.{{name}}, Assert{{mostInnerItems.dataType}}Constraints); err != nil {
+{{#isNullable}}     {{/isNullable}}		return err
+{{#isNullable}}     {{/isNullable}}	}
+{{/mostInnerItems.isPrimitiveType}}
+{{/mostInnerItems.isModel}}
+{{/items.isModel}}
 {{/isArray}}
 {{#isNullable}}
-    {{#isModel}}
-        }
-    {{/isModel}}
-    {{#isArray}}
-        {{#items.isModel}}
-            }
-        {{/items.isModel}}
-        {{^items.isModel}}
-            {{#mostInnerItems.isModel}}
-                {{^mostInnerItems.isPrimitiveType}}
-                    }
-                {{/mostInnerItems.isPrimitiveType}}
-            {{/mostInnerItems.isModel}}
-        {{/items.isModel}}
-    {{/isArray}}
+{{#isModel}}
+    }
+{{/isModel}}
+{{#isArray}}
+{{#items.isModel}}
+    }
+{{/items.isModel}}
+{{^items.isModel}}
+{{#mostInnerItems.isModel}}
+{{^mostInnerItems.isPrimitiveType}}
+{{#isNullable}}
+    }
+{{/isNullable}}
+{{/mostInnerItems.isPrimitiveType}}
+{{/mostInnerItems.isModel}}
+{{/items.isModel}}
+{{/isArray}}
 {{/isNullable}}
 {{/Vars}}
 	return nil

diff --git a/samples/openapi3/server/petstore/go/go-petstore/go/model_an_object.go b/samples/openapi3/server/petstore/go/go-petstore/go/model_an_object.go
diff --git a/samples/openapi3/server/petstore/go/go-petstore/go/model_pet.go b/samples/openapi3/server/petstore/go/go-petstore/go/model_pet.go
diff --git a/samples/openapi3/server/petstore/go/go-petstore/go/model_user.go b/samples/openapi3/server/petstore/go/go-petstore/go/model_user.go
diff --git a/samples/server/petstore/go-api-server/go/model_an_object.go b/samples/server/petstore/go-api-server/go/model_an_object.go
diff --git a/samples/server/petstore/go-api-server/go/model_pet.go b/samples/server/petstore/go-api-server/go/model_pet.go
diff --git a/samples/server/petstore/go-api-server/go/model_user.go b/samples/server/petstore/go-api-server/go/model_user.go
diff --git a/samples/server/petstore/go-chi-server/go/model_an_object.go b/samples/server/petstore/go-chi-server/go/model_an_object.go
diff --git a/samples/server/petstore/go-chi-server/go/model_pet.go b/samples/server/petstore/go-chi-server/go/model_pet.go
diff --git a/samples/server/petstore/go-chi-server/go/model_user.go b/samples/server/petstore/go-chi-server/go/model_user.go