Merge branch 'development' into 'devops-staging'

Development

See merge request empatnusabangsa/ppob/ppob-backend!73

src/product/product.service.ts

@@ -336,8 +336,8 @@ export class ProductService {
     }
 
     const data = await baseQuery
-      .offset(page * 10)
+      .offset(page * pageSize)
-      .limit(10)
+      .limit(pageSize)
       .getRawMany();
 
     const totalData = await baseQuery.getCount();

src/users/users.controller.ts

@@ -113,8 +113,18 @@ export class UsersController {
   }
 
   @Get()
-  async findAll(@Request() req, @Query('page') page: number) {
+  async findAll(
-    const data = await this.usersService.findAll(page, req.user.userId);
+    @Request() req, 
+    @Query('page') page: number,
+    @Query('superior') superior: string,
+    @Query('type') type: string,
+  ) {
+    const data = await this.usersService.findAll(
+      page, 
+      req.user.userId,
+      superior == 'null' ? null : superior,
+      type == 'null' ? null : type,
+    );
 
     return {
       ...data,

src/users/users.service.ts

@@ -118,7 +118,7 @@ export class UsersService {
     return userData;
   }
 
-  async findAll(page: number, id: string) {
+  async findAll(page: number, id: string, superior: string, type: string) {
     const baseQuery = this.usersRepository
       .createQueryBuilder('user')
       .where('user.id != :id', {
@@ -148,6 +148,20 @@ export class UsersService {
         'coa.amount',
       ]);
 
+    if(superior){
+      baseQuery.where('user.superior = :id_supperior',{
+        id_supperior:superior
+      })
+    }
+
+    if(type){
+      if(type == 'partner'){
+        baseQuery.where('user.partner_id is not null')
+      } else {
+        baseQuery.where('user.partner_id is null')
+      }
+    }
+
     const data = await baseQuery
       .orderBy('user.createdAt', 'DESC')
       .skip(page * 10)