[fix] ticket agenda title fix

42organization · Aug 30, 2024 · 6dfe554 · 6dfe554
1 parent 6958553
commit 6dfe554
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 6 deletions.
diff --git a/gg-agenda-api/src/main/java/gg/agenda/api/admin/agenda/service/AgendaAdminService.java b/gg-agenda-api/src/main/java/gg/agenda/api/admin/agenda/service/AgendaAdminService.java
@@ -6,6 +6,7 @@
 import java.net.URL;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
@@ -82,8 +83,7 @@ public List<AgendaAdminSimpleResDto> getAgendaSimpleList() {
 	}
 
 	@Transactional(readOnly = true)
-	public Agenda getAgenda(UUID agendaKey) {
-		return agendaAdminRepository.findByAgendaKey(agendaKey)
-			.orElse(null);
+	public Optional<Agenda> getAgenda(UUID agendaKey) {
+		return agendaAdminRepository.findByAgendaKey(agendaKey);
 	}
 }
diff --git a/gg-agenda-api/src/main/java/gg/agenda/api/admin/ticket/controller/TicketAdminController.java b/gg-agenda-api/src/main/java/gg/agenda/api/admin/ticket/controller/TicketAdminController.java
@@ -87,12 +87,12 @@ public ResponseEntity<PageResponseDto<TicketFindResDto>> getTicketList(
 				TicketFindResDto dto = new TicketFindResDto(ticket);
 
 				if (dto.getIssuedFromKey() != null) {
-					Agenda agendaIssuedFrom = agendaAdminService.getAgenda(dto.getIssuedFromKey());
+					Agenda agendaIssuedFrom = agendaAdminService.getAgenda(dto.getIssuedFromKey()).orElse(null);
 					dto.changeIssuedFrom(agendaIssuedFrom);
 				}
 
 				if (dto.getUsedToKey() != null) {
-					Agenda agendaUsedTo = agendaAdminService.getAgenda(dto.getUsedToKey());
+					Agenda agendaUsedTo = agendaAdminService.getAgenda(dto.getUsedToKey()).orElse(null);
 					dto.changeUsedTo(agendaUsedTo);
 				}
 

diff --git a/gg-agenda-api/src/main/java/gg/agenda/api/user/agenda/service/AgendaService.java b/gg-agenda-api/src/main/java/gg/agenda/api/user/agenda/service/AgendaService.java
@@ -6,6 +6,7 @@
 import java.net.URL;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
@@ -133,4 +134,9 @@ public void cancelAgenda(Agenda agenda) {
 		attendTeams.forEach(agendaTeamService::leaveTeamAll);
 		agenda.cancelAgenda();
 	}
+
+	@Transactional(readOnly = true)
+	public Optional<Agenda> getAgenda(UUID agendaKey) {
+		return agendaRepository.findByAgendaKey(agendaKey);
+	}
 }
diff --git a/gg-agenda-api/src/main/java/gg/agenda/api/user/ticket/controller/TicketController.java b/gg-agenda-api/src/main/java/gg/agenda/api/user/ticket/controller/TicketController.java
@@ -21,12 +21,14 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import gg.agenda.api.user.agenda.service.AgendaService;
 import gg.agenda.api.user.agendaprofile.service.AgendaProfileFindService;
 import gg.agenda.api.user.ticket.controller.response.TicketCountResDto;
 import gg.agenda.api.user.ticket.controller.response.TicketHistoryResDto;
 import gg.agenda.api.user.ticket.service.TicketService;
 import gg.auth.UserDto;
 import gg.auth.argumentresolver.Login;
+import gg.data.agenda.Agenda;
 import gg.data.agenda.AgendaProfile;
 import gg.data.agenda.Ticket;
 import gg.utils.cookie.CookieUtil;
@@ -44,6 +46,7 @@ public class TicketController {
 	private final CookieUtil cookieUtil;
 	private final TicketService ticketService;
 	private final AgendaProfileFindService agendaProfileFindService;
+	private final AgendaService agendaService;
 
 	/**
 	 * 티켓 설정 추가
@@ -104,7 +107,21 @@ public ResponseEntity<PageResponseDto<TicketHistoryResDto>> ticketHistoryList(
 		Page<Ticket> tickets = ticketService.findTicketsByUserId(user.getId(), pageable);
 
 		List<TicketHistoryResDto> ticketDtos = tickets.stream()
-			.map(ticketService::convertAgendaKeyToTitleWhereIssuedFromAndUsedTo)
+			.map(ticket -> {
+				TicketHistoryResDto dto = new TicketHistoryResDto(ticket);
+
+				if (dto.getIssuedFromKey() != null) {
+					Agenda agendaIssuedFrom = agendaService.getAgenda(dto.getIssuedFromKey()).orElse(null);
+					dto.changeIssuedFrom(agendaIssuedFrom);
+				}
+
+				if (dto.getUsedToKey() != null) {
+					Agenda agendaUsedTo = agendaService.getAgenda(dto.getUsedToKey()).orElse(null);
+					dto.changeUsedTo(agendaUsedTo);
+				}
+
+				return dto;
+			})
 			.collect(Collectors.toList());
 
 		PageResponseDto<TicketHistoryResDto> pageResponseDto = PageResponseDto.of(