fix: fix conditions in the resolveEntity method

w3tecch · Apr 11, 2020 · 9287bc0 · 9287bc0
1 parent 5c0f58b
commit 9287bc0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/sample/entities/User.entity.ts b/sample/entities/User.entity.ts
@@ -13,6 +13,9 @@ export class User {
   @Column()
   lastName: string
 
+  @Column({ nullable: true })
+  middleName: string
+
   @Column()
   email: string
 

diff --git a/sample/factories/user.factory.ts b/sample/factories/user.factory.ts
@@ -11,6 +11,7 @@ define(User, (faker: typeof Faker) => {
   const user = new User()
   user.firstName = firstName
   user.lastName = lastName
+  user.middleName = null
   user.email = email
   user.password = faker.random.word()
   return user

diff --git a/src/entity-factory.ts b/src/entity-factory.ts
@@ -98,19 +98,19 @@ export class EntityFactory<Entity, Settings> {
     for (const attribute in entity) {
       if (entity.hasOwnProperty(attribute)) {
         if (isPromiseLike(entity[attribute])) {
-          entity[attribute] = entity[attribute]
+          entity[attribute] = await entity[attribute]
         }
-        if (entity[attribute] && typeof entity[attribute] === 'object' && !(entity[attribute] instanceof Date)) {
+        if (
+          entity[attribute] &&
+          typeof entity[attribute] === 'object' &&
+          entity[attribute].constructor.name === EntityFactory.name
+        ) {
           const subEntityFactory = entity[attribute]
           try {
             if (isSeeding) {
-              if (typeof (subEntityFactory as any).seed === 'function') {
-                entity[attribute] = await (subEntityFactory as any).seed()
-              }
+              entity[attribute] = await (subEntityFactory as any).seed()
             } else {
-              if (typeof (subEntityFactory as any).make === 'function') {
-                entity[attribute] = await (subEntityFactory as any).make()
-              }
+              entity[attribute] = await (subEntityFactory as any).make()
             }
           } catch (error) {
             const message = `Could not make ${(subEntityFactory as any).name}`