Deploy | CAKK-56 | v2.0.4 배포

.github/workflows/ci.yml

@@ -55,7 +55,9 @@ jobs:
         uses: EnricoMi/publish-unit-test-result-action@v2
         if: always()
         with:
-          files: ./cakk-api/build/test-results/**/*.xml
+          files: |
+            ./cakk-api/build/test-results/**/*.xml
+            ./cakk-domain/mysql/build/test-results/**/*.xml
 
       - name: Upload test coverage
         id: jacoco

cakk-api/src/main/java/com/cakk/api/controller/shop/ShopController.java

@@ -123,7 +123,6 @@ public ApiResponse<Void> like(
 		@SignInUser User user,
 		@PathVariable Long cakeShopId
 	) {
-		likeService.validateLikeCount(user, cakeShopId);
 		likeService.likeCakeShop(user, cakeShopId);
 
 		return ApiResponse.success();

cakk-api/src/main/java/com/cakk/api/service/like/HeartService.java

@@ -16,21 +16,16 @@
 import com.cakk.api.mapper.CakeMapper;
 import com.cakk.api.mapper.HeartMapper;
 import com.cakk.api.mapper.ShopMapper;
-import com.cakk.common.enums.RedisKey;
 import com.cakk.domain.mysql.dto.param.like.HeartCakeImageResponseParam;
 import com.cakk.domain.mysql.dto.param.like.HeartCakeShopResponseParam;
 import com.cakk.domain.mysql.entity.cake.Cake;
-import com.cakk.domain.mysql.entity.cake.CakeHeart;
 import com.cakk.domain.mysql.entity.shop.CakeShop;
-import com.cakk.domain.mysql.entity.shop.CakeShopHeart;
 import com.cakk.domain.mysql.entity.user.User;
+import com.cakk.domain.mysql.facade.user.UserHeartFacade;
 import com.cakk.domain.mysql.repository.reader.CakeHeartReader;
 import com.cakk.domain.mysql.repository.reader.CakeReader;
 import com.cakk.domain.mysql.repository.reader.CakeShopHeartReader;
 import com.cakk.domain.mysql.repository.reader.CakeShopReader;
-import com.cakk.domain.mysql.repository.writer.CakeHeartWriter;
-import com.cakk.domain.mysql.repository.writer.CakeShopHeartWriter;
-import com.cakk.domain.redis.repository.LockRedisRepository;
 
 @RequiredArgsConstructor
 @Service
@@ -39,9 +34,8 @@ public class HeartService {
 	private final CakeReader cakeReader;
 	private final CakeShopReader cakeShopReader;
 	private final CakeHeartReader cakeHeartReader;
-	private final CakeHeartWriter cakeHeartWriter;
 	private final CakeShopHeartReader cakeShopHeartReader;
-	private final CakeShopHeartWriter cakeShopHeartWriter;
+	private final UserHeartFacade userHeartFacade;
 
 	@Transactional(readOnly = true)
 	public HeartCakeImageListResponse searchCakeImagesByCursorAndHeart(
@@ -73,33 +67,31 @@ public HeartCakeShopListResponse searchCakeShopByCursorAndHeart(
 
 	@Transactional(readOnly = true)
 	public HeartResponse isHeartCake(final User user, final Long cakeId) {
-		final Cake cake = cakeReader.findById(cakeId);
-		final boolean isHeart = cakeHeartReader.existsByUserAndCake(user, cake);
+		final Cake cake = cakeReader.findByIdWithHeart(cakeId);
+		final boolean isHeart = cake.isHeartedBy(user);
 
 		return HeartMapper.supplyHeartResponseBy(isHeart);
 	}
 
 	@Transactional(readOnly = true)
 	public HeartResponse isHeartCakeShop(final User user, final Long cakeShopId) {
-		final CakeShop cakeShop = cakeShopReader.findById(cakeShopId);
-		final boolean isHeart = cakeShopHeartReader.existsByUserAndCakeShop(user, cakeShop);
+		final CakeShop cakeShop = cakeShopReader.findByIdWithHeart(cakeShopId);
+		final boolean isHeart = cakeShop.isHeartedBy(user);
 
 		return HeartMapper.supplyHeartResponseBy(isHeart);
 	}
 
 	@DistributedLock(key = "#cakeId")
 	public void heartCake(final User user, final Long cakeId) {
-		final Cake cake = cakeReader.findById(cakeId);
-		final CakeHeart cakeHeart = cakeHeartReader.findOrNullByUserAndCake(user, cake);
+		final Cake cake = cakeReader.findByIdWithHeart(cakeId);
 
-		cakeHeartWriter.heartOrCancel(cakeHeart, user, cake);
+		userHeartFacade.heartCake(user, cake);
 	}
 
 	@DistributedLock(key = "#cakeShopId")
 	public void heartCakeShop(final User user, final Long cakeShopId) {
-		final CakeShop cakeShop = cakeShopReader.findById(cakeShopId);
-		final CakeShopHeart cakeShopHeart = cakeShopHeartReader.findOrNullByUserAndCakeShop(user, cakeShop);
+		final CakeShop cakeShop = cakeShopReader.findByIdWithHeart(cakeShopId);
 
-		cakeShopHeartWriter.heartOrCancel(cakeShopHeart, user, cakeShop);
+		userHeartFacade.heartCakeShop(user, cakeShop);
 	}
 }

cakk-api/src/main/java/com/cakk/api/service/like/LikeService.java

@@ -1,40 +1,26 @@
 package com.cakk.api.service.like;
 
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import lombok.RequiredArgsConstructor;
 
 import com.cakk.api.annotation.DistributedLock;
-import com.cakk.common.enums.ReturnCode;
-import com.cakk.common.exception.CakkException;
 import com.cakk.domain.mysql.entity.shop.CakeShop;
 import com.cakk.domain.mysql.entity.user.User;
-import com.cakk.domain.mysql.repository.reader.CakeShopLikeReader;
+import com.cakk.domain.mysql.facade.user.UserLikeFacade;
 import com.cakk.domain.mysql.repository.reader.CakeShopReader;
-import com.cakk.domain.mysql.repository.writer.CakeShopLikeWriter;
 
 @Service
 @RequiredArgsConstructor
 public class LikeService {
 
 	private final CakeShopReader cakeShopReader;
-	private final CakeShopLikeReader cakeShopLikeReader;
-	private final CakeShopLikeWriter cakeShopLikeWriter;
-
-	@Transactional(readOnly = true)
-	public void validateLikeCount(final User user, final Long cakeShopId) {
-		final int likeCount = cakeShopLikeReader.countByCakeShopIdAndUser(cakeShopId, user);
-
-		if (likeCount >= 50) {
-			throw new CakkException(ReturnCode.MAX_CAKE_SHOP_LIKE);
-		}
-	}
+	private final UserLikeFacade userCakeFacade;
 
 	@DistributedLock(key = "#cakeShopId")
 	public void likeCakeShop(final User user, final Long cakeShopId) {
-		final CakeShop cakeShop = cakeShopReader.findById(cakeShopId);
+		final CakeShop cakeShop = cakeShopReader.findByIdWithLike(cakeShopId);
 
-		cakeShopLikeWriter.like(cakeShop, user);
+		userCakeFacade.likeCakeShop(user, cakeShop);
 	}
 }

cakk-api/src/test/java/com/cakk/api/service/like/HeartServiceTest.java

@@ -21,17 +21,15 @@
 import com.cakk.domain.mysql.dto.param.like.HeartCakeImageResponseParam;
 import com.cakk.domain.mysql.entity.cake.Cake;
 import com.cakk.domain.mysql.entity.shop.CakeShop;
-import com.cakk.domain.mysql.entity.shop.CakeShopHeart;
 import com.cakk.domain.mysql.entity.user.User;
+import com.cakk.domain.mysql.facade.user.UserHeartFacade;
 import com.cakk.domain.mysql.repository.reader.CakeHeartReader;
 import com.cakk.domain.mysql.repository.reader.CakeReader;
 import com.cakk.domain.mysql.repository.reader.CakeShopHeartReader;
 import com.cakk.domain.mysql.repository.reader.CakeShopReader;
-import com.cakk.domain.mysql.repository.writer.CakeHeartWriter;
-import com.cakk.domain.mysql.repository.writer.CakeShopHeartWriter;
 
 @DisplayName("하트 기능 관련 비즈니스 로직 테스트")
-public class HeartServiceTest extends ServiceTest {
+class HeartServiceTest extends ServiceTest {
 
 	@InjectMocks
 	private HeartService heartService;
@@ -45,14 +43,12 @@ public class HeartServiceTest extends ServiceTest {
 	@Mock
 	private CakeHeartReader cakeHeartReader;
 
-	@Mock
-	private CakeHeartWriter cakeHeartWriter;
-
 	@Mock
 	private CakeShopHeartReader cakeShopHeartReader;
 
 	@Mock
-	private CakeShopHeartWriter cakeShopHeartWriter;
+	private UserHeartFacade userHeartFacade;
+
 
 	@TestWithDisplayName("하트 한 케이크 목록을 조회한다.")
 	void findCakeImagesByCursorAndHeart() {
@@ -135,59 +131,53 @@ void heartCake1() {
 		final Long cakeId = 1L;
 		final Cake cake = getConstructorMonkey().giveMeOne(Cake.class);
 
-		doReturn(cake).when(cakeReader).findById(cakeId);
-		doReturn(null).when(cakeHeartReader).findOrNullByUserAndCake(user, cake);
+		doReturn(cake).when(cakeReader).findByIdWithHeart(cakeId);
+		doNothing().when(userHeartFacade).heartCake(user, cake);
 
 		// when & then
 		assertDoesNotThrow(() -> heartService.heartCake(user, cakeId));
 
-		verify(cakeReader, times(1)).findById(cakeId);
-		verify(cakeHeartReader, times(1)).findOrNullByUserAndCake(user, cake);
+		verify(cakeReader, times(1)).findByIdWithHeart(cakeId);
+		verify(userHeartFacade, times(1)).heartCake(user, cake);
 	}
 
-	@TestWithDisplayName("해당 케이크가 없으면 하트 동작을 실패한다.")
+	@TestWithDisplayName("케이크에 대하여 하트 취소를 동작한다.")
 	void heartCake2() {
 		// given
 		final User user = getUser();
 		final Long cakeId = 1L;
 		final Cake cake = getConstructorMonkey().giveMeOne(Cake.class);
+		cake.heart(user);
 
-		doThrow(new CakkException(ReturnCode.NOT_EXIST_CAKE)).when(cakeReader).findById(cakeId);
+		doReturn(cake).when(cakeReader).findByIdWithHeart(cakeId);
+		doNothing().when(userHeartFacade).heartCake(user, cake);
 
 		// when & then
-		assertThrows(
-			CakkException.class,
-			() -> heartService.heartCake(user, cakeId),
-			ReturnCode.NOT_EXIST_CAKE.getMessage());
+		assertDoesNotThrow(() -> heartService.heartCake(user, cakeId));
 
-		verify(cakeReader, times(1)).findById(cakeId);
-		verify(cakeHeartReader, times(0)).findOrNullByUserAndCake(user, cake);
+		verify(cakeReader, times(1)).findByIdWithHeart(cakeId);
+		verify(userHeartFacade, times(1)).heartCake(user, cake);
 	}
 
-	@TestWithDisplayName("케이크 샵에 대하여 하트를 동작한다.")
-	void heartCakeShop1() {
+	@TestWithDisplayName("해당 케이크가 없으면 하트 동작을 실패한다.")
+	void heartCake3() {
 		// given
 		final User user = getUser();
-		final Long cakeShopId = 1L;
-		final CakeShop cakeShop = getConstructorMonkey().giveMeBuilder(CakeShop.class)
-			.set("shopName", Arbitraries.strings().withCharRange('a', 'z').ofMaxLength(30))
-			.set("shopBio", Arbitraries.strings().withCharRange('a', 'z').ofMaxLength(40))
-			.set("shopDescription", Arbitraries.strings().withCharRange('a', 'z').ofMaxLength(500))
-			.set("location", supplyPointBy(Arbitraries.doubles().sample(), Arbitraries.doubles().sample()))
-			.sample();
+		final Long cakeId = 1L;
 
-		doReturn(cakeShop).when(cakeShopReader).findById(cakeShopId);
-		doReturn(null).when(cakeShopHeartReader).findOrNullByUserAndCakeShop(user, cakeShop);
+		doThrow(new CakkException(ReturnCode.NOT_EXIST_CAKE)).when(cakeReader).findByIdWithHeart(cakeId);
 
 		// when & then
-		assertDoesNotThrow(() -> heartService.heartCakeShop(user, cakeShopId));
+		assertThrows(
+			CakkException.class,
+			() -> heartService.heartCake(user, cakeId),
+			ReturnCode.NOT_EXIST_CAKE.getMessage());
 
-		verify(cakeShopReader, times(1)).findById(cakeShopId);
-		verify(cakeShopHeartReader, times(1)).findOrNullByUserAndCakeShop(user, cakeShop);
+		verify(cakeReader, times(1)).findByIdWithHeart(cakeId);
 	}
 
-	@TestWithDisplayName("케이크 샵에 대하여 하트 취소를 동작한다.")
-	void heartCakeShop2() {
+	@TestWithDisplayName("케이크 샵에 대하여 하트를 동작한다.")
+	void heartCakeShop1() {
 		// given
 		final User user = getUser();
 		final Long cakeShopId = 1L;
@@ -197,16 +187,15 @@ void heartCakeShop2() {
 			.set("shopDescription", Arbitraries.strings().withCharRange('a', 'z').ofMaxLength(500))
 			.set("location", supplyPointBy(Arbitraries.doubles().sample(), Arbitraries.doubles().sample()))
 			.sample();
-		final CakeShopHeart cakeShopHeart = getConstructorMonkey().giveMeOne(CakeShopHeart.class);
 
-		doReturn(cakeShop).when(cakeShopReader).findById(cakeShopId);
-		doReturn(cakeShopHeart).when(cakeShopHeartReader).findOrNullByUserAndCakeShop(user, cakeShop);
+		doReturn(cakeShop).when(cakeShopReader).findByIdWithHeart(cakeShopId);
+		doNothing().when(userHeartFacade).heartCakeShop(user, cakeShop);
 
 		// when & then
 		assertDoesNotThrow(() -> heartService.heartCakeShop(user, cakeShopId));
 
-		verify(cakeShopReader, times(1)).findById(cakeShopId);
-		verify(cakeShopHeartReader, times(1)).findOrNullByUserAndCakeShop(user, cakeShop);
+		verify(cakeShopReader, times(1)).findByIdWithHeart(cakeShopId);
+		verify(userHeartFacade, times(1)).heartCakeShop(user, cakeShop);
 	}
 
 	@TestWithDisplayName("해당 케이크 샵이 없으면 하트 동작을 실패한다.")
@@ -215,15 +204,15 @@ void heartCakeShop3() {
 		final User user = getUser();
 		final Long cakeShopId = 1L;
 
-		doThrow(new CakkException(ReturnCode.NOT_EXIST_CAKE_SHOP)).when(cakeShopReader).findById(cakeShopId);
+		doThrow(new CakkException(ReturnCode.NOT_EXIST_CAKE_SHOP)).when(cakeShopReader).findByIdWithHeart(cakeShopId);
 
 		// when & then
 		assertThrows(
 			CakkException.class,
 			() -> heartService.heartCakeShop(user, cakeShopId),
 			ReturnCode.NOT_EXIST_CAKE_SHOP.getMessage());
 
-		verify(cakeShopReader, times(1)).findById(cakeShopId);
+		verify(cakeShopReader, times(1)).findByIdWithHeart(cakeShopId);
 		verify(cakeShopHeartReader, times(0)).findOrNullByUserAndCakeShop(any(User.class), any(CakeShop.class));
 	}
 }

cakk-api/src/test/java/com/cakk/api/service/like/LikeServiceTest.java

@@ -11,14 +11,10 @@
 
 import com.cakk.api.common.annotation.TestWithDisplayName;
 import com.cakk.api.common.base.ServiceTest;
-import com.cakk.common.enums.ReturnCode;
-import com.cakk.common.exception.CakkException;
 import com.cakk.domain.mysql.entity.shop.CakeShop;
 import com.cakk.domain.mysql.entity.user.User;
-import com.cakk.domain.mysql.repository.reader.CakeShopLikeReader;
+import com.cakk.domain.mysql.facade.user.UserLikeFacade;
 import com.cakk.domain.mysql.repository.reader.CakeShopReader;
-import com.cakk.domain.mysql.repository.writer.CakeShopLikeWriter;
-
 @DisplayName("좋아요 기능 관련 비즈니스 로직 테스트")
 public class LikeServiceTest extends ServiceTest {
 
@@ -29,39 +25,7 @@ public class LikeServiceTest extends ServiceTest {
 	private CakeShopReader cakeShopReader;
 
 	@Mock
-	private CakeShopLikeReader cakeShopLikeReader;
-
-	@Mock
-	private CakeShopLikeWriter cakeShopLikeWriter;
-
-	@TestWithDisplayName("좋아요 개수 50개가 넘지 않으면 유효성 검사에 통과한다.")
-	void validateLikeCountSuccess() {
-		// given
-		final User user = getUser();
-		final long cakeShopId = Arbitraries.longs().greaterOrEqual(1).sample();
-		final int likeCount = Arbitraries.integers().lessOrEqual(49).sample();
-
-		doReturn(likeCount).when(cakeShopLikeReader).countByCakeShopIdAndUser(cakeShopId, user);
-
-		// when & then
-		assertDoesNotThrow(() -> likeService.validateLikeCount(user, cakeShopId));
-	}
-
-	@TestWithDisplayName("좋아요 개수 50개가 넘으면 유효성 검사에서 에러를 반환한다.")
-	void validateLikeCountFail() {
-		// given
-		final User user = getUser();
-		final long cakeShopId = Arbitraries.longs().greaterOrEqual(1).sample();
-		final int likeCount = Arbitraries.integers().greaterOrEqual(50).sample();
-
-		doReturn(likeCount).when(cakeShopLikeReader).countByCakeShopIdAndUser(cakeShopId, user);
-
-		// when & then
-		assertThrows(
-			CakkException.class,
-			() -> likeService.validateLikeCount(user, cakeShopId),
-			ReturnCode.MAX_CAKE_SHOP_LIKE.getMessage());
-	}
+	private UserLikeFacade userLikeFacade;
 
 	@TestWithDisplayName("케이크 샵 좋아요를 성공한다.")
 	void likeCakeShop() {
@@ -75,8 +39,8 @@ void likeCakeShop() {
 			.set("location", supplyPointBy(Arbitraries.doubles().sample(), Arbitraries.doubles().sample()))
 			.sample();
 
-		doReturn(cakeShop).when(cakeShopReader).findById(cakeShopId);
-		doNothing().when(cakeShopLikeWriter).like(cakeShop, user);
+		doReturn(cakeShop).when(cakeShopReader).findByIdWithLike(cakeShopId);
+		doNothing().when(userLikeFacade).likeCakeShop(user, cakeShop);
 
 		// when
 		likeService.likeCakeShop(user, cakeShopId);

cakk-api/src/test/resources/sql/insert-cake-shop.sql

@@ -10,7 +10,7 @@ SET @g9 = 'Point(37.543343 127.052609)';
 SET @g10 = 'Point(37.541530 127.054164)';
 
 insert into cake_shop (shop_id, thumbnail_url, shop_name, shop_address, shop_bio, shop_description, location, like_count, heart_count, created_at, updated_at)
-values (1, 'thumbnail_url1', '케이크 맛집1', '케이크 맛집입니다.', '서울시 강남구 어쩌고로1', '케이크 맛집입니다.', ST_GeomFromText(@g1, 4326), 0, 0, now(), now()),
+values (1, 'thumbnail_url1', '케이크 맛집1', '케이크 맛집입니다.', '서울시 강남구 어쩌고로1', '케이크 맛집입니다.', ST_GeomFromText(@g1, 4326), 0, 1, now(), now()),
        (2, 'thumbnail_url2', '케이크 맛집2', '케이크 맛집입니다.', '서울시 강남구 어쩌고로2', '케이크 맛집입니다.', ST_GeomFromText(@g2, 4326), 0, 0, now(), now()),
        (3, 'thumbnail_url3', '케이크 맛집3', '케이크 맛집입니다.', '서울시 강남구 어쩌고로3', '케이크 맛집입니다.', ST_GeomFromText(@g3, 4326), 0, 0, now(), now()),
        (4, 'thumbnail_url4', '케이크 맛집4', '케이크 맛집입니다.', '서울시 강남구 어쩌고로3', '케이크 맛집입니다.', ST_GeomFromText(@g4, 4326), 0, 0, now(), now()),

cakk-api/src/test/resources/sql/insert-cake.sql

@@ -42,7 +42,7 @@ values (1, 1, 0, '10:00:00', '22:00:00', now(), now()),
 insert into cake (cake_id, shop_id, cake_image_url, heart_count, created_at, updated_at)
 values (1, 1, 'cake_image_url1', 0, now(), now()),
        (2, 1, 'cake_image_url2', 0, now(), now()),
-       (3, 1, 'cake_image_url3', 0, now(), now()),
+       (3, 1, 'cake_image_url3', 1, now(), now()),
        (4, 2, 'cake_image_url4', 0, now(), now()),
        (5, 2, 'cake_image_url5', 0, now(), now()),
        (6, 2, 'cake_image_url6', 0, now(), now()),

cakk-domain/mysql/build.gradle

@@ -8,7 +8,7 @@ dependencies {
 	implementation 'io.hypersistence:hypersistence-utils-hibernate-63:3.7.4'
 
 	// test
-	testImplementation("com.navercorp.fixturemonkey:fixture-monkey-starter:1.0.16")
+	testImplementation("com.navercorp.fixturemonkey:fixture-monkey-starter:1.0.23")
 	testImplementation('org.assertj:assertj-core')
 	testImplementation('org.junit.jupiter:junit-jupiter')
 	testRuntimeOnly('org.junit.platform:junit-platform-launcher')