Issue with default value for additional property (oneOf) (#270)

* Add extra property to test spec for discriminatedOneOf

* Fix issue where non-discriminator property is treated as discriminator

src/main/kotlin/com/cjbooms/fabrikt/util/KaizenParserExtensions.kt

@@ -154,7 +154,8 @@ object KaizenParserExtensions {
     fun Schema.isDiscriminatorProperty(api: OpenApi3, prop: Map.Entry<String, Schema>): Boolean =
         discriminator?.propertyName == prop.key ||
             findOneOfSuperInterface(api.schemas.values.toList()).any { oneOf ->
-                oneOf.discriminator?.mappings?.values?.any { it.endsWith("/$name") } ?: false
+                oneOf.discriminator?.propertyName == prop.key
+                        && oneOf.discriminator?.mappings?.values?.any { it.endsWith("/$name") } ?: false
             }
 
     fun Schema.findOneOfSuperInterface(allSchemas: List<Schema>): Set<Schema> {

src/test/resources/examples/discriminatedOneOf/api.yaml

@@ -35,6 +35,12 @@ components:
       type: object
       required:
         - status
+        - mode
       properties:
         status:
           $ref: '#/components/schemas/Status'
+        mode:
+          type: string
+          enum:
+            - mode1
+            - mode2

src/test/resources/examples/discriminatedOneOf/models/Models.kt

@@ -41,12 +41,30 @@ public data class StateA(
 ) : State
 
 public data class StateB(
+    @get:JsonProperty("mode")
+    @get:NotNull
+    public val mode: StateBMode,
     @get:JsonProperty("status")
     @get:NotNull
     @param:JsonProperty("status")
     public val status: Status = Status.B,
 ) : State
 
+public enum class StateBMode(
+    @JsonValue
+    public val `value`: String,
+) {
+    MODE1("mode1"),
+    MODE2("mode2"),
+    ;
+
+    public companion object {
+        private val mapping: Map<String, StateBMode> = values().associateBy(StateBMode::value)
+
+        public fun fromValue(`value`: String): StateBMode? = mapping[value]
+    }
+}
+
 public enum class Status(
     @JsonValue
     public val `value`: String,