Refactor | CAKK-82 | 코드 리뷰 반영

CAKK-DEV · Sep 16, 2024 · d4674e3 · d4674e3
1 parent 5d6a724
commit d4674e3
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 26 deletions.
diff --git a/cakk-api/src/main/java/com/cakk/api/controller/shop/ShopController.java b/cakk-api/src/main/java/com/cakk/api/controller/shop/ShopController.java
@@ -142,7 +142,7 @@ public ApiResponse<Void> updateBasicInformation(
 		@PathVariable Long cakeShopId,
 		@Valid @RequestBody UpdateShopRequest request
 	) {
-		//shopService.updateBasicInformation(request.toParam(user, cakeShopId));
+		shopService.updateBasicInformation(request.toParam(user, cakeShopId));
 
 		return ApiResponse.success();
 	}

diff --git a/cakk-api/src/main/java/com/cakk/api/dto/request/shop/UpdateShopRequest.java b/cakk-api/src/main/java/com/cakk/api/dto/request/shop/UpdateShopRequest.java
@@ -17,14 +17,14 @@ public record UpdateShopRequest(
 	String shopDescription
 ) {
 
-	// public CakeShopUpdateParam toParam(User user, Long cakeShopId) {
-	// 	return CakeShopUpdateParam.builder()
-	// 		.user(user)
-	// 		.cakeShopId(cakeShopId)
-	// 		.thumbnailUrl(thumbnailUrl())
-	// 		.shopName(shopName())
-	// 		.shopBio(shopBio())
-	// 		.shopDescription(shopDescription())
-	// 		.build();
-	// }
+	public CakeShopUpdateParam toParam(User user, Long cakeShopId) {
+		return CakeShopUpdateParam.builder()
+			.user(user)
+			.cakeShopId(cakeShopId)
+			.thumbnailUrl(thumbnailUrl())
+			.shopName(shopName())
+			.shopBio(shopBio())
+			.shopDescription(shopDescription())
+			.build();
+	}
 }
diff --git a/cakk-core/src/main/kotlin/com/cakk/core/facade/tag/TagReadFacade.kt b/cakk-core/src/main/kotlin/com/cakk/core/facade/tag/TagReadFacade.kt
@@ -12,13 +12,10 @@ class TagReadFacade(
 
     fun getTagsByTagName(tagNames: List<String>): List<Tag> {
         val tags: List<Tag> = tagJpaRepository.findTagsByTagNameIsIn(tagNames)
-        return tagNames.stream()
-                .map { tagName: String ->
-                    tags
-						.stream()
-						.filter { tag: Tag -> tag.tagName == tagName }
-						.findAny()
-						.orElse(tagJpaRepository.save(TagMapper.supplyTagBy(tagName)))
-                }.toList()
+		return tagNames.map {
+			tags.find {
+				tag: Tag -> tag.tagName == it
+			} ?: tagJpaRepository.save(TagMapper.supplyTagBy(it))
+		}.toList()
     }
 }
diff --git a/cakk-core/src/main/kotlin/com/cakk/core/facade/user/UserManageFacade.kt b/cakk-core/src/main/kotlin/com/cakk/core/facade/user/UserManageFacade.kt
@@ -16,8 +16,9 @@ class UserManageFacade(
 ) {
 
 	fun create(user: User): User {
-		userJpaRepository.findByProviderId(user.providerId) ?: return userJpaRepository.save(user)
-		throw CakkException(ReturnCode.ALREADY_EXIST_USER)
+		userJpaRepository.findByProviderId(user.providerId)?.let {
+			throw CakkException(ReturnCode.ALREADY_EXIST_USER)
+		} ?: return userJpaRepository.save(user)
 	}
 
 	fun updateProfile(user: User, param: ProfileUpdateParam) {

diff --git a/cakk-core/src/main/kotlin/com/cakk/core/facade/user/UserReadFacade.kt b/cakk-core/src/main/kotlin/com/cakk/core/facade/user/UserReadFacade.kt
@@ -24,11 +24,7 @@ class UserReadFacade(
 	}
 
     fun findByIdWithAll(userId: Long): User {
-        val user: User = userQueryRepository.searchByIdWithAll(userId)
-        if (Objects.isNull(user)) {
-            throw CakkException(ReturnCode.NOT_EXIST_USER)
-        }
-        return user
+		return userQueryRepository.searchByIdWithAll(userId) ?: throw CakkException(ReturnCode.NOT_EXIST_USER)
     }
 
     fun findAll(): List<User> {