Merge branch 'wip/document-yabo'

서비스url QR코드 내용 추가
Merge pull request #66 from hwanny1128/fix/dashboard
2025-12-06 06:46:24 +00:00 · 2025-10-31 14:10:19 +09:00 · 2025-10-31 14:09:02 +09:00 · 2025-10-31 14:07:34 +09:00 · 2025-10-31 14:06:55 +09:00 · 2025-10-31 13:40:21 +09:00
7 changed files with 5640 additions and 8 deletions
--- a/build/reports/problems/problems-report.html
+++ b/build/reports/problems/problems-report.html
--- a/서비스_v1.12.pptx
+++ b/서비스_v1.12.pptx
--- a/docs/aiHGZero.png
+++ b/docs/aiHGZero.png
--- a/docs/prototype.png
+++ b/docs/prototype.png
--- a/meeting/logs/meeting-service.log
+++ b/meeting/logs/meeting-service.log
--- a/meeting/src/main/java/com/unicorn/hgzero/meeting/biz/dto/DashboardDTO.java
+++ b/meeting/src/main/java/com/unicorn/hgzero/meeting/biz/dto/DashboardDTO.java
@ -103,8 +103,8 @@ public class DashboardDTO {
                                .meetingId(meeting.getMeetingId())
                                .title(meeting.getTitle())
                                .startTime(meeting.getScheduledAt())
-                                .endTime(null) // Meeting 도메인에 endTime이 없음
-                                .location(null) // Meeting 도메인에 location이 없음
+                                .endTime(meeting.getEndTime())
+                                .location(meeting.getLocation())
                                .participantCount(meeting.getParticipants() != null ? meeting.getParticipants().size() : 0)
                                .status(meeting.getStatus())
                                .userRole(currentUserId.equals(meeting.getOrganizerId()) ? "CREATOR" : "PARTICIPANT")
--- a/meeting/src/main/java/com/unicorn/hgzero/meeting/biz/service/EndMeetingService.java
+++ b/meeting/src/main/java/com/unicorn/hgzero/meeting/biz/service/EndMeetingService.java
@ -177,12 +177,13 @@ public class EndMeetingService implements EndMeetingUseCase {
     */
    private MinutesEntity getOrCreateConsolidatedMinutes(MeetingEntity meeting) {
        // userId가 NULL인 회의록 찾기 (AI 통합 회의록)
-        Optional<MinutesEntity> existing = minutesRepository
+        List<MinutesEntity> existingList = minutesRepository
                .findByMeetingIdAndUserIdIsNull(meeting.getMeetingId());

-        if (existing.isPresent()) {
-            log.debug("기존 통합 회의록 사용 - minutesId: {}", existing.get().getMinutesId());
-            return existing.get();
+        if (!existingList.isEmpty()) {
+            MinutesEntity existing = existingList.get(0);
+            log.debug("기존 통합 회의록 사용 - minutesId: {}", existing.getMinutesId());
+            return existing;
        }

        // 없으면 새로 생성
Author	SHA1	Message	Date
yabo0812	3227db01cd	Merge branch 'wip/document-yabo'	2025-10-31 14:10:19 +09:00
yabo0812	019d6f2d98	서비스url QR코드 내용 추가	2025-10-31 14:09:02 +09:00
Cho Yoon Jin	119b9d7931	Merge pull request #66 from hwanny1128/fix/dashboard Fix: 대시보드 조회 API 장소 해결	2025-10-31 14:07:34 +09:00
cyjadela	82c6873450	Fix: 대시보드 조회 API 장소 해결	2025-10-31 14:06:55 +09:00
Cho Yoon Jin	85ab3007c6	Merge pull request #65 from hwanny1128/fix/dashboard Fix: meeting 빌드 에러 해결	2025-10-31 13:40:21 +09:00
cyjadela	af53c80439	Fix: meeting 빌드 에러 해결	2025-10-31 13:36:05 +09:00