refactor: 도메인 전체 리팩토링

Author: taeho4523

src/main/java/com/threestar/trainus/domain/comment/controller/CommentController.java

@@ -16,11 +16,11 @@
 import com.threestar.trainus.domain.comment.dto.CommentPageResponseDto;
 import com.threestar.trainus.domain.comment.dto.CommentResponseDto;
 import com.threestar.trainus.domain.comment.service.CommentService;
+import com.threestar.trainus.global.annotation.LoginUser;
 import com.threestar.trainus.global.unit.BaseResponse;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.servlet.http.HttpSession;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 
@@ -37,8 +37,7 @@ public class CommentController {
 	@PostMapping("/{lessonId}")
 	@Operation(summary = "댓글 작성", description = "레슨 ID에 해당되는 댓글을 작성합니다.")
 	public ResponseEntity<BaseResponse<CommentResponseDto>> createComment(@PathVariable Long lessonId,
-		@Valid @RequestBody CommentCreateRequestDto request, HttpSession session) {
-		Long userId = (Long)session.getAttribute("LOGIN_USER");
+		@Valid @RequestBody CommentCreateRequestDto request, @LoginUser Long userId) {
 		CommentResponseDto comment = commentService.createComment(request, lessonId, userId);
 		return BaseResponse.ok("댓글 등록 완료되었습니다", comment, HttpStatus.CREATED);
 	}
@@ -56,9 +55,8 @@ public ResponseEntity<BaseResponse<CommentPageResponseDto>> readAll(@PathVariabl
 
 	@DeleteMapping("/{commentId}")
 	@Operation(summary = "댓글 삭제", description = "댓글 ID에 해당되는 댓글을 삭제합니다.")
-	public ResponseEntity<Void> deleteComment(@PathVariable Long commentId, HttpSession session) {
-		Long userId = (Long)session.getAttribute("LOGIN_USER");
+	public ResponseEntity<BaseResponse<Void>> deleteComment(@PathVariable Long commentId, @LoginUser Long userId) {
 		commentService.delete(commentId, userId);
-		return ResponseEntity.noContent().build();
+		return BaseResponse.okOnlyStatus(HttpStatus.NO_CONTENT);
 	}
 }

src/main/java/com/threestar/trainus/domain/comment/dto/CommentCreateRequestDto.java

@@ -2,9 +2,9 @@
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
-import lombok.Data;
+import lombok.Getter;
 
-@Data
+@Getter
 public class CommentCreateRequestDto {
 	@NotBlank(message = "댓글 내용은 필수입니다")
 	@Size(max = 255, message = "댓글은 255자 이내여야 합니다.")

src/main/java/com/threestar/trainus/domain/comment/service/CommentService.java

@@ -12,11 +12,9 @@
 import com.threestar.trainus.domain.comment.mapper.CommentMapper;
 import com.threestar.trainus.domain.comment.repository.CommentRepository;
 import com.threestar.trainus.domain.lesson.admin.entity.Lesson;
-import com.threestar.trainus.domain.lesson.admin.repository.LessonRepository;
+import com.threestar.trainus.domain.lesson.admin.service.AdminLessonService;
 import com.threestar.trainus.domain.user.entity.User;
-import com.threestar.trainus.domain.user.repository.UserRepository;
-import com.threestar.trainus.global.exception.domain.ErrorCode;
-import com.threestar.trainus.global.exception.handler.BusinessException;
+import com.threestar.trainus.domain.user.service.UserService;
 import com.threestar.trainus.global.utils.PageLimitCalculator;
 
 import lombok.RequiredArgsConstructor;
@@ -25,16 +23,14 @@
 @RequiredArgsConstructor
 public class CommentService {
 
-	private final UserRepository userRepository;
-	private final LessonRepository lessonRepository;
+	private final AdminLessonService adminLessonService;
 	private final CommentRepository commentRepository;
+	private final UserService userService;
 
 	@Transactional
 	public CommentResponseDto createComment(CommentCreateRequestDto request, Long lessonId, Long userId) {
-		Lesson findLesson = lessonRepository.findById(lessonId)
-			.orElseThrow(() -> new BusinessException(ErrorCode.LESSON_NOT_FOUND));
-		User findUser = userRepository.findById(userId)
-			.orElseThrow(() -> new BusinessException(ErrorCode.USER_NOT_FOUND));
+		Lesson findLesson = adminLessonService.findLessonById(lessonId);
+		User findUser = userService.getUserById(userId);
 		Comment parent = findParent(request);
 
 		Comment newComment = Comment.builder()

src/main/java/com/threestar/trainus/domain/coupon/user/dto/CouponResponseDto.java

@@ -20,21 +20,7 @@ public class CouponResponseDto {
 	private LocalDateTime expirationDate;
 	private OwnedStatus ownedStatus;
 	private Integer quantity;
-	private String category;
+	private CouponCategory category;
 	private LocalDateTime openTime;
 
-	public CouponResponseDto(Long couponId, String couponName, String discountPrice,
-		Integer minOrderPrice, LocalDateTime expirationDate,
-		String ownedStatus, Integer quantity, CouponCategory category,
-		LocalDateTime openTime) {
-		this.couponId = couponId;
-		this.couponName = couponName;
-		this.discountPrice = discountPrice;
-		this.minOrderPrice = minOrderPrice;
-		this.expirationDate = expirationDate;
-		this.ownedStatus = OwnedStatus.valueOf(ownedStatus);
-		this.quantity = quantity;
-		this.category = category.name();
-		this.openTime = openTime;
-	}
 }

src/main/java/com/threestar/trainus/domain/coupon/user/dto/CreateUserCouponResponseDto.java

@@ -3,6 +3,7 @@
 import java.time.LocalDateTime;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.threestar.trainus.domain.coupon.user.entity.CouponStatus;
 
 import lombok.Builder;
 import lombok.Getter;
@@ -15,6 +16,6 @@ public class CreateUserCouponResponseDto {
 	@JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
 	private LocalDateTime createdAt;
 	private LocalDateTime expirationDate;
-	private String status;
+	private CouponStatus status;
 
 }

src/main/java/com/threestar/trainus/domain/coupon/user/dto/UserCouponResponseDto.java

@@ -2,6 +2,8 @@
 
 import java.time.LocalDateTime;
 
+import com.threestar.trainus.domain.coupon.user.entity.CouponStatus;
+
 import lombok.Builder;
 import lombok.Getter;
 
@@ -13,6 +15,6 @@ public class UserCouponResponseDto {
 	private String discountPrice;
 	private Integer minOrderPrice;
 	private LocalDateTime expirationDate;
-	private String status;
+	private CouponStatus status;
 	private LocalDateTime useDate;
 }

src/main/java/com/threestar/trainus/domain/coupon/user/entity/Coupon.java

@@ -35,6 +35,7 @@ public class Coupon extends BaseDateEntity {
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private Long id;
 
+	@Builder.Default
 	@OneToMany(mappedBy = "coupon")
 	private List<UserCoupon> userCoupons = new ArrayList<>();
 

src/main/java/com/threestar/trainus/domain/coupon/user/entity/UserCoupon.java

@@ -17,7 +17,6 @@
 import jakarta.persistence.UniqueConstraint;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
@@ -29,7 +28,6 @@
 	}
 )
 @Getter
-@Builder
 @AllArgsConstructor
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class UserCoupon extends BaseDateEntity {

src/main/java/com/threestar/trainus/domain/coupon/user/mapper/CouponMapper.java

@@ -17,7 +17,7 @@ public static CouponResponseDto toDto(Coupon coupon, boolean owned) {
 			.expirationDate(coupon.getExpirationDate())
 			.ownedStatus(owned ? OwnedStatus.OWNED : OwnedStatus.NOT_OWNED)
 			.quantity(coupon.getQuantity())
-			.category(coupon.getCategory().name())
+			.category(coupon.getCategory())
 			.openTime(coupon.getOpenAt())
 			.build();
 	}

src/main/java/com/threestar/trainus/domain/coupon/user/mapper/UserCouponMapper.java

@@ -18,7 +18,7 @@ public static CreateUserCouponResponseDto toCreateUserCouponResponseDto(UserCoup
 			.userId(userCoupon.getUser().getId())
 			.createdAt(userCoupon.getCreatedAt())
 			.expirationDate(userCoupon.getExpirationDate())
-			.status(userCoupon.getStatus().name())
+			.status(userCoupon.getStatus())
 			.build();
 	}
 
@@ -30,7 +30,7 @@ public static UserCouponResponseDto toUserCouponResponseDto(UserCoupon userCoupo
 			.discountPrice(coupon.getDiscountPrice())
 			.minOrderPrice(coupon.getMinOrderPrice())
 			.expirationDate(coupon.getExpirationDate())
-			.status(coupon.getStatus().name())
+			.status(coupon.getStatus())
 			.useDate(userCoupon.getUseDate())
 			.build();
 	}