Merge branch 'develop' of https://github.com/prgrms-web-devcourse-final-project/WEB5_7_3star_BE into feat/#100/user-delete

# Conflicts:
#	src/main/java/com/threestar/trainus/domain/user/controller/UserController.java
#	src/main/java/com/threestar/trainus/domain/user/service/UserService.java

Author: cba700

build.gradle

@@ -43,6 +43,8 @@ dependencies {
     testAnnotationProcessor 'org.projectlombok:lombok'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.security:spring-security-test'
+    testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 

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

@@ -51,7 +51,7 @@ public ResponseEntity<PagedResponse<CommentPageWrapperDto>> readAll(@PathVariabl
 		@RequestParam("page") int page,
 		@RequestParam("pageSize") int pageSize) {
 		int correctPage = Math.max(page, 1);
-		int correctPageSize = Math.max(1, Math.max(pageSize, pageSizeLimit));
+		int correctPageSize = Math.max(1, Math.min(pageSize, pageSizeLimit));
 		CommentPageResponseDto commentsInfo = commentService.readAll(lessonId, correctPage, correctPageSize);
 		CommentPageWrapperDto comments = CommentMapper.toCommentPageWrapperDto(commentsInfo);
 		return PagedResponse.ok("댓글 조회 성공", comments, commentsInfo.getCount(), HttpStatus.OK);

src/main/java/com/threestar/trainus/domain/comment/entity/Comment.java

@@ -1,6 +1,6 @@
 package com.threestar.trainus.domain.comment.entity;
 
-import com.threestar.trainus.domain.lesson.admin.entity.Lesson;
+import com.threestar.trainus.domain.lesson.teacher.entity.Lesson;
 import com.threestar.trainus.domain.user.entity.User;
 import com.threestar.trainus.global.entity.BaseDateEntity;
 

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

@@ -11,8 +11,8 @@
 import com.threestar.trainus.domain.comment.entity.Comment;
 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.service.AdminLessonService;
+import com.threestar.trainus.domain.lesson.teacher.entity.Lesson;
+import com.threestar.trainus.domain.lesson.teacher.service.AdminLessonService;
 import com.threestar.trainus.domain.user.entity.User;
 import com.threestar.trainus.domain.user.service.UserService;
 import com.threestar.trainus.global.utils.PageLimitCalculator;

src/main/java/com/threestar/trainus/domain/coupon/user/repository/UserCouponRepository.java

@@ -1,6 +1,7 @@
 package com.threestar.trainus.domain.coupon.user.repository;
 
 import java.util.List;
+import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
@@ -12,6 +13,8 @@
 public interface UserCouponRepository extends JpaRepository<UserCoupon, Long> {
 	boolean existsByUserIdAndCouponId(Long userId, Long couponId);
 
+	Optional<UserCoupon> findByUserIdAndCouponId(Long userId, Long couponId);
+
 	@Query("SELECT uc FROM UserCoupon uc JOIN FETCH uc.coupon WHERE uc.user.id = :userId")
 	List<UserCoupon> findAllByUserIdWithCoupon(@Param("userId") Long userId);
 

src/main/java/com/threestar/trainus/domain/coupon/user/service/CouponService.java

@@ -94,4 +94,35 @@ public CouponPageResponseDto getCoupons(Long userId) {
 			.coupons(dtoList)
 			.build();
 	}
+
+	@Transactional
+	public UserCoupon getValidUserCoupon(Long userCouponId, Long userId) {
+		return userCouponRepository.findByUserIdAndCouponId(userId, userCouponId)
+			.filter(c -> c.getStatus() == CouponStatus.ACTIVE)
+			.orElseThrow(() -> new BusinessException(ErrorCode.COUPON_NOT_FOUND));
+	}
+
+	public int calculateDiscountedPrice(int originalPrice, UserCoupon coupon) {
+		String discountPrice = coupon.getCoupon().getDiscountPrice();
+		if (discountPrice.contains("%")) {
+			int discountPercentage = Integer.parseInt(discountPrice.substring(0, discountPrice.indexOf("%")));
+			return originalPrice * discountPercentage / 100;
+		} else {
+			return Integer.parseInt(discountPrice.replace("원", ""));
+		}
+	}
+
+	public void useCoupon(UserCoupon coupon) {
+		if (coupon.getStatus() == CouponStatus.ACTIVE) {
+			coupon.use();
+			userCouponRepository.save(coupon);
+		}
+	}
+
+	public void restoreCoupon(UserCoupon coupon) {
+		if (coupon.getStatus() == CouponStatus.INACTIVE) {
+			coupon.restore();
+			userCouponRepository.save(coupon);
+		}
+	}
 }

src/main/java/com/threestar/trainus/domain/lesson/admin/repository/LessonParticipantRepository.java

@@ -11,7 +11,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.threestar.trainus.domain.lesson.admin.entity.Category;
 import com.threestar.trainus.domain.lesson.student.dto.LessonApplicationResponseDto;
 import com.threestar.trainus.domain.lesson.student.dto.LessonDetailResponseDto;
 import com.threestar.trainus.domain.lesson.student.dto.LessonSearchListResponseDto;
@@ -20,6 +19,7 @@
 import com.threestar.trainus.domain.lesson.student.dto.MyLessonApplicationListResponseDto;
 import com.threestar.trainus.domain.lesson.student.dto.MyLessonApplicationListWrapperDto;
 import com.threestar.trainus.domain.lesson.student.service.StudentLessonService;
+import com.threestar.trainus.domain.lesson.teacher.entity.Category;
 import com.threestar.trainus.global.annotation.LoginUser;
 import com.threestar.trainus.global.dto.PageRequestDto;
 import com.threestar.trainus.global.exception.domain.ErrorCode;

src/main/java/com/threestar/trainus/domain/lesson/student/controller/StudentLessonController.java

@@ -2,7 +2,7 @@
 
 import java.time.LocalDateTime;
 
-import com.threestar.trainus.domain.lesson.admin.entity.ApplicationStatus;
+import com.threestar.trainus.domain.lesson.teacher.entity.ApplicationStatus;
 
 import lombok.Builder;
 

src/main/java/com/threestar/trainus/domain/lesson/student/dto/LessonApplicationResponseDto.java

@@ -3,8 +3,8 @@
 import java.time.LocalDateTime;
 import java.util.List;
 
-import com.threestar.trainus.domain.lesson.admin.entity.Category;
-import com.threestar.trainus.domain.lesson.admin.entity.LessonStatus;
+import com.threestar.trainus.domain.lesson.teacher.entity.Category;
+import com.threestar.trainus.domain.lesson.teacher.entity.LessonStatus;
 
 import lombok.Builder;
 
@@ -37,4 +37,4 @@ public record LessonDetailResponseDto(
 	LocalDateTime updatedAt,
 	List<String> lessonImages
 ) {
-}
+}