fixed applyHooks for recursive embedded discriminators

Faibk · Faibk · commit 2ed278a2a828 · 2017-11-14T15:56:33.000+01:00
diff --git a/lib/services/model/applyHooks.js b/lib/services/model/applyHooks.js
@@ -28,14 +28,14 @@ function applyHooks(model, schema) {
     if (childModel.$appliedHooks) {
       continue;
     }
+    applyHooks(childModel, schema.childSchemas[i].schema);
     if (childModel.discriminators != null) {
       keys = Object.keys(childModel.discriminators);
       for (j = 0; j < keys.length; ++j) {
         applyHooks(childModel.discriminators[keys[j]],
           childModel.discriminators[keys[j]].schema);
       }
     }
-    applyHooks(childModel, schema.childSchemas[i].schema);
   }
 
   if (!q.length) {

Original file line number	Diff line number	Diff line change
`@@ -28,14 +28,14 @@ function applyHooks(model, schema) {`
`28`	`28`	`if (childModel.$appliedHooks) {`
`29`	`29`	`continue;`
`30`	`30`	`}`
	`31`	`+ applyHooks(childModel, schema.childSchemas[i].schema);`
`31`	`32`	`if (childModel.discriminators != null) {`
`32`	`33`	`keys = Object.keys(childModel.discriminators);`
`33`	`34`	`for (j = 0; j < keys.length; ++j) {`
`34`	`35`	`applyHooks(childModel.discriminators[keys[j]],`
`35`	`36`	`childModel.discriminators[keys[j]].schema);`
`36`	`37`	`}`
`37`	`38`	`}`
`38`		`- applyHooks(childModel, schema.childSchemas[i].schema);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`if (!q.length) {`