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

[🔨 fix/#82]: 필터링 재설정 로직 오류 수정
teamterning · Jul 18, 2024 · 0b9bb07 · 0b9bb07
2 parents 76a88a5 + 27bbd6a
commit 0b9bb07
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/main/java/org/terning/terningserver/controller/FilterController.java b/src/main/java/org/terning/terningserver/controller/FilterController.java
@@ -34,7 +34,7 @@ public ResponseEntity<SuccessResponse> updateUserFilter(
             @AuthenticationPrincipal Long userId,
             @RequestBody UserFilterRequestDto requestDto) {
         filterService.updateUserFilter(requestDto, userId);
-        return ResponseEntity.ok(SuccessResponse.of(SUCCESS_UPDATE_SCRAP));
+        return ResponseEntity.ok(SuccessResponse.of(SUCCESS_UPDATE_USER_FILTER));
     }
 
 }
diff --git a/src/main/java/org/terning/terningserver/service/FilterServiceImpl.java b/src/main/java/org/terning/terningserver/service/FilterServiceImpl.java
@@ -32,13 +32,15 @@ public UserFilterResponseDto getUserFilter(Long userId) {
     public void updateUserFilter(UserFilterRequestDto responseDto, Long userId) {
         User user = findUser(userId);
         Filter filter = user.getFilter();
-
-        filter.updateFilter(
-                Grade.fromKey(responseDto.grade()),
-                WorkingPeriod.fromKey(responseDto.workingPeriod()),
-                responseDto.startYear(),
-                responseDto.startMonth()
-        );
+        System.out.println("filter = " + filter);
+        if(filter != null){
+            filter.updateFilter(
+                    Grade.fromKey(responseDto.grade()),
+                    WorkingPeriod.fromKey(responseDto.workingPeriod()),
+                    responseDto.startYear(),
+                    responseDto.startMonth()
+            );
+        }
     }
 
     private User findUser(Long userId) {