-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feature/BE/415/get-user-info #441
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
21d29cf
get-user-info endpoint
tacettinburakeren 3ab5f8c
get-user-info endpoint fixed
tacettinburakeren 5c1bfa1
get-user-info fixed some issues
tacettinburakeren eaf6c79
some issues fixed
tacettinburakeren cde30cb
conflicts fixed
tacettinburakeren 53dd754
Merge branch 'development' into feature/BE/415/get-user-info
tacettinburakeren d8e980a
fixed some bugs
tacettinburakeren File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
import { ApiProperty } from '@nestjs/swagger'; | ||
import { IsString } from 'class-validator'; | ||
|
||
export class GetUserInfoDto { | ||
@ApiProperty({ | ||
example: '1', | ||
}) | ||
@IsString() | ||
id: string; | ||
} |
11 changes: 11 additions & 0 deletions
11
ludos/backend/src/dtos/user/response/get-user-info-response.dto.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
import { ApiProperty } from '@nestjs/swagger'; | ||
import { Game } from '../../../entities/game.entity'; | ||
|
||
export class GetUserInfoResponseDto { | ||
@ApiProperty() | ||
username: string; | ||
@ApiProperty() | ||
email: string; | ||
@ApiProperty() | ||
followedGames: Game[]; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,6 +23,7 @@ import { EditUserInfoDto } from '../dtos/user/request/edit-info.dto'; | |
import { Payload } from '../interfaces/user/payload.interface'; | ||
import { ResetPasswordRepository } from '../repositories/reset-password.repository'; | ||
import { UserRepository } from '../repositories/user.repository'; | ||
import { GetUserInfoResponseDto } from '../dtos/user/response/get-user-info-response.dto'; | ||
|
||
@Injectable() | ||
export class UserService { | ||
|
@@ -31,7 +32,7 @@ export class UserService { | |
private readonly resetPasswordRepository: ResetPasswordRepository, | ||
private readonly jwtService: JwtService, | ||
private readonly configService: ConfigService, | ||
) {} | ||
) {} | ||
|
||
public async register(input: RegisterDto): Promise<RegisterResponseDto> { | ||
try { | ||
|
@@ -187,4 +188,18 @@ export class UserService { | |
let updated = Object.assign(user, editInfoDto); | ||
await this.userRepository.save(updated); | ||
} | ||
|
||
public async getUserInfo(userId: string): Promise<GetUserInfoResponseDto> { | ||
const user = await this.userRepository.findUserByIdWithRelations(userId); | ||
if (!user) { | ||
throw new NotFoundException('User not found'); | ||
} | ||
|
||
const response = new GetUserInfoResponseDto(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Recently added user fields should be added also. These are not enough. |
||
response.email = user.email; | ||
response.username = user.username; | ||
response.followedGames = user.followedGames; | ||
|
||
return response; | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would be better if the user with all relations is fetched in one query since we will have additional relations. You can check this