PPOB/ppob-backend
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into devops-staging

Browse Source
This commit is contained in:
Fadli 2022-08-21 01:16:17 +07:00
commit b720a93983
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/product/product.service.ts
View File

@ -429,6 +429,30 @@ export class ProductService {
}
}
async findOneActive(code: string, type: string) {
try {
return await this.productRepository.findOneOrFail({
relations: ['supplier'],
where: {
code: code,
status: 'ACTIVE',
},
});
} catch (e) {
if (e instanceof EntityNotFoundError) {
throw new HttpException(
{
statusCode: HttpStatus.NOT_FOUND,
error: 'Product not found',
},
HttpStatus.NOT_FOUND,
);
} else {
throw e;
}
}
}
async findOneById(id: string) {
try {
return await this.productRepository.findOneOrFail({

8
src/transaction/transaction.service.ts
View File

@ -310,7 +310,7 @@ export class TransactionService {
'prepaid',
);
if (productData.status == 'NOT ACTIVE') {
if (!productData.status.includes('ACTIVE')) {
throw new HttpException(
{
statusCode: HttpStatus.INTERNAL_SERVER_ERROR,
@ -333,7 +333,7 @@ export class TransactionService {
);
//GET PRODUCT
const product = await this.productService.findOne(
const product = await this.productService.findOneActive(
orderTransactionDto.productCode,
'prepaid'
);
@ -467,7 +467,7 @@ export class TransactionService {
'prepaid',
);
if (productData.status == 'NOT ACTIVE') {
if (!productData.status.includes('ACTIVE')) {
throw new HttpException(
{
statusCode: HttpStatus.INTERNAL_SERVER_ERROR,
@ -484,7 +484,7 @@ export class TransactionService {
);
//GET PRODUCT AND PRICE
const product = await this.productService.findOne(
const product = await this.productService.findOneActive(
orderTransactionDto.productCode,
'prepaid',
);