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

Merge branch 'development' into 'devops-staging'

Browse Source 
fix: product in partner

See merge request empatnusabangsa/ppob/ppob-backend!155
This commit is contained in:
ilham dwi pratama 2022-05-08 15:43:27 +00:00
commit 1135599a9b
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -172,7 +172,7 @@ export class ProductService {
'product.currentPrice',
'product.priceHistory',
'current_price',
'current_price.partner_id is null and current_price.end_date is NULL',
'current_price.end_date is NULL',
)
.select(['product.id'])
.addSelect([
@ -297,7 +297,6 @@ export class ProductService {
username: string,
) {
const user = await this.usersService.findOneByUsername(username);
const supplier = await this.supplierService.findByActive();
if (user.partner === null) {
throw new HttpException(
@ -312,12 +311,12 @@ export class ProductService {
const baseQuery = this.productRepository
.createQueryBuilder('product')
.leftJoin('product.sub_categories', 'sub_categories')
.where(
`product.supplier_id = :supplier_id and product.status = 'ACTIVE'`,
{
supplier_id: supplier.id,
},
.leftJoinAndSelect(
'product.supplier',
'supplier',
'supplier.status = true',
)
.where(`product.status = 'ACTIVE'`)
.innerJoinAndMapOne(
'product.currentPrice',
'product.priceHistory',