From bee85570552cb8ddefe869315c5617e2c7b40e78 Mon Sep 17 00:00:00 2001
From: ilham <ilhamdwips@gmail.com>
Date: Mon, 20 Dec 2021 12:33:48 +0700
Subject: [PATCH] fix: unselect product that not active

---
 src/product/product.service.ts | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/product/product.service.ts b/src/product/product.service.ts
index 7138d13..061d23b 100644
--- a/src/product/product.service.ts
+++ b/src/product/product.service.ts
@@ -57,11 +57,12 @@ export class ProductService {
     if (supplier == 'null' || !supplier) {
       supplier = (await this.supplierService.findByActive()).id;
     }
+
     const baseQuery = this.productRepository
       .createQueryBuilder('product')
       .leftJoin('product.sub_categories', 'sub_categories')
       .leftJoin('sub_categories.category', 'category')
-      .where('product.supplier_id = :supplier_id', {
+      .where(`product.supplier_id = :supplier_id`, {
         supplier_id: supplier,
       })
       .leftJoinAndMapOne(
@@ -131,12 +132,16 @@ export class ProductService {
     if (supplier != 'null' && !supplier) {
       supplier = (await this.supplierService.findByActive()).id;
     }
+
     const baseQuery = this.productRepository
       .createQueryBuilder('product')
       .leftJoin('product.sub_categories', 'sub_categories')
-      .where('product.supplier_id = :supplier_id', {
-        supplier_id: supplier,
-      })
+      .where(
+        `product.supplier_id = :supplier_id and product.status = 'ACTIVE'`,
+        {
+          supplier_id: supplier,
+        },
+      )
       .leftJoinAndMapOne(
         'product.currentPrice',
         'product.priceHistory',
@@ -176,7 +181,7 @@ export class ProductService {
       .createQueryBuilder('product')
       .leftJoin('product.sub_categories', 'sub_categories')
       .where(
-        'sub_categories.category_id = :id and product.supplier_id = :supplier_id',
+        `sub_categories.category_id = :id and product.supplier_id = :supplier_id and product.status = 'ACTIVE'`,
         {
           id: categories,
           supplier_id: supplier.id,