refactor: pr suggestions

xgeekshq · Dec 7, 2022 · 443adfc · 443adfc
1 parent 3d7e324
commit 443adfc
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/backend/src/libs/repositories/interfaces/base.repository.interface.ts b/backend/src/libs/repositories/interfaces/base.repository.interface.ts
@@ -1,18 +1,24 @@
-import { UpdateQuery } from 'mongoose';
+import { PopulateOptions, UpdateQuery } from 'mongoose';
 import { ModelProps, SelectedValues } from '../types';
 
+export type PopulateType = PopulateOptions | (PopulateOptions | string)[];
+
 export interface BaseInterfaceRepository<T> {
 	findAll(selectedValues?: SelectedValues<T>): Promise<T[]>;
 
-	findOneById(id: any, selectedValues?: SelectedValues<T>, populate?: any): Promise<T>;
+	findOneById(id: any, selectedValues?: SelectedValues<T>, populate?: PopulateType): Promise<T>;
 
-	findAllWithQuery(query: any, selectedValues?: SelectedValues<T>, populate?: any): Promise<T[]>;
+	findAllWithQuery(
+		query: any,
+		selectedValues?: SelectedValues<T>,
+		populate?: PopulateType
+	): Promise<T[]>;
 
 	findOneByField(fields: ModelProps<T>): Promise<T>;
 
 	create(item: T): Promise<T>;
 
-	update(id: string, item: T);
+	update(id: string, item: T): Promise<T>;
 
 	deleteMany(field: ModelProps<T>, withSession: boolean): Promise<number>;
 
@@ -22,11 +28,11 @@ export interface BaseInterfaceRepository<T> {
 
 	findOneAndRemoveByField(fields: ModelProps<T>, withSession: boolean): Promise<T>;
 
-	startTransaction();
+	startTransaction(): Promise<void>;
 
-	commitTransaction();
+	commitTransaction(): Promise<void>;
 
-	abortTransaction();
+	abortTransaction(): Promise<void>;
 
-	endSession();
+	endSession(): Promise<void>;
 }
diff --git a/backend/src/libs/repositories/mongo/mongo-generic.repository.ts b/backend/src/libs/repositories/mongo/mongo-generic.repository.ts
@@ -1,9 +1,7 @@
-import { ClientSession, Model, PopulateOptions, UpdateQuery } from 'mongoose';
-import { BaseInterfaceRepository } from '../interfaces/base.repository.interface';
+import { ClientSession, Model, UpdateQuery } from 'mongoose';
+import { BaseInterfaceRepository, PopulateType } from '../interfaces/base.repository.interface';
 import { ModelProps, SelectedValues } from '../types';
 
-type PopulateType = PopulateOptions | (PopulateOptions | string)[];
-
 export class MongoGenericRepository<T> implements BaseInterfaceRepository<T> {
 	protected _repository: Model<T>;
 	protected _session: ClientSession;
@@ -49,8 +47,8 @@ export class MongoGenericRepository<T> implements BaseInterfaceRepository<T> {
 		return this._repository.create(item);
 	}
 
-	update(id: string, item: T) {
-		return this._repository.findByIdAndUpdate(id, item);
+	update(id: string, item: T): Promise<T> {
+		return this._repository.findByIdAndUpdate(id, item).exec();
 	}
 
 	findOneByFieldAndUpdate(value: ModelProps<T>, query: UpdateQuery<T>): Promise<T> {