Merge pull request #87 from teamterning/feat/#82

[🔨fix/#82]: 필터릴 재설정 로직 수정
teamterning · Jul 18, 2024 · 5d49776 · 5d49776
2 parents 0b9bb07 + 6679fc3
commit 5d49776
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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,14 +34,23 @@ 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()),
                     WorkingPeriod.fromKey(responseDto.workingPeriod()),
                     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);
         }
     }