refactor/맞춤 장학공고 nullpointer에러 해결

KUSITMS-29th-TEAM-F · May 23, 2024 · f070aaa · f070aaa
1 parent 1bd6df4
commit f070aaa
Showing 1 changed file with 18 additions and 11 deletions.
diff --git a/src/main/java/backend/univfit/domain/apply/application/AnnouncementManager.java b/src/main/java/backend/univfit/domain/apply/application/AnnouncementManager.java
@@ -135,21 +135,28 @@ private boolean compareBasicInfo(ConditionEntity condition, MemberPrivateInfo me
     }
 
     private boolean compareGrades(ConditionEntity condition, MemberPrivateInfo memberInfo) {
-        boolean useThree = memberInfo.getLastGradeOfThree() != null; //F
+        boolean useThree = memberInfo.getLastGradeOfThree() != null;
+
         if (useThree) {
-            return (condition.getTotalGradeOfThree() == null || memberInfo.getTotalGradeOfThree() == null || condition.getTotalGradeOfThree() <= memberInfo.getTotalGradeOfThree()) &&
-                    (condition.getLastGradeOfThree() == null || memberInfo.getLastGradeOfThree() == null || condition.getLastGradeOfThree() <= memberInfo.getLastGradeOfThree());
+            return (condition.getTotalGradeOfThree() == null ||
+                    (memberInfo.getTotalGradeOfThree() != null && condition.getTotalGradeOfThree() <= memberInfo.getTotalGradeOfThree())) &&
+                    (condition.getLastGradeOfThree() == null ||
+                            (memberInfo.getLastGradeOfThree() != null && condition.getLastGradeOfThree() <= memberInfo.getLastGradeOfThree()));
         } else {
-            return (condition.getTotalGradeOfFive() == null || memberInfo.getTotalGradeOfFive() == null || condition.getTotalGradeOfFive() <= memberInfo.getTotalGradeOfFive()) &&
-                    (condition.getLastGradeOfFive() == null || memberInfo.getLastGradeOfFive() == null || condition.getLastGradeOfFive() <= memberInfo.getLastGradeOfFive());
-        } //T 반환
-
+            return (condition.getTotalGradeOfFive() == null ||
+                    (memberInfo.getTotalGradeOfFive() != null && condition.getTotalGradeOfFive() <= memberInfo.getTotalGradeOfFive())) &&
+                    (condition.getLastGradeOfFive() == null ||
+                            (memberInfo.getLastGradeOfFive() != null && condition.getLastGradeOfFive() <= memberInfo.getLastGradeOfFive()));
+        }
     }
 
     private boolean compareIncome(ConditionEntity condition, MemberPrivateInfo memberInfo) {
-        return (condition.getIncomeQuality() == null || (condition.getIncomeQuality() >= memberInfo.getIncomeQuality())) &&
-                (condition.getSupportSection()==null || (condition.getSupportSection() >= memberInfo.getSupportSection())) &&
-                (condition.getMonthlyIncome() == null || condition.getMonthlyIncome() >= memberInfo.getMonthlyIncome());
-    } //T
+        return (condition.getIncomeQuality() == null ||
+                (memberInfo.getIncomeQuality() != null && condition.getIncomeQuality() >= memberInfo.getIncomeQuality())) &&
+                (condition.getSupportSection() == null ||
+                        (memberInfo.getSupportSection() != null && condition.getSupportSection() >= memberInfo.getSupportSection())) &&
+                (condition.getMonthlyIncome() == null ||
+                        (memberInfo.getMonthlyIncome() != null && condition.getMonthlyIncome() >= memberInfo.getMonthlyIncome()));
+    }
 
 }