fix(repository): make sure model definition is built correctly

See #2002

Author: raymondfeng

packages/openapi-v3/test/unit/filter-schema.unit.ts

@@ -0,0 +1,36 @@
+// Copyright IBM Corp. 2018. All Rights Reserved.
+// Node module: @loopback/openapi-v3.
+// This file is licensed under the MIT License.
+// License text available at https://opensource.org/licenses/MIT
+
+import {getFilterSchemaFor} from '../..';
+import {Entity, model, property} from '@loopback/repository';
+import {expect} from '@loopback/testlab';
+
+describe('filterSchema', () => {
+  @model({
+    name: 'my-user-model',
+  })
+  class MyUserModel extends Entity {
+    @property()
+    id: string;
+
+    @property()
+    age: number;
+  }
+
+  it('generate filter schema', () => {
+    const schema = getFilterSchemaFor(MyUserModel);
+    expect(MyUserModel.definition.name).to.eql('my-user-model');
+    expect(schema).to.eql({
+      properties: {
+        where: {type: 'object'},
+        fields: {type: 'object'},
+        offset: {type: 'integer', minimum: 0},
+        limit: {type: 'integer', minimum: 0},
+        skip: {type: 'integer', minimum: 0},
+        order: {type: 'array', items: {type: 'string'}},
+      },
+    });
+  });
+});

packages/repository/src/decorators/model.decorator.ts

@@ -68,8 +68,15 @@ export function buildModelDefinition(
   target: Function & {definition?: ModelDefinition | undefined},
   def?: ModelDefinitionSyntax,
 ) {
-  // Check if the definition for this class has been built
-  if (!def && target.definition && target.definition.name === target.name) {
+  // Check if the definition for this class has been built (not from the super
+  // class)
+  const baseClass = Object.getPrototypeOf(target);
+  if (
+    !def &&
+    target.definition &&
+    baseClass &&
+    target.definition !== baseClass.definition
+  ) {
     return target.definition;
   }
   const modelDef = new ModelDefinition(def || {name: target.name});