Merge pull request #84 from team-ecolink/feature/product

team-ecolink · Feb 7, 2024 · eacd8d4 · eacd8d4
2 parents bfcec4c + 0e8e5cc
commit eacd8d4
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 44 deletions.
diff --git a/src/main/java/com/ecolink/core/product/controller/StoreProductController.java b/src/main/java/com/ecolink/core/product/controller/StoreProductController.java
@@ -1,18 +1,22 @@
 package com.ecolink.core.product.controller;
 
 import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.ecolink.core.auth.token.UserPrincipal;
 import com.ecolink.core.common.response.ApiCursorPageResponse;
 import com.ecolink.core.product.dto.request.GetStoreProductRequest;
 import com.ecolink.core.product.dto.response.GetStoreProductResponse;
 import com.ecolink.core.product.service.StoreProductSearchService;
 
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
@@ -37,4 +41,18 @@ public ApiCursorPageResponse<GetStoreProductResponse, Long> searchStoreProducts(
 		return ApiCursorPageResponse.ok(storeProductSearchService.searchStoreProducts(storeId, request));
 	}
 
+	@Tag(name = "${swagger.tag.manager}")
+	@Operation(summary = "점주 매장 판매 제품 목록 조회 API- 인증 필요",
+		description = "점주 매장 판매 제품 목록 조회 API - 인증 필요",
+		security = {@SecurityRequirement(name = "session-token")})
+	@PreAuthorize("hasRole('MANAGER')")
+	@GetMapping("/m/stores/{id}/products")
+	public ApiCursorPageResponse<GetStoreProductResponse, Long> searchStoreProductsByManager(
+		@Valid @ParameterObject GetStoreProductRequest request,
+		@PathVariable("id") @NotNull @Positive Long storeId,
+		@AuthenticationPrincipal UserPrincipal principal) {
+		return ApiCursorPageResponse.ok(
+			storeProductSearchService.searchStoreProductsByManager(storeId, request, principal));
+	}
+
 }
diff --git a/src/main/java/com/ecolink/core/product/domain/StoreProduct.java b/src/main/java/com/ecolink/core/product/domain/StoreProduct.java
@@ -3,6 +3,7 @@
 import com.ecolink.core.common.domain.BaseTimeEntity;
 import com.ecolink.core.store.domain.Store;
 import com.ecolink.core.tag.domain.Product;
+import com.ecolink.core.tag.domain.Tag;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
@@ -47,4 +48,9 @@ public class StoreProduct extends BaseTimeEntity {
 	@ManyToOne(fetch = FetchType.LAZY)
 	private Product product;
 
+	@NotNull
+	@JoinColumn(name = "tag_id")
+	@ManyToOne(fetch = FetchType.LAZY)
+	private Tag tag;
+
 }
diff --git a/src/main/java/com/ecolink/core/product/domain/StoreProductTag.java b/src/main/java/com/ecolink/core/product/domain/StoreProductTag.java
diff --git a/src/main/java/com/ecolink/core/product/repository/StoreProductJpaRepository.java b/src/main/java/com/ecolink/core/product/repository/StoreProductJpaRepository.java
@@ -2,7 +2,6 @@
 
 import static com.ecolink.core.product.domain.QStoreProduct.*;
 import static com.ecolink.core.product.domain.QStoreProductPhoto.*;
-import static com.ecolink.core.product.domain.QStoreProductTag.*;
 import static com.ecolink.core.tag.domain.QProduct.*;
 import static com.ecolink.core.tag.domain.QTag.*;
 
@@ -28,7 +27,8 @@ public StoreProductJpaRepository(EntityManager entityManager) {
 		this.queryFactory = new JPAQueryFactory(entityManager);
 	}
 
-	public List<GetStoreProductResponse> queryByNameAndTag(Long storeId, GetStoreProductRequest request, Boolean onSale) {
+	public List<GetStoreProductResponse> queryByNameAndTag(Long storeId, GetStoreProductRequest request,
+		Boolean onSale) {
 
 		JPAQuery<GetStoreProductResponse> common = queryFactory.select(new QGetStoreProductResponse(
 				storeProduct,
@@ -56,14 +56,11 @@ private static JPAQuery<GetStoreProductResponse> withCondition(JPAQuery<GetStore
 			builder.and(product.name.contains(request.getKeyword()));
 
 		if (request.getTagId() != null) {
-			common.leftJoin(storeProductTag)
-				.on(storeProductTag.storeProduct.eq(storeProduct))
-				.join(tag)
-				.on(tag.eq(storeProductTag.tag));
+			common.join(storeProduct.tag, tag);
 			builder.and(tag.id.eq(request.getTagId()));
 		}
 
-		if(onSale != null)
+		if (onSale != null)
 			builder.and(storeProduct.onSale.eq(onSale));
 
 		return common.where(builder);

diff --git a/src/main/java/com/ecolink/core/product/service/StoreProductSearchService.java b/src/main/java/com/ecolink/core/product/service/StoreProductSearchService.java
@@ -3,7 +3,11 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.ecolink.core.auth.token.UserPrincipal;
 import com.ecolink.core.common.dto.CursorPage;
+import com.ecolink.core.common.error.ErrorCode;
+import com.ecolink.core.common.error.exception.ManagerForbiddenException;
+import com.ecolink.core.common.util.AuthorityUtil;
 import com.ecolink.core.product.dto.request.GetStoreProductRequest;
 import com.ecolink.core.product.dto.response.GetStoreProductResponse;
 import com.ecolink.core.tag.constant.TagCategory;
@@ -27,4 +31,16 @@ public CursorPage<GetStoreProductResponse, Long> searchStoreProducts(Long storeI
 			GetStoreProductResponse::getId);
 	}
 
+	public CursorPage<GetStoreProductResponse, Long> searchStoreProductsByManager(Long storeId,
+		GetStoreProductRequest request, UserPrincipal principal) {
+		if(!principal.isManagerOf(storeId) && !AuthorityUtil.hasAdminAuthority(principal))
+			throw new ManagerForbiddenException(ErrorCode.NOT_MANAGER_OF_STORE);
+
+		if (request.getTagId() != null)
+			tagService.validateCategory(request.getTagId(), TagCategory.PRODUCT);
+
+		return CursorPage.of(storeProductService.getByNameAndTag(storeId, request, null), request.getSize(),
+			GetStoreProductResponse::getId);
+	}
+
 }
diff --git a/src/main/java/com/ecolink/core/product/service/StoreProductService.java b/src/main/java/com/ecolink/core/product/service/StoreProductService.java
@@ -83,7 +83,7 @@ private void addTop3StoreProductsToDto(StoreSearchDto dto) {
 		}
 	}
 
-	public List<GetStoreProductResponse> getByNameAndTag(Long storeId, GetStoreProductRequest request, boolean onSale) {
+	public List<GetStoreProductResponse> getByNameAndTag(Long storeId, GetStoreProductRequest request, Boolean onSale) {
 		return storeProductJpaRepository.queryByNameAndTag(storeId, request, onSale);
 	}
 

diff --git a/src/main/resources/application-swagger.yml b/src/main/resources/application-swagger.yml
@@ -6,5 +6,6 @@ swagger:
     my-page: '04. 마이페이지'
     store: '05. 매장 상세 페이지'
     bookmark: '06. 북마크'
+    manager: '07. 매장 관리페이지'
     account: '08. 계정 관리페이지'
     tag: '10.태그'