From 5da48273c0afda9337e4bdb139fa573fcef00b8b Mon Sep 17 00:00:00 2001
From: ilham <ilhamdwips@gmail.com>
Date: Fri, 17 Dec 2021 02:00:07 +0700
Subject: [PATCH] fix: get product all

---
 src/product/product.controller.ts | 20 +-------------------
 src/product/product.service.ts    |  2 +-
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/src/product/product.controller.ts b/src/product/product.controller.ts
index 2a0ef46..08f09ce 100644
--- a/src/product/product.controller.ts
+++ b/src/product/product.controller.ts
@@ -69,7 +69,7 @@ export class ProductController {
     };
   }
 
-  @Get('get-all')
+  @Get('all')
   async findAll(
     @Query('page') page: number,
     @Query('sub-category') subcategory: string,
@@ -179,24 +179,6 @@ export class ProductController {
     };
   }
 
-  @Get('categories/:id')
-  async findOneCategories(@Param('id', ParseUUIDPipe) id: string) {
-    return {
-      data: await this.productCategoriesService.findOne(id),
-      statusCode: HttpStatus.OK,
-      message: 'success',
-    };
-  }
-
-  @Get('sub-categories/:id')
-  async findOneSubCategories(@Param('id', ParseUUIDPipe) id: string) {
-    return {
-      data: await this.productSubCategoriesService.findOne(id),
-      statusCode: HttpStatus.OK,
-      message: 'success',
-    };
-  }
-
   @Put(':id')
   async update(
     @Param('id', ParseUUIDPipe) id: string,
diff --git a/src/product/product.service.ts b/src/product/product.service.ts
index f459374..57f96dc 100644
--- a/src/product/product.service.ts
+++ b/src/product/product.service.ts
@@ -54,7 +54,7 @@ export class ProductService {
   }
 
   async findAll(page, supplier, categories, subCategories) {
-    if (supplier != 'null' && !supplier) {
+    if (supplier == 'null' || !supplier) {
       supplier = (await this.supplierService.findByActive()).id;
     }
     const baseQuery = this.productRepository