Refactor | #128 | @lcomment | catalog 롤백

CAKK-DEV · Jun 28, 2024 · ecadffd · ecadffd
1 parent 803eff5
commit ecadffd
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 15 deletions.
diff --git a/cakk-api/src/test/java/com/cakk/api/service/shop/ShopServiceTest.java b/cakk-api/src/test/java/com/cakk/api/service/shop/ShopServiceTest.java
@@ -183,14 +183,15 @@ void searchDetailById2() {
 	void createCakeShop() {
 		//given
 		CreateShopRequest request = getCreateShopRequestFixture();
+		CakeShop cakeShop = getCakeShopFixture();
 		when(cakeShopWriter.createCakeShop(any(CakeShop.class), anyList(), any(BusinessInformation.class), anyList()))
-			.thenReturn(getCakeShopFixture());
+			.thenReturn(cakeShop);
 
 		//when
 		final CakeShopCreateResponse response = shopService.createCakeShopByCertification(request);
 
 		//verify
-		assertThat(response.cakeShopId()).isNotNull();
+		assertEquals(response.cakeShopId(), cakeShop.getId());
 		verify(cakeShopWriter, times(1))
 			.createCakeShop(any(CakeShop.class), anyList(), any(BusinessInformation.class), anyList());
 	}

diff --git a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/entity/cake/Cake.java b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/entity/cake/Cake.java
@@ -33,7 +33,7 @@
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
-@Table(name = "cake", catalog = "cakk")
+@Table(name = "cake")
 public class Cake extends AuditEntity {
 
 	@Id

diff --git a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/entity/cake/CakeCategory.java b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/entity/cake/CakeCategory.java
@@ -23,7 +23,7 @@
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
-@Table(name = "cake_category", catalog = "cakk")
+@Table(name = "cake_category")
 public class CakeCategory extends AuditCreatedEntity {
 
 	@Id

diff --git a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/entity/cake/CakeHeart.java b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/entity/cake/CakeHeart.java
@@ -19,7 +19,7 @@
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
-@Table(name = "cake_heart", catalog = "cakk")
+@Table(name = "cake_heart")
 public class CakeHeart extends AuditCreatedEntity {
 
 	@Id

diff --git a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/entity/cake/CakeTag.java b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/entity/cake/CakeTag.java
@@ -20,7 +20,7 @@
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
-@Table(name = "cake_tag", catalog = "cakk")
+@Table(name = "cake_tag")
 public class CakeTag extends AuditCreatedEntity {
 
 	@Id

diff --git a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/entity/cake/Tag.java b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/entity/cake/Tag.java
@@ -17,7 +17,7 @@
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
-@Table(name = "tag", catalog = "cakk")
+@Table(name = "tag")
 public class Tag extends AuditCreatedEntity {
 
 	@Id

diff --git a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/entity/shop/CakeShop.java b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/entity/shop/CakeShop.java
@@ -35,7 +35,7 @@
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
-@Table(name = "cake_shop", catalog = "cakk")
+@Table(name = "cake_shop")
 public class CakeShop extends AuditEntity {
 
 	@Id

diff --git a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/entity/shop/CakeShopHeart.java b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/entity/shop/CakeShopHeart.java
@@ -19,7 +19,7 @@
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
-@Table(name = "cake_shop_heart", catalog = "cakk")
+@Table(name = "cake_shop_heart")
 public class CakeShopHeart extends AuditCreatedEntity {
 
 	@Id

diff --git a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/entity/shop/CakeShopLike.java b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/entity/shop/CakeShopLike.java
@@ -19,7 +19,7 @@
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
-@Table(name = "cake_shop_like", catalog = "cakk")
+@Table(name = "cake_shop_like")
 public class CakeShopLike extends AuditCreatedEntity {
 
 	@Id

diff --git a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/entity/shop/CakeShopLink.java b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/entity/shop/CakeShopLink.java
@@ -23,7 +23,7 @@
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
-@Table(name = "cake_shop_link", catalog = "cakk")
+@Table(name = "cake_shop_link")
 public class CakeShopLink extends AuditEntity {
 
 	@Id

diff --git a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/entity/shop/CakeShopOperation.java b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/entity/shop/CakeShopOperation.java
@@ -25,7 +25,7 @@
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
-@Table(name = "cake_shop_operation", catalog = "cakk")
+@Table(name = "cake_shop_operation")
 public class CakeShopOperation extends AuditEntity {
 
 	@Id

diff --git a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/entity/user/BusinessInformation.java b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/entity/user/BusinessInformation.java
@@ -26,7 +26,7 @@
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
-@Table(name = "business_information", catalog = "cakk")
+@Table(name = "business_information")
 public class BusinessInformation extends AuditEntity {
 
 	@Id

diff --git a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/entity/user/User.java b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/entity/user/User.java
@@ -33,7 +33,7 @@
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
-@Table(name = "users", catalog = "cakk")
+@Table(name = "users")
 public class User extends AuditEntity {
 
 	@Id

diff --git a/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/entity/user/UserWithdrawal.java b/cakk-domain/mysql/src/main/java/com/cakk/domain/mysql/entity/user/UserWithdrawal.java
@@ -29,7 +29,7 @@
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
-@Table(name = "user_withdrawal", catalog = "cakk")
+@Table(name = "user_withdrawal")
 public class UserWithdrawal extends AuditCreatedEntity {
 
 	@Id