Refactor: LikeTargetType enum 엔티티용과 이벤트용으로 분리

dungbik · dungbik · commit daff3de56a1a · 2025-09-03T15:59:42.000+09:00
diff --git a/src/main/java/project/flipnote/cardset/listener/CardSetLikeEventHandler.java b/src/main/java/project/flipnote/cardset/listener/CardSetLikeEventHandler.java
@@ -12,8 +12,8 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import project.flipnote.cardset.service.CardSetService;
-import project.flipnote.common.entity.LikeType;
 import project.flipnote.common.model.event.LikeEvent;
+import project.flipnote.common.model.event.LikeEventTargetType;
 
 @Slf4j
 @RequiredArgsConstructor
@@ -30,7 +30,7 @@ public class CardSetLikeEventHandler {
 	)
 	@TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
 	public void handleLikeEvent(LikeEvent event) {
-		if (event.likeType() != LikeType.CARD_SET) {
+		if (event.targetType() != LikeEventTargetType.CARD_SET) {
 			return;
 		}
 
@@ -40,8 +40,8 @@ public void handleLikeEvent(LikeEvent event) {
 	@Recover
 	public void recover(Exception ex, LikeEvent event) {
 		log.error(
-			"좋아요 수 반영 처리 중 예외 발생 : likeType={}, targetId={}, userId={}",
-			event.likeType(), event.targetId(), event.userId(), ex
+			"좋아요 수 반영 처리 중 예외 발생 : targetType={}, targetId={}, userId={}",
+			event.targetType(), event.targetId(), event.userId(), ex
 		);
 	}
 }
diff --git a/src/main/java/project/flipnote/cardset/listener/CardSetUnlikeEventHandler.java b/src/main/java/project/flipnote/cardset/listener/CardSetUnlikeEventHandler.java
@@ -12,7 +12,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import project.flipnote.cardset.service.CardSetService;
-import project.flipnote.common.entity.LikeType;
+import project.flipnote.common.model.event.LikeEventTargetType;
 import project.flipnote.common.model.event.UnlikeEvent;
 
 @Slf4j
@@ -30,7 +30,7 @@ public class CardSetUnlikeEventHandler {
 	)
 	@TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
 	public void handleUnlikeEvent(UnlikeEvent event) {
-		if (event.likeType() != LikeType.CARD_SET) {
+		if (event.targetType() != LikeEventTargetType.CARD_SET) {
 			return;
 		}
 
@@ -40,8 +40,8 @@ public void handleUnlikeEvent(UnlikeEvent event) {
 	@Recover
 	public void recover(Exception ex, UnlikeEvent event) {
 		log.error(
-			"좋아요 취소 수 반영 처리 중 예외 발생 : likeType={}, targetId={}, userId={}",
-			event.likeType(), event.targetId(), event.userId(), ex
+			"좋아요 취소 수 반영 처리 중 예외 발생 : targetType={}, targetId={}, userId={}",
+			event.targetType(), event.targetId(), event.userId(), ex
 		);
 	}
 }
diff --git a/src/main/java/project/flipnote/common/entity/LikeType.java b/src/main/java/project/flipnote/common/entity/LikeType.java
diff --git a/src/main/java/project/flipnote/common/model/event/LikeEvent.java b/src/main/java/project/flipnote/common/model/event/LikeEvent.java
@@ -1,9 +1,7 @@
 package project.flipnote.common.model.event;
 
-import project.flipnote.common.entity.LikeType;
-
 public record LikeEvent(
-	LikeType likeType,
+	LikeEventTargetType targetType,
 	Long targetId,
 	Long userId
 ) {
diff --git a/src/main/java/project/flipnote/common/model/event/LikeEventTargetType.java b/src/main/java/project/flipnote/common/model/event/LikeEventTargetType.java
@@ -0,0 +1,5 @@
+package project.flipnote.common.model.event;
+
+public enum LikeEventTargetType {
+	CARD_SET
+}
diff --git a/src/main/java/project/flipnote/common/model/event/UnlikeEvent.java b/src/main/java/project/flipnote/common/model/event/UnlikeEvent.java
@@ -1,9 +1,7 @@
 package project.flipnote.common.model.event;
 
-import project.flipnote.common.entity.LikeType;
-
 public record UnlikeEvent(
-	LikeType likeType,
+	LikeEventTargetType targetType,
 	Long targetId,
 	Long userId
 ) {
diff --git a/src/main/java/project/flipnote/like/controller/LikeController.java b/src/main/java/project/flipnote/like/controller/LikeController.java
@@ -18,7 +18,7 @@
 import project.flipnote.like.model.LikeResponse;
 import project.flipnote.like.model.LikeSearchRequest;
 import project.flipnote.like.model.LikeTargetResponse;
-import project.flipnote.like.model.LikeTypeRequest;
+import project.flipnote.like.model.LikeTargetTypeRequest;
 import project.flipnote.like.service.LikeService;
 
 @RequiredArgsConstructor
@@ -28,36 +28,36 @@ public class LikeController implements LikeControllerDocs {
 
 	private final LikeService likeService;
 
-	@PostMapping("/{type}/{targetId}")
+	@PostMapping("/{targetType}/{targetId}")
 	public ResponseEntity<Void> addLike(
-		@PathVariable("type") LikeTypeRequest likeType,
+		@PathVariable("targetType") LikeTargetTypeRequest targetType,
 		@PathVariable("targetId") Long targetId,
 		@AuthenticationPrincipal AuthPrinciple authPrinciple
 	) {
-		likeService.addLike(authPrinciple.userId(), likeType.toDomain(), targetId);
+		likeService.addLike(authPrinciple.userId(), targetType.toDomainType(), targetId);
 
 		return ResponseEntity.ok().build();
 	}
 
-	@DeleteMapping("/{type}/{targetId}")
+	@DeleteMapping("/{targetType}/{targetId}")
 	public ResponseEntity<Void> removeLike(
-		@PathVariable("type") LikeTypeRequest likeType,
+		@PathVariable("targetType") LikeTargetTypeRequest targetType,
 		@PathVariable("targetId") Long targetId,
 		@AuthenticationPrincipal AuthPrinciple authPrinciple
 	) {
-		likeService.removeLike(authPrinciple.userId(), likeType.toDomain(), targetId);
+		likeService.removeLike(authPrinciple.userId(), targetType.toDomainType(), targetId);
 
 		return ResponseEntity.ok().build();
 	}
 
-	@GetMapping("/{type}")
+	@GetMapping("/{targetType}")
 	public ResponseEntity<PagingResponse<LikeResponse<LikeTargetResponse>>> getLikes(
-		@PathVariable(name = "type") LikeTypeRequest likeType,
+		@PathVariable(name = "targetType") LikeTargetTypeRequest targetType,
 		@Valid @ModelAttribute LikeSearchRequest req,
 		@AuthenticationPrincipal AuthPrinciple authPrinciple
 	) {
 		PagingResponse<LikeResponse<LikeTargetResponse>> res
-			= likeService.getLikes(authPrinciple.userId(), likeType.toDomain(), req);
+			= likeService.getLikes(authPrinciple.userId(), targetType.toDomainType(), req);
 
 		return ResponseEntity.ok(res);
 	}
diff --git a/src/main/java/project/flipnote/like/controller/docs/LikeControllerDocs.java b/src/main/java/project/flipnote/like/controller/docs/LikeControllerDocs.java
@@ -10,20 +10,20 @@
 import project.flipnote.like.model.LikeResponse;
 import project.flipnote.like.model.LikeSearchRequest;
 import project.flipnote.like.model.LikeTargetResponse;
-import project.flipnote.like.model.LikeTypeRequest;
+import project.flipnote.like.model.LikeTargetTypeRequest;
 
 @Tag(name = "Like", description = "Like API")
 public interface LikeControllerDocs {
 
 	@Operation(summary = "좋아요 추가", security = {@SecurityRequirement(name = "access-token")})
-	ResponseEntity<Void> addLike(LikeTypeRequest likeType, Long targetId, AuthPrinciple authPrinciple);
+	ResponseEntity<Void> addLike(LikeTargetTypeRequest targetType, Long targetId, AuthPrinciple authPrinciple);
 
 	@Operation(summary = "좋아요 취소", security = {@SecurityRequirement(name = "access-token")})
-	ResponseEntity<Void> removeLike(LikeTypeRequest likeType, Long targetId, AuthPrinciple authPrinciple);
+	ResponseEntity<Void> removeLike(LikeTargetTypeRequest targetType, Long targetId, AuthPrinciple authPrinciple);
 
 	@Operation(summary = "좋아요 누른 목록 조회", security = {@SecurityRequirement(name = "access-token")})
 	ResponseEntity<PagingResponse<LikeResponse<LikeTargetResponse>>> getLikes(
-		LikeTypeRequest likeType,
+		LikeTargetTypeRequest targetType,
 		LikeSearchRequest req,
 		AuthPrinciple authPrinciple
 	);
diff --git a/src/main/java/project/flipnote/like/entity/Like.java b/src/main/java/project/flipnote/like/entity/Like.java
@@ -15,7 +15,6 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import project.flipnote.common.entity.BaseEntity;
-import project.flipnote.common.entity.LikeType;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
@@ -40,7 +39,7 @@ public class Like extends BaseEntity {
 
 	@Enumerated(EnumType.STRING)
 	@Column(nullable = false)
-	private LikeType type;
+	private LikeTargetType targetType;
 
 	@Column(nullable = false)
 	private Long targetId;
@@ -49,8 +48,8 @@ public class Like extends BaseEntity {
 	private Long userId;
 
 	@Builder
-	public Like(LikeType type, Long targetId, Long userId) {
-		this.type = type;
+	public Like(LikeTargetType targetType, Long targetId, Long userId) {
+		this.targetType = targetType;
 		this.targetId = targetId;
 		this.userId = userId;
 	}
diff --git a/src/main/java/project/flipnote/like/entity/LikeTargetType.java b/src/main/java/project/flipnote/like/entity/LikeTargetType.java
@@ -0,0 +1,21 @@
+package project.flipnote.like.entity;
+
+import lombok.extern.slf4j.Slf4j;
+import project.flipnote.common.model.event.LikeEventTargetType;
+
+@Slf4j
+public enum LikeTargetType {
+	CARD_SET;
+
+	public LikeEventTargetType toEventType() {
+		try {
+			return LikeEventTargetType.valueOf(this.name());
+		} catch (IllegalArgumentException e) {
+			log.error("Failed to map LikeTargetType '{}' to LikeEventTargetType", this.name(), e);
+			throw new IllegalStateException(
+				"Invalid mapping from LikeTargetType to LikeEventTargetType: " + this.name(),
+				e
+			);
+		}
+	}
+}
diff --git a/src/main/java/project/flipnote/like/model/LikeTargetTypeRequest.java b/src/main/java/project/flipnote/like/model/LikeTargetTypeRequest.java
@@ -0,0 +1,14 @@
+package project.flipnote.like.model;
+
+import project.flipnote.like.entity.LikeTargetType;
+
+public enum LikeTargetTypeRequest {
+	card_set;
+
+	public LikeTargetType toDomainType() {
+		switch (this) {
+			case card_set: return LikeTargetType.CARD_SET;
+			default: throw new IllegalArgumentException("Invalid LikeTargetTypeRequest");
+		}
+	}
+}
diff --git a/src/main/java/project/flipnote/like/model/LikeTypeRequest.java b/src/main/java/project/flipnote/like/model/LikeTypeRequest.java
diff --git a/src/main/java/project/flipnote/like/repository/LikeRepository.java b/src/main/java/project/flipnote/like/repository/LikeRepository.java
@@ -6,13 +6,13 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import project.flipnote.common.entity.LikeType;
+import project.flipnote.like.entity.LikeTargetType;
 import project.flipnote.like.entity.Like;
 
 public interface LikeRepository extends JpaRepository<Like, Long> {
-	boolean existsByTypeAndTargetIdAndUserId(LikeType likeType, Long targetId, Long userId);
+	boolean existsByTargetTypeAndTargetIdAndUserId(LikeTargetType targetType, Long targetId, Long userId);
 
-	Optional<Like> findByTypeAndTargetIdAndUserId(LikeType likeType, Long targetId, Long userId);
+	Optional<Like> findByTargetTypeAndTargetIdAndUserId(LikeTargetType targetType, Long targetId, Long userId);
 
-	Page<Like> findByTypeAndUserId(LikeType likeType, Long userId, Pageable pageable);
+	Page<Like> findByTargetTypeAndUserId(LikeTargetType targetType, Long userId, Pageable pageable);
 }
diff --git a/src/main/java/project/flipnote/like/service/LikePolicyService.java b/src/main/java/project/flipnote/like/service/LikePolicyService.java
@@ -4,7 +4,7 @@
 
 import lombok.RequiredArgsConstructor;
 import project.flipnote.cardset.service.CardSetService;
-import project.flipnote.common.entity.LikeType;
+import project.flipnote.like.entity.LikeTargetType;
 import project.flipnote.common.exception.BizException;
 import project.flipnote.like.exception.LikeErrorCode;
 import project.flipnote.like.repository.LikeRepository;
@@ -16,9 +16,9 @@ public class LikePolicyService {
 	private final CardSetService cardSetService;
 	private final LikeRepository likeRepository;
 
-	public void validateTargetExists(LikeType likeType, Long targetId) {
+	public void validateTargetExists(LikeTargetType targetType, Long targetId) {
 		boolean targetExists = false;
-		switch (likeType) {
+		switch (targetType) {
 			case CARD_SET -> targetExists = cardSetService.existsById(targetId);
 		}
 
@@ -27,8 +27,8 @@ public void validateTargetExists(LikeType likeType, Long targetId) {
 		}
 	}
 
-	public void validateNotAlreadyLiked(LikeType likeType, Long targetId, Long userId) {
-		if (likeRepository.existsByTypeAndTargetIdAndUserId(likeType, targetId, userId)) {
+	public void validateNotAlreadyLiked(LikeTargetType targetType, Long targetId, Long userId) {
+		if (likeRepository.existsByTargetTypeAndTargetIdAndUserId(targetType, targetId, userId)) {
 			throw new BizException(LikeErrorCode.ALREADY_LIKED);
 		}
 	}
diff --git a/src/main/java/project/flipnote/like/service/LikeService.java b/src/main/java/project/flipnote/like/service/LikeService.java
diff --git a/src/main/java/project/flipnote/like/service/fetcher/CardSetFetcher.java b/src/main/java/project/flipnote/like/service/fetcher/CardSetFetcher.java
diff --git a/src/main/java/project/flipnote/like/service/fetcher/LikeTargetFetcher.java b/src/main/java/project/flipnote/like/service/fetcher/LikeTargetFetcher.java
