Merge pull request #78 from Team-HMH/fix/#74-fix-onboarding-info

fix - 회원 가입시 문제 인식 정보 입력되지 않는 오류 해결
Team-HMH · Jan 18, 2024 · d9e0012 · d9e0012
2 parents 4b88bc9 + 6b96545
commit d9e0012
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 23 deletions.
diff --git a/src/main/java/sopt/org/HMH/domain/challenge/dto/response/ChallengeResponse.java b/src/main/java/sopt/org/HMH/domain/challenge/dto/response/ChallengeResponse.java
@@ -40,8 +40,4 @@ public static ChallengeResponse of(Challenge challenge, String os) {
                         .toList())
                 .build();
     }
-
-    private static Integer calculateDaysSinceToday(LocalDateTime dateToCompare) {
-        return (int) ChronoUnit.DAYS.between(dateToCompare.toLocalDate(), LocalDateTime.now().toLocalDate());
-    }
 }
diff --git a/src/main/java/sopt/org/HMH/domain/dummy/DummyAppController.java b/src/main/java/sopt/org/HMH/domain/dummy/DummyAppController.java
@@ -5,17 +5,17 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import sopt.org.HMH.global.common.response.ApiResponse;
+import sopt.org.HMH.global.common.response.BaseResponse;
 
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/v1/dummy")
 @Deprecated
 public class DummyAppController {
     @GetMapping("/app")
-    public ResponseEntity<ApiResponse<?>> orderModifyDailyChallenge() {
+    public ResponseEntity<BaseResponse<?>> orderModifyDailyChallenge() {
         return ResponseEntity
                 .status(DummyAppSuccess.GET_DUMMY_SUCCESS.getHttpStatus())
-                .body(ApiResponse.success(DummyAppSuccess.GET_DUMMY_SUCCESS, DummyAppListResponse.of()));
+                .body(BaseResponse.success(DummyAppSuccess.GET_DUMMY_SUCCESS, DummyAppListResponse.of()));
     }
 }
diff --git a/src/main/java/sopt/org/HMH/domain/user/domain/User.java b/src/main/java/sopt/org/HMH/domain/user/domain/User.java
@@ -37,16 +37,14 @@ public class User extends BaseTimeEntity {
     @Column(columnDefinition = "TEXT")
     private String profileImageUrl;
 
-    private Long onboardingInfoId;
     private boolean isDeleted = false;
     private LocalDateTime deletedAt;
 
     @Builder
-    public User(SocialPlatform socialPlatform, String socialId, String name, Long onboardingInfoId) {
+    public User(SocialPlatform socialPlatform, String socialId, String name) {
         this.socialPlatform = socialPlatform;
         this.socialId = socialId;
         this.name = name;
-        this.onboardingInfoId = onboardingInfoId;
         this.point = UserConstants.INITIAL_POINT;
     }
 

diff --git a/src/main/java/sopt/org/HMH/domain/user/repository/ProblemRepository.java b/src/main/java/sopt/org/HMH/domain/user/repository/ProblemRepository.java
@@ -0,0 +1,7 @@
+package sopt.org.HMH.domain.user.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import sopt.org.HMH.domain.user.domain.OnboardingProblem;
+
+public interface ProblemRepository extends JpaRepository<OnboardingProblem, Long> {
+}
diff --git a/src/main/java/sopt/org/HMH/domain/user/service/UserService.java b/src/main/java/sopt/org/HMH/domain/user/service/UserService.java
@@ -1,14 +1,11 @@
 package sopt.org.HMH.domain.user.service;
 
-import java.util.ArrayList;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
-import sopt.org.HMH.domain.app.service.AppService;
 import sopt.org.HMH.domain.challenge.service.ChallengeService;
-import sopt.org.HMH.domain.dailychallenge.service.DailyChallengeService;
 import sopt.org.HMH.domain.user.domain.OnboardingInfo;
 import sopt.org.HMH.domain.user.domain.OnboardingProblem;
 import sopt.org.HMH.domain.user.domain.User;
@@ -21,6 +18,7 @@
 import sopt.org.HMH.domain.user.dto.response.ReissueResponse;
 import sopt.org.HMH.domain.user.dto.response.UserInfoResponse;
 import sopt.org.HMH.domain.user.repository.OnboardingInfoRepository;
+import sopt.org.HMH.domain.user.repository.ProblemRepository;
 import sopt.org.HMH.domain.user.repository.UserRepository;
 import sopt.org.HMH.global.auth.jwt.JwtProvider;
 import sopt.org.HMH.global.auth.jwt.JwtValidator;
@@ -40,6 +38,7 @@ public class UserService {
     private final JwtValidator jwtValidator;
     private final UserRepository userRepository;
     private final OnboardingInfoRepository onboardingInfoRepository;
+    private final ProblemRepository problemRepository;
     private final KakaoLoginService kakaoLoginService;
     private final ChallengeService challengeService;
     private final TokenService tokenService;
@@ -173,18 +172,16 @@ private String validateName(String name) {
     }
 
     private void registerOnboardingInfo(SocialSignUpRequest request) {
-        List<OnboardingProblem> problemList = new ArrayList<>();
-        for (String problem : request.onboardingRequest().problemList()) {
-            problemList.add(
-                    OnboardingProblem.builder()
-                            .problem(problem)
-                            .build()
-            );
-        }
-
         OnboardingInfo onboardingInfo = OnboardingInfo.builder()
                 .averageUseTime(request.onboardingRequest().averageUseTime())
                 .build();
-        onboardingInfoRepository.save(onboardingInfo);
+        Long onboardingInfoId = onboardingInfoRepository.save(onboardingInfo).getId();
+
+        List<OnboardingProblem> problemList = request.onboardingRequest().problemList().stream()
+                .map(problem ->  OnboardingProblem.builder()
+                        .onboardingInfoId(onboardingInfoId)
+                        .problem(problem).build())
+                .toList();
+        problemRepository.saveAll(problemList);
     }
 }