[HOTFIX] basetime null pointer exception

HongDam-org · Jan 13, 2024 · 4d5c70e · 4d5c70e
1 parent b64bc0f
commit 4d5c70e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/backend/src/main/java/com/twtw/backend/domain/friend/entity/Friend.java b/backend/src/main/java/com/twtw/backend/domain/friend/entity/Friend.java
@@ -98,7 +98,7 @@ public void checkExpire() {
     }
 
     private boolean isRequestNotExpired() {
-        return this.friendStatus == FriendStatus.REQUESTED
-                && this.baseTime.getCreatedAt().isAfter(LocalDateTime.now().minusMinutes(30L));
+        return this.baseTime == null || (this.friendStatus == FriendStatus.REQUESTED
+                && this.baseTime.getCreatedAt().isAfter(LocalDateTime.now().minusMinutes(30L)));
     }
 }
diff --git a/backend/src/main/java/com/twtw/backend/domain/group/entity/GroupMember.java b/backend/src/main/java/com/twtw/backend/domain/group/entity/GroupMember.java
@@ -126,7 +126,7 @@ public void checkExpire() {
     }
 
     private boolean isRequestNotExpired() {
-        return this.groupInviteCode == GroupInviteCode.REQUESTED
-                && this.baseTime.getCreatedAt().isAfter(LocalDateTime.now().minusMinutes(30L));
+        return this.baseTime == null || (this.groupInviteCode == GroupInviteCode.REQUESTED
+                && this.baseTime.getCreatedAt().isAfter(LocalDateTime.now().minusMinutes(30L)));
     }
 }
diff --git a/backend/src/main/java/com/twtw/backend/domain/plan/entity/PlanMember.java b/backend/src/main/java/com/twtw/backend/domain/plan/entity/PlanMember.java
@@ -100,6 +100,7 @@ public String getDeviceTokenValue() {
     }
 
     private boolean isRequestNotExpired() {
-        return this.baseTime.getCreatedAt().isAfter(LocalDateTime.now().minusMinutes(30L));
+        return this.baseTime == null ||
+                (this.planInviteCode == PlanInviteCode.REQUESTED && this.baseTime.getCreatedAt().isAfter(LocalDateTime.now().minusMinutes(30L)));
     }
 }