Bug fixes after 634 #623
Merged
Bug fixes after 634 #623
Conversation
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
First pull request to Master
Deployment changes
Merge release to master
Merge from release into master
Merge release to master
Merge release to master
Merge release into master
Merge release into master
Merge Release into Master
Merge Release into Master
Merge develop into release
Merge develop into release
refresh_token_logic
fields for user, response statuses
coockie settings
cookie domain
added new endpoints
refresh token test
Formatting "publishAt"
merging develop to release
merging develop to release
merging develop to release
logging: develop -> release
merge develop -> realese
develop -> release, log refactor
Merge develop to release
* Implement user account activation logic without tests, they will be in next commits * Return port 5432 to docker compose file * Made changes regarding comments * Made changes regarding comments * Delete rewrite (#616) * Refactored deleteById method * Fixed style errors * Tests are ready to go * Refactored deleteById method * Fixed style errors * Tests are ready to go * Added eventPublisher for deleteById method * Added method to change status * Change user methods to work with authorId (#617) * Change everywhere we use userId to AuthorId and then add logic to get userEntity from authorEntity, change some dtos * Change tests to new version of code * Change tests to new version of code * Change tests to new version of code * test * test * test * Delete rewrite (#616) * Refactored deleteById method * Fixed style errors * Tests are ready to go * Refactored deleteById method * Fixed style errors * Tests are ready to go * Added eventPublisher for deleteById method * Added method to change status * Change everywhere we use userId to AuthorId and then add logic to get userEntity from authorEntity, change some dtos * Change tests to new version of code * Change tests to new version of code * Change tests to new version of code * test * test * test * Add join author id to all queries that returns user information --------- Co-authored-by: VadimasikKPI <fhghvhg314@gmail.com> Co-authored-by: Voloshkevych <59647995+Voloshkevych@users.noreply.github.com> --------- Co-authored-by: VadimasikKPI <fhghvhg314@gmail.com> Co-authored-by: Voloshkevych <59647995+Voloshkevych@users.noreply.github.com>
V-Kaidash
reviewed
Nov 15, 2023
| + "U.phone, U.created_at, U.avatar,U.enabled,U.role_id, U.edited_at, " | ||
| + "U.public_email, D.author_id as \"user_id\" from USERS U\n" | ||
| + "JOIN AUTHORS D ON U.user_id=D.user_id") | ||
| value = "SELECT U.* from USERS U\n") |
There was a problem hiding this comment.
Suggested change
| value = "SELECT U.* from USERS U\n") | |
| value = "SELECT U.* from USERS U") |
| @@ -97,7 +97,11 @@ public Page<UserEntity> findAll(Pageable pageable) { | |||
| */ | |||
| @Override | |||
| public UserDTO findExpertById(Integer userId) { | |||
| return userMapper.toUserDTO(userRepository.findById(userId).orElse(null)); | |||
| AuthorEntity author = authorRepository.findById(userId).orElse(null); | |||
There was a problem hiding this comment.
Suggested change
| AuthorEntity author = authorRepository.findById(userId).orElse(null); | |
| AuthorEntity author = authorRepository.findById(userId).orElseThrow(() -> new EntityNotFoundException("Author not found"));; |
And you can remove if-statement.
This is a more concise way to achieve the same outcome.
| if (author == null) { | ||
| throw new EntityNotFoundException("Author not found"); | ||
| } | ||
| return userMapper.toUserDTO(userRepository.findById(author.getProfile().getId()).orElse(null)); |
There was a problem hiding this comment.
It's not a good practice to return null value. Try to avoid such cases if possible.
There was a problem hiding this comment.
Is it good to also throw EntityNotFoundException in this case like in previous one to avoid null returning?
There was a problem hiding this comment.
It's definitely better than returning null.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
develop
GitHub Board
Issue link
#11 Issue name
Story link
#11 Story
Code reviewers
Summary of issue
Summary of change