From fa8ea4110b85ac29a7b80b649c520f31e59bebf4 Mon Sep 17 00:00:00 2001 From: chyo1 Date: Tue, 4 Jun 2024 12:52:44 +0900 Subject: [PATCH] =?UTF-8?q?[BE]=20FIX:=20ItemHistoryQueryService=20?= =?UTF-8?q?=EB=A9=94=EC=84=9C=EB=93=9C=EB=AA=85=20find=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/item/service/AdminItemFacadeService.java | 4 ++-- .../service/AdminStatisticsFacadeService.java | 4 ++-- .../cabinet/item/service/ItemFacadeService.java | 6 +++--- .../item/service/ItemHistoryQueryService.java | 14 +++++++------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/backend/src/main/java/org/ftclub/cabinet/admin/item/service/AdminItemFacadeService.java b/backend/src/main/java/org/ftclub/cabinet/admin/item/service/AdminItemFacadeService.java index d9159569a..4ab6384a5 100644 --- a/backend/src/main/java/org/ftclub/cabinet/admin/item/service/AdminItemFacadeService.java +++ b/backend/src/main/java/org/ftclub/cabinet/admin/item/service/AdminItemFacadeService.java @@ -52,7 +52,7 @@ public void assignItem(List userIds, Sku sku) { @Transactional(readOnly = true) public AdminItemHistoryPaginationDto getUserItemHistories(Long userId, Pageable pageable) { Page itemHistoryWithItem = - itemHistoryQueryService.getItemHistoriesByUserIdWithItem(userId, pageable); + itemHistoryQueryService.findItemHistoriesByUserIdWithItem(userId, pageable); List result = itemHistoryWithItem.stream() .map(ih -> itemMapper.toAdminItemHistoryDto(ih, ih.getItem())) @@ -66,7 +66,7 @@ public ItemStatisticsDto getItemPurchaseStatistics() { List itemsOnSale = itemQueryService.getUseItemIds(); List result = itemsOnSale.stream() .map(item -> { - int userCount = itemHistoryQueryService.getPurchaseCountByItemId(item.getId()); + int userCount = itemHistoryQueryService.findPurchaseCountByItemId(item.getId()); return itemMapper.toItemPurchaseCountDto(item, userCount); }).collect(Collectors.toList()); diff --git a/backend/src/main/java/org/ftclub/cabinet/admin/statistics/service/AdminStatisticsFacadeService.java b/backend/src/main/java/org/ftclub/cabinet/admin/statistics/service/AdminStatisticsFacadeService.java index 946ef5f34..e4892b0d0 100644 --- a/backend/src/main/java/org/ftclub/cabinet/admin/statistics/service/AdminStatisticsFacadeService.java +++ b/backend/src/main/java/org/ftclub/cabinet/admin/statistics/service/AdminStatisticsFacadeService.java @@ -147,7 +147,7 @@ public OverdueUserCabinetPaginationDto getOverdueUsers(Pageable pageable) { public CoinCollectStatisticsDto getCoinCollectCountByMonth(Integer year, Integer month) { Long itemId = itemQueryService.getBySku(COIN_COLLECT).getId(); List coinCollectedInfoByMonth = - itemHistoryQueryService.getCoinCollectedInfoByMonth(itemId, year, month); + itemHistoryQueryService.findCoinCollectedInfoByMonth(itemId, year, month); Map coinCollectCountByUser = coinCollectedInfoByMonth.stream() .collect(groupingBy(ItemHistory::getUserId, Collectors.counting())); @@ -196,7 +196,7 @@ public CoinStaticsDto getCoinStaticsDto(LocalDate startDate, LocalDate endDate) }); List usedCoins = - itemHistoryQueryService.getUsedCoinHistoryBetween(startDate, + itemHistoryQueryService.findUsedCoinHistoryBetween(startDate, endDate); usedCoins.forEach( diff --git a/backend/src/main/java/org/ftclub/cabinet/item/service/ItemFacadeService.java b/backend/src/main/java/org/ftclub/cabinet/item/service/ItemFacadeService.java index c18ac7e21..2c007a5b4 100644 --- a/backend/src/main/java/org/ftclub/cabinet/item/service/ItemFacadeService.java +++ b/backend/src/main/java/org/ftclub/cabinet/item/service/ItemFacadeService.java @@ -123,7 +123,7 @@ public MyItemResponseDto getMyItems(UserSessionDto user) { @Transactional(readOnly = true) public ItemHistoryPaginationDto getItemHistory(Long userId, Pageable pageable) { Page itemHistories = - itemHistoryQueryService.getItemHistoryWithItem(userId, pageable); + itemHistoryQueryService.findItemHistoryWithItem(userId, pageable); List result = itemHistories.stream() .map(ih -> itemMapper.toItemHistoryDto(ih, itemMapper.toItemDto(ih.getItem()))) .collect(Collectors.toList()); @@ -143,7 +143,7 @@ public CoinHistoryPaginationDto getCoinHistory(Long userId, CoinHistoryType type } List itemIds = items.stream().map(Item::getId).collect(Collectors.toList()); Page coinHistories = - itemHistoryQueryService.getCoinHistory(userId, pageable, itemIds); + itemHistoryQueryService.findCoinHistory(userId, pageable, itemIds); Map itemMap = items.stream() .collect(Collectors.toMap(Item::getId, item -> item)); @@ -240,7 +240,7 @@ public void useItem(Long userId, Sku sku, ItemUseRequestDto data) { } Item item = itemQueryService.getBySku(sku); List itemInInventory = - itemHistoryQueryService.getUnusedItemsInUserInventory(user.getId(), item.getId()); + itemHistoryQueryService.findUnusedItemsInUserInventory(user.getId(), item.getId()); ItemHistory firstItem = itemPolicyService.verifyEmptyItems(itemInInventory); ItemUsage itemUsage = getItemUsage(userId, item, data); diff --git a/backend/src/main/java/org/ftclub/cabinet/item/service/ItemHistoryQueryService.java b/backend/src/main/java/org/ftclub/cabinet/item/service/ItemHistoryQueryService.java index a66f45dc0..4409404d6 100644 --- a/backend/src/main/java/org/ftclub/cabinet/item/service/ItemHistoryQueryService.java +++ b/backend/src/main/java/org/ftclub/cabinet/item/service/ItemHistoryQueryService.java @@ -22,33 +22,33 @@ public List findAllItemHistoryByUser(Long userId) { return itemHistoryRepository.getAllUnusedItemHistoryByUser(userId); } - public Page getItemHistoryWithItem(Long userId, Pageable pageable) { + public Page findItemHistoryWithItem(Long userId, Pageable pageable) { return itemHistoryRepository.findAllByUserIdOnMinusPriceItemsWithSubQuery(userId, pageable); } - public Page getItemHistoriesByUserIdWithItem(Long userId, Pageable pageable) { + public Page findItemHistoriesByUserIdWithItem(Long userId, Pageable pageable) { return itemHistoryRepository.findAllByUserIdOrderByPurchaseAtDesc(userId, pageable); } - public Page getCoinHistory(Long userId, Pageable pageable, List itemIds) { + public Page findCoinHistory(Long userId, Pageable pageable, List itemIds) { return itemHistoryRepository.findAllByUserIdAndItemIdIn(userId, pageable, itemIds); } - public List getUnusedItemsInUserInventory(Long userId, Long itemId) { + public List findUnusedItemsInUserInventory(Long userId, Long itemId) { return itemHistoryRepository.findAllByUserIdAndItemIdAndUsedAtIsNull(userId, itemId); } - public int getPurchaseCountByItemId(Long itemId) { + public int findPurchaseCountByItemId(Long itemId) { return itemHistoryRepository.getCountByItemIds(itemId); } - public List getUsedCoinHistoryBetween( + public List findUsedCoinHistoryBetween( LocalDate startDate, LocalDate endDate) { return itemHistoryRepository.findAllUsedAtIsNotNullBetween(startDate, endDate); } - public List getCoinCollectedInfoByMonth(Long itemId, Integer year, + public List findCoinCollectedInfoByMonth(Long itemId, Integer year, Integer month) { return itemHistoryRepository.findCoinCollectInfoByIdAtYearAndMonth(itemId, year, month); }