add:partner module

src/users/users.service.ts

@@ -7,7 +7,13 @@ import {
 } from '@nestjs/common';
 import { CreateUserDto } from './dto/create-user.dto';
 import { UpdateUserDto } from './dto/update-user.dto';
-import { Connection, EntityNotFoundError, Repository } from 'typeorm';
+import {
+  Connection,
+  EntityNotFoundError,
+  Equal,
+  Not,
+  Repository,
+} from 'typeorm';
 import { User } from './entities/user.entity';
 import { InjectRepository } from '@nestjs/typeorm';
 import { randomStringGenerator } from '@nestjs/common/utils/random-string-generator.util';
@@ -59,53 +65,56 @@ export class UsersService {
     userData.username = createUserDto.username;
     userData.password = await hashPassword(createUserDto.password, salt);
     userData.salt = salt;
-    userData.superior = superior;
+    if (createUserDto.superior) {
+      userData.superior = superior;
+    } else {
+      userData.superior = null;
+      userData.partner = createUserDto.partner;
+    }
     userData.roles = roles;
 
     await this.connection.transaction(async (manager) => {
       const result = await manager.insert(User, userData);
 
       const dataCoaWallet = new InputCoaDto();
-
       dataCoaWallet.user = userData;
       dataCoaWallet.balanceType = balanceType.CREDIT;
       dataCoaWallet.type = coaType.WALLET;
       dataCoaWallet.coaEntityManager = manager;
+      await this.coaService.create(dataCoaWallet);
 
       if (createUserDto.superior) {
         const dataCoaAP = new InputCoaDto();
-
         dataCoaAP.user = userData;
         dataCoaAP.balanceType = balanceType.CREDIT;
         dataCoaAP.relatedUserId = superior.id;
         dataCoaAP.type = coaType.ACCOUNT_PAYABLE;
         dataCoaAP.coaEntityManager = manager;
+        await this.coaService.create(dataCoaAP);
 
         const dataCoaAR = new InputCoaDto();
-
         dataCoaAR.user = userData;
         dataCoaAR.balanceType = balanceType.DEBIT;
         dataCoaAR.relatedUserId = superior.id;
         dataCoaAR.type = coaType.ACCOUNT_RECEIVABLE;
         dataCoaAR.coaEntityManager = manager;
-
-        await this.coaService.create(dataCoaAP);
         await this.coaService.create(dataCoaAR);
       }
-
-      await this.coaService.create(dataCoaWallet);
     });
 
     return userData;
   }
 
-  findAll(page: number) {
+  findAll(page: number, id: string) {
     return this.usersRepository.findAndCount({
       skip: page * 10,
       take: 10,
       order: {
         version: 'DESC',
       },
+      where: {
+        id: Not(Equal(id)),
+      },
     });
   }