Merge pull request #26 from Modarb-Ai-Trainer/update

src/modules/console/modules/admins/controllers/admins.controller.ts

@@ -14,7 +14,7 @@ import { serialize } from "@helpers/serialize";
 import { AdminSerialization } from "src/modules/console/common/serializers/admin.serializtion";
 
 @Prefix("/console/admins")
-// @ControllerMiddleware(AdminGuardMiddleware({ roles: [Role.SUPER_ADMIN] }))
+@ControllerMiddleware(AdminGuardMiddleware({ roles: [Role.SUPER_ADMIN] }))
 export class AdminsController extends BaseController {
   private adminsService = new AdminsService();
 
@@ -58,7 +58,7 @@ export class AdminsController extends BaseController {
       _id: req.params.id,
     });
     const response = new JsonResponse({
-      data: serialize(data, AdminSerialization),
+      data: serialize(data.toJSON(), AdminSerialization),
     });
     res.json(response);
   };
@@ -66,7 +66,7 @@ export class AdminsController extends BaseController {
   create = async (req: Request, res: Response) => {
     const admin = await this.adminsService.create(req.body);
     const response = new JsonResponse({
-      data: admin,
+      data: serialize(admin.toJSON(), AdminSerialization),
     });
     res.json(response);
   };
@@ -80,7 +80,7 @@ export class AdminsController extends BaseController {
     );
 
     const response = new JsonResponse({
-      data: serialize(admin, AdminSerialization),
+      data: serialize(admin.toJSON(), AdminSerialization),
     });
 
     res.json(response);
@@ -92,7 +92,7 @@ export class AdminsController extends BaseController {
     });
 
     const response = new JsonResponse({
-      data: serialize(admin, AdminSerialization),
+      data: serialize(admin.toJSON(), AdminSerialization),
     });
 
     res.json(response);

src/modules/console/modules/users/controllers/users.controller.ts

@@ -24,7 +24,7 @@ export class AdminUsersController extends BaseController {
   create = async (req: Request, res: Response) => {
     let user = await this.usersService.create(req.body);
     const response = new JsonResponse({
-      data: serialize(user, UserSerialization),
+      data: serialize(user.toJSON(), UserSerialization),
     });
     return res.json(response);
   };

src/modules/users/auth/controllers/auth.controller.ts

@@ -31,7 +31,7 @@ export class UsersAuthController extends BaseController {
     const user = await this.authService.register(req.body as IUserRegister);
 
     const response = new JsonResponse({
-      data: serialize(user.toJSON(),UserSerialization),
+      data: serialize(user.toJSON(), UserSerialization),
     });
     return res.json(response);
   };
@@ -39,7 +39,7 @@ export class UsersAuthController extends BaseController {
   login = async (req: Request, res: Response) => {
     const { user, token } = await this.authService.login(req.body);
     const response = new JsonResponse({
-      data: { user, token },
+      data: { user: serialize(user.toJSON(), UserSerialization), token },
     });
     return res.json(response);
   };