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

feat: rewrite filter for product

Browse Source
This commit is contained in:
caturbgs
2021-12-22 14:03:57 +07:00
parent 41856f7a02
commit ff2205ea03
3 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,16 +47,7 @@ export class ProductService {
return this.productRepository.findOneOrFail(result.identifiers[0].id);
}
async findAll(page: number, supplier: string, subCategories: string) {
let filterSupplier = [];
let filterSubCategories = [];
if (supplier !== 'null') {
filterSupplier = supplier.split(',').map((data) => data.trim());
}
if (subCategories !== 'null') {
filterSubCategories = subCategories.split(',').map((data) => data.trim());
}
async findAll(page: number, supplier: [], subCategories: []) {
// if (supplier.length > 0) {
// const dataSupplier = await this.supplierService.findByActiveAll();
// supplier = dataSupplier.map((item) => item.id);
@@ -87,15 +78,15 @@ export class ProductService {
// .addSelect('current_price.price')
// .addSelect('(current_price.price + current_price.mark_up_price) as mark_up_price');
if (filterSubCategories.length > 0) {
if (subCategories.length > 0) {
baseQuery.where('product.sub_categories_id IN (:...subCategoryId)', {
subCategoryId: filterSubCategories,
subCategoryId: subCategories,
});
}
if (filterSupplier.length > 0) {
if (supplier.length > 0) {
baseQuery.where('supplier.id IN (:...supplierId)', {
supplierId: filterSupplier,
supplierId: supplier,
});
}