refactor and update tests

getkin · Oct 21, 2022 · b8a9c2f · b8a9c2f
1 parent f627fee
commit b8a9c2f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/openapi3/example_validation_test.go b/openapi3/example_validation_test.go
@@ -324,12 +324,15 @@ components:
       properties:
         username:
           type: string
+          default: default
           writeOnly: true # only sent in a request
         password:
           type: string
+          default: default
           writeOnly: true # only sent in a request
         user_id:
           format: int64
+          default: 1
           type: integer
           readOnly: true # only returned in a response
       type: object

diff --git a/openapi3/schema.go b/openapi3/schema.go
@@ -1458,22 +1458,22 @@ func (schema *Schema) visitJSONObject(settings *schemaValidationSettings, value
 		sort.Strings(properties)
 		for _, propName := range properties {
 			propSchema := schema.Properties[propName]
+			reqRO := settings.asreq && propSchema.Value.ReadOnly
+			repWO := settings.asrep && propSchema.Value.WriteOnly
 
 			if value[propName] == nil {
-				if dlft := propSchema.Value.Default; dlft != nil &&
-					!(settings.asreq && propSchema.Value.ReadOnly) &&
-					!(settings.asrep && propSchema.Value.WriteOnly) {
+				if dlft := propSchema.Value.Default; dlft != nil && !reqRO && !repWO {
 					value[propName] = dlft
 					if f := settings.defaultsSet; f != nil {
 						settings.onceSettingDefaults.Do(f)
 					}
 				}
 			}
 
-			if value[propName] != nil {
-				if settings.asreq && propSchema.Value.ReadOnly {
+			if v := value[propName]; v != nil {
+				if reqRO {
 					me = append(me, fmt.Errorf("readOnly property %q in request", propName))
-				} else if settings.asrep && propSchema.Value.WriteOnly {
+				} else if repWO {
 					me = append(me, fmt.Errorf("writeOnly property %q in response", propName))
 				}
 			}