42/42_INT_14_transcendence
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into eric_front_and_back

Browse Source
This commit is contained in:
Me
2023-01-17 12:32:05 +01:00
parent 926fc1dd67 d8317350b0
commit 822543da3d
7 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
srcs/requirements/nestjs/api_back/src/auth/42/authentication.service.ts
View File

@@ -24,10 +24,12 @@ export class AuthenticationService {
if (!check_name)
return await this.userService.create(createUsersDto);
let createUsersDtoWithUsername : CreateUsersDto = createUsersDto;
let i = 0;
while (check_name === true)
{
createUsersDtoWithUsername = { ...createUsersDto, username: createUsersDto.username + randomUUID() };
createUsersDtoWithUsername = { ...createUsersDto, username: createUsersDto.username + '_' + i};
check_name = await this.userService.isUsernameExists(createUsersDtoWithUsername.username);
i++;
}
return this.userService.create(createUsersDtoWithUsername);
}

11
srcs/requirements/nestjs/api_back/src/chat/chat.service.ts
View File

@@ -372,11 +372,14 @@ export class ChatService {
async getListBlockUser(username: string): Promise<string[]>
{
printCaller("-- in ");
let users: string[] = [];
let user = await this.getUserByName(username);
let friends_users = await this.friendshipService.findAllBlockedFriends(user.id);
let users = friends_users.map(user => user.receiverUsername);
console.log("USERNAME CHAT SRVICE " + username);
let friends_users;
if (user)
friends_users = await this.friendshipService.findAllBlockedFriends(user.id);
if (friends_users)
users = friends_users.map(user => user.receiverUsername);
printCaller("-- out ");
return users;
}

4
srcs/requirements/nestjs/api_back/src/users/dto/create-users.dto.ts
View File

@@ -1,9 +1,11 @@
import { IsBoolean, IsEmail, IsNotEmpty, IsOptional, IsString } from 'class-validator';
import { IsBoolean, Matches, MaxLength, IsEmail, IsNotEmpty, IsOptional, IsString } from 'class-validator';
import { isSet } from 'util/types';
export class CreateUsersDto {
@IsString()
@IsNotEmpty()
@Matches(/^[a-zA-Z0-9'-_]+$/)
@MaxLength(50)
readonly username: string;
readonly fortyTwoId: string;
@IsEmail()