diff --git a/README.md b/README.md index d81cf0d7..8c14a401 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ ## 🌸 금μͺ½μ΄λ“€ | 이동섭 | λ°•μ˜ˆμ€€ | | :----------------------------------------------------------: |:----------------------------------------------------------------------------------------------------------------------------------:| -| | | +| | | | [ddongseop](https://github.com/ddongseop) | [jun02160](https://github.com/jun02160) | ## πŸ‘» Role diff --git a/src/main/java/sopt/org/umbbaServer/domain/qna/service/QnAService.java b/src/main/java/sopt/org/umbbaServer/domain/qna/service/QnAService.java index 18bf46d4..e5bd4979 100644 --- a/src/main/java/sopt/org/umbbaServer/domain/qna/service/QnAService.java +++ b/src/main/java/sopt/org/umbbaServer/domain/qna/service/QnAService.java @@ -59,7 +59,10 @@ public GetInvitationResponseDto getInvitation(Long userId) { if (matchUser.isEmpty()) { return invitation(userId); } - if (matchUser.get().getSocialPlatform().equals(SocialPlatform.WITHDRAW)) { + else if (matchUser.get().getUsername() == null) { + return invitation(userId); + } + else if (matchUser.get().getSocialPlatform().equals(SocialPlatform.WITHDRAW)) { return withdrawUser(); } @@ -131,7 +134,7 @@ public void filterFirstQuestion(Long userId, List onboardingAnswerString // 첫번째 μ§ˆλ¬Έμ€ MVP λ‹¨μ—μ„œλŠ” κ³ μ • QnA newQnA = QnA.builder() - .question(questionRepository.findById(1L/* μˆ˜μ • ν•„μš” */).get()) // TODO μ˜ˆμ™Έμ²˜λ¦¬ ν•„μš” + .question(questionRepository.findByType(FIX).get(0)) .isParentAnswer(false) .isChildAnswer(false) .build();