feat/#146 (#151)

src/apis/v1/documents/service.ts

@@ -29,7 +29,7 @@ export const getDocuments = async (urlParams: URLParams) => {
       .skip(pageSize * currentPage)
       .limit(pageSize)
       .sort({ created_at: order === 'DESC' ? -1 : 1 })
-      .populate('author', '-is_blocked -roles -created_at -updated_at -__v')
+      .populate('author', '-is_deleted -is_blocked -roles -created_at -updated_at -__v')
       .populate('subject', '-is_deleted -created_at -updated_at -__v');
 
     logger.info(`Get all documents successfully`);
@@ -147,7 +147,7 @@ export const getDocumentsByAdmin = async (filter: DocumentFilter, urlParams: URL
       .skip(pageSize * currentPage)
       .limit(pageSize)
       .sort({ created_at: order === 'DESC' ? -1 : 1 })
-      .populate('author', '-is_blocked -roles -created_at -updated_at -__v')
+      .populate('author', '-is_deleted -is_blocked -roles -created_at -updated_at -__v')
       .populate('subject', '-is_deleted -created_at -updated_at -__v');
 
     logger.info(`Get all documents successfully`);
@@ -179,7 +179,9 @@ export const getDocumentsBySubjectId = async (subjectId: string) => {
 
     logger.info(`Get all documents by subjectId successfully`);
     return {
-      documents: resultAll[0],
+      documents: resultAll[0].map((documents: any) => {
+        return { ...documents.toObject(), author: hideUserInfoIfRequired(documents?.author) };
+      }),
       subject: resultAll[1],
     };
   } catch (error) {

src/apis/v1/exam/service.ts

@@ -7,6 +7,7 @@ import { DEFAULT_PAGING } from 'utils/constants';
 import { logger } from 'utils/logger';
 import URLParams from 'utils/rest/urlparams';
 import { ExamDto, UpdateExamByAdminDto, UpdateExamByOwnerDto } from './dto/ExamDto';
+import { hideUserInfoIfRequired } from 'utils';
 
 //Get all user's exams
 export const getExams = async (urlParams: URLParams) => {
@@ -71,7 +72,9 @@ export const getExams = async (urlParams: URLParams) => {
 
     const resolveAll = await Promise.all([count, data]);
     return {
-      result: resolveAll[1],
+      result: resolveAll[1].map((exam: any) => {
+        return { ...exam, author: hideUserInfoIfRequired(exam?.author[0]) };
+      }),
       meta: {
         total: resolveAll[0],
         pageSize,
@@ -131,6 +134,8 @@ export const getExamById = async (id: string) => {
             _id: '$author._id',
             fullname: '$author.fullname',
             email: '$author.email',
+            nickname: '$author.nickname',
+            is_show_info: '$author.is_show_info',
           },
           subject: {
             _id: '$subject._id',
@@ -155,7 +160,10 @@ export const getExamById = async (id: string) => {
       },
     ]);
 
-    return data[0];
+    return {
+      ...data[0],
+      author: hideUserInfoIfRequired(data[0].author),
+    };
   } catch (error) {
     logger.error(`Error while get exam: ${error}`);
     throw new HttpException(400, error, ErrorCodes.BAD_REQUEST.CODE);
@@ -228,7 +236,9 @@ export const getExamsBySubjectId = async (subjectId: string, urlParams: URLParam
     const resolveAll = await Promise.all([count, data]);
 
     return {
-      result: resolveAll[1],
+      result: resolveAll[1].map((exam: any) => {
+        return { ...exam, author: hideUserInfoIfRequired(exam?.author[0]) };
+      }),
       meta: {
         total: resolveAll[0],
         pageSize,

src/apis/v1/user/controller.ts

@@ -4,7 +4,7 @@ import RequestWithUser from 'utils/rest/request';
 import * as service from './service';
 import fmt from 'utils/formatter';
 
-import { UserDto, UpdateUserDto, ParamsUserDto } from './dto/UserDto';
+import { UserDto, UpdateUserDto, ParamsUserDto, QueryUserDto } from './dto/UserDto';
 import URLParams from 'utils/rest/urlparams';
 
 export const createUser = async (request: RequestWithUser, response: Response) => {
@@ -35,3 +35,10 @@ export const deleteUser = async (request: RequestWithUser, response: Response) =
   const result = await service.deleteUser(params.id);
   response.send(fmt.formatResponse(result, Date.now() - request.startTime, 'OK'));
 };
+
+export const getUserByEmail = async (req: RequestWithUser, res: Response) => {
+  const query: QueryUserDto = req.query;
+
+  const result = await service.getUserByEmail(query.email);
+  res.send(fmt.formatResponse(result, Date.now() - req.startTime, 'OK'));
+};

src/apis/v1/user/dto/UserDto.ts

@@ -20,6 +20,14 @@ export class UserDto {
   @IsOptional()
   @IsString()
   role: string;
+
+  @IsOptional()
+  @IsString()
+  nickname: string;
+
+  @IsOptional()
+  @IsBoolean()
+  is_show_info: boolean;
 }
 
 export class UpdateUserDto {
@@ -34,9 +42,22 @@ export class UpdateUserDto {
   @IsOptional()
   @IsString()
   role: string;
+
+  @IsOptional()
+  @IsString()
+  nickname: string;
+
+  @IsOptional()
+  @IsBoolean()
+  is_show_info: boolean;
 }
 export class ParamsUserDto {
   @IsString()
   @IsDefined()
   id: string;
 }
+export class QueryUserDto {
+  @IsString()
+  @IsOptional()
+  email?: string;
+}

src/apis/v1/user/index.ts

@@ -16,6 +16,7 @@ router.post(
   asyncRouteHandler(controller.createUser)
 );
 router.get('/', authMiddleware, adminMiddleware, asyncRouteHandler(controller.getUsers));
+router.get('/email', authMiddleware, adminMiddleware, asyncRouteHandler(controller.getUserByEmail));
 
 router.put(
   '/:id',

src/apis/v1/user/service.ts

@@ -6,6 +6,7 @@ import { logger } from 'utils/logger';
 import { UserDto, UpdateUserDto } from './dto/UserDto';
 import URLParams from 'utils/rest/urlparams';
 import { DEFAULT_PAGING } from 'utils/constants';
+import { hideUserInfoIfRequired } from 'utils';
 
 export const createUser = async function (input: UserDto) {
   try {
@@ -76,7 +77,7 @@ export const getUserById = async function (id: ObjectId) {
 export const getUserByEmail = async function (email: string) {
   try {
     const user = await UserModel.findOne({ email });
-    return user;
+    return hideUserInfoIfRequired(user);
   } catch (error) {
     logger.error(`Error while get user by email: ${error}`);
     throw new HttpException(400, ErrorCodes.BAD_REQUEST.MESSAGE, ErrorCodes.BAD_REQUEST.CODE);
@@ -88,9 +89,7 @@ export const updateUser = async function (input: UpdateUserDto, id: string) {
     const users = await UserModel.findOneAndUpdate(
       { _id: id },
       {
-        fullname: input.fullname,
-        roles: input.role,
-        is_blocked: input.is_blocked,
+        $set: input,
       }
     );
     logger.info(`Update for user have id: ${id} successfully`);

src/apis/v1/userExam/service.ts

@@ -13,6 +13,8 @@ import URLParams from 'utils/rest/urlparams';
 import { DEFAULT_PAGING } from 'utils/constants';
 import UserExam from 'models/types/UserExam';
 
+import { hideUserInfoIfRequired } from 'utils';
+
 export const createUserExam = async (input: UserExamDto, author: ObjectIdType) => {
   try {
     const exam = await getExamById(input.exam_id);
@@ -238,7 +240,9 @@ export const getAllUserExamsByOwner = async (userId: string, filter: UserExamFil
         pageSize,
         currentPage,
       },
-      result: resolveAll[1],
+      result: resolveAll[1].map((userExam: any) => {
+        return { ...userExam, author: hideUserInfoIfRequired(userExam?.author[0]) };
+      }),
     };
   } catch (error) {
     logger.error(`Error while get all user exams : ${error}`);
@@ -302,7 +306,7 @@ export const getUserExamByOwner = async (userEmail: string, userExamId: string)
     }
 
     if (userExam[0]?.is_completed) {
-      return userExam[0];
+      return { ...userExam[0], author: hideUserInfoIfRequired(userExam[0]?.author) };
     }
 
     //duration is in milliseconds
@@ -329,6 +333,7 @@ export const getUserExamByOwner = async (userEmail: string, userExamId: string)
           _id: question._id,
         };
       }),
+      author: hideUserInfoIfRequired(userExam[0]?.author),
     };
   } catch (error) {
     logger.error(`Error while get userExam of user : ${error}`);