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

trying to push again

Browse Source
This commit is contained in:
Me
2022-12-09 16:53:00 +01:00
parent b75bce4212
commit 15ea27955b
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
srcs/requirements/nestjs/api_back/src/friendship/friendship.service.ts
View File

@@ -68,9 +68,10 @@ export class FriendshipService {
} }
//GROS CHANTIER //GROS CHANTIER
async create(createFriendshipDto: CreateFriendshipDto, creator : User) { async create(createFriendshipDto: CreateFriendshipDto, creator : User) {
const addressee = await this.userRepository.findOneBy({username: createFriendshipDto.requesterUsername}); const addressee = await this.userRepository.findOneBy({username: createFriendshipDto.addresseeUsername});
if (!addressee) if (!addressee)
throw new HttpException(`The addressee does not exist.`, HttpStatus.NOT_FOUND); throw new HttpException(`The addressee does not exist.`, HttpStatus.NOT_FOUND);
// console.log('Addressee ID: ' + addressee.id + 'Username: ' + a)
if (creator.id === addressee.id) if (creator.id === addressee.id)
throw new HttpException(`You can't add yourself.`, HttpStatus.FORBIDDEN); throw new HttpException(`You can't add yourself.`, HttpStatus.FORBIDDEN);
if (createFriendshipDto.status !== FriendshipStatus.REQUESTED && createFriendshipDto.status !== FriendshipStatus.BLOCKED) if (createFriendshipDto.status !== FriendshipStatus.REQUESTED && createFriendshipDto.status !== FriendshipStatus.BLOCKED)

6
srcs/requirements/svelte/api_front/src/pages/profile/ProfileFriends.svelte
View File

@@ -103,9 +103,9 @@
method : "POST", method : "POST",
headers: { 'Content-Type': 'application/json'}, headers: { 'Content-Type': 'application/json'},
body: JSON.stringify({ body: JSON.stringify({
"requesterId": user.id, "requesterUsername": user.username,
"addresseeId": set.friendId, "addresseeUsername": set.friendUsername,
"status": r "status": "R"
}) })
}) })
.then( x => x.json()) .then( x => x.json())