From dd3105e16b68840e74ea2f24296807c86301a4ef Mon Sep 17 00:00:00 2001 From: dayoung030303 Date: Sun, 1 Jun 2025 03:35:39 +0900 Subject: [PATCH] =?UTF-8?q?userId=20=ED=99=95=EC=9D=B8=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EB=A1=9C=EC=A7=81=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gp_backend_data/card/domain/entity/Card.java | 1 - .../gp_backend_data/card/service/StatsService.java | 10 +++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/gp_backend_data/card/domain/entity/Card.java b/src/main/java/com/example/gp_backend_data/card/domain/entity/Card.java index 776f2b8..8e67c96 100644 --- a/src/main/java/com/example/gp_backend_data/card/domain/entity/Card.java +++ b/src/main/java/com/example/gp_backend_data/card/domain/entity/Card.java @@ -50,7 +50,6 @@ public class Card { @OneToMany(mappedBy = "card", cascade = CascadeType.ALL, fetch = FetchType.LAZY) private List cardlinks; - private byte[] createdBy; // 사용자 ID 저장 필드 (x-auth-sub와 매칭됨) } diff --git a/src/main/java/com/example/gp_backend_data/card/service/StatsService.java b/src/main/java/com/example/gp_backend_data/card/service/StatsService.java index 2abb589..ed2915b 100644 --- a/src/main/java/com/example/gp_backend_data/card/service/StatsService.java +++ b/src/main/java/com/example/gp_backend_data/card/service/StatsService.java @@ -90,9 +90,17 @@ public List getActivitiesByDateRangeGroupedBySpace(Local //사용자가 생성한 카드만 필터링 List userCards = cards.stream() - .filter(card -> Arrays.equals(uuidHelper.convertUUIDToByteArray(userId), card.getCreatedBy())) // `createdBy`는 Card 엔티티에 있어야 합니다. + .filter(card -> { + byte[] spaceId = card.getSpaceId(); + Space space = spaceRepository.findById(spaceId).orElse(null); + return space != null && Arrays.equals(uuidHelper.convertUUIDToByteArray(userId), space.getUserId()); + }) .toList(); + if (userCards.isEmpty()) { + throw new ResponseStatusException(HttpStatus.NOT_FOUND, "No activity found for this user today."); + } + if (cards.isEmpty()) { throw new ResponseStatusException(HttpStatus.NOT_FOUND, "No activity found for selected date range."); }