Merge branch 'develop' into refactor/#111/lessonAndCoupon

Author: iamjieunkim

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/coupon/user/repository/UserCouponRepository.java

@@ -2,6 +2,7 @@
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
@@ -13,6 +14,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/student/service/StudentLessonService.java

@@ -195,6 +195,57 @@ public LessonApplicationResponseDto applyToLesson(Long lessonId, Long userId) {
 		}
 	}
 
+	@Transactional
+	public LessonApplicationResponseDto applyToLessonWithLock(Long lessonId, Long userId) {
+		Lesson lesson = adminLessonService.findLessonByIdWithLock(lessonId); // 락적용 find 메서드
+
+		User user = userService.getUserById(userId);
+
+		if (lesson.getLessonLeader().equals(userId)) {
+			throw new BusinessException(ErrorCode.LESSON_CREATOR_CANNOT_APPLY);
+		}
+
+		boolean alreadyParticipated = lessonParticipantRepository.existsByLessonIdAndUserId(lessonId, userId);
+		boolean alreadyApplied = lessonApplicationRepository.existsByLessonIdAndUserId(lessonId, userId);
+		if (alreadyParticipated || alreadyApplied) {
+			throw new BusinessException(ErrorCode.ALREADY_APPLIED);
+		}
+
+		if (lesson.getStatus() != LessonStatus.RECRUITING) {
+			throw new BusinessException(ErrorCode.LESSON_NOT_AVAILABLE);
+		}
+
+		if (lesson.getOpenRun()) {
+			LessonParticipant participant = LessonParticipant.builder()
+				.lesson(lesson)
+				.user(user)
+				.build();
+			lessonParticipantRepository.save(participant);
+			lesson.incrementParticipantCount();
+
+			return LessonApplyMapper.toLessonApplicationResponseDto(
+				lesson.getId(),
+				user.getId(),
+				ApplicationStatus.APPROVED,
+				participant.getJoinAt()
+			);
+		} else {
+			LessonApplication application = LessonApplication.builder()
+				.lesson(lesson)
+				.user(user)
+				.build();
+			lessonApplicationRepository.save(application);
+
+			return LessonApplyMapper.toLessonApplicationResponseDto(
+				lesson.getId(),
+				user.getId(),
+				ApplicationStatus.PENDING,
+				application.getCreatedAt()
+			);
+		}
+	}
+
+
 	@Transactional
 	public void cancelLessonApplication(Long lessonId, Long userId) {
 		// 레슨 조회
@@ -255,4 +306,24 @@ public LessonSimpleResponseDto getLessonSimple(Long lessonId) {
 
 		return LessonSimpleMapper.toLessonSimpleDto(lesson);
 	}
+
+	@Transactional
+	public void cancelPayment(Long lessonId, Long userId) {
+		Lesson lesson = adminLessonService.findLessonById(lessonId);
+		lesson.decrementParticipantCount();
+		lessonRepository.save(lesson);
+
+		LessonParticipant lessonParticipant = lessonParticipantRepository.findByLessonIdAndUserId(lessonId, userId)
+			.orElseThrow(() -> new BusinessException(ErrorCode.INVALID_LESSON_PARTICIPANT));
+
+		lessonParticipantRepository.delete(lessonParticipant);
+	}
+
+	@Transactional
+	public void checkValidLessonParticipant(Lesson lesson, User user) {
+		boolean ifExists = lessonParticipantRepository.existsByLessonIdAndUserId(lesson.getId(), user.getId());
+		if (!ifExists) {
+			throw new BusinessException(ErrorCode.INVALID_LESSON_PARTICIPANT);
+		}
+	}
 }

src/main/java/com/threestar/trainus/domain/lesson/teacher/controller/LocationCsvController.java

@@ -40,4 +40,4 @@ public ResponseEntity<Boolean> checkExists(
 		boolean exists = locationCsvService.checkLocation(city, district, dong, ri);
 		return ResponseEntity.ok(exists);
 	}
-}
+}

src/main/java/com/threestar/trainus/domain/lesson/teacher/entity/Lesson.java

@@ -132,6 +132,16 @@ public void incrementParticipantCount() {
 		}
 	}
 
+	// 참가자 수 감소
+	public void decrementParticipantCount() {
+		this.participantCount--;
+
+		// 정원 달성 시 -> 모집완료로 상태 변경
+		if (this.participantCount < this.maxParticipants) {
+			this.status = LessonStatus.RECRUITING;
+		}
+	}
+
 	//레슨 이름 수정
 	public void updateLessonName(String lessonName) {
 		if (lessonName != null && !lessonName.trim().isEmpty()) {

src/main/java/com/threestar/trainus/domain/lesson/teacher/entity/Location.java

@@ -31,4 +31,4 @@ public Location(String city, String district, String dong, String ri) {
 		this.dong = dong;
 		this.ri = ri;
 	}
-}
+}

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

@@ -1,10 +1,25 @@
 package com.threestar.trainus.domain.lesson.teacher.repository;
 
+import java.util.Optional;
+
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 
 import com.threestar.trainus.domain.lesson.teacher.entity.LessonParticipant;
 
+import jakarta.transaction.Transactional;
+
 public interface LessonParticipantRepository extends CrudRepository<LessonParticipant, Long> {
 
 	boolean existsByLessonIdAndUserId(Long lessonId, Long userId);
+
+	Optional<LessonParticipant> findByLessonIdAndUserId(Long lessonId, Long userId);
+
+	long countByLessonId(Long lessonId);
+
+	@Modifying
+	@Transactional
+	@Query("DELETE FROM LessonParticipant lp WHERE lp.lesson.id = :lessonId")
+	void deleteByLessonId(Long lessonId);
 }

src/main/java/com/threestar/trainus/domain/lesson/teacher/repository/LocationRepository.java

@@ -8,4 +8,4 @@ public interface LocationRepository extends JpaRepository<Location, Long> {
 	boolean existsByCityAndDistrictAndDongAndRi(String city, String district, String dong, String ri);
 
 	boolean existsByCityAndDistrictAndDong(String city, String district, String dong);
-}
+}

src/main/java/com/threestar/trainus/domain/lesson/teacher/service/AdminLessonService.java

@@ -381,7 +381,7 @@ private ApplicationStatus toApplicationStatus(String status) {
 		}
 	}
 
-	//레슨 상태 파싱
+	//레슨 신청 상태 검증
 	private LessonStatus toLessonStatus(String status) {
 		try {
 			return LessonStatus.valueOf(status);
@@ -393,7 +393,7 @@ private LessonStatus toLessonStatus(String status) {
 	//신청 페이지 조회
 	private Page<LessonApplication> getApplicationPage(Lesson lesson, String status,
 		ApplicationStatus applicationStatus, Pageable pageable) {
-
+	
 		if ("ALL".equals(status)) {
 			return lessonApplicationRepository.findByLesson(lesson, pageable);
 		} else {
@@ -410,8 +410,8 @@ private Page<Lesson> getLessonPage(Long userId, String status, Pageable pageable
 			return lessonRepository.findByLessonLeaderAndDeletedAtIsNull(userId, pageable);
 		}
 	}
-
-	//레슨 이미지 저장
+  
+//레슨 이미지 저장
 	private List<LessonImage> saveLessonImages(Lesson lesson, List<String> imageUrls) {
 		if (imageUrls == null || imageUrls.isEmpty()) {
 			return List.of();