Merge branch 'development' into 'devops-staging'

Development

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

src/configurable/configurable.controller.ts

@@ -47,6 +47,20 @@ export class ConfigurableController {
     };
   }
 
+  @Get('/roles/for-membership')
+  async findAllForMembership(@Query('page') page: number) {
+    const [data, count] = await this.roleService.findAllRolesForCreateMember(
+      page,
+    );
+
+    return {
+      data,
+      count,
+      statusCode: HttpStatus.OK,
+      message: 'success',
+    };
+  }
+
   @Get(':id')
   async findOne(@Param('id', ParseUUIDPipe) id: string) {
     return {

src/configurable/roles.service.ts

@@ -1,5 +1,5 @@
 import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
-import { EntityNotFoundError, Repository } from 'typeorm';
+import { EntityNotFoundError, In, Not, Repository } from 'typeorm';
 import { Roles } from './entities/roles.entity';
 import { InjectRepository } from '@nestjs/typeorm';
 
@@ -20,6 +20,24 @@ export class RoleService {
     });
   }
 
+  findAllRolesForCreateMember(page) {
+    return this.rolesRepository.findAndCount({
+      skip: page * 10,
+      take: 10,
+      where: {
+        id: Not(
+          In([
+            '3196cdf4-ae5f-4677-9bcd-98be35c72321',
+            '21dceea2-416e-4b55-b74c-12605e1f8d1b',
+          ]),
+        ),
+      },
+      order: {
+        version: 'DESC',
+      },
+    });
+  }
+
   async findOne(id: string) {
     try {
       return await this.rolesRepository.findOneOrFail(id);

src/users/entities/partner.entity.ts

@@ -17,6 +17,9 @@ export class Partner extends BaseModel {
   @Column()
   address: string;
 
+  @Column()
+  phone_number: string;
+
   @Column({ default: true })
   status: boolean;
 }

src/users/partner/partner.service.ts

@@ -59,6 +59,8 @@ export class PartnerService {
 
     const dataUser = new CreateUserDto();
     dataUser.username = `admin_${partnerData.name}`;
+    dataUser.username = partnerData.name;
+    dataUser.phone_number = partnerData.phone_number;
     dataUser.roleId = '21dceea2-416e-4b55-b74c-12605e1f8d1b';
     dataUser.superior = false;
     dataUser.partner = partnerData;