Merge branch 'development' into 'devops-staging'

add: relation

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

src/product/product.service.ts

@@ -46,6 +46,7 @@ export class ProductService {
   findAll(page) {
     return this.productRepository.findAndCount({
       skip: page * 10,
+      relations: ['subCategories'],
       take: 10,
       order: {
         version: 'DESC',

src/users/users.controller.ts

@@ -48,7 +48,7 @@ export class UsersController {
   @Get('find-by-supperior')
   async findBySuperrior(@Request() req, @Query('page') page: number) {
     return {
-      data: await this.usersService.findBySuperrior(req.user.id, page),
+      data: await this.usersService.findBySuperrior(req.user.userId, page),
       statusCode: HttpStatus.OK,
       message: 'success',
     };

src/users/users.service.ts

@@ -114,7 +114,6 @@ export class UsersService {
       where: {
         superior: superriorId,
       },
-      relations: ['roles'],
       order: {
         updatedAt: 'DESC',
       },