add payment dto

backend/src/payment/dto/create-payment.dto.ts

@@ -1 +1,19 @@
-export class CreatePaymentDto {}
+import { IsNumber, IsOptional, IsString } from "class-validator"
+
+export class CreatePaymentDto {
+    @IsNumber()
+    amount: number
+
+    @IsOptional()
+    @IsString()
+    bankCode: string
+
+    @IsString()
+    orderDescription: string
+
+    @IsString()
+    orderType: string
+
+    @IsString()
+    language: string
+}

backend/src/payment/payment.controller.ts

@@ -3,6 +3,7 @@ import { Controller, Post, Body, Req, Res } from '@nestjs/common';
 import { PaymentService } from './payment.service.js';
 import { Request, Response } from 'express';
 import { Public } from '../modules/authentication/authentication.decorator.js';
+import { CreatePaymentDto } from './dto/create-payment.dto.js';
 
 @Controller('payment')
 export class PaymentController {
@@ -10,13 +11,13 @@ export class PaymentController {
 
   @Public()
   @Post('create_payment_url')
-  async createPaymentUrl(@Req() req: Request, @Body() body: any) {
-    console.log("hello")
+  async createPaymentUrl(@Req() req: Request, @Body() body: CreatePaymentDto) {
+
     const ipAddr =
       req.headers['x-forwarded-for'] ||
       req.socket.remoteAddress ||
       req.socket?.remoteAddress;
-    console.log(ipAddr);
+
     return await this.paymentService.createPaymentUrl(
       body.amount,
       body.bankCode,

backend/src/payment/payment.service.ts

@@ -9,18 +9,18 @@ export class PaymentService {
   constructor(private readonly configService: ConfigService) {}
 
   async createPaymentUrl(amount: number, bankCode: string, orderDescription: string, orderType: string, language: string, ipAddr: string) {
-    console.log("hi")
+
     const tmnCode = this.configService.get<string>('vnp_TmnCode');
     const secretKey = this.configService.get<string>('vnp_HashSecret');
     const vnpUrl = this.configService.get<string>('vnp_Url');
     const returnUrl = this.configService.get<string>('vnp_ReturnUrl');
-    console.log("1")
+
     const date = new Date();
     const createDate = this.formatDate(date, 'yyyymmddHHmmss');
-    const orderId = "5638"
+    const orderId = Date.now().toString();
     const locale = language || 'vn';
     const currCode = 'VND';
-    console.log("2")
+
     const vnp_Params: Record<string, string> = {
       vnp_Version: '2.1.0',
       vnp_Command: 'pay',
@@ -40,24 +40,17 @@ export class PaymentService {
       vnp_Params['vnp_BankCode'] = bankCode;
     }
 
-    // Sort the parameters
-    // const sortedParams = Object.keys(vnp_Params)
-    //   .sort()
-    //   .reduce((acc, key) => {
-    //     acc[key] = vnp_Params[key];
-    //     return acc;
-    //   }, {} as Record<string, string>);
     const sortedParams = this.sortObject(vnp_Params);
-      console.log("4")
+
     // Sign the data
     const signData = querystring.stringify(sortedParams, { encode: false });
     const hmac = crypto.createHmac('sha512', secretKey);
     const signed = hmac.update(Buffer.from(signData, 'utf-8')).digest('hex');
     sortedParams['vnp_SecureHash'] = signed;
-    console.log("5")
+
     // Create the URL
     const res = `${vnpUrl}?${querystring.stringify(sortedParams, { encode: false })}`;
-    console.log("6");
+
     return res;
   }
   // Format date helper function