feature: replace mongoose lean() on exec() and improve serialize interceptor

VMihalov · VMihalov · commit ef4cf805e48d · 2022-06-22T16:20:36.000+03:00
diff --git a/generators/auth/templates/mongodb/jwt/src/interceptors/serialization.interceptor.ts b/generators/auth/templates/mongodb/jwt/src/interceptors/serialization.interceptor.ts
@@ -6,20 +6,32 @@ import {
 } from '@nestjs/common';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
+import _ from 'lodash';
 import { getSerializeType } from '@decorators/serialization.decorator';
 
+const getSerializer = (entity: any) => (data: any) => Object.assign(entity, data);
+
 @Injectable()
 export default class SerializeInterceptor implements NestInterceptor {
   intercept(context: ExecutionContext, next: CallHandler): Observable<any> {
     return next.handle().pipe(
       map((args) => {
         const SerializeType = getSerializeType(context.getHandler());
-        const entity = new SerializeType();
-        if (Array.isArray(args)) {
-          return Object.assign(entity, { data: args });
-        } else {
-          return Object.assign(entity, args);
+        const serializer = getSerializer(new SerializeType());
+
+        if (_.isArray(args)) {
+          if (args && args[0] && args[0].toJSON) {
+            return serializer({ data: args.map((doc) => doc.toJSON()) });
+          }
+
+          return serializer({ data: args });
         }
+
+        if (args && args.toJSON) {
+          return serializer(args.toJSON());
+        }
+
+        return serializer(args);
       }),
     );
   }
diff --git a/generators/auth/templates/mongodb/jwt/src/modules/v1/users/users.repository.ts b/generators/auth/templates/mongodb/jwt/src/modules/v1/users/users.repository.ts
@@ -17,41 +17,41 @@ export default class UsersRepository {
       verified: false,
     });
 
-    return newUser.toObject();
+    return newUser.toJSON();
   }
 
   public async getUnverifiedUserByEmail(email: string): Promise<User | null> {
     return this.usersModel.findOne({
       email,
       verified: false,
-    }).lean();
+    }).exec();
   }
 
   public async getVerifiedUserByEmail(email: string): Promise<User | null> {
     return this.usersModel.findOne({
       email,
       verified: true,
-    }).lean();
+    }).exec();
   }
 
   public async getById(id: Types.ObjectId): Promise<User | null> {
     return  this.usersModel.findOne({
       _id: id,
-    }, { password: 0 }).lean();
+    }, { password: 0 }).exec();
   }
 
   public async getVerifiedUserById(id: Types.ObjectId): Promise<User | null> {
     return this.usersModel.findOne({
       _id: id,
       verified: true,
-    }, { password: 0 }).lean();
+    }, { password: 0 }).exec();
   }
 
   public async getUnverifiedUserById(id: Types.ObjectId): Promise<User | null> {
     return this.usersModel.findOne({
       _id: id,
       verified: false,
-    }, { password: 0 }).lean();
+    }, { password: 0 }).exec();
   }
 
   public async updateById(id: Types.ObjectId, data: UpdateUserDto): Promise<User | null> {
@@ -60,14 +60,14 @@ export default class UsersRepository {
       {
         $set: data,
       },
-    ).lean();
+    ).exec();
   }
 
   public getAll() {
-    return this.usersModel.find().lean();
+    return this.usersModel.find().exec();
   }
 
   public getVerifiedUsers() {
-    return this.usersModel.find({ verified: true }).lean();
+    return this.usersModel.find({ verified: true }).exec();
   }
 }
diff --git a/generators/auth/templates/mongodb/oauth2/src/interceptors/serialization.interceptor.ts b/generators/auth/templates/mongodb/oauth2/src/interceptors/serialization.interceptor.ts
@@ -6,20 +6,32 @@ import {
 } from '@nestjs/common';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
+import _ from 'lodash';
 import { getSerializeType } from '@decorators/serialization.decorator';
 
+const getSerializer = (entity: any) => (data: any) => Object.assign(entity, data);
+
 @Injectable()
 export default class SerializeInterceptor implements NestInterceptor {
   intercept(context: ExecutionContext, next: CallHandler): Observable<any> {
     return next.handle().pipe(
       map((args) => {
         const SerializeType = getSerializeType(context.getHandler());
-        const entity = new SerializeType();
-        if (Array.isArray(args)) {
-          return Object.assign(entity, { data: args });
-        } else {
-          return Object.assign(entity, args);
+        const serializer = getSerializer(new SerializeType());
+
+        if (_.isArray(args)) {
+          if (args && args[0] && args[0].toJSON) {
+            return serializer({ data: args.map((doc) => doc.toJSON()) });
+          }
+
+          return serializer({ data: args });
         }
+
+        if (args && args.toJSON) {
+          return serializer(args.toJSON());
+        }
+
+        return serializer(args);
       }),
     );
   }
diff --git a/generators/auth/templates/mongodb/oauth2/src/modules/v1/users/users.repository.ts b/generators/auth/templates/mongodb/oauth2/src/modules/v1/users/users.repository.ts
@@ -11,47 +11,47 @@ export default class UsersRepository {
   public async create(user: User): Promise<User> {
     const newUser = await this.usersModel.create(user);
 
-    return newUser.toObject();
+    return newUser.toJSON();
   }
 
   public async getByEmail(email: string): Promise<User | null> {
     return this.usersModel.findOne({
       email,
-    }, { password: 0 }).lean();
+    }, { password: 0 }).exec();
   }
 
   public async getVerifiedUserById(id: Types.ObjectId): Promise<User | null> {
     return this.usersModel.findOne({
       _id: id,
       verified: true,
-    }, { password: 0 }).lean();
+    }, { password: 0 }).exec();
   }
 
   public async getById(id: Types.ObjectId): Promise<User | null> {
     return this.usersModel.findOne({
       _id: id,
-    }, { password: 0 }).lean();
+    }, { password: 0 }).exec();
   }
 
   public async getVerifiedUserByEmail(email: string) {
     return this.usersModel.findOne({
       email,
       verified: true,
-    }).lean();
+    }).exec();
   }
 
   public async getUnverifiedUserByEmail(email: string) {
     return this.usersModel.findOne({
       email,
       verified: false,
-    }).lean();
+    }).exec();
   }
 
   public getAll(): Query<UserDocument[], UserDocument> {
-    return this.usersModel.find().lean();
+    return this.usersModel.find().exec();
   }
 
   public getVerifiedUsers(): Query<UserDocument[], UserDocument> {
-    return this.usersModel.find({ verified: true }).lean();
+    return this.usersModel.find({ verified: true }).exec();
   }
 }
diff --git a/generators/auth/templates/mongodb/passportLocal/src/modules/v1/users/users.repository.ts b/generators/auth/templates/mongodb/passportLocal/src/modules/v1/users/users.repository.ts
@@ -24,17 +24,17 @@ export default class UsersRepository {
     return this.userModel.findOne({
       email,
       verified: true,
-    });
+    }).exec();
   }
 
   public async getVerifiedUserById(id: Types.ObjectId): Promise<User | null> {
     return  this.userModel.findOne({
       _id: id,
       verified: true,
-    });
+    }).exec();
   }
 
   public async getAll(): Promise<User[] | []> {
-    return this.userModel.find({}, { password: false }).lean();
+    return this.userModel.find({}, { password: false }).exec();
   }
 }
diff --git a/generators/auth/templates/mysql/jwt/src/interceptors/serialization.interceptor.ts b/generators/auth/templates/mysql/jwt/src/interceptors/serialization.interceptor.ts
@@ -6,20 +6,32 @@ import {
 } from '@nestjs/common';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
+import _ from 'lodash';
 import { getSerializeType } from '@decorators/serialization.decorator';
 
+const getSerializer = (entity: any) => (data: any) => Object.assign(entity, data);
+
 @Injectable()
 export default class SerializeInterceptor implements NestInterceptor {
   intercept(context: ExecutionContext, next: CallHandler): Observable<any> {
     return next.handle().pipe(
       map((args) => {
         const SerializeType = getSerializeType(context.getHandler());
-        const entity = new SerializeType();
-        if (Array.isArray(args)) {
-          return Object.assign(entity, { data: args });
-        } else {
-          return Object.assign(entity, args);
+        const serializer = getSerializer(new SerializeType());
+
+        if (_.isArray(args)) {
+          if (args && args[0] && args[0].toJSON) {
+            return serializer({ data: args.map((doc) => doc.toJSON()) });
+          }
+
+          return serializer({ data: args });
         }
+
+        if (args && args.toJSON) {
+          return serializer(args.toJSON());
+        }
+
+        return serializer(args);
       }),
     );
   }
diff --git a/generators/auth/templates/mysql/oauth2/src/interceptors/serialization.interceptor.ts b/generators/auth/templates/mysql/oauth2/src/interceptors/serialization.interceptor.ts
@@ -6,20 +6,32 @@ import {
 } from '@nestjs/common';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
+import _ from 'lodash';
 import { getSerializeType } from '@decorators/serialization.decorator';
 
+const getSerializer = (entity: any) => (data: any) => Object.assign(entity, data);
+
 @Injectable()
 export default class SerializeInterceptor implements NestInterceptor {
   intercept(context: ExecutionContext, next: CallHandler): Observable<any> {
     return next.handle().pipe(
       map((args) => {
         const SerializeType = getSerializeType(context.getHandler());
-        const entity = new SerializeType();
-        if (Array.isArray(args)) {
-          return Object.assign(entity, { data: args });
-        } else {
-          return Object.assign(entity, args);
+        const serializer = getSerializer(new SerializeType());
+
+        if (_.isArray(args)) {
+          if (args && args[0] && args[0].toJSON) {
+            return serializer({ data: args.map((doc) => doc.toJSON()) });
+          }
+
+          return serializer({ data: args });
         }
+
+        if (args && args.toJSON) {
+          return serializer(args.toJSON());
+        }
+
+        return serializer(args);
       }),
     );
   }
diff --git a/generators/auth/templates/postgresql/jwt/src/interceptors/serialization.interceptor.ts b/generators/auth/templates/postgresql/jwt/src/interceptors/serialization.interceptor.ts
@@ -6,20 +6,32 @@ import {
 } from '@nestjs/common';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
+import _ from 'lodash';
 import { getSerializeType } from '@decorators/serialization.decorator';
 
+const getSerializer = (entity: any) => (data: any) => Object.assign(entity, data);
+
 @Injectable()
 export default class SerializeInterceptor implements NestInterceptor {
   intercept(context: ExecutionContext, next: CallHandler): Observable<any> {
     return next.handle().pipe(
       map((args) => {
         const SerializeType = getSerializeType(context.getHandler());
-        const entity = new SerializeType();
-        if (Array.isArray(args)) {
-          return Object.assign(entity, { data: args });
-        } else {
-          return Object.assign(entity, args);
+        const serializer = getSerializer(new SerializeType());
+
+        if (_.isArray(args)) {
+          if (args && args[0] && args[0].toJSON) {
+            return serializer({ data: args.map((doc) => doc.toJSON()) });
+          }
+
+          return serializer({ data: args });
         }
+
+        if (args && args.toJSON) {
+          return serializer(args.toJSON());
+        }
+
+        return serializer(args);
       }),
     );
   }
diff --git a/generators/mailer/templates/mongodb/passportLocal/src/modules/v1/users/users.repository.ts b/generators/mailer/templates/mongodb/passportLocal/src/modules/v1/users/users.repository.ts
@@ -22,44 +22,38 @@ export default class UsersRepository {
   }
 
   public async getByEmail(email: string): Promise<User | null> {
-    const foundUser: User | null = await this.userModel.findOne({
+    return this.userModel.findOne({
       email,
-    });
-    return foundUser || null;
+    }).exec();
   }
 
   public async getById(id: Types.ObjectId): Promise<User | null> {
-    const foundUser: User | null = await this.userModel.findOne({
+    return this.userModel.findOne({
       _id: id,
-    });
-    return foundUser || null;
+    }).exec();
   }
 
   public async getAll(): Promise<User[] | []> {
-    const foundUsers: User[] | [] = await this.userModel.find({}, { password: false }).lean();
+    const foundUsers: User[] | [] = await this.userModel.find({}, { password: false }).exec();
 
     return foundUsers.length > 0 ? foundUsers : [];
   }
 
-  public async getVerifiedUserByEmail(email: string): Promise<User | null> {
-    const foundUser: User | null = await this.userModel.findOne({
+  public getVerifiedUserByEmail(email: string): Promise<User | null> {
+    return this.userModel.findOne({
       email,
       verified: true,
-    });
-
-    return foundUser || null;
+    }).exec();
   }
 
-  public async getVerifiedUserById(id: Types.ObjectId): Promise<User | null> {
-    const foundUser: User | null = await this.userModel.findOne({
+  public getVerifiedUserById(id: Types.ObjectId): Promise<User | null> {
+    return  this.userModel.findOne({
       _id: id,
       verified: true,
-    });
-
-    return foundUser || null;
+    }).exec();
   }
 
   public findOneAndUpdate(_id: Types.ObjectId, fieldForUpdate: IUpdateUser) {
-    return this.userModel.findByIdAndUpdate({ _id }, fieldForUpdate);
+    return this.userModel.findByIdAndUpdate({ _id }, fieldForUpdate).exec();
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -17,41 +17,41 @@ export default class UsersRepository {`
`17`	`17`	`verified: false,`
`18`	`18`	`});`
`19`	`19`
`20`		`- return newUser.toObject();`
	`20`	`+ return newUser.toJSON();`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`public async getUnverifiedUserByEmail(email: string): Promise<User \| null> {`
`24`	`24`	`return this.usersModel.findOne({`
`25`	`25`	`email,`
`26`	`26`	`verified: false,`
`27`		`- }).lean();`
	`27`	`+ }).exec();`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public async getVerifiedUserByEmail(email: string): Promise<User \| null> {`
`31`	`31`	`return this.usersModel.findOne({`
`32`	`32`	`email,`
`33`	`33`	`verified: true,`
`34`		`- }).lean();`
	`34`	`+ }).exec();`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public async getById(id: Types.ObjectId): Promise<User \| null> {`
`38`	`38`	`return this.usersModel.findOne({`
`39`	`39`	`_id: id,`
`40`		`- }, { password: 0 }).lean();`
	`40`	`+ }, { password: 0 }).exec();`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public async getVerifiedUserById(id: Types.ObjectId): Promise<User \| null> {`
`44`	`44`	`return this.usersModel.findOne({`
`45`	`45`	`_id: id,`
`46`	`46`	`verified: true,`
`47`		`- }, { password: 0 }).lean();`
	`47`	`+ }, { password: 0 }).exec();`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`public async getUnverifiedUserById(id: Types.ObjectId): Promise<User \| null> {`
`51`	`51`	`return this.usersModel.findOne({`
`52`	`52`	`_id: id,`
`53`	`53`	`verified: false,`
`54`		`- }, { password: 0 }).lean();`
	`54`	`+ }, { password: 0 }).exec();`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`public async updateById(id: Types.ObjectId, data: UpdateUserDto): Promise<User \| null> {`
`@@ -60,14 +60,14 @@ export default class UsersRepository {`
`60`	`60`	`{`
`61`	`61`	`$set: data,`
`62`	`62`	`},`
`63`		`- ).lean();`
	`63`	`+ ).exec();`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`public getAll() {`
`67`		`- return this.usersModel.find().lean();`
	`67`	`+ return this.usersModel.find().exec();`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`public getVerifiedUsers() {`
`71`		`- return this.usersModel.find({ verified: true }).lean();`
	`71`	`+ return this.usersModel.find({ verified: true }).exec();`
`72`	`72`	`}`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,47 +11,47 @@ export default class UsersRepository {`
`11`	`11`	`public async create(user: User): Promise<User> {`
`12`	`12`	`const newUser = await this.usersModel.create(user);`
`13`	`13`
`14`		`- return newUser.toObject();`
	`14`	`+ return newUser.toJSON();`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`public async getByEmail(email: string): Promise<User \| null> {`
`18`	`18`	`return this.usersModel.findOne({`
`19`	`19`	`email,`
`20`		`- }, { password: 0 }).lean();`
	`20`	`+ }, { password: 0 }).exec();`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`public async getVerifiedUserById(id: Types.ObjectId): Promise<User \| null> {`
`24`	`24`	`return this.usersModel.findOne({`
`25`	`25`	`_id: id,`
`26`	`26`	`verified: true,`
`27`		`- }, { password: 0 }).lean();`
	`27`	`+ }, { password: 0 }).exec();`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public async getById(id: Types.ObjectId): Promise<User \| null> {`
`31`	`31`	`return this.usersModel.findOne({`
`32`	`32`	`_id: id,`
`33`		`- }, { password: 0 }).lean();`
	`33`	`+ }, { password: 0 }).exec();`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`public async getVerifiedUserByEmail(email: string) {`
`37`	`37`	`return this.usersModel.findOne({`
`38`	`38`	`email,`
`39`	`39`	`verified: true,`
`40`		`- }).lean();`
	`40`	`+ }).exec();`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public async getUnverifiedUserByEmail(email: string) {`
`44`	`44`	`return this.usersModel.findOne({`
`45`	`45`	`email,`
`46`	`46`	`verified: false,`
`47`		`- }).lean();`
	`47`	`+ }).exec();`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`public getAll(): Query<UserDocument[], UserDocument> {`
`51`		`- return this.usersModel.find().lean();`
	`51`	`+ return this.usersModel.find().exec();`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`public getVerifiedUsers(): Query<UserDocument[], UserDocument> {`
`55`		`- return this.usersModel.find({ verified: true }).lean();`
	`55`	`+ return this.usersModel.find({ verified: true }).exec();`
`56`	`56`	`}`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,17 +24,17 @@ export default class UsersRepository {`
`24`	`24`	`return this.userModel.findOne({`
`25`	`25`	`email,`
`26`	`26`	`verified: true,`
`27`		`- });`
	`27`	`+ }).exec();`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public async getVerifiedUserById(id: Types.ObjectId): Promise<User \| null> {`
`31`	`31`	`return this.userModel.findOne({`
`32`	`32`	`_id: id,`
`33`	`33`	`verified: true,`
`34`		`- });`
	`34`	`+ }).exec();`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public async getAll(): Promise<User[] \| []> {`
`38`		`- return this.userModel.find({}, { password: false }).lean();`
	`38`	`+ return this.userModel.find({}, { password: false }).exec();`
`39`	`39`	`}`
`40`	`40`	`}`