Skip to content

Commit c191f6e

Browse files
yuseok0215yuseok0215
committed
chore: merge develop
2 parents 08d314f + 0979b26 commit c191f6e

9 files changed

Lines changed: 41 additions & 69 deletions

File tree

‎src/main/java/bitnagil/bitnagil_backend/emotionMarble/domain/EmotionMarble.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,9 @@
2323
@Where(clause = "deleted_at IS NULL")
2424
public class EmotionMarble extends BaseTimeEntity {
2525

26-
@EmbeddedId
27-
@AttributeOverrides({
28-
@AttributeOverride(name = "id", column = @Column(name = "emotion_marble_id")),
29-
@AttributeOverride(name = "historySeq", column = @Column(name = "history_seq"))
30-
})
31-
private HistoryPk emotionMarblePk;
26+
@Id
27+
@GeneratedValue(strategy = GenerationType.IDENTITY)
28+
private Long emotionMarbleId;
3229

3330
@NotNull
3431
@Enumerated(EnumType.STRING)
@@ -52,9 +49,8 @@ public class EmotionMarble extends BaseTimeEntity {
5249
private Case resultCase;
5350

5451
@Builder
55-
public EmotionMarble(HistoryPk emotionMarblePk, EmotionMarbleType emotionMarbleType, LocalDate date, Long userId,
52+
public EmotionMarble(EmotionMarbleType emotionMarbleType, LocalDate date, Long userId,
5653
LocalDateTime historyStartDateTime, LocalDateTime historyEndDateTime, Case resultCase) {
57-
this.emotionMarblePk = emotionMarblePk;
5854
this.emotionMarbleType = emotionMarbleType;
5955
this.date = date;
6056
this.userId = userId;

‎src/main/java/bitnagil/bitnagil_backend/emotionMarble/service/EmotionMarbleFactory.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ public EmotionMarble createTodayEmotionMarble(User user, RegisterEmotionMarbleRe
2424
LocalDateTime nowDateTime, LocalDateTime endDateTime) {
2525

2626
return EmotionMarble.builder()
27-
.emotionMarblePk(new HistoryPk(UUID.randomUUID(), 1L))
2827
.emotionMarbleType(request.getEmotionMarbleType())
2928
.date(nowDate)
3029
.userId(user.getUserId())

‎src/main/java/bitnagil/bitnagil_backend/routine/repository/RoutineCompletionRepository.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
public interface RoutineCompletionRepository extends JpaRepository<RoutineCompletion, Long> {
1313

14-
RoutineCompletion findByRoutineIdAndRoutineHistorySeqAndRoutineType(
15-
UUID routineId, Long routineHistorySeq, RoutineType routineType);
14+
RoutineCompletion findByRoutineIdAndPerformedDateAndRoutineHistorySeqAndRoutineType(
15+
UUID routineId, LocalDate performedDate, Long routineHistorySeq, RoutineType routineType);
1616

1717
Optional<RoutineCompletion> findByPerformedDateAndRoutineIdAndRoutineHistorySeqAndRoutineType(
1818
LocalDate performedDate, UUID routineId, Long routineHistorySeq, RoutineType routineType);

‎src/main/java/bitnagil/bitnagil_backend/routine/service/RoutineService.java‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
import bitnagil.bitnagil_backend.changedRoutine.repository.ChangedRoutineRepository;
1616
import bitnagil.bitnagil_backend.changedRoutine.repository.ChangedSubRoutineRepository;
1717
import bitnagil.bitnagil_backend.emotionMarble.repository.EmotionMarbleRepository;
18-
import bitnagil.bitnagil_backend.global.entity.HistoryPk;
19-
import bitnagil.bitnagil_backend.global.utils.TimeUtils;
2018
import bitnagil.bitnagil_backend.routine.domain.RoutineCompletion;
2119
import bitnagil.bitnagil_backend.routine.domain.enums.RoutineType;
2220
import bitnagil.bitnagil_backend.routine.repository.RoutineCompletionRepository;
@@ -234,8 +232,9 @@ public void updateRoutineCompletionStatus(User user, UpdateRoutineCompletionRequ
234232

235233
// 기존 완료 여부 엔티티가 존재하는지 조회
236234
RoutineCompletion existingRoutineCompletion = routineCompletionRepository
237-
.findByRoutineIdAndRoutineHistorySeqAndRoutineType(
235+
.findByRoutineIdAndPerformedDateAndRoutineHistorySeqAndRoutineType(
238236
routineCompletionInfo.getRoutineId(),
237+
request.getPerformedDate(),
239238
routineCompletionInfo.getHistorySeq(),
240239
routineCompletionInfo.getRoutineType());
241240

@@ -337,9 +336,11 @@ private void applyChangedRoutines(List<ChangedRoutine> changedRoutines,
337336

338337
// 변경 서브 루틴완료 여부를 파악
339338
RoutineCompletion changedSubRoutineCompletion =
340-
routineCompletionRepository.findByRoutineIdAndRoutineHistorySeqAndRoutineType(
339+
routineCompletionRepository.findByRoutineIdAndPerformedDateAndRoutineHistorySeqAndRoutineType(
341340
changedSubRoutine.getChangedSubRoutinePk().getId(),
342-
changedSubRoutine.getChangedSubRoutinePk().getHistorySeq(), RoutineType.CHANGED_SUB_ROUTINE);
341+
changedRoutineDate,
342+
changedSubRoutine.getChangedSubRoutinePk().getHistorySeq(),
343+
RoutineType.CHANGED_SUB_ROUTINE);
343344

344345
SubRoutineSearchResultDto changedSubRoutineSearchResultDto =
345346
routineMapper.toChangedSubRoutineSearchResultDto(changedSubRoutine, changedSubRoutineCompletion);
@@ -351,9 +352,11 @@ private void applyChangedRoutines(List<ChangedRoutine> changedRoutines,
351352

352353
// 변경루틴 완료여부 조회
353354
RoutineCompletion changedRoutineCompletion =
354-
routineCompletionRepository.findByRoutineIdAndRoutineHistorySeqAndRoutineType(
355+
routineCompletionRepository.findByRoutineIdAndPerformedDateAndRoutineHistorySeqAndRoutineType(
355356
changedRoutine.getChangedRoutinePk().getId(),
356-
changedRoutine.getChangedRoutinePk().getHistorySeq(), RoutineType.CHANGED_ROUTINE);
357+
changedRoutineDate,
358+
changedRoutine.getChangedRoutinePk().getHistorySeq(),
359+
RoutineType.CHANGED_ROUTINE);
357360

358361
RoutineSearchResultDto changedRoutineSearchResultDto = routineMapper.toChangedRoutineSearchResultDto(
359362
changedRoutine, changedSubRoutineSearchResultList, changedRoutineCompletion);
@@ -389,8 +392,9 @@ private Map<LocalDate, List<RoutineSearchResultDto>> buildRoutinesGroupedByDate(
389392

390393
// 서브 루틴 완료 여부 조회
391394
RoutineCompletion subRoutineCompletion =
392-
routineCompletionRepository.findByRoutineIdAndRoutineHistorySeqAndRoutineType(
395+
routineCompletionRepository.findByRoutineIdAndPerformedDateAndRoutineHistorySeqAndRoutineType(
393396
subRoutine.getSubRoutinePk().getId(),
397+
date,
394398
subRoutine.getSubRoutinePk().getHistorySeq(),
395399
RoutineType.SUB_ROUTINE);
396400

@@ -404,8 +408,12 @@ private Map<LocalDate, List<RoutineSearchResultDto>> buildRoutinesGroupedByDate(
404408
subRoutineSearchResultList.sort((a, b) -> a.getSortOrder().compareTo(b.getSortOrder()));
405409

406410
// 루틴 완료 여부 조회
407-
RoutineCompletion routineCompletion = routineCompletionRepository.findByRoutineIdAndRoutineHistorySeqAndRoutineType(
408-
routine.getRoutinePk().getId(), routine.getRoutinePk().getHistorySeq(), RoutineType.ROUTINE);
411+
RoutineCompletion routineCompletion =
412+
routineCompletionRepository.findByRoutineIdAndPerformedDateAndRoutineHistorySeqAndRoutineType(
413+
routine.getRoutinePk().getId(),
414+
date,
415+
routine.getRoutinePk().getHistorySeq(),
416+
RoutineType.ROUTINE);
409417

410418
RoutineSearchResultDto routineSearchResultDto =
411419
routineMapper.toRoutineSearchResultDto(routine, subRoutineSearchResultList, routineCompletion);

‎src/main/java/bitnagil/bitnagil_backend/user/controller/UserAuthController.java‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
import bitnagil.bitnagil_backend.user.request.UserLoginRequest;
55
import org.springframework.web.bind.annotation.*;
66

7-
import bitnagil.bitnagil_backend.user.response.UserLoginResponse;
7+
import bitnagil.bitnagil_backend.user.response.UserTokenResponse;
88
import bitnagil.bitnagil_backend.global.annotation.CurrentUser;
99
import bitnagil.bitnagil_backend.user.controller.spec.UserAuthSpec;
1010
import bitnagil.bitnagil_backend.user.domain.User;
11-
import bitnagil.bitnagil_backend.user.response.UserReissueResponse;
1211
import bitnagil.bitnagil_backend.user.service.UserAuthService;
1312
import bitnagil.bitnagil_backend.global.response.CustomResponseDto;
1413
import lombok.RequiredArgsConstructor;
@@ -20,16 +19,16 @@ public class UserAuthController implements UserAuthSpec {
2019
private final UserAuthService userAuthService;
2120

2221
@PostMapping("/login")
23-
public CustomResponseDto<UserLoginResponse> login(
22+
public CustomResponseDto<UserTokenResponse> login(
2423
@RequestBody UserLoginRequest userLoginRequest,
2524
@RequestHeader("SocialAccessToken") String socialAccessToken) {
2625

27-
UserLoginResponse userLoginResponse = userAuthService.socialLogin(
26+
UserTokenResponse userTokenResponse = userAuthService.socialLogin(
2827
userLoginRequest.getSocialType(),
2928
userLoginRequest.getNickname(),
3029
socialAccessToken);
3130

32-
return CustomResponseDto.from(userLoginResponse);
31+
return CustomResponseDto.from(userTokenResponse);
3332
}
3433

3534
@PostMapping("/logout")
@@ -40,10 +39,8 @@ public CustomResponseDto<Object> logout(@CurrentUser User user) {
4039
}
4140

4241
@PostMapping("/token/reissue")
43-
public CustomResponseDto<UserReissueResponse> reissueToken(@RequestHeader("Refresh-Token") String refreshToken) {
44-
UserReissueResponse userReissueResponse = userAuthService.reissueToken(refreshToken);
45-
46-
return CustomResponseDto.from(userReissueResponse);
42+
public CustomResponseDto<UserTokenResponse> reissueToken(@RequestHeader("Refresh-Token") String refreshToken) {
43+
return CustomResponseDto.from(userAuthService.reissueToken(refreshToken));
4744
}
4845

4946
@PostMapping("/withdrawal")

‎src/main/java/bitnagil/bitnagil_backend/user/controller/spec/UserAuthSpec.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@
33
import bitnagil.bitnagil_backend.user.request.UserAgreementsRequest;
44
import bitnagil.bitnagil_backend.user.request.UserLoginRequest;
55

6-
import bitnagil.bitnagil_backend.user.response.UserLoginResponse;
6+
import bitnagil.bitnagil_backend.user.response.UserTokenResponse;
77
import bitnagil.bitnagil_backend.global.errorcode.ErrorCode;
88
import bitnagil.bitnagil_backend.global.response.CustomResponseDto;
99
import bitnagil.bitnagil_backend.global.swagger.ApiErrorCodeExamples;
1010
import bitnagil.bitnagil_backend.global.swagger.ApiTags;
1111
import bitnagil.bitnagil_backend.user.domain.User;
12-
import bitnagil.bitnagil_backend.user.response.UserReissueResponse;
1312
import io.swagger.v3.oas.annotations.Operation;
1413
import io.swagger.v3.oas.annotations.Parameter;
1514
import io.swagger.v3.oas.annotations.Parameters;
@@ -31,7 +30,7 @@ public interface UserAuthSpec {
3130
@Parameter(name = "SocialAccessToken", description = "소셜로그인 플랫폼에서 발급해준 access token 입니다.(Bearer를 붙히지 않습니다.)", required = true,
3231
example = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9", in = ParameterIn.HEADER),
3332
})
34-
CustomResponseDto<UserLoginResponse> login(UserLoginRequest userLoginRequest,
33+
CustomResponseDto<UserTokenResponse> login(UserLoginRequest userLoginRequest,
3534
String socialAccessToken);
3635

3736

@@ -50,7 +49,7 @@ CustomResponseDto<UserLoginResponse> login(UserLoginRequest userLoginRequest,
5049
@Parameter(name = "Refresh-Token", description = "서버에서 발급해준 refresh token 입니다.(Bearer를 붙히지 않습니다.)", required = true,
5150
example = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9", in = ParameterIn.HEADER)
5251
})
53-
CustomResponseDto<UserReissueResponse> reissueToken(String refreshToken);
52+
CustomResponseDto<UserTokenResponse> reissueToken(String refreshToken);
5453

5554

5655
@Operation(summary = "소셜로그인으로 연결된 유저가 회원탈퇴합니다. 반환 정보는 없습니다.")

‎src/main/java/bitnagil/bitnagil_backend/user/response/UserReissueResponse.java‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

src/main/java/bitnagil/bitnagil_backend/user/response/UserLoginResponse.java renamed to src/main/java/bitnagil/bitnagil_backend/user/response/UserTokenResponse.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
@Getter
1414
@AllArgsConstructor
1515
@Builder
16-
public class UserLoginResponse {
16+
public class UserTokenResponse {
1717
@NotEmpty
1818
private String accessToken;
1919

@@ -23,8 +23,8 @@ public class UserLoginResponse {
2323
@NotEmpty
2424
private Role role;
2525

26-
public static UserLoginResponse of(Token token, Role role) {
27-
return UserLoginResponse.builder()
26+
public static UserTokenResponse of(Token token, Role role) {
27+
return UserTokenResponse.builder()
2828
.accessToken(token.getAccessToken())
2929
.refreshToken(token.getRefreshToken())
3030
.role(role)

‎src/main/java/bitnagil/bitnagil_backend/user/service/UserAuthService.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@
1818
import bitnagil.bitnagil_backend.global.exception.CustomException;
1919
import bitnagil.bitnagil_backend.user.repository.UserRepository;
2020
import bitnagil.bitnagil_backend.enums.SocialType;
21-
import bitnagil.bitnagil_backend.user.response.UserLoginResponse;
21+
import bitnagil.bitnagil_backend.user.response.UserTokenResponse;
2222
import bitnagil.bitnagil_backend.user.domain.User;
2323
import bitnagil.bitnagil_backend.enums.Role;
2424
import bitnagil.bitnagil_backend.user.domain.UserAuthInfo;
25-
import bitnagil.bitnagil_backend.user.response.UserReissueResponse;
2625
import lombok.RequiredArgsConstructor;
2726

2827
/**
@@ -42,20 +41,20 @@ public class UserAuthService {
4241

4342
// 소셜 로그인을 통해 로그인 혹은 회원가입을 진행
4443
@Transactional
45-
public UserLoginResponse socialLogin(SocialType socialType, String nickname, String socialAccessToken) {
44+
public UserTokenResponse socialLogin(SocialType socialType, String nickname, String socialAccessToken) {
4645

4746
UserAuthInfo userAuthInfo = getUserAuthInfo(socialType, socialAccessToken);
4847

4948
User user = signUpOrLogin(socialType, nickname, userAuthInfo);
5049

5150
Token token = jwtUtil.generateToken(user.getUserId());
5251

53-
return UserLoginResponse.of(token, user.getRole());
52+
return UserTokenResponse.of(token, user.getRole());
5453
}
5554

5655
// refreshToken으로 accessToken 재발행
5756
@Transactional
58-
public UserReissueResponse reissueToken(String refreshToken) {
57+
public UserTokenResponse reissueToken(String refreshToken) {
5958

6059
if (!jwtUtil.validateToken(refreshToken)) {
6160
throw new CustomException(ErrorCode.INVALID_JWT_TOKEN);
@@ -72,7 +71,7 @@ public UserReissueResponse reissueToken(String refreshToken) {
7271

7372
Token token = jwtUtil.generateToken(user.getUserId());
7473

75-
return UserReissueResponse.of(token);
74+
return UserTokenResponse.of(token, user.getRole());
7675
}
7776

7877
// refreshToken 삭제 및 카카오 토큰 무효화

0 commit comments

Comments
 (0)