Fix: 조회 쿼리 수정 및 비즈니스 로직 중 권한 변경 빠진 부분 추가

CAKK-DEV · May 21, 2024 · aa8b2fb · aa8b2fb
2 parents 6341681 + b7eeb1d
commit aa8b2fb
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 6 deletions.
diff --git a/cakk-api/src/main/java/com/cakk/api/service/shop/ShopService.java b/cakk-api/src/main/java/com/cakk/api/service/shop/ShopService.java
@@ -43,7 +43,8 @@ public void createCakeShopByCertification(CreateShopRequest request) {
 	@Transactional
 	public void promoteUserToBusinessOwner(PromotionRequest request) {
 		User user = userReader.findByUserId(request.userId());
-		BusinessInformation businessInformation = cakeShopReader.findBusinessInformationByShopId(request.cakeShopId());
+		BusinessInformation businessInformation = cakeShopReader
+			.findBusinessInformationWithShop(request.cakeShopId());
 
 		businessInformation.promotedByBusinessOwner(user);
 	}
@@ -53,7 +54,7 @@ public void requestCertificationBusinessOwner(CertificationParam param) {
 		BusinessInformation businessInformation;
 
 		if (param.cakeShopId() != null) {
-			businessInformation = cakeShopReader.findBusinessInformationByShopId(param.cakeShopId());
+			businessInformation = cakeShopReader.findBusinessInformationByCakeShopId(param.cakeShopId());
 		} else {
 			businessInformation = ShopMapper.supplyBusinessInformationBy();
 		}

diff --git a/cakk-common/src/main/java/com/cakk/common/enums/Role.java b/cakk-common/src/main/java/com/cakk/common/enums/Role.java
@@ -2,7 +2,7 @@
 
 public enum Role {
 
-	ADMIN, MERCHANT, USER;
+	ADMIN, BUSINESS_OWNER, USER;
 
 	public String getSecurityRole() {
 		return "ROLE_" + this;

diff --git a/cakk-domain/src/main/java/com/cakk/domain/entity/user/BusinessInformation.java b/cakk-domain/src/main/java/com/cakk/domain/entity/user/BusinessInformation.java
@@ -65,6 +65,7 @@ public CertificationEvent getRequestCertificationMessage(CertificationParam para
 
 	public void promotedByBusinessOwner(User businessOwner) {
 		user = businessOwner;
+		user.upgradedRoleToBusinessOwner();
 		cakeShop.ownedByUser();
 	}
 

diff --git a/cakk-domain/src/main/java/com/cakk/domain/entity/user/User.java b/cakk-domain/src/main/java/com/cakk/domain/entity/user/User.java
@@ -96,4 +96,8 @@ public User(
 		this.deviceToken = deviceToken;
 		this.role = role;
 	}
+
+	public void upgradedRoleToBusinessOwner() {
+		role = Role.BUSINESS_OWNER;
+	}
 }
diff --git a/...domain/src/main/java/com/cakk/domain/repository/jpa/BusinessInformationJpaRepository.java b/...domain/src/main/java/com/cakk/domain/repository/jpa/BusinessInformationJpaRepository.java
@@ -3,11 +3,16 @@
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import com.cakk.domain.entity.user.BusinessInformation;
 
 public interface BusinessInformationJpaRepository extends JpaRepository<BusinessInformation, Long> {
 
-	Optional<BusinessInformation> findBusinessInformationByCakeShopId(Long cakeShopId);
+	@Query("select bi from BusinessInformation as bi join fetch bi.cakeShop "
+		+ "where bi.cakeShop.id =:cakeShopId")
+	Optional<BusinessInformation> findBusinessInformationWithCakeShop(@Param("cakeShopId") Long cakeShopId);
 
+	Optional<BusinessInformation> findBusinessInformationByCakeShopId(Long cakeShopId);
 }
diff --git a/cakk-domain/src/main/java/com/cakk/domain/repository/reader/CakeShopReader.java b/cakk-domain/src/main/java/com/cakk/domain/repository/reader/CakeShopReader.java
@@ -21,9 +21,15 @@ public CakeShop findById(Long cakeShopId) {
 		return cakeShopJpaRepository.findById(cakeShopId).orElseThrow(() -> new CakkException(ReturnCode.NOT_EXIST_CAKE_SHOP));
 	}
 
-	public BusinessInformation findBusinessInformationByShopId(Long cakeShopId) {
+	public BusinessInformation findBusinessInformationWithShop(Long cakeShopId) {
 		return businessInformationJpaRepository
-			.findBusinessInformationByCakeShopId(cakeShopId)
+			.findBusinessInformationWithCakeShop(cakeShopId)
 			.orElseThrow(() -> new CakkException(ReturnCode.NOT_EXIST_CAKE_SHOP));
 	}
+
+	public BusinessInformation findBusinessInformationByCakeShopId(Long cakeShopId) {
+		return businessInformationJpaRepository.findBusinessInformationByCakeShopId(cakeShopId)
+			.orElseThrow(() -> new CakkException(ReturnCode.NOT_EXIST_CAKE_SHOP));
+	}
+
 }