Merge branch 'development' into 'devops-staging'

Development

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

src/product/entities/product-category.entity.ts

@@ -23,5 +23,5 @@ export class ProductCategories extends BaseModel {
     () => ProductSubCategories,
     (subCategories) => subCategories.category,
   )
-  subCategories: ProductSubCategories;
+  sub_categories: ProductSubCategories;
 }

src/product/entities/product-history-price.entity.ts

@@ -1,9 +1,4 @@
-import {
-  Entity,
-  Column,
-  PrimaryGeneratedColumn,
-  ManyToOne,
-} from 'typeorm';
+import { Entity, Column, PrimaryGeneratedColumn, ManyToOne } from 'typeorm';
 import { Product } from './product.entity';
 import { BaseModel } from '../../config/basemodel.entity';
 import { productType } from '../../helper/enum-list';
@@ -20,14 +15,14 @@ export class ProductHistoryPrice extends BaseModel {
   price: number;
 
   @Column()
-  markUpPrice: number;
+  mark_up_price: number;
 
   @Column({ type: 'date' })
   startDate: Date;
 
-  @Column({ 
+  @Column({
     type: 'date',
-    nullable:true 
+    nullable: true,
   })
   endDate: Date;
 

src/product/entities/product-sub-category.entity.ts

@@ -17,9 +17,9 @@ export class ProductSubCategories extends BaseModel {
   @Column()
   name: string;
 
-  @ManyToOne(() => ProductCategories, (categories) => categories.subCategories)
+  @ManyToOne(() => ProductCategories, (categories) => categories.sub_categories)
   category: ProductCategories;
 
-  @OneToMany(() => Product, (product) => product.subCategories)
+  @OneToMany(() => Product, (product) => product.sub_categories)
   product: Product;
 }

src/product/entities/product.entity.ts

@@ -42,5 +42,5 @@ export class Product extends BaseModel {
       return subCategories.product;
     },
   )
-  subCategories: ProductSubCategories;
+  sub_categories: ProductSubCategories;
 }

src/product/product.service.ts

@@ -27,7 +27,7 @@ export class ProductService {
       name: createProductDto.name,
       code: createProductDto.code,
       status: createProductDto.status,
-      subCategories: subCategories,
+      sub_categories: subCategories,
       price: createProductDto.price,
     });
 
@@ -35,7 +35,7 @@ export class ProductService {
       product: result.identifiers[0],
       type: productType.NORMAL,
       price: createProductDto.price,
-      markUpPrice: createProductDto.markUpPrice,
+      mark_up_price: createProductDto.markUpPrice,
       startDate: new Date(),
       endDate: null,
     });
@@ -111,7 +111,7 @@ export class ProductService {
       name: updateProductDto.name,
       code: updateProductDto.code,
       status: updateProductDto.status,
-      subCategories: subCategories,
+      sub_categories: subCategories,
     });
 
     return this.productRepository.findOneOrFail(id);
@@ -127,7 +127,7 @@ export class ProductService {
       product: product,
       type: updatePriceProductDto.type,
       price: updatePriceProductDto.price,
-      markUpPrice: updatePriceProductDto.markUpPrice,
+      mark_up_price: updatePriceProductDto.markUpPrice,
       startDate: updatePriceProductDto.startDate,
       endDate: updatePriceProductDto.endDate,
     });

src/users/users.controller.ts

@@ -47,8 +47,13 @@ export class UsersController {
 
   @Get('find-by-supperior')
   async findBySuperrior(@Request() req, @Query('page') page: number) {
+    const [data, count] = await this.usersService.findBySuperrior(
+      req.user.userId,
+      page,
+    );
     return {
-      data: await this.usersService.findBySuperrior(req.user.userId, page),
+      data,
+      count,
       statusCode: HttpStatus.OK,
       message: 'success',
     };
@@ -59,8 +64,10 @@ export class UsersController {
     @Param('id', ParseUUIDPipe) id: string,
     @Query('page') page: number,
   ) {
+    const [data, count] = await this.usersService.findByRoles(id, page);
     return {
-      data: await this.usersService.findByRoles(id, page),
+      data,
+      count,
       statusCode: HttpStatus.OK,
       message: 'success',
     };