Merge branch 'develop' of https://github.com/Team-Umbba/Umbba-Server …

…into feat/#67-demoday_test
Team-Umbba · Jul 19, 2023 · d4c211f · d4c211f
2 parents 6814c0b + 3317f12
commit d4c211f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 ## 🌸 금쪽이들
 |                             이동섭                             |                                                                박예준                                                                 |
 | :----------------------------------------------------------: |:----------------------------------------------------------------------------------------------------------------------------------:|
-| <img src="https://github.com/GOSOPT-CDS-TEAM7-DeskTop/Backend/assets/67463603/3c92f168-1ff0-42a4-a91f-9fbd11189d35" width="300"/> | <img src="https://user-images.githubusercontent.com/80024278/222954622-1c2da6cb-d1fe-4b0c-9eaa-cf5608d11e9c.jpeg" width="300"/> |
+| <img src="https://user-images.githubusercontent.com/80024278/254709711-99261fdf-9a96-48e3-abfd-21346143aa8c.png" width="300"/> | <img src="https://user-images.githubusercontent.com/80024278/254709696-8d5a2b63-1fca-4f70-8fcd-242a04a21be9.jpg" width="300"/> |
 |              [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
@@ -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<String> onboardingAnswerString
 
         // 첫번째 질문은 MVP 단에서는 고정
         QnA newQnA = QnA.builder()
-                .question(questionRepository.findById(1L/* 수정 필요 */).get()) // TODO 예외처리 필요
+                .question(questionRepository.findByType(FIX).get(0))
                 .isParentAnswer(false)
                 .isChildAnswer(false)
                 .build();