From 7f226b9e6935493bb1ddc71398e546d80db0d4e9 Mon Sep 17 00:00:00 2001 From: Jeongjin Lee Date: Tue, 14 Nov 2023 16:52:17 +0900 Subject: [PATCH] =?UTF-8?q?Fix:=20=EA=B3=BC=EB=A6=BF=201.1.3=20(#315)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix: 과릿 1.1.3 (#314) --- .../gwalit/domain/lesson/repository/LessonRepositoryImpl.java | 2 +- .../com/selfrunner/gwalit/global/batch/NotificationTasklet.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/selfrunner/gwalit/domain/lesson/repository/LessonRepositoryImpl.java b/src/main/java/com/selfrunner/gwalit/domain/lesson/repository/LessonRepositoryImpl.java index 8d9390d2..a3373003 100644 --- a/src/main/java/com/selfrunner/gwalit/domain/lesson/repository/LessonRepositoryImpl.java +++ b/src/main/java/com/selfrunner/gwalit/domain/lesson/repository/LessonRepositoryImpl.java @@ -161,7 +161,7 @@ public List findAllByDate(List lessonIdList) { .leftJoin(lecture).on(lecture.lectureId.eq(lesson.lecture.lectureId)) .leftJoin(memberAndLecture).on(memberAndLecture.lecture.lectureId.eq(lecture.lectureId)) .leftJoin(member).on(memberAndLecture.member.memberId.eq(member.memberId)) - .where(lesson.lessonId.in(lessonIdList)) + .where(lesson.lessonId.in(lessonIdList), member.token.isNotNull()) .transform(groupBy(memberAndLecture.member.memberId) .list(Projections.constructor(BatchNotificationDto.class, memberAndLecture.member.memberId, member.token, list(Projections.constructor(BatchLessonDto.class, lecture.name, lesson.date, lesson.startTime, lesson.endTime))))); diff --git a/src/main/java/com/selfrunner/gwalit/global/batch/NotificationTasklet.java b/src/main/java/com/selfrunner/gwalit/global/batch/NotificationTasklet.java index d4a47ff2..20727823 100644 --- a/src/main/java/com/selfrunner/gwalit/global/batch/NotificationTasklet.java +++ b/src/main/java/com/selfrunner/gwalit/global/batch/NotificationTasklet.java @@ -46,7 +46,7 @@ public RepeatStatus execute(StepContribution contribution, ChunkContext chunkCon String temp = lessonDto.getStartTime().format(DateTimeFormatter.ofPattern("HH:mm")) + " ~ " + lessonDto.getEndTime().format(DateTimeFormatter.ofPattern("HH:mm")) + " " + lessonDto.getName() + "\n"; body.append(temp); } - // 마지막 개행문자 제거 + // 마지막 개행 문자 제거 if(body.length() > 0 && body.charAt(body.length() - 1) == '\n') { body.setLength(body.length() - 1); }