deploy: develop 배포 (연사자·대기 수락·마감일·사용자 검색)

src/main/java/com/example/rels/domain/auth/controller/AuthController.java

@@ -15,6 +15,7 @@
 import com.example.rels.domain.auth.dto.CurrentUserResponse;
 import com.example.rels.domain.auth.dto.OAuthSignInRequest;
 import com.example.rels.domain.auth.dto.OAuthSignInResponse;
+import com.example.rels.domain.auth.dto.RefreshTokenRequest;
 import com.example.rels.domain.auth.service.AuthService;
 import com.example.rels.domain.auth.service.DgOAuthFlowService;
 import com.example.rels.global.security.AuthenticatedUser;
@@ -47,6 +48,11 @@ public OAuthSignInResponse signIn(@Valid @RequestBody OAuthSignInRequest request
 		return authService.signIn(request);
 	}
 
+	@PostMapping("/refresh")
+	public OAuthSignInResponse refresh(@Valid @RequestBody RefreshTokenRequest request) {
+		return authService.refresh(request);
+	}
+
 	@GetMapping("/me")
 	public CurrentUserResponse me(@AuthenticationPrincipal AuthenticatedUser currentUser) {
 		if (currentUser == null) {

src/main/java/com/example/rels/domain/lecture/controller/LectureController.java

@@ -1,6 +1,7 @@
 package com.example.rels.domain.lecture.controller;
 
 import com.example.rels.domain.lecture.dto.request.AttendanceUpdateRequest;
+import com.example.rels.domain.lecture.dto.request.EnrollmentDecisionRequest;
 import com.example.rels.domain.lecture.dto.request.LectureApprovalRequest;
 import com.example.rels.domain.lecture.dto.request.LectureCreateRequest;
 import com.example.rels.domain.lecture.dto.request.LectureUpdateRequest;
@@ -122,8 +123,21 @@ public EnrollmentResponse cancelEnrollment(
 	}
 
 	@GetMapping("/{lectureId}/enrollments")
-	public EnrollmentListResponse getEnrollments(@PathVariable Long lectureId) {
-		return lectureService.getEnrollments(lectureId);
+	public EnrollmentListResponse getEnrollments(
+			@PathVariable Long lectureId,
+			@AuthenticationPrincipal AuthenticatedUser currentUser) {
+		AuthenticatedUser authenticatedUser = requireUser(currentUser);
+		return lectureService.getEnrollments(lectureId, authenticatedUser.userId(), authenticatedUser.role());
+	}
+
+	@PatchMapping("/{lectureId}/enrollments/{userId}/decision")
+	public EnrollmentResponse decideWaitingEnrollment(
+			@PathVariable Long lectureId,
+			@PathVariable Long userId,
+			@AuthenticationPrincipal AuthenticatedUser currentUser,
+			@Valid @RequestBody EnrollmentDecisionRequest request) {
+		AuthenticatedUser authenticatedUser = requireUser(currentUser);
+		return lectureService.decideWaitingEnrollment(lectureId, userId, authenticatedUser.userId(), authenticatedUser.role(), request);
 	}
 
 	@GetMapping("/enrollments/me")
@@ -156,4 +170,4 @@ private AuthenticatedUser requireUser(AuthenticatedUser currentUser) {
 		}
 		return currentUser;
 	}
-}
+}

src/main/java/com/example/rels/domain/lecture/dto/request/EnrollmentDecisionRequest.java

@@ -0,0 +1,8 @@
+package com.example.rels.domain.lecture.dto.request;
+
+import jakarta.validation.constraints.NotNull;
+
+public record EnrollmentDecisionRequest(
+		@NotNull Boolean approved
+) {
+}

src/main/java/com/example/rels/domain/lecture/dto/request/LectureCreateRequest.java

@@ -1,7 +1,6 @@
 package com.example.rels.domain.lecture.dto.request;
 
-
-
+import jakarta.validation.constraints.Future;
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
@@ -11,16 +10,17 @@
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.Map;
-
+import java.util.Set;
 
 public record LectureCreateRequest(
-	@NotBlank @Size(max = 100) String title,
-	@NotBlank @Size(max = 800) String description,
-	Map<@NotNull @Min(1) @Max(3) Integer, @NotNull @Min(0) Integer> capacityByGrade,
-	Integer totalCapacity,
-	@NotBlank @Size(max = 255) String lectureLocation,
-	@NotNull LocalDate lectureDate,
-	@NotNull LocalTime lectureTime,
-	@NotNull LocalDateTime applicationDeadline
+		@NotBlank @Size(max = 100) String title,
+		@NotBlank @Size(max = 800) String description,
+		Map<@NotNull @Min(1) @Max(3) Integer, @NotNull @Min(0) Integer> capacityByGrade,
+		Integer totalCapacity,
+		@NotBlank @Size(max = 255) String lectureLocation,
+		@NotNull LocalDate lectureDate,
+		@NotNull LocalTime lectureTime,
+		@NotNull @Future(message = "신청 마감 시각은 현재보다 미래여야 합니다.") LocalDateTime applicationDeadline,
+		Set<@NotNull Long> speakerIds
 ) {
-}
+}

src/main/java/com/example/rels/domain/lecture/dto/request/LectureUpdateRequest.java

@@ -1,7 +1,5 @@
 package com.example.rels.domain.lecture.dto.request;
 
-
-
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
@@ -11,16 +9,17 @@
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.Map;
-
+import java.util.Set;
 
 public record LectureUpdateRequest(
-	@NotBlank @Size(max = 100) String title,
-	@NotBlank @Size(max = 800) String description,
-	Map<@NotNull @Min(1) @Max(3) Integer, @NotNull @Min(0) Integer> capacityByGrade,
-	Integer totalCapacity,
-	@NotBlank @Size(max = 255) String lectureLocation,
-	@NotNull LocalDate lectureDate,
-	@NotNull LocalTime lectureTime,
-	@NotNull LocalDateTime applicationDeadline
+		@NotBlank @Size(max = 100) String title,
+		@NotBlank @Size(max = 800) String description,
+		Map<@NotNull @Min(1) @Max(3) Integer, @NotNull @Min(0) Integer> capacityByGrade,
+		Integer totalCapacity,
+		@NotBlank @Size(max = 255) String lectureLocation,
+		@NotNull LocalDate lectureDate,
+		@NotNull LocalTime lectureTime,
+		@NotNull LocalDateTime applicationDeadline,
+		Set<@NotNull Long> speakerIds
 ) {
 }

src/main/java/com/example/rels/domain/lecture/dto/response/EnrollmentListResponse.java

@@ -4,6 +4,7 @@
 
 public record EnrollmentListResponse(
     List<EnrollmentUserResponse> enrolled,
-    List<EnrollmentUserResponse> waiting
+    List<EnrollmentUserResponse> waiting,
+    List<EnrollmentUserResponse> rejected
 ) {}
 

src/main/java/com/example/rels/domain/lecture/dto/response/LectureDetailResponse.java

@@ -5,6 +5,7 @@
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.Map;
+import java.util.List;
 
 
 
@@ -15,6 +16,7 @@ public record LectureDetailResponse(
 		Long creatorId,
 		String creatorName,
 		String creatorStudentNumber,
+		List<LectureSpeakerResponse> speakers,
 		String lectureStatus,
 		String approvalStatus,
 		String rejectionReason,
@@ -26,6 +28,7 @@ public record LectureDetailResponse(
 		LocalTime lectureTime,
 		LocalDateTime applicationDeadline,
 		LocalDateTime createdAt,
+		LocalDateTime approvedAt,
 		Map<Integer, Integer> capacityByGrade,
 		Integer totalCapacity
 ) {

src/main/java/com/example/rels/domain/lecture/dto/response/LectureSpeakerResponse.java

@@ -0,0 +1,8 @@
+package com.example.rels.domain.lecture.dto.response;
+
+public record LectureSpeakerResponse(
+		Long userId,
+		String name,
+		String studentNumber
+) {
+}

src/main/java/com/example/rels/domain/lecture/dto/response/LectureSummaryResponse.java

@@ -4,6 +4,7 @@
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.Map;
+import java.util.List;
 
 
 public record LectureSummaryResponse(
@@ -13,6 +14,7 @@ public record LectureSummaryResponse(
 		Long creatorId,
 		String creatorName,
 		String creatorStudentNumber,
+		List<LectureSpeakerResponse> speakers,
 		String lectureStatus,
 		String approvalStatus,
 		String rejectionReason,
@@ -23,6 +25,7 @@ public record LectureSummaryResponse(
 		LocalTime lectureTime,
 		LocalDateTime applicationDeadline,
 		LocalDateTime createdAt,
+		LocalDateTime approvedAt,
 		Map<Integer, Integer> capacityByGrade,
 		Integer totalCapacity
 ) {

src/main/java/com/example/rels/domain/lecture/dto/response/MyCreatedLectureResponse.java

@@ -7,6 +7,7 @@
 public record MyCreatedLectureResponse(
 		Long lectureId,
 		String title,
+		boolean creator,
 		String lectureStatus,
 		String approvalStatus,
 		String rejectionReason,

src/main/java/com/example/rels/domain/lecture/entity/EnrollmentStatus.java

@@ -2,6 +2,7 @@
 
 public enum EnrollmentStatus {
 	ENROLLED,
-	WAITING
+	WAITING,
+	REJECTED
 }
 

src/main/java/com/example/rels/domain/lecture/entity/LectureEnrollmentEntity.java

@@ -81,6 +81,10 @@ public void promoteToEnrolled() {
 		this.status = EnrollmentStatus.ENROLLED;
 	}
 
+	public void reject() {
+		this.status = EnrollmentStatus.REJECTED;
+	}
+
 	@Enumerated(EnumType.STRING)
 	@Column(nullable = false)
 	private AttendanceStatus attendanceStatus = AttendanceStatus.NONE;

src/main/java/com/example/rels/domain/lecture/entity/LectureEntity.java

@@ -1,21 +1,21 @@
 package com.example.rels.domain.lecture.entity;
 
-import java.util.HashMap;
-import java.util.Map;
-import jakarta.persistence.ElementCollection;
-import jakarta.persistence.CollectionTable;
-import jakarta.persistence.MapKeyColumn;
-
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
 
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.UpdateTimestamp;
 
 import com.example.rels.domain.user.entity.UserEntity;
 
+import jakarta.persistence.CollectionTable;
 import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
@@ -24,12 +24,16 @@
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
 import jakarta.persistence.ManyToOne;
+import jakarta.persistence.MapKeyColumn;
 import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "lectures")
 public class LectureEntity {
+
 	@ElementCollection
 	@CollectionTable(name = "lecture_capacity_by_grade", joinColumns = @JoinColumn(name = "lecture_id"))
 	@MapKeyColumn(name = "grade")
@@ -50,6 +54,12 @@ public class LectureEntity {
 	@JoinColumn(name = "creator_id", nullable = false)
 	private UserEntity creator;
 
+	@ManyToMany(fetch = FetchType.LAZY)
+	@JoinTable(name = "lecture_speakers",
+			joinColumns = @JoinColumn(name = "lecture_id"),
+			inverseJoinColumns = @JoinColumn(name = "user_id"))
+	private Set<UserEntity> speakers = new LinkedHashSet<>();
+
 	@Enumerated(EnumType.STRING)
 	@Column(nullable = false)
 	private LectureStatus status;
@@ -63,7 +73,7 @@ public class LectureEntity {
 	@Column(name = "lecture_time")
 	private LocalTime lectureTime;
 
-	@Column(name = "application_deadline", nullable = false)
+	@Column(name = "application_deadline")
 	private LocalDateTime applicationDeadline;
 
 	@Column(name = "total_capacity")
@@ -84,13 +94,17 @@ public class LectureEntity {
 	@Column(name = "rejection_reason")
 	private String rejectionReason;
 
+	@Column(name = "approved_at")
+	private LocalDateTime approvedAt;
+
 	protected LectureEntity() {
 	}
 
 	public LectureEntity(String title, String description, UserEntity creator, String lectureLocation, LocalDate lectureDate, LocalTime lectureTime, LocalDateTime applicationDeadline, Integer totalCapacity) {
 		this.title = title;
 		this.description = description;
 		this.creator = creator;
+		this.speakers.add(creator);
 		this.status = LectureStatus.OPEN;
 		this.capacityByGrade = new HashMap<>();
 		this.lectureLocation = lectureLocation;
@@ -134,6 +148,22 @@ public UserEntity getCreator() {
 		return creator;
 	}
 
+	public Set<UserEntity> getSpeakers() {
+		return Set.copyOf(speakers);
+	}
+
+	public boolean isSpeaker(Long userId) {
+		return userId != null && speakers.stream().anyMatch(speaker -> speaker.getId().equals(userId));
+	}
+
+	public void updateSpeakers(Set<UserEntity> speakers) {
+		this.speakers.clear();
+		this.speakers.add(creator);
+		if (speakers != null) {
+			this.speakers.addAll(speakers);
+		}
+	}
+
 	public LectureStatus getStatus() {
 		return status;
 	}
@@ -205,8 +235,15 @@ public String getRejectionReason() {
 		return rejectionReason;
 	}
 
+	public LocalDateTime getApprovedAt() {
+		return approvedAt;
+	}
+
 	public void updateApprovalStatus(ApprovalStatus approvalStatus, String rejectionReason) {
 		this.approvalStatus = approvalStatus;
 		this.rejectionReason = rejectionReason;
+		if (approvalStatus == ApprovalStatus.APPROVED) {
+			this.approvedAt = LocalDateTime.now();
+		}
 	}
-}
+}

src/main/java/com/example/rels/domain/lecture/repository/LectureRepository.java

@@ -17,19 +17,21 @@
 
 public interface LectureRepository extends JpaRepository<LectureEntity, Long> {
 
-	@EntityGraph(attributePaths = "creator")
+	@EntityGraph(attributePaths = {"creator", "speakers"})
 	Page<LectureEntity> findAllByOrderByCreatedAtDesc(Pageable pageable);
 
-	@EntityGraph(attributePaths = "creator")
+	@EntityGraph(attributePaths = {"creator", "speakers"})
 	Page<LectureEntity> findAllByApprovalStatusOrderByCreatedAtDesc(ApprovalStatus approvalStatus, Pageable pageable);
 
-	// 승인된 강연 + 조회한 본인이 개설한 강연(승인 대기/거절 포함)
-	@EntityGraph(attributePaths = "creator")
-	Page<LectureEntity> findAllByApprovalStatusOrCreatorIdOrderByCreatedAtDesc(ApprovalStatus approvalStatus, Long creatorId, Pageable pageable);
+	@EntityGraph(attributePaths = {"creator", "speakers"})
+	@Query("select distinct l from LectureEntity l left join l.speakers s where l.approvalStatus = :approvalStatus or l.creator.id = :userId or s.id = :userId")
+	Page<LectureEntity> findVisibleToUser(ApprovalStatus approvalStatus, Long userId, Pageable pageable);
 
 	@Lock(LockModeType.PESSIMISTIC_WRITE)
 	@Query("select l from LectureEntity l where l.id = :lectureId")
 	Optional<LectureEntity> findByIdForUpdate(Long lectureId);
 
-	List<LectureEntity> findAllByCreatorIdOrderByCreatedAtDesc(Long creatorId);
-}
+	@EntityGraph(attributePaths = {"creator", "speakers"})
+	@Query("select distinct l from LectureEntity l join l.speakers s where s.id = :userId order by l.createdAt desc")
+	List<LectureEntity> findAllBySpeakerIdOrderByCreatedAtDesc(Long userId);
+}