diff --git a/package-lock.json b/package-lock.json index c99b3fe..abb1638 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9017,7 +9017,7 @@ "node_modules/protospack-v2": { "version": "0.0.0", "resolved": "file:../protospack-v2/protospack-v2-0.0.0.tgz", - "integrity": "sha512-e9xqk0tm7AQcd4tZa1PbMsGRDHSbwJ6dUHAePL4myVGRH+j/g4K7K1dg5igd9daKVNIrJaTwZb5RmgoFaU6T4Q==", + "integrity": "sha512-tT+tkBmv9rQlWS6kX/NqVCBZfMsSe7aym2sENQqaMKPGMD1yKR2BI5fvn9Oq3D7wTF0BFNxXHIz4CkmNwdp/OQ==", "license": "ISC", "dependencies": { "@grpc/grpc-js": "^1.6.7", @@ -17247,7 +17247,7 @@ }, "protospack-v2": { "version": "file:../protospack-v2/protospack-v2-0.0.0.tgz", - "integrity": "sha512-e9xqk0tm7AQcd4tZa1PbMsGRDHSbwJ6dUHAePL4myVGRH+j/g4K7K1dg5igd9daKVNIrJaTwZb5RmgoFaU6T4Q==", + "integrity": "sha512-tT+tkBmv9rQlWS6kX/NqVCBZfMsSe7aym2sENQqaMKPGMD1yKR2BI5fvn9Oq3D7wTF0BFNxXHIz4CkmNwdp/OQ==", "requires": { "@grpc/grpc-js": "^1.6.7", "rxjs": "^7.5.5", diff --git a/src/modules/roles/dto/entities.ts b/src/modules/roles/dto/entities.ts index b7ce791..74b8de5 100644 --- a/src/modules/roles/dto/entities.ts +++ b/src/modules/roles/dto/entities.ts @@ -1,8 +1,5 @@ import { ApiProperty, ApiPropertyOptional, OmitType } from '@nestjs/swagger'; -import { - Permission, - PermissionDto, -} from 'src/modules/permissions/dto/entities'; +import { PermissionDto } from 'src/modules/permissions/dto/entities'; import { Customer, UserNoRolesAndCustomer, diff --git a/src/modules/users/users.service.ts b/src/modules/users/users.service.ts index 6a69216..79c9b79 100644 --- a/src/modules/users/users.service.ts +++ b/src/modules/users/users.service.ts @@ -8,6 +8,7 @@ import { AssignRoleToUserRequest, IdRequest, UnassignRoleFromUserRequest, + UserCreateRequest, } from 'protospack-v2/dist/lib/Duc/interfaces/messages'; import { lastValueFrom } from 'rxjs'; import { @@ -52,9 +53,10 @@ export class UsersService implements OnModuleInit { email, hierarchy, name, - roleIds: roles, + roleIds: [], department, jobTitle, + roleNames: roles, }), ); } @@ -71,9 +73,10 @@ export class UsersService implements OnModuleInit { } async batchCreateUser({ users }: BatchCreateUserReq) { - const usersToCreate = users.map((u) => ({ + const usersToCreate: UserCreateRequest[] = users.map((u) => ({ ...u, - roleIds: u.roles, + roleIds: [], + roleNames: u.roles, name: u.name || '', hierarchy: u.hierarchy || null, }));