diff --git a/src/product/product.module.ts b/src/product/product.module.ts index cf65094..e514519 100644 --- a/src/product/product.module.ts +++ b/src/product/product.module.ts @@ -24,5 +24,6 @@ import { ProductSubCategoriesService } from './product-sub-categories.service'; ProductCategoriesService, ProductSubCategoriesService, ], + exports: [ProductService], }) export class ProductModule {} diff --git a/src/transaction/dto/order-transaction.dto.ts b/src/transaction/dto/order-transaction.dto.ts new file mode 100644 index 0000000..462682c --- /dev/null +++ b/src/transaction/dto/order-transaction.dto.ts @@ -0,0 +1,6 @@ +import { IsNotEmpty, IsUUID } from 'class-validator'; + +export class OrderTransactionDto { + @IsNotEmpty() + productCode: string; +} diff --git a/src/transaction/transaction.controller.ts b/src/transaction/transaction.controller.ts index 2b95bf8..d3f09bd 100644 --- a/src/transaction/transaction.controller.ts +++ b/src/transaction/transaction.controller.ts @@ -9,6 +9,7 @@ import { } from '@nestjs/common'; import { TransactionService } from './transaction.service'; import { DistributeTransactionDto } from './dto/distribute-transaction.dto'; +import { OrderTransactionDto } from './dto/order-transaction.dto'; import { UpdateTransactionDto } from './dto/update-transaction.dto'; @Controller({ @@ -20,12 +21,12 @@ export class TransactionController { @Post() create(@Body() createTransactionDto: DistributeTransactionDto) { - return this.transactionService.create(createTransactionDto); + return this.transactionService.distributeDeposit(createTransactionDto); } - @Get() - findAll() { - return this.transactionService.findAll(); + @Post('order') + orderTransaction(@Body() orderTransactionDto: OrderTransactionDto) { + return this.transactionService.orderTransaction(orderTransactionDto); } @Get(':id') diff --git a/src/transaction/transaction.module.ts b/src/transaction/transaction.module.ts index 74dc84e..73ead99 100644 --- a/src/transaction/transaction.module.ts +++ b/src/transaction/transaction.module.ts @@ -9,6 +9,8 @@ import { TransactionType } from './entities/transaction-type.entity'; import { TransactionJournal } from './entities/transaction-journal.entity'; import { Transactions } from './entities/transactions.entity'; import { CoaService } from './coa.service'; +import { ProductService } from '../product/product.service'; +import { ProductSubCategoriesService } from '../product/product-sub-categories.service'; @Module({ imports: [ @@ -19,6 +21,7 @@ import { CoaService } from './coa.service'; TransactionJournal, Transactions, ]), + ProductService, ], controllers: [TransactionController, PpobCallbackController], providers: [TransactionService, CoaService], diff --git a/src/transaction/transaction.service.ts b/src/transaction/transaction.service.ts index 24bc015..0dc7fc2 100644 --- a/src/transaction/transaction.service.ts +++ b/src/transaction/transaction.service.ts @@ -1,5 +1,6 @@ import { Injectable } from '@nestjs/common'; import { DistributeTransactionDto } from './dto/distribute-transaction.dto'; +import { OrderTransactionDto } from './dto/order-transaction.dto'; import { UpdateTransactionDto } from './dto/update-transaction.dto'; import { InjectRepository } from '@nestjs/typeorm'; import { Transactions } from './entities/transactions.entity'; @@ -9,6 +10,7 @@ import { TransactionType } from './entities/transaction-type.entity'; import { TransactionJournal } from './entities/transaction-journal.entity'; import { CoaService } from './coa.service'; import { statusTransaction } from '../helper/enum-list'; +import { ProductService } from '../product/product.service'; @Injectable() export class TransactionService { @@ -25,7 +27,7 @@ export class TransactionService { private connection: Connection, ) {} - async create(distributeTransactionDto: DistributeTransactionDto) { + async distributeDeposit(distributeTransactionDto: DistributeTransactionDto) { // GET COA const coaSender = await this.coaService.findByUser('id_user'); const coaReciever = await this.coaService.findByUser('id_user'); @@ -63,16 +65,15 @@ export class TransactionService { await manager.save(coaReciever); }); - //ADD USER IN INSERT - - // await this.coaRepository.update({ - // amount:1 - // }) return true; } - findAll() { - return `This action returns all transaction`; + async orderTransaction(orderTransactionDto: OrderTransactionDto) { + // const product = await this.productService.findOne( + // orderTransactionDto.productCode, + // ); + + return true; } findOne(id: number) {