Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[fix] answer 분기처리 수정 #97

Merged
merged 1 commit into from
Jun 7, 2024
Merged

[fix] answer 분기처리 수정 #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/main/java/com/telepigeon/server/repository/AnswerRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ List<Answer> findAllByProfileInAndCreatedAtBetweenOrderByCreatedAt(

Boolean existsByQuestion(Question question);

Boolean existsByProfile(Profile profile);

@Query(value="select new com.telepigeon.server.dto.answer.RankAnswerDto(a.question.keyword, avg(a.emotion)) " +
"from Answer a where a.profile = :profile and a.question.keyword is not null and a.createdAt between :startTime and :endTime " +
"group by a.question.keyword order by avg(a.emotion) desc")
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/telepigeon/server/service/answer/AnswerRetriever.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ public Answer findFirstByProfile(final Profile profile){
);
}

public boolean existsByProfile(final Profile profile){
return answerRepository.existsByProfile(profile);
}

public Answer findByQuestion(final Question question){
return answerRepository.findByQuestion(question)
.orElseThrow(
Expand Down
8 changes: 3 additions & 5 deletions src/main/java/com/telepigeon/server/service/room/RoomService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,11 @@ public RoomListDto.RoomDto createRoomDto(final User user, final Room room) {
);
}
Profile opponentProfile = profileRetriever.findByUserNotAndRoom(user, room);
Answer myAnswer = answerRetriever.findFirstByProfile(myProfile);
Answer opponentAnswer = answerRetriever.findFirstByProfile(opponentProfile);
String opponentRelation = opponentProfile.getRelation() != null ? opponentProfile.getRelation().getContent() : "-";
boolean myState = myAnswer.getContent() != null;
boolean opponentState = opponentAnswer.getContent() != null;
boolean myState = answerRetriever.existsByProfile(myProfile);
boolean opponentState = answerRetriever.existsByProfile(opponentProfile);

// 감정 측정 시 업데이트
// 감정 측정 시 업데이트
emotion = getEmotion(opponentProfile.getEmotion());

if (myState && opponentState) {
Expand Down
Loading