этап 3 #3
Open
этап 3 #3
Conversation
This file contains hidden or 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
ErkinKasymaliev
suggested changes
Sep 19, 2024
| @Setter | ||
| @AllArgsConstructor | ||
| @NoArgsConstructor | ||
| public class Mark { |
There was a problem hiding this comment.
лучше Rate - семантически вернее будет, следовательно надо везде поменять RateService, RateRepo ...
| @Transactional | ||
| public void deleteMark(int userId, int eventId) { | ||
| Mark mark = markRepository.findOneByEvaluator_IdAndEvent_Id(userId, eventId); | ||
| ; |
| public void deleteMark(int userId, int eventId) { | ||
| Mark mark = markRepository.findOneByEvaluator_IdAndEvent_Id(userId, eventId); | ||
| ; | ||
| if (mark != null) { |
There was a problem hiding this comment.
if (mark == null) {
return;
}
Event event = eventService.getEvent(eventId);
User initiator = userService.getUser(event.getInitiator().getId());
...
main-service/src/main/java/ru/practicum/mainservice/model/mark/Mark.java
Outdated
Show resolved
Hide resolved
| @Transactional | ||
| public void putMark(int userId, int eventId, Boolean score) { | ||
| Mark mark = markRepository.findOneByEvaluator_IdAndEvent_Id(userId, eventId); | ||
| ; |
| initiator.setRating(initiator.getRating() + Constants.CHANGING_RATING_WHEN_CHANGING_MARK); | ||
| } | ||
| mark.setScore(score); | ||
| eventService.save(event); |
There was a problem hiding this comment.
eventService.save(event);
markRepository.save(mark);
userService.saveUser(initiator);
это дублируется в else.
давайте вынесем за if-else в конец метода
ErkinKasymaliev
approved these changes
Sep 19, 2024
ErkinKasymaliev
left a comment
ErkinKasymaliev
left a comment
There was a problem hiding this comment.
поправьте комменты (они стилистические) и можете мержить.
Работа принята!
Поздравляю вас с окончанием курса! Скорейшего вам выхода на коммерческую разработку и стремительного роста!
| } | ||
|
|
||
| @Transactional | ||
| public void putMark(int userId, int eventId, Boolean score) { |
| } | ||
|
|
||
| @Transactional | ||
| public void deleteMark(int userId, int eventId) { |
| public void putMark(int userId, int eventId, Boolean score) { | ||
| Mark mark = markRepository.findOneByEvaluator_IdAndEvent_Id(userId, eventId); | ||
| ; | ||
| Rate mark = rateRepository.findOneByEvaluator_IdAndEvent_Id(userId, eventId); |
There was a problem hiding this comment.
Rate rate уберите отовсюду mark
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
No description provided.