Browse Source

revert findUser

revert findUser
master
nicolas-arnaud 2 years ago
parent
commit
7749817794
  1. 2
      back/volume/src/chat/message.service.ts
  2. 3
      back/volume/src/users/users.controller.ts
  3. 4
      back/volume/src/users/users.service.ts

2
back/volume/src/chat/message.service.ts

@ -22,7 +22,7 @@ export class MessageService {
const msg = new Message() const msg = new Message()
msg.text = message.text msg.text = message.text
msg.channel = await this.channelService.getChannel(message.ChannelId) 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 = '' msg.author.socketKey = ''
return await this.MessageRepository.save(msg) return await this.MessageRepository.save(msg)
} }

3
back/volume/src/users/users.controller.ts

@ -212,9 +212,10 @@ export class UsersController {
async updateUser ( async updateUser (
@Body() payload: UserDto, @Body() payload: UserDto,
@Profile42() profile: Profile @Profile42() profile: Profile
): Promise<void> { ): Promise<User> {
const user = await this.usersService.findUser(profile.id) const user = await this.usersService.findUser(profile.id)
if (user == null) throw new BadRequestException('User not found.') if (user == null) throw new BadRequestException('User not found.')
await this.usersService.update(user, payload) await this.usersService.update(user, payload)
return user
} }
} }

4
back/volume/src/users/users.service.ts

@ -55,9 +55,9 @@ export class UsersService {
await this.getLeaderboard() await this.getLeaderboard()
} }
async findUser (ftId: number): Promise<User> { async findUser (ftId: number): Promise<User | null> {
const user = await this.usersRepository.findOneBy({ ftId }) 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() user.lastAccess = Date.now()
if (user.status === 'offline') user.status = 'online' if (user.status === 'offline') user.status = 'online'
await this.update(user, user) await this.update(user, user)

Loading…
Cancel
Save