From 7749817794f6873c696906c13e027710d50d48bc Mon Sep 17 00:00:00 2001
From: nicolas-arnaud <nicolas.rr.arnaud@gmail.com>
Date: Sat, 18 Mar 2023 14:04:21 +0100
Subject: [PATCH] revert findUser

revert findUser
---
 back/volume/src/chat/message.service.ts   | 2 +-
 back/volume/src/users/users.controller.ts | 3 ++-
 back/volume/src/users/users.service.ts    | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/back/volume/src/chat/message.service.ts b/back/volume/src/chat/message.service.ts
index c2d5661..0968807 100644
--- a/back/volume/src/chat/message.service.ts
+++ b/back/volume/src/chat/message.service.ts
@@ -22,7 +22,7 @@ export class MessageService {
     const msg = new Message()
     msg.text = message.text
     msg.channel = await this.channelService.getChannel(message.ChannelId)
-    msg.author = await this.usersService.findUser(message.UserId)
+    msg.author = (await this.usersService.findUser(message.UserId)) as User
     msg.author.socketKey = ''
     return await this.MessageRepository.save(msg)
   }
diff --git a/back/volume/src/users/users.controller.ts b/back/volume/src/users/users.controller.ts
index 1ddcb89..627fefa 100644
--- a/back/volume/src/users/users.controller.ts
+++ b/back/volume/src/users/users.controller.ts
@@ -212,9 +212,10 @@ export class UsersController {
   async updateUser (
     @Body() payload: UserDto,
       @Profile42() profile: Profile
-  ): Promise<void> {
+  ): Promise<User> {
     const user = await this.usersService.findUser(profile.id)
     if (user == null) throw new BadRequestException('User not found.')
     await this.usersService.update(user, payload)
+    return user
   }
 }
diff --git a/back/volume/src/users/users.service.ts b/back/volume/src/users/users.service.ts
index e15ab33..ee46ee0 100644
--- a/back/volume/src/users/users.service.ts
+++ b/back/volume/src/users/users.service.ts
@@ -55,9 +55,9 @@ export class UsersService {
     await this.getLeaderboard()
   }
 
-  async findUser (ftId: number): Promise<User> {
+  async findUser (ftId: number): Promise<User | null> {
     const user = await this.usersRepository.findOneBy({ ftId })
-    if (user == null) throw new BadRequestException('User not exist')
+    if (user == null) return null
     user.lastAccess = Date.now()
     if (user.status === 'offline') user.status = 'online'
     await this.update(user, user)