From 0242794c2351b11c0d342d058ca4ad2b2aa617c7 Mon Sep 17 00:00:00 2001 From: jeonghee-Han <134862850+Jeonghee-Han@users.noreply.github.com> Date: Wed, 2 Oct 2024 14:38:14 +0900 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20Comment=20content=20not=20null=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/umc/mada/timetable/domain/Comment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/umc/mada/timetable/domain/Comment.java b/src/main/java/com/umc/mada/timetable/domain/Comment.java index 0fe04fc..1d9045b 100644 --- a/src/main/java/com/umc/mada/timetable/domain/Comment.java +++ b/src/main/java/com/umc/mada/timetable/domain/Comment.java @@ -31,7 +31,7 @@ public class Comment { @Column(name = "date", nullable = false) private LocalDate date; - @Column(name = "content") + @Column(name = "content", nullable = false) private String content; @CreationTimestamp From 0d3d97839c4ebb238c4d5de4c80d74e892827d55 Mon Sep 17 00:00:00 2001 From: jeonghee-Han <134862850+Jeonghee-Han@users.noreply.github.com> Date: Wed, 2 Oct 2024 14:38:39 +0900 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20@Transactional=20=EC=B6=94=EA=B0=80?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/umc/mada/timetable/service/TimetableService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/umc/mada/timetable/service/TimetableService.java b/src/main/java/com/umc/mada/timetable/service/TimetableService.java index a363621..bd4b7df 100644 --- a/src/main/java/com/umc/mada/timetable/service/TimetableService.java +++ b/src/main/java/com/umc/mada/timetable/service/TimetableService.java @@ -48,7 +48,7 @@ public TimetableService(UserRepository userRepository, TimetableRepository timet this.calendarRepository = calendarRepository; this.repeatTodoRepository = repeatTodoRepository; } - + @Transactional // 시간표 일정 생성 로직 public TimetableResponseDto createTimetable(User user, TimetableRequestDto timetableRequestDto){ // 유효성 검사 메서드를 호출하여 해당 ID가 데이터베이스에 존재하는지 확인 @@ -211,7 +211,7 @@ public List getWeeklyTimetable(User userId) { // checkAndLoadDailyData(user, today); // } // } - + @Transactional // 주간 시간표의 일정을 기반으로 한 일일 시간표 생성 메서드 public Map checkAndLoadDailyData(User user, LocalDate date) { java.time.DayOfWeek dayOfWeek = date.getDayOfWeek(); @@ -261,7 +261,7 @@ public Map checkAndLoadDailyData(User user, LocalDate date) { result.put("data",data); return result; } - + @Transactional // comment 생성 로직 public CommentResponseDto createComment(User user, CommentRequestDto commentRequestDto){ validateUserId(user); From 07d5adc1453375719a33c82cfae1acbffaf8999b Mon Sep 17 00:00:00 2001 From: jeonghee-Han <134862850+Jeonghee-Han@users.noreply.github.com> Date: Thu, 17 Oct 2024 19:04:16 +0900 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20comment=EA=B0=80=20=EC=97=86?= =?UTF-8?q?=EC=9D=84=20=EA=B2=BD=EC=9A=B0=20=EB=B0=98=ED=99=98=EA=B0=92=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../timetable/controller/TimetableController.java | 12 +++++++++--- .../umc/mada/timetable/service/TimetableService.java | 5 ++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/umc/mada/timetable/controller/TimetableController.java b/src/main/java/com/umc/mada/timetable/controller/TimetableController.java index 1f91e11..2c40e60 100644 --- a/src/main/java/com/umc/mada/timetable/controller/TimetableController.java +++ b/src/main/java/com/umc/mada/timetable/controller/TimetableController.java @@ -73,10 +73,16 @@ public ResponseEntity> getUserTimetableComment(Authenticatio Optional userOptional = userRepository.findByAuthId(authentication.getName()); User user = userOptional.get(); CommentResponseDto userComment = timetableService.getUserComment(user, date); - Map data = new LinkedHashMap<>(); - data.put("Comment", userComment); Map result = new LinkedHashMap<>(); - result.put("data", data); + + if (userComment != null) { + Map data = new LinkedHashMap<>(); + data.put("Comment", userComment); + result.put("data", data); // comment가 있으면 data를 추가 + } else { + result.put("data", null); // comment가 없으면 data를 null로 설정 + } + return ResponseEntity.ok().body(result); } diff --git a/src/main/java/com/umc/mada/timetable/service/TimetableService.java b/src/main/java/com/umc/mada/timetable/service/TimetableService.java index d556c16..af4b17f 100644 --- a/src/main/java/com/umc/mada/timetable/service/TimetableService.java +++ b/src/main/java/com/umc/mada/timetable/service/TimetableService.java @@ -298,10 +298,9 @@ public CommentResponseDto updateComment (User user, LocalDate date, CommentReque // 특정 유저 comment 조회 로직 public CommentResponseDto getUserComment(User user, LocalDate date) { validateUserId(user); - Comment comment = commentRepository.findCommentByUserIdAndDateIs(user, date) - .orElseThrow(() -> new IllegalArgumentException("NOT_FOUND_ERROR")); - + .orElse(null); + if (comment == null) {return null;} return new CommentResponseDto(comment.getId(), comment.getDate(), comment.getContent()); }