[Bug] 티켓 카운트 로직 수정

42organization · Sep 9, 2024 · 6b052f2 · 6b052f2
1 parent 368be13
commit 6b052f2
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/...pi/src/main/java/gg/agenda/api/user/agendaprofile/controller/AgendaProfileController.java b/...pi/src/main/java/gg/agenda/api/user/agendaprofile/controller/AgendaProfileController.java
@@ -77,7 +77,7 @@ public ResponseEntity<AgendaProfileInfoDetailsResDto> myAgendaProfileInfoDetails
 	public ResponseEntity<MyAgendaProfileDetailsResDto> myAgendaProfileDetails(
 		@Login @Parameter(hidden = true) UserDto user, HttpServletResponse response) {
 		AgendaProfile profile = agendaProfileFindService.findAgendaProfileByIntraId(user.getIntraId());
-		int ticketCount = ticketService.findTicketList(profile).size();
+		int ticketCount = ticketService.findUsedTrueApproveTrueTicketList(profile).size();
 		IntraProfile intraProfile = intraProfileUtils.getIntraProfile(response);
 		MyAgendaProfileDetailsResDto agendaProfileDetails = MyAgendaProfileDetailsResDto.toDto(
 			profile, ticketCount, intraProfile);

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
@@ -66,13 +66,13 @@ public ResponseEntity<Void> ticketSetupAdd(@Parameter(hidden = true) @Login User
 	@GetMapping
 	public ResponseEntity<TicketCountResDto> ticketCountFind(@Parameter(hidden = true) @Login UserDto user) {
 		AgendaProfile profile = agendaProfileFindService.findAgendaProfileByIntraId(user.getIntraId());
-		List<Ticket> tickets = ticketService.findTicketList(profile);
+		List<Ticket> tickets = ticketService.findUsedFalseTicketList(profile);
 		long approvedCount = tickets.stream()
 			.filter(Ticket::getIsApproved)
 			.count();
 		boolean setupTicket = tickets.size() > approvedCount;
 
-		return ResponseEntity.ok(new TicketCountResDto(tickets.size(), setupTicket));
+		return ResponseEntity.ok(new TicketCountResDto(approvedCount, setupTicket));
 	}
 
 	/**

diff --git a/...da-api/src/main/java/gg/agenda/api/user/ticket/controller/response/TicketCountResDto.java b/...da-api/src/main/java/gg/agenda/api/user/ticket/controller/response/TicketCountResDto.java
@@ -6,10 +6,10 @@
 @Getter
 @NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
 public class TicketCountResDto {
-	private int ticketCount;
+	private long ticketCount;
 	private boolean setupTicket;
 
-	public TicketCountResDto(int ticketCount, boolean setupTicket) {
+	public TicketCountResDto(long ticketCount, boolean setupTicket) {
 		this.ticketCount = ticketCount;
 		this.setupTicket = setupTicket;
 	}

diff --git a/gg-agenda-api/src/main/java/gg/agenda/api/user/ticket/service/TicketService.java b/gg-agenda-api/src/main/java/gg/agenda/api/user/ticket/service/TicketService.java
@@ -17,14 +17,12 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.HttpClientErrorException;
 
-import gg.agenda.api.user.agendaprofile.service.AgendaProfileFindService;
 import gg.auth.FortyTwoAuthUtil;
 import gg.auth.UserDto;
 import gg.data.agenda.AgendaProfile;
 import gg.data.agenda.AgendaTeamProfile;
 import gg.data.agenda.Ticket;
 import gg.repo.agenda.AgendaProfileRepository;
-import gg.repo.agenda.AgendaRepository;
 import gg.repo.agenda.TicketRepository;
 import gg.utils.DateTimeUtil;
 import gg.utils.exception.custom.DuplicationException;
@@ -38,8 +36,6 @@ public class TicketService {
 	private final ApiUtil apiUtil;
 	private final FortyTwoAuthUtil fortyTwoAuthUtil;
 	private final TicketRepository ticketRepository;
-	private final AgendaRepository agendaRepository;
-	private final AgendaProfileFindService agendaProfileFindService;
 	private final AgendaProfileRepository agendaProfileRepository;
 
 	@Value("https://api.intra.42.fr/v2/users/{id}/correction_point_historics?sort=-id")
@@ -74,10 +70,15 @@ public void addTicketSetup(UserDto user) {
 	 * @return 티켓 수
 	 */
 	@Transactional(readOnly = true)
-	public List<Ticket> findTicketList(AgendaProfile profile) {
+	public List<Ticket> findUsedTrueApproveTrueTicketList(AgendaProfile profile) {
 		return ticketRepository.findByAgendaProfileAndIsUsedFalseAndIsApprovedTrue(profile);
 	}
 
+	@Transactional(readOnly = true)
+	public List<Ticket> findUsedFalseTicketList(AgendaProfile profile) {
+		return ticketRepository.findByAgendaProfileAndIsUsedFalse(profile);
+	}
+
 	/**
 	 * 티켓 승인/거절
 	 * @param profile 사용자 정보

diff --git a/gg-repo/src/main/java/gg/repo/agenda/TicketRepository.java b/gg-repo/src/main/java/gg/repo/agenda/TicketRepository.java
@@ -21,4 +21,6 @@ Optional<Ticket> findFirstByAgendaProfileAndIsApprovedTrueAndIsUsedFalseOrderByC
 	Page<Ticket> findByAgendaProfileId(Long agendaProfileId, Pageable pageable);
 
 	List<Ticket> findByAgendaProfileAndIsUsedFalseAndIsApprovedTrue(AgendaProfile agendaProfile);
+
+	List<Ticket> findByAgendaProfileAndIsUsedFalse(AgendaProfile agendaProfile);
 }