From a1e522c832262d82401cb4b6f9db17c8c300bdf1 Mon Sep 17 00:00:00 2001 From: transfer_kk Date: Thu, 18 Jan 2024 06:01:24 +0900 Subject: [PATCH 1/6] =?UTF-8?q?del=20-=20#74=20=EC=82=AC=EC=9A=A9=ED=95=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20onboardingInfoId=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/sopt/org/HMH/domain/user/domain/User.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 index 0540d231..12ac7103 100644 --- 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; } From 20cf4b432793b102e013dc1b1265a1a65efaf74d Mon Sep 17 00:00:00 2001 From: transfer_kk Date: Thu, 18 Jan 2024 06:03:07 +0900 Subject: [PATCH 2/6] =?UTF-8?q?del=20-=20#74=20=EC=82=AC=EC=9A=A9=ED=95=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20=ED=95=A8=EC=88=98=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HMH/domain/challenge/dto/response/ChallengeResponse.java | 4 ---- 1 file changed, 4 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 index 35e32acb..0a1e724a 100644 --- 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()); - } } \ No newline at end of file From 215aa7144ee49e7299ffd9e7a37606fa36e58ed0 Mon Sep 17 00:00:00 2001 From: transfer_kk Date: Thu, 18 Jan 2024 06:03:41 +0900 Subject: [PATCH 3/6] =?UTF-8?q?feat=20-=20#74=20problem=20repository=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/HMH/domain/user/repository/ProblemRepository.java | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/main/java/sopt/org/HMH/domain/user/repository/ProblemRepository.java 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 new file mode 100644 index 00000000..f724a0b3 --- /dev/null +++ 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 { +} From 8c33bf2105a4a2a2967c5e65ebefcab8f3720554 Mon Sep 17 00:00:00 2001 From: transfer_kk Date: Thu, 18 Jan 2024 06:04:20 +0900 Subject: [PATCH 4/6] =?UTF-8?q?fix=20-=20#74=20=ED=9A=8C=EC=9B=90=20?= =?UTF-8?q?=EA=B0=80=EC=9E=85=EC=8B=9C=20=EB=AC=B8=EC=A0=9C=20=EC=9D=B8?= =?UTF-8?q?=EC=8B=9D=20=EC=A0=95=EB=B3=B4=20=EC=A0=80=EC=9E=A5=EB=90=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HMH/domain/user/service/UserService.java | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) 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 index 063625b9..b88652a2 100644 --- 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,10 @@ 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 +17,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 +37,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 +171,18 @@ private String validateName(String name) { } private void registerOnboardingInfo(SocialSignUpRequest request) { - List problemList = new ArrayList<>(); + OnboardingInfo onboardingInfo = OnboardingInfo.builder() + .averageUseTime(request.onboardingRequest().averageUseTime()) + .build(); + Long onboardingInfoId = onboardingInfoRepository.save(onboardingInfo).getId(); + for (String problem : request.onboardingRequest().problemList()) { - problemList.add( + problemRepository.save( OnboardingProblem.builder() + .onboardingInfoId(onboardingInfoId) .problem(problem) .build() ); } - - OnboardingInfo onboardingInfo = OnboardingInfo.builder() - .averageUseTime(request.onboardingRequest().averageUseTime()) - .build(); - onboardingInfoRepository.save(onboardingInfo); } } \ No newline at end of file From 71c6d7b3bd8ea3af8677fff4c3567b694fb03f2b Mon Sep 17 00:00:00 2001 From: transfer_kk Date: Thu, 18 Jan 2024 16:55:56 +0900 Subject: [PATCH 5/6] =?UTF-8?q?modify=20-=20#74=20saveAll=EC=9D=84=20?= =?UTF-8?q?=ED=86=B5=ED=95=9C=20=EC=84=B1=EB=8A=A5=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/HMH/domain/user/service/UserService.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) 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 index b88652a2..cebe7969 100644 --- 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,5 +1,6 @@ package sopt.org.HMH.domain.user.service; +import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -176,13 +177,11 @@ private void registerOnboardingInfo(SocialSignUpRequest request) { .build(); Long onboardingInfoId = onboardingInfoRepository.save(onboardingInfo).getId(); - for (String problem : request.onboardingRequest().problemList()) { - problemRepository.save( - OnboardingProblem.builder() - .onboardingInfoId(onboardingInfoId) - .problem(problem) - .build() - ); - } + List problemList = request.onboardingRequest().problemList().stream() + .map(problem -> OnboardingProblem.builder() + .onboardingInfoId(onboardingInfoId) + .problem(problem).build()) + .toList(); + problemRepository.saveAll(problemList); } } \ No newline at end of file From 6b96545ce58036a216ba17e098a0b4f4160add1a Mon Sep 17 00:00:00 2001 From: transfer_kk Date: Thu, 18 Jan 2024 17:20:18 +0900 Subject: [PATCH 6/6] =?UTF-8?q?fix=20-=20#74=20=EB=B3=91=ED=95=A9=20?= =?UTF-8?q?=EC=8B=9C=20=EB=B9=8C=EB=93=9C=20=EC=95=88=EB=90=98=EB=8A=94=20?= =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/sopt/org/HMH/domain/dummy/DummyAppController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/sopt/org/HMH/domain/dummy/DummyAppController.java b/src/main/java/sopt/org/HMH/domain/dummy/DummyAppController.java index fda70da6..c599deff 100644 --- a/src/main/java/sopt/org/HMH/domain/dummy/DummyAppController.java +++ b/src/main/java/sopt/org/HMH/domain/dummy/DummyAppController.java @@ -5,7 +5,7 @@ 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 @@ -13,9 +13,9 @@ @Deprecated public class DummyAppController { @GetMapping("/app") - public ResponseEntity> orderModifyDailyChallenge() { + public ResponseEntity> 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())); } }