[hotfix] null 값 처리 진행

capstone-kw-jjiggle · Nov 10, 2024 · 7947f6c · 7947f6c
1 parent 867dcf5
commit 7947f6c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/main/java/gitbal/backend/api/userPage/dto/RegionRankDto.java b/src/main/java/gitbal/backend/api/userPage/dto/RegionRankDto.java
@@ -9,9 +9,9 @@ public class RegionRankDto {
 
 
     private String regionName;
-    private int regionRank;
+    private Integer regionRank;
 
-    public static RegionRankDto of(String regionName, int regionRank) {
+    public static RegionRankDto of(String regionName, Integer regionRank) {
         return new RegionRankDto(regionName, regionRank);
     }
 }
diff --git a/src/main/java/gitbal/backend/api/userPage/dto/SchoolRankDto.java b/src/main/java/gitbal/backend/api/userPage/dto/SchoolRankDto.java
@@ -1,6 +1,7 @@
 package gitbal.backend.api.userPage.dto;
 
 import gitbal.backend.domain.school.School;
+import java.util.Objects;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -9,10 +10,11 @@
 public class SchoolRankDto {
 
     private String schoolName;
-    private int schoolRank;
+    private Integer schoolRank;
 
 
     public static SchoolRankDto of(School userSchool) {
+        if(Objects.isNull(userSchool)) return new SchoolRankDto(null, null);
         return new SchoolRankDto(userSchool.getSchoolName(), userSchool.getSchoolRank());
     }
 }
diff --git a/src/main/java/gitbal/backend/api/userPage/service/UserRankService.java b/src/main/java/gitbal/backend/api/userPage/service/UserRankService.java
@@ -45,14 +45,14 @@ public UserRankingResponseDto makeUserRankResponse(String username) {
     @Transactional(readOnly = true)
     public SchoolRankResponseDto makeUserRankSchoolStatusByUsername(String username) {
         School findUserScool = userService.findSchoolByUserName(username);
-        if(Objects.isNull(findUserScool)) return SchoolRankResponseDto.of(null);
+        if(Objects.isNull(findUserScool)) return SchoolRankResponseDto.of(SchoolRankDto.of(null));
         return SchoolRankResponseDto.of(SchoolRankDto.of(findUserScool));
     }
 
     @Transactional(readOnly = true)
     public RegionRankResponseDto makeUserRankRegionStatusByUsername(String username) {
         Region findRegion = userService.findRegionByUserName(username);
-        if(Objects.isNull(findRegion)) return RegionRankResponseDto.of(null);
+        if(Objects.isNull(findRegion)) return RegionRankResponseDto.of(RegionRankDto.of(null, null));
         int regionRanking = regionService.findRegionRanking(findRegion.getRegionName());
         return RegionRankResponseDto.of(RegionRankDto.of(findRegion.getRegionName(),  regionRanking));
     }