Merge pull request #88 from DigiChanges/fix/LC/getOneBy

fix: getOneBy fixed
Murzbul · Feb 21, 2022 · c3c178a · c3c178a
2 parents 752aeca + 699b7c5
commit c3c178a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 26 deletions.
diff --git a/src/App/Infrastructure/Repositories/BaseMikroSqlRepository.ts b/src/App/Infrastructure/Repositories/BaseMikroSqlRepository.ts
@@ -1,5 +1,5 @@
 import { injectable, unmanaged } from 'inversify';
-import { EntityRepository } from '@mikro-orm/core';
+import { EntityRepository, EntitySchema, FindOneOptions } from '@mikro-orm/core';
 import NotFoundException from '../../../Shared/Exceptions/NotFoundException';
 import IByOptions from '../../InterfaceAdapters/IByOptions';
 import IBaseRepository from '../../InterfaceAdapters/IBaseRepository';
@@ -12,7 +12,7 @@ abstract class BaseMikroSqlRepository<T> implements IBaseRepository<T>
     protected repository: EntityRepository<any>;
     protected em = EntityManagerFactory.getEntityFactory();
 
-    constructor(@unmanaged() entityName: string, @unmanaged() entitySchema: any)
+    constructor(@unmanaged() entityName: string, @unmanaged() entitySchema: EntitySchema<any>)
     {
         this.entityName = entityName;
         this.repository = this.em.getRepository(entitySchema);
@@ -56,13 +56,11 @@ abstract class BaseMikroSqlRepository<T> implements IBaseRepository<T>
         return entity;
     }
 
-    async getOneBy(condition: Record<string, any>, options: IByOptions = { initThrow: true }): Promise<T>
+    async getOneBy(condition: Record<string, any>, options: IByOptions = {}): Promise<T>
     {
-        let { initThrow } = options;
-
-        initThrow = initThrow ?? false;
+        const { initThrow = true, populate = [] } = options;
 
-        const entity = await this.repository.findOne(condition);
+        const entity = await this.repository.findOne(condition, ({ populate } as FindOneOptions<T>));
 
         if (initThrow && !entity)
         {

diff --git a/src/App/Infrastructure/Repositories/BaseMongoRepository.ts b/src/App/Infrastructure/Repositories/BaseMongoRepository.ts
@@ -1,4 +1,4 @@
-import { Document, Model } from 'mongoose';
+import { Document, FilterQuery, Model, UpdateQuery } from 'mongoose';
 import { injectable, unmanaged } from 'inversify';
 import { connection } from '../../../Shared/Database/MongooseCreateConnection';
 import NotFoundException from '../../../Shared/Exceptions/NotFoundException';
@@ -27,7 +27,7 @@ abstract class BaseMongoRepository<T extends IBaseDomain, D extends Document & T
 
     async getOne(id: string): Promise<T>
     {
-        const entity = await this.repository.findOne({ _id: id } as any).populate(this.populate);
+        const entity = await this.repository.findOne({ _id: id } as FilterQuery<T>).populate(this.populate);
 
         if (!entity)
         {
@@ -39,7 +39,7 @@ abstract class BaseMongoRepository<T extends IBaseDomain, D extends Document & T
 
     async update(entity: T): Promise<T>
     {
-        return this.repository.findOneAndUpdate({ _id: entity.getId() } as any, { $set: entity } as any, { new: true }).populate(this.populate);
+        return this.repository.findOneAndUpdate({ _id: entity.getId() } as FilterQuery<T>, { $set: entity } as UpdateQuery<T>, { new: true }).populate(this.populate);
     }
 
     async delete(id: string): Promise<T>
@@ -54,14 +54,11 @@ abstract class BaseMongoRepository<T extends IBaseDomain, D extends Document & T
         return entity as any;
     }
 
-    async getOneBy(condition: Record<string, any>, options: IByOptions = { initThrow: true, populate: null }): Promise<T>
+    async getOneBy(condition: Record<string, any>, options: IByOptions = {}): Promise<T>
     {
-        let { initThrow, populate } = options;
-
-        initThrow = initThrow ?? false;
-        populate = populate ?? null;
+        const { initThrow = true, populate = null } = options;
 
-        const entity = await this.repository.findOne(condition as any).populate(populate).exec();
+        const entity = await this.repository.findOne(condition as FilterQuery<T>).populate(populate).exec();
 
         if (initThrow && !entity)
         {
@@ -78,7 +75,7 @@ abstract class BaseMongoRepository<T extends IBaseDomain, D extends Document & T
         initThrow = initThrow ?? false;
         populate = populate ?? null;
 
-        const entities = await this.repository.find(condition as any).populate(populate).exec();
+        const entities = await this.repository.find(condition as FilterQuery<T>).populate(populate).exec();
 
         if (initThrow && entities.length === 0)
         {
@@ -97,7 +94,7 @@ abstract class BaseMongoRepository<T extends IBaseDomain, D extends Document & T
 
     async exist(condition: Record<string, any>, select: string[], initThrow = false): Promise<any>
     {
-        const exist = await this.repository.findOne(condition as any, select.join(' '));
+        const exist = await this.repository.findOne(condition as FilterQuery<T>, select.join(' '));
 
         if (initThrow && !exist)
         {

diff --git a/src/App/Infrastructure/Repositories/BaseSqlRepository.ts b/src/App/Infrastructure/Repositories/BaseSqlRepository.ts
@@ -52,11 +52,9 @@ abstract class BaseSqlRepository<T> implements IBaseRepository<T>
         return entity;
     }
 
-    async getOneBy(condition: Record<string, any>, options: IByOptions = { initThrow: true }): Promise<T>
+    async getOneBy(condition: Record<string, any>, options: IByOptions = {}): Promise<T>
     {
-        let { initThrow } = options;
-
-        initThrow = initThrow ?? false;
+        const { initThrow = true } = options;
 
         const entity = await this.repository.findOne(condition);
 
@@ -99,7 +97,7 @@ abstract class BaseSqlRepository<T> implements IBaseRepository<T>
             loadEagerRelations: false
         };
 
-        const exist = await this.repository.findOne(conditionMap);
+        const exist = await this.repository.findOne(conditionMap as FindOneOptions<T>);
 
         if (initThrow && !exist)
         {

diff --git a/src/App/InterfaceAdapters/IByOptions.ts b/src/App/InterfaceAdapters/IByOptions.ts
@@ -1,9 +1,7 @@
-import { PopulateOptions } from 'mongoose';
-
 interface IByOptions
 {
     initThrow?: boolean | undefined;
-    populate?: string | PopulateOptions | PopulateOptions[] | undefined;
+    populate?: string | string[] | boolean | undefined;
 }
 
 export default IByOptions;