diff --git a/store-service/src/main/java/com/justpickup/storeservice/domain/category/repository/CategoryRepositoryCustom.java b/store-service/src/main/java/com/justpickup/storeservice/domain/category/repository/CategoryRepositoryCustom.java index 56ad620..c993ea6 100644 --- a/store-service/src/main/java/com/justpickup/storeservice/domain/category/repository/CategoryRepositoryCustom.java +++ b/store-service/src/main/java/com/justpickup/storeservice/domain/category/repository/CategoryRepositoryCustom.java @@ -17,12 +17,12 @@ public class CategoryRepositoryCustom { private final JPAQueryFactory jpaQueryFactory; - public List getCategoryList(Long storeId){ + public List getCategoryList(Long userId){ List categoryList = jpaQueryFactory.selectFrom(QCategory.category) .leftJoin(QCategory.category.items, QItem.item).fetchJoin() .join(QCategory.category.store, QStore.store).fetchJoin() - .where(QCategory.category.store.id.eq(storeId)) + .where(QCategory.category.store.userId.eq(userId)) .orderBy(QCategory.category.order.asc()) .distinct() .fetch(); diff --git a/store-service/src/main/java/com/justpickup/storeservice/domain/category/service/CategoryService.java b/store-service/src/main/java/com/justpickup/storeservice/domain/category/service/CategoryService.java index 25dd471..ab92592 100644 --- a/store-service/src/main/java/com/justpickup/storeservice/domain/category/service/CategoryService.java +++ b/store-service/src/main/java/com/justpickup/storeservice/domain/category/service/CategoryService.java @@ -27,9 +27,9 @@ public class CategoryService { private final CategoryRepositoryCustom categoryRepositoryCustom; private final StoreRepository storeRepository; - public List getCategoryList(Long storeId){ + public List getCategoryList(Long userId){ - return categoryRepositoryCustom.getCategoryList(storeId) + return categoryRepositoryCustom.getCategoryList(userId) .stream() .map(CategoryDto::new) .collect(Collectors.toList()); diff --git a/store-service/src/main/java/com/justpickup/storeservice/domain/category/web/CategoryOwnerApiController.java b/store-service/src/main/java/com/justpickup/storeservice/domain/category/web/CategoryOwnerApiController.java index a444af3..10182de 100644 --- a/store-service/src/main/java/com/justpickup/storeservice/domain/category/web/CategoryOwnerApiController.java +++ b/store-service/src/main/java/com/justpickup/storeservice/domain/category/web/CategoryOwnerApiController.java @@ -23,8 +23,7 @@ public class CategoryOwnerApiController { @GetMapping("/category") public ResponseEntity getCategoryList(@RequestHeader(value = "user-id") String userId ){ - Long storeId = Long.parseLong(userId); - List categoryList = categoryService.getCategoryList(storeId); + List categoryList = categoryService.getCategoryList(Long.parseLong(userId)); List categoryResponseList = categoryList.stream() .map(CategoryResponse::new) diff --git a/store-service/src/main/java/com/justpickup/storeservice/domain/item/repository/ItemRepositoryCustom.java b/store-service/src/main/java/com/justpickup/storeservice/domain/item/repository/ItemRepositoryCustom.java index de29b2a..9459d9e 100644 --- a/store-service/src/main/java/com/justpickup/storeservice/domain/item/repository/ItemRepositoryCustom.java +++ b/store-service/src/main/java/com/justpickup/storeservice/domain/item/repository/ItemRepositoryCustom.java @@ -32,14 +32,14 @@ public class ItemRepositoryCustom { return Optional.ofNullable(item); } - public Page findItem(Long storeId,String word, Pageable pageable){ + public Page findItem(Long userId,String word, Pageable pageable){ //count 가져오기 Long count = queryFactory.select(QItem.item.count()) .from(QItem.item) .join(QItem.item.category) .leftJoin(QItem.item.store) - .on(QItem.item.store.id.eq(storeId)) + .on(QItem.item.store.userId.eq(userId)) .where( QItem.item.name.contains(word) .or(QItem.item.category.name.contains(word)) @@ -52,7 +52,7 @@ public class ItemRepositoryCustom { List itemList = queryFactory.selectFrom(QItem.item) .join(QItem.item.category).fetchJoin() .leftJoin(QItem.item.store) - .on(QItem.item.store.id.eq(storeId)) + .on(QItem.item.store.id.eq(userId)) .where( QItem.item.name.contains(word) .or(QItem.item.category.name.contains(word)) diff --git a/store-service/src/main/java/com/justpickup/storeservice/domain/item/service/ItemService.java b/store-service/src/main/java/com/justpickup/storeservice/domain/item/service/ItemService.java index c1c34c8..3f4d0ad 100644 --- a/store-service/src/main/java/com/justpickup/storeservice/domain/item/service/ItemService.java +++ b/store-service/src/main/java/com/justpickup/storeservice/domain/item/service/ItemService.java @@ -14,9 +14,9 @@ public interface ItemService { ItemDto findFullItemByItemId(Long itemId); - Page findItemList(Long storeId,String word, Pageable pageable); + Page findItemList(Long userId,String word, Pageable pageable); void putItem(Long itemId, String itemName, Long itemPrice, Long categoryId, List itemOptionDtos); - void createItem( Long storeId, String itemName, Long itemPrice, Long categoryId, List itemOptionDtos); + void createItem( Long userId, String itemName, Long itemPrice, Long categoryId, List itemOptionDtos); } diff --git a/store-service/src/main/java/com/justpickup/storeservice/domain/item/service/ItemServiceImpl.java b/store-service/src/main/java/com/justpickup/storeservice/domain/item/service/ItemServiceImpl.java index f0e71c5..6882217 100644 --- a/store-service/src/main/java/com/justpickup/storeservice/domain/item/service/ItemServiceImpl.java +++ b/store-service/src/main/java/com/justpickup/storeservice/domain/item/service/ItemServiceImpl.java @@ -57,9 +57,9 @@ public class ItemServiceImpl implements ItemService { @Override - public Page findItemList( Long storeId,String word, Pageable pageable) { + public Page findItemList( Long userId,String word, Pageable pageable) { - Page itemList = itemRepositoryCustom.findItem(storeId,word,pageable); + Page itemList = itemRepositoryCustom.findItem(userId,word,pageable); return PageableExecutionUtils.getPage(itemList.stream() .map(ItemDto::createWithCategoryItemDto) .collect(Collectors.toList()),pageable,itemList::getTotalElements); @@ -91,14 +91,14 @@ public class ItemServiceImpl implements ItemService { @Override @Transactional - public void createItem(Long storeId, + public void createItem(Long userId, String itemName, Long itemPrice, Long categoryId, List itemOptionDtos) { //find Store - Store store = storeRepository.findById(storeId) + Store store = storeRepository.findByUserId(userId) .orElseThrow(() -> new NotExistItemException("존재하지 않는 매장 입니다.")); //find Category diff --git a/store-service/src/main/java/com/justpickup/storeservice/domain/item/web/ItemOwnerApiController.java b/store-service/src/main/java/com/justpickup/storeservice/domain/item/web/ItemOwnerApiController.java index 8da50a4..a7b066e 100644 --- a/store-service/src/main/java/com/justpickup/storeservice/domain/item/web/ItemOwnerApiController.java +++ b/store-service/src/main/java/com/justpickup/storeservice/domain/item/web/ItemOwnerApiController.java @@ -32,10 +32,9 @@ public class ItemOwnerApiController { @PageableDefault Pageable pageable, @RequestHeader(value = "user-id") String userId ){ - Long storeId = Long.parseLong(userId); Page itemDtoList = - itemService.findItemList(storeId, + itemService.findItemList(Long.parseLong(userId), word.orElse(""), pageable); List itemList = itemDtoList.stream() @@ -200,7 +199,6 @@ public class ItemOwnerApiController { public ResponseEntity createItem( @RequestBody @Valid ItemRequest itemRequest, @RequestHeader(value = "user-id") String userId ){ - Long storeId = Long.parseLong(userId); List itemOption = itemRequest.getRequiredOption().stream() .map(ItemRequest.ItemOptionRequest::createItemOptionDto) @@ -209,7 +207,7 @@ public class ItemOwnerApiController { .map(ItemRequest.ItemOptionRequest::createItemOptionDto) .collect(Collectors.toList())); - itemService.createItem(storeId + itemService.createItem(Long.parseLong(userId) , itemRequest.getItemName() , itemRequest.getItemPrice() , itemRequest.getCategoryId() diff --git a/store-service/src/main/java/com/justpickup/storeservice/domain/store/repository/StoreRepository.java b/store-service/src/main/java/com/justpickup/storeservice/domain/store/repository/StoreRepository.java index 4f9b0e4..42aa09a 100644 --- a/store-service/src/main/java/com/justpickup/storeservice/domain/store/repository/StoreRepository.java +++ b/store-service/src/main/java/com/justpickup/storeservice/domain/store/repository/StoreRepository.java @@ -4,6 +4,10 @@ import com.justpickup.storeservice.domain.store.entity.Store; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; +import java.util.Optional; + @Repository public interface StoreRepository extends JpaRepository { + + Optional findByUserId(Long userId); }