Skip to content

Commit 876e1be

Browse files
committed
🐛 fix: NPE
1 parent d5ec488 commit 876e1be

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/main/java/org/withtime/be/withtimebe/domain/date/converter/DateConverter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public static DateResponseDTO.DatePlace createDatePlace(DatePlace datePlace,
7878
LocalTime startTime,
7979
LocalTime endTime) {
8080
Item item = null;
81-
if (!datePlace.getItems().isEmpty()) {
81+
if (datePlace.getItems() != null && !datePlace.getItems().isEmpty()) {
8282
item = datePlace.getItems().get(0);
8383
}
8484

@@ -117,7 +117,7 @@ public static DateResponseDTO.DatePlace createDatePlace(DatePlace datePlace,
117117
.placeType(datePlace.getPlaceType())
118118
.startTime(LocalTime.from(startTime))
119119
.endTime(LocalTime.from(endTime))
120-
.signatureDish(toSignatureDish(datePlace.getItems().isEmpty() ? null : datePlace.getItems().get(0)))
120+
.signatureDish(toSignatureDish(datePlace.getItems() == null || datePlace.getItems().isEmpty() ? null : datePlace.getItems().get(0)))
121121
.build();
122122
}
123123

@@ -126,7 +126,7 @@ public static DateResponseDTO.DateCourse createDateCourse(DateCourse dateCourse,
126126
Set<Long> bookmarkedIds,
127127
DateRequestDTO.DateCourseSearchCond cond){
128128
Boolean bookmarked = null;
129-
if (!bookmarkedIds.isEmpty()) bookmarked = bookmarkedIds.contains(dateCourse.getId());
129+
if (bookmarkedIds != null && !bookmarkedIds.isEmpty()) bookmarked = bookmarkedIds.contains(dateCourse.getId());
130130
List<DateResponseDTO.DatePlace> datePlaces = dateCourse.getDatePlaceDateCourses().stream()
131131
.map(dc -> DateConverter.createDatePlace(dc.getDatePlace(), dc.getStartTime(), dc.getEndTime()))
132132
.toList();

0 commit comments

Comments
 (0)