Compare commits

..

6 Commits

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
7 changed files with 5640 additions and 8 deletions

File diff suppressed because one or more lines are too long

BIN
docs/aiHGZero.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
docs/prototype.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

File diff suppressed because it is too large Load Diff

View File

@ -103,8 +103,8 @@ public class DashboardDTO {
.meetingId(meeting.getMeetingId()) .meetingId(meeting.getMeetingId())
.title(meeting.getTitle()) .title(meeting.getTitle())
.startTime(meeting.getScheduledAt()) .startTime(meeting.getScheduledAt())
.endTime(null) // Meeting 도메인에 endTime이 없음 .endTime(meeting.getEndTime())
.location(null) // Meeting 도메인에 location이 없음 .location(meeting.getLocation())
.participantCount(meeting.getParticipants() != null ? meeting.getParticipants().size() : 0) .participantCount(meeting.getParticipants() != null ? meeting.getParticipants().size() : 0)
.status(meeting.getStatus()) .status(meeting.getStatus())
.userRole(currentUserId.equals(meeting.getOrganizerId()) ? "CREATOR" : "PARTICIPANT") .userRole(currentUserId.equals(meeting.getOrganizerId()) ? "CREATOR" : "PARTICIPANT")

View File

@ -177,12 +177,13 @@ public class EndMeetingService implements EndMeetingUseCase {
*/ */
private MinutesEntity getOrCreateConsolidatedMinutes(MeetingEntity meeting) { private MinutesEntity getOrCreateConsolidatedMinutes(MeetingEntity meeting) {
// userId가 NULL인 회의록 찾기 (AI 통합 회의록) // userId가 NULL인 회의록 찾기 (AI 통합 회의록)
Optional<MinutesEntity> existing = minutesRepository List<MinutesEntity> existingList = minutesRepository
.findByMeetingIdAndUserIdIsNull(meeting.getMeetingId()); .findByMeetingIdAndUserIdIsNull(meeting.getMeetingId());
if (existing.isPresent()) { if (!existingList.isEmpty()) {
log.debug("기존 통합 회의록 사용 - minutesId: {}", existing.get().getMinutesId()); MinutesEntity existing = existingList.get(0);
return existing.get(); log.debug("기존 통합 회의록 사용 - minutesId: {}", existing.getMinutesId());
return existing;
} }
// 없으면 새로 생성 // 없으면 새로 생성