refactor: save method clean up

Author: bashleigh

src/__tests__/polymorphic.repository.spec.ts

@@ -4,7 +4,7 @@ import { UserEntity } from './entities/user.entity';
 import { config } from 'dotenv';
 import { resolve } from 'path';
 import { AdvertRepository } from './repository/advert.repository';
-import { AbstractPolymorphicRepository } from '../../dist';
+import { AbstractPolymorphicRepository } from '../';
 
 describe('AbstractPolymorphicRepository', () => {
   let connection: Connection;
@@ -41,38 +41,42 @@ describe('AbstractPolymorphicRepository', () => {
     ]);
   });
 
-  describe('child', () => {
-    it('Can create with parent', async () => {
-      const repository = connection.getCustomRepository(AdvertRepository);
+  describe('Childen', () => {
+    describe('create', () => {
+      it('Can create with parent', async () => {
+        const repository = connection.getCustomRepository(AdvertRepository);
 
-      const user = new UserEntity();
+        const user = new UserEntity();
 
-      const result = repository.create({
-        owner: user,
-      });
+        const result = repository.create({
+          owner: user,
+        });
 
-      expect(result).toBeInstanceOf(AdvertEntity);
-      expect(result.owner).toBeInstanceOf(UserEntity);
+        expect(result).toBeInstanceOf(AdvertEntity);
+        expect(result.owner).toBeInstanceOf(UserEntity);
+      });
     });
 
-    it('Can save cascade parent', async () => {
-      const repository = connection.getCustomRepository(AdvertRepository);
-      const userRepository = connection.getRepository(UserEntity);
+    describe('save', () => {
+      it('Can save cascade parent', async () => {
+        const repository = connection.getCustomRepository(AdvertRepository);
+        const userRepository = connection.getRepository(UserEntity);
 
-      const user = await userRepository.save(new UserEntity());
+        const user = await userRepository.save(new UserEntity());
 
-      const result = await repository.save(
-        repository.create({
-          owner: user,
-        }),
-      );
+        const result = await repository.save(
+          repository.create({
+            owner: user,
+          }),
+        );
 
-      expect(result).toBeInstanceOf(AdvertEntity);
-      expect(result.owner).toBeInstanceOf(UserEntity);
-      expect(result.id).toBeTruthy();
-      expect(result.owner.id).toBeTruthy();
-      expect(result.entityType).toBe(UserEntity.name);
-      expect(result.entityId).toBe(result.owner.id);
+        expect(result).toBeInstanceOf(AdvertEntity);
+        expect(result.owner).toBeInstanceOf(UserEntity);
+        expect(result.id).toBeTruthy();
+        expect(result.owner.id).toBeTruthy();
+        expect(result.entityType).toBe(UserEntity.name);
+        expect(result.entityId).toBe(result.owner.id);
+      });
     });
   });
 });

src/polymorphic.repository.ts

@@ -226,13 +226,9 @@ export abstract class AbstractPolymorphicRepository<E> extends Repository<E> {
     options?: SaveOptions & { reload: false },
   ): Promise<(T & E) | Array<T & E> | T | Array<T>> {
     if (!this.isPolymorph()) {
-      return Array.isArray(entityOrEntities) && options
-        ? await super.save(entityOrEntities, options)
-        : Array.isArray(entityOrEntities)
-        ? await super.save(entityOrEntities)
-        : options
-        ? await super.save(entityOrEntities, options)
-        : await super.save(entityOrEntities);
+      return Array.isArray(entityOrEntities)
+        ? super.save(entityOrEntities, options)
+        : super.save(entityOrEntities, options);
     }
 
     const metadata = this.getPolymorphicMetadata();
@@ -248,53 +244,51 @@ export abstract class AbstractPolymorphicRepository<E> extends Repository<E> {
           if (!parent || entity[entityIdColumn(options)] !== undefined) {
             return entity;
           }
+
+          /**
+           * Add parent's id and type to child's id and type field
+           */
           entity[entityIdColumn(options)] = parent[PrimaryColumn(options)];
           entity[entityTypeColumn(options)] = parent.constructor.name;
           return entity;
         });
       }
     });
 
-    const savedEntities =
-      Array.isArray(entityOrEntities) && options
-        ? await super.save(entityOrEntities, options)
-        : Array.isArray(entityOrEntities)
-        ? await super.save(entityOrEntities)
-        : options
-        ? await super.save(entityOrEntities, options)
-        : await super.save(entityOrEntities);
-
-    return savedEntities;
-
-    // return Promise.all(
-    //   (Array.isArray(savedEntities) ? savedEntities : [savedEntities]).map(
-    //     entity =>
-    //       new Promise(async resolve => {
-    //         // @ts-ignore
-    //         await this.deletePolymorphs(entity as E, metadata);
-    //         // @ts-ignore
-    //         resolve(await this.savePolymorphs(entity as E, metadata));
-    //       }),
-    //   ),
-    // );
+    /**
+     * Check deleteBeforeUpdate
+     */
+    Array.isArray(entityOrEntities)
+      ? await Promise.all(
+          (entityOrEntities as Array<T>).map((entity) =>
+            this.deletePolymorphs(entity, metadata),
+          ),
+        )
+      : await this.deletePolymorphs(entityOrEntities as T, metadata);
+
+    return Array.isArray(entityOrEntities)
+      ? super.save(entityOrEntities, options)
+      : super.save(entityOrEntities, options);
   }
 
   private async deletePolymorphs(
-    entity: E,
+    entity: DeepPartial<E>,
     options: PolymorphicMetadataInterface[],
   ): Promise<void | never> {
     await Promise.all(
       options.map(
         (option: PolymorphicMetadataInterface) =>
           new Promise((resolve) => {
+            console.log('delete', option.deleteBeforeUpdate);
             if (!option.deleteBeforeUpdate) {
-              return Promise.resolve();
+              resolve(Promise.resolve());
             }
 
             const entityTypes = Array.isArray(option.classType)
               ? option.classType
               : [option.classType];
 
+            // resolve to singular query?
             resolve(
               Promise.all(
                 entityTypes.map((type: () => Function | Function[]) => {