7

Author: bangmaple

apps/common/filters/generic-http.exception.ts

@@ -0,0 +1,7 @@
+import {HttpException, HttpStatus} from "@nestjs/common";
+
+export class GenericHttpException extends HttpException {
+  constructor(e) {
+    super(e, HttpStatus.INTERNAL_SERVER_ERROR);
+  }
+}

apps/common/filters/http-exception.filter.ts

@@ -0,0 +1,28 @@
+import {ArgumentsHost, Catch, ExceptionFilter, HttpStatus} from "@nestjs/common";
+import {GenericHttpException} from "./generic-http.exception";
+
+@Catch(GenericHttpException)
+export class HttpExceptionFilter implements ExceptionFilter {
+  catch(exception: GenericHttpException, host: ArgumentsHost) {
+    const ctx = host.switchToHttp();
+    const response = ctx.getResponse();
+    const request = ctx.getRequest();
+    let error;
+    const errorMsg = exception.message.substring(exception.message.indexOf(':')+1);
+    if (!errorMsg.trim().startsWith('{')) {
+      error = {
+        statusCode: HttpStatus.INTERNAL_SERVER_ERROR,
+        message: errorMsg,
+        timestamp: new Date().toISOString(),
+      };
+    } else {
+      error = JSON.parse(errorMsg);
+    }
+    response
+      .status(error.statusCode)
+      .send({
+        ...error,
+        path: request.url,
+      });
+  }
+}

apps/common/filters/http-exception.interceptor.ts

@@ -0,0 +1,16 @@
+import {CallHandler, ExecutionContext, Injectable, Logger, NestInterceptor} from "@nestjs/common";
+import {catchError} from "rxjs/operators";
+
+@Injectable()
+export class HttpExceptionInterceptor implements NestInterceptor {
+  intercept(context: ExecutionContext, next: CallHandler<any>) {
+    return next.handle().pipe(catchError((error) => {
+      const httpError = JSON.parse(error.details);
+      Logger.error(httpError);
+      context.switchToHttp().getResponse().status(httpError.statusCode).send(httpError);
+      throw error;
+    }));
+  }
+
+
+}

apps/common/filters/rpc-exception.filter.ts

@@ -1,11 +1,18 @@
-import { ArgumentsHost, Catch } from '@nestjs/common';
-import { BaseRpcExceptionFilter, RpcException } from '@nestjs/microservices';
-import { Observable, throwError } from 'rxjs';
-import { RpcExceptionModel } from './rpc-exception.model';
+import {ArgumentsHost, Catch} from '@nestjs/common';
+import {BaseRpcExceptionFilter, RpcException} from '@nestjs/microservices';
+import {Observable, throwError} from 'rxjs';
+import {RpcExceptionModel} from './rpc-exception.model';
 
 @Catch(RpcException)
-export class ExceptionFilter extends BaseRpcExceptionFilter {
+export class ExceptionFilter extends BaseRpcExceptionFilter<RpcException> {
   catch(e: RpcException, host: ArgumentsHost): Observable<RpcExceptionModel> {
-    return throwError(() => e);
+    const httpError = JSON.parse(e.message);
+    return throwError(() => new RpcException({
+      message: JSON.stringify({
+        statusCode: httpError.statusCode,
+        message: httpError.message,
+        timestamp: new Date().toISOString(),
+      })
+    }));
   }
 }

apps/common/grpc-services.route.ts

@@ -36,6 +36,9 @@ export const USERS_MANAGEMENT_GRPC_SERVICE: ClientOptions = {
 export const GRPC_ADMIN_SERVICE = 'AdminService';
 export const ADMIN_SERVICE_FIND_ALL = 'FindAll';
 export const ADMIN_SERVICE_VIEW_DETAIL = 'ViewDetail';
+export const ADMIN_SERVICE_UPDATE = 'Update';
+export const ADMIN_SERVICE_DELETE = 'Delete';
+export const ADMIN_SERVICE_CREATE = 'Create';
 
 export const GRPC_CUSTOMER_SERVICE = 'CustomerService';
 export const CUSTOMER_SERVICE_FIND_ALL = 'FindAll';

apps/common/mappers/customer.mapper.ts

@@ -1,7 +1,7 @@
-import { CreateCustDto } from '../dtos/customer/create-customer.dto';
-import { CustomerEntity } from '../entities/customer.entity';
-import { UpdateCustDto } from '../dtos/customer/update-customer.dto';
-import { AccountStatus } from '../constants/enums';
+import {CreateCustDto} from '../dtos/customer/create-customer.dto';
+import {CustomerEntity} from '../entities/customer.entity';
+import {UpdateCustDto} from '../dtos/customer/update-customer.dto';
+import {AccountStatus} from '../constants/enums';
 
 export class CustomerMapper {
   static async mapCreateCustDtoToEntity(dto: CreateCustDto) : Promise<CustomerEntity>{

apps/common/mappers/package.mapper.ts

@@ -1,8 +1,8 @@
-import { CreatePackageDto } from '../dtos/package/create-package.dto';
-import { PackageEntity } from '../entities/package.entity';
-import { UpdatePackageDto } from '../dtos/package/update-package.dto';
-import { PackageStatus } from '../constants/enums';
-import { TrainerEntity } from '../entities/trainer.entity';
+import {CreatePackageDto} from '../dtos/package/create-package.dto';
+import {PackageEntity} from '../entities/package.entity';
+import {UpdatePackageDto} from '../dtos/package/update-package.dto';
+import {PackageStatus} from '../constants/enums';
+import {TrainerEntity} from '../entities/trainer.entity';
 
 export class PackageMapper {
 

apps/common/mappers/trainer.mapper.ts

@@ -1,7 +1,7 @@
-import { CreateTrainerDto } from '../dtos/trainer/create-trainer.dto';
-import { TrainerEntity } from '../entities/trainer.entity';
-import { UpdateTrainerDto } from '../dtos/trainer/update-trainer.dto';
-import { AccountStatus } from '../constants/enums';
+import {CreateTrainerDto} from '../dtos/trainer/create-trainer.dto';
+import {TrainerEntity} from '../entities/trainer.entity';
+import {UpdateTrainerDto} from '../dtos/trainer/update-trainer.dto';
+import {AccountStatus} from '../constants/enums';
 
 export class TrainerMapper {
   static async mapCreateDtoToEntity(dto: CreateTrainerDto): Promise<TrainerEntity> {

apps/common/proto-models/users-mgnt.proto.ts

@@ -1,5 +1,4 @@
 import {Observable} from "rxjs";
-import {Column, ManyToOne, PrimaryGeneratedColumn} from "typeorm";
 
 export class AdminEntity {
   email?: string;
@@ -13,18 +12,57 @@ export class AdminEntity {
   dob?: number;
 }
 
+export type EmptyBody = {};
+
+export type EmailBody = {
+  email: string;
+}
+
 export interface AdminService {
-  findAll(data): Observable<AdminEntitiesResponse>;
-  viewDetail(data: AdminEntityViewDetailRequest): Observable<AdminEntityResponse>;
+  findAll(data: object): Observable<AdminEntitiesResponse>;
+
+  viewDetail(data: EmailBody): Observable<AdminEntityResponse>;
+
+  delete(data: EmailBody): Observable<any>;
+
+  update(data: UpdateAdminEntityRequest): Observable<AdminEntityResponse>;
+  create(data): Observable<any>;
+}
+
+export interface CustomerService {
+  findAll(data: object): Observable<CustomerEntitiesResponse>;
+  viewDetail(data: EmailBody): Observable<CustomerEntityResponse>;
+  delete(data: EmailBody): Observable<any>;
+  create(data): Observable<any>;
 }
 
 export interface TrainerService {
   findAll(data): Observable<TrainerEntitiesResponse>;
+
   viewDetail(data: TrainerEntityViewDetailRequest): Observable<TrainerEntityResponse>;
+  delete(data: EmailBody): Observable<any>;
+  create(data): Observable<any>;
 }
+
 export interface CustomerService {
   findAll(data): Observable<CustomerEntitiesResponse>;
   viewDetail(data: CustomerEntityViewDetailRequest): Observable<CustomerEntityResponse>;
+  update(data): Observable<any>;
+  delete(data): Observable<any>;
+}
+
+export type UpdateAdminEntityRequest = { email: string, payload: UpdateAdminEntity };
+
+export type UpdateAdminEntity = {
+  email?: string;
+  password?: string;
+  fullname?: string;
+  address?: string;
+  phone?: string;
+  gender?: string;
+  profileImage?: string;
+  status?: number;
+  dob?: number;
 }
 
 export type AdminEntityViewDetailRequest = {
@@ -99,7 +137,7 @@ export type CampaignEntity = {
   startDate: number;
   endDate: number;
   feedback: string;
-  customer : CustomerEntity;
+  customer: CustomerEntity;
 }
 
 export type PackageEntity = {
@@ -109,5 +147,5 @@ export type PackageEntity = {
   price: number;
   status: number;
   dietPlan: string;
-  trainer : TrainerEntity;
+  trainer: TrainerEntity;
 }

apps/common/routes/packages-management-routes.ts

@@ -1,4 +1,4 @@
-import { UpdatePackageDto } from '../../weight-loss-consultant-users-mgnt-api/src/app/dtos/package/update-package';
+import {UpdatePackageDto} from '../../weight-loss-consultant-users-mgnt-api/src/app/dtos/package/update-package';
 
 export const DELETE_PACKAGE_BY_ID = 'delete-package-by-id';
 export const FIND_ALL_PACKAGES = 'find-all-packages';