diff --git a/src/main/java/com/salemale/domain/item/repository/ItemRepository.java b/src/main/java/com/salemale/domain/item/repository/ItemRepository.java index 4d851a6..0c96778 100644 --- a/src/main/java/com/salemale/domain/item/repository/ItemRepository.java +++ b/src/main/java/com/salemale/domain/item/repository/ItemRepository.java @@ -60,12 +60,12 @@ List findByEndTimeBeforeAndItemStatus( WHERE i.item_type = 'AUCTION' AND i.item_status = CAST(:status AS varchar) AND ( - :me IS NULL OR i.seller NOT IN ( - SELECT bl.blocked - FROM BlockList bl - WHERE bl.blocker.id = :me + :me IS NULL OR i.seller_id NOT IN ( + SELECT bl.blocked_user_id + FROM block_list bl + WHERE bl.blocker_id = :me ) - ) + ) AND ( 6371 * acos( LEAST(1, GREATEST(-1, @@ -84,11 +84,11 @@ SELECT count(1) WHERE i.item_type = 'AUCTION' AND i.item_status = CAST(:status AS varchar) AND ( - :me IS NULL OR i.seller NOT IN ( - SELECT bl.blocked - FROM BlockList bl - WHERE bl.blocker.id = :me - ) + :me IS NULL OR i.seller_id NOT IN ( + SELECT bl.blocked_user_id + FROM block_list bl + WHERE bl.blocker_id = :me + ) ) AND ( 6371 * acos( @@ -118,12 +118,12 @@ Page findNearbyItems( WHERE i.itemType = com.salemale.global.common.enums.ItemType.AUCTION AND i.itemStatus = :status AND ( - :me IS NULL OR i.seller NOT IN ( - SELECT bl.blocked - FROM BlockList bl - WHERE bl.blocker.id = :me - ) - ) + :me IS NULL OR i.seller_id NOT IN ( + SELECT bl.blocked_user_id + FROM block_list bl + WHERE bl.blocker_id = :me + ) + ) AND ( LOWER(i.title) LIKE LOWER(CONCAT('%', :keyword, '%')) OR LOWER(i.name) LIKE LOWER(CONCAT('%', :keyword, '%')) @@ -148,12 +148,12 @@ Page searchItemsByKeyword( WHERE i.itemType = com.salemale.global.common.enums.ItemType.AUCTION AND i.itemStatus = :status AND ( - :me IS NULL OR i.seller NOT IN ( - SELECT bl.blocked - FROM BlockList bl - WHERE bl.blocker.id = :me - ) - ) + :me IS NULL OR i.seller_id NOT IN ( + SELECT bl.blocked_user_id + FROM block_list bl + WHERE bl.blocker_id = :me + ) + ) AND ( LOWER(i.title) LIKE LOWER(CONCAT('%', :keyword, '%')) OR LOWER(i.name) LIKE LOWER(CONCAT('%', :keyword, '%')) @@ -191,12 +191,12 @@ Page searchItemsByKeywordWithFilters( WHERE i.itemType = com.salemale.global.common.enums.ItemType.AUCTION AND i.itemStatus = :status AND ( - :me IS NULL OR i.seller NOT IN ( - SELECT bl.blocked - FROM BlockList bl - WHERE bl.blocker.id = :me + :me IS NULL OR i.seller_id NOT IN ( + SELECT bl.blocked_user_id + FROM block_list bl + WHERE bl.blocker_id = :me ) - ) + ) AND (:categories IS NULL OR i.category IN :categories) AND (:minPrice IS NULL OR i.currentPrice >= :minPrice) AND (:maxPrice IS NULL OR i.currentPrice <= :maxPrice) @@ -228,12 +228,12 @@ Page searchItemsByFiltersOnly( WHERE i.item_type = 'AUCTION' AND i.item_status = CAST(:status AS varchar) AND ( - :me IS NULL OR i.seller NOT IN ( - SELECT bl.blocked - FROM BlockList bl - WHERE bl.blocker.id = :me - ) - ) + :me IS NULL OR i.seller_id NOT IN ( + SELECT bl.blocked_user_id + FROM block_list bl + WHERE bl.blocker_id = :me + ) + ) AND ( LOWER(i.title) LIKE LOWER(CONCAT('%', :keyword, '%')) OR LOWER(i.name) LIKE LOWER(CONCAT('%', :keyword, '%')) @@ -256,10 +256,10 @@ SELECT count(1) WHERE i.item_type = 'AUCTION' AND i.item_status = CAST(:status AS varchar) AND ( - :me IS NULL OR i.seller NOT IN ( - SELECT bl.blocked - FROM BlockList bl - WHERE bl.blocker.id = :me + :me IS NULL OR i.seller_id NOT IN ( + SELECT bl.blocked_user_id + FROM block_list bl + WHERE bl.blocker_id = :me ) ) AND ( @@ -317,4 +317,4 @@ List findByEndTimeBetweenAndItemStatus( LocalDateTime end, ItemStatus status ); -} \ No newline at end of file +}