Skip to content

Commit 9bbd822

Browse files
committed
[FIX] 그룹원 프로필 루틴 조회 API 날짜 받도록 수정
1 parent 9d145b6 commit 9bbd822

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

src/main/java/org/routineade/RoutineAdeServer/controller/GroupController.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -302,18 +302,20 @@ public ResponseEntity<Void> updateGroupAlarm(Principal principal,
302302
@Operation(summary = "그룹원 프로필 루틴 조회", description = "그룹원의 루틴을 조회하는 API")
303303
@Parameters({
304304
@Parameter(name = "groupId", description = "그룹 ID", example = "1"),
305-
@Parameter(name = "userId", description = "조회할 유저 ID", example = "1")
305+
@Parameter(name = "userId", description = "조회할 유저 ID", example = "1"),
306+
@Parameter(name = "routineDate", description = "조회할 날짜", example = "2024.10.07")
306307
})
307308
@GetMapping("{groupId}/users/{userId}/routines")
308309
public ResponseEntity<RoutinesByUserProfileGetResponse> getUserProfileRoutines(Principal principal,
309310
@PathVariable Long groupId,
310-
@PathVariable Long userId) {
311+
@PathVariable Long userId,
312+
@RequestParam String routineDate) {
311313
userService.getUserOrException(Long.valueOf(principal.getName()));
312314
User targetUser = userService.getUserOrException(userId);
313315

314316
return ResponseEntity
315317
.status(OK)
316-
.body(groupService.getUserProfileRoutines(groupId, targetUser));
318+
.body(groupService.getUserProfileRoutines(groupId, targetUser, routineDate));
317319
}
318320

319321
}

src/main/java/org/routineade/RoutineAdeServer/dto/routine/RoutinesByUserProfileGetResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public static RoutinesByUserProfileGetResponse of(User user,
2020
user.getProfileImage(),
2121
user.getNickname(),
2222
user.getIntro(),
23-
userEmotion.getEmotion(),
23+
userEmotion == null ? null : userEmotion.getEmotion(),
2424
groupRoutines
2525
);
2626
}

src/main/java/org/routineade/RoutineAdeServer/service/GroupService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,14 +291,14 @@ public Group getGroupOrThrowException(Long groupId) {
291291
}
292292

293293
@Transactional(readOnly = true)
294-
public RoutinesByUserProfileGetResponse getUserProfileRoutines(Long groupId, User user) {
294+
public RoutinesByUserProfileGetResponse getUserProfileRoutines(Long groupId, User user, String routineDate) {
295295
Group group = getGroupOrThrowException(groupId);
296296

297297
if (!groupMemberService.isMember(group, user)) {
298298
throw new IllegalArgumentException("해당 유저가 해당 그룹의 멤버가 아닙니다!");
299299
}
300300

301-
return routineService.getRoutinesByUserProfile(group, user,
301+
return routineService.getRoutinesByUserProfile(group, user, routineDate,
302302
groupMemberService.isUserGroupAlarmEnabled(user, group));
303303
}
304304

src/main/java/org/routineade/RoutineAdeServer/service/RoutineService.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,9 @@ public RoutinesGetResponse getRoutines(User user, String routineDate) {
120120
}
121121

122122
@Transactional(readOnly = true)
123-
public RoutinesByUserProfileGetResponse getRoutinesByUserProfile(Group group, User user, Boolean isAlarmEnabled) {
124-
LocalDate date = LocalDate.now();
123+
public RoutinesByUserProfileGetResponse getRoutinesByUserProfile(Group group, User user, String routineDate,
124+
Boolean isAlarmEnabled) {
125+
LocalDate date = LocalDate.parse(routineDate, DATE_FORMATTER);
125126

126127
List<Routine> routines = group.getGroupRoutines().stream().map(GroupRoutine::getRoutine).toList();
127128
List<Routine> filterRoutines = routineRepeatDayService.filterRoutinesByDay(routines, date.getDayOfWeek());

0 commit comments

Comments
 (0)