diff --git a/src/main/java/org/terning/terningserver/domain/Filter.java b/src/main/java/org/terning/terningserver/domain/Filter.java index cf123c8..d4e6cbf 100644 --- a/src/main/java/org/terning/terningserver/domain/Filter.java +++ b/src/main/java/org/terning/terningserver/domain/Filter.java @@ -33,10 +33,12 @@ public class Filter { private int startMonth; // 근무 시작 월 + public void updateFilter(Grade grade, WorkingPeriod workingPeriod, int startYear, int startMonth) { this.grade = grade; this.workingPeriod = workingPeriod; this.startYear = startYear; this.startMonth = startMonth; } + } diff --git a/src/main/java/org/terning/terningserver/domain/User.java b/src/main/java/org/terning/terningserver/domain/User.java index 773bc73..6abd6ed 100644 --- a/src/main/java/org/terning/terningserver/domain/User.java +++ b/src/main/java/org/terning/terningserver/domain/User.java @@ -83,4 +83,5 @@ public void updateUser(AuthType authType, String authId, User user) { this.authId = authId; this.refreshToken = user.getRefreshToken(); } + } diff --git a/src/main/java/org/terning/terningserver/service/FilterServiceImpl.java b/src/main/java/org/terning/terningserver/service/FilterServiceImpl.java index f6a2d96..c1cc974 100644 --- a/src/main/java/org/terning/terningserver/service/FilterServiceImpl.java +++ b/src/main/java/org/terning/terningserver/service/FilterServiceImpl.java @@ -11,6 +11,7 @@ import org.terning.terningserver.dto.filter.request.UserFilterRequestDto; import org.terning.terningserver.dto.filter.response.UserFilterResponseDto; import org.terning.terningserver.exception.CustomException; +import org.terning.terningserver.repository.filter.FilterRepository; import org.terning.terningserver.repository.user.UserRepository; import static org.terning.terningserver.exception.enums.ErrorMessage.NOT_FOUND_USER_EXCEPTION; @@ -21,6 +22,7 @@ public class FilterServiceImpl implements FilterService { private final UserRepository userRepository; + private final FilterRepository filterRepository; @Override public UserFilterResponseDto getUserFilter(Long userId) { @@ -32,7 +34,6 @@ public UserFilterResponseDto getUserFilter(Long userId) { public void updateUserFilter(UserFilterRequestDto responseDto, Long userId) { User user = findUser(userId); Filter filter = user.getFilter(); - System.out.println("filter = " + filter); if(filter != null){ filter.updateFilter( Grade.fromKey(responseDto.grade()), @@ -40,6 +41,16 @@ public void updateUserFilter(UserFilterRequestDto responseDto, Long userId) { responseDto.startYear(), responseDto.startMonth() ); + } else { + Filter savedFilter = filterRepository.save( + Filter.builder() + .grade(Grade.fromKey(responseDto.grade())) + .workingPeriod(WorkingPeriod.fromKey(responseDto.workingPeriod())) + .startYear(responseDto.startYear()) + .startMonth(responseDto.startMonth()) + .build() + ); + user.assignFilter(savedFilter); } }