-
Notifications
You must be signed in to change notification settings - Fork 7
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[BE] 방 수정 기능 & 스케줄러 부분 분리 및 리팩토링(#605) #606
Changes from all commits
4a27da8
85b9f11
adb297b
e05bc8a
38a083b
e5264b8
800c48b
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
package corea.room.dto; | ||
|
||
import com.fasterxml.jackson.annotation.JsonFormat; | ||
import corea.member.domain.Member; | ||
import corea.room.domain.Room; | ||
import corea.room.domain.RoomClassification; | ||
import corea.room.domain.RoomStatus; | ||
import io.swagger.v3.oas.annotations.media.Schema; | ||
import jakarta.validation.constraints.NotBlank; | ||
import jakarta.validation.constraints.NotNull; | ||
|
||
import java.time.LocalDateTime; | ||
import java.util.List; | ||
|
||
@Schema(description = "방 수정 요청") | ||
public record RoomUpdateRequest( | ||
@Schema(description = "방 ID", example = "99") | ||
@NotBlank | ||
long roomId, | ||
|
||
@Schema(description = "방 제목", example = "MVC를 아시나요?") | ||
@NotBlank | ||
String title, | ||
|
||
@Schema(description = "방 내용", example = "MVC 패턴을 아시나요?") | ||
String content, | ||
|
||
@Schema(description = "repository 링크", example = "https://github.com/example/java-racingcar") | ||
@NotBlank | ||
String repositoryLink, | ||
|
||
@Schema(description = "썸네일 링크", example = "https://gongu.copyright.or.kr/gongu/wrt/cmmn/wrtFileImageView.do?wrtSn=13301655&filePath=L2Rpc2sxL25ld2RhdGEvMjAyMS8yMS9DTFMxMDAwNC8xMzMwMTY1NV9XUlRfMjFfQ0xTMTAwMDRfMjAyMTEyMTNfMQ==&thumbAt=Y&thumbSe=b_tbumb&wrtTy=10004") | ||
String thumbnailLink, | ||
|
||
@Schema(description = "상호 리뷰 인원", example = "2") | ||
@NotNull | ||
int matchingSize, | ||
|
||
@Schema(description = "중심으로 리뷰하면 좋은 키워드", example = "[\"TDD\", \"클린코드\"]") | ||
List<String> keywords, | ||
|
||
@Schema(description = "제한 참여 인원", example = "200") | ||
@NotNull | ||
int limitedParticipants, | ||
|
||
@Schema(description = "모집 마감일", example = "2024-07-30 15:00") | ||
@NotNull | ||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm") | ||
LocalDateTime recruitmentDeadline, | ||
|
||
@Schema(description = "리뷰 마감일", example = "2024-08-10 23:59") | ||
@NotNull | ||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm") | ||
LocalDateTime reviewDeadline, | ||
|
||
@Schema(description = "방이 속하는 분야", example = "BE") | ||
@NotNull | ||
RoomClassification classification | ||
) { | ||
|
||
private static final int INITIAL_PARTICIPANTS_SIZE = 1; | ||
private static final RoomStatus INITIAL_ROOM_STATUS = RoomStatus.OPEN; | ||
|
||
public Room toEntity(Member manager) { | ||
return new Room( | ||
roomId, | ||
title, content, | ||
matchingSize, repositoryLink, | ||
thumbnailLink, keywords, | ||
INITIAL_PARTICIPANTS_SIZE, limitedParticipants, | ||
manager, recruitmentDeadline, | ||
reviewDeadline, classification, | ||
INITIAL_ROOM_STATUS | ||
); | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,84 @@ | ||
package corea.room.service; | ||
|
||
import corea.room.domain.Room; | ||
import corea.scheduler.domain.*; | ||
import corea.scheduler.service.*; | ||
import lombok.RequiredArgsConstructor; | ||
import lombok.extern.slf4j.Slf4j; | ||
import org.springframework.boot.context.event.ApplicationReadyEvent; | ||
import org.springframework.context.event.EventListener; | ||
import org.springframework.stereotype.Service; | ||
import org.springframework.transaction.annotation.Transactional; | ||
|
||
import java.util.List; | ||
|
||
@Slf4j | ||
@Service | ||
@RequiredArgsConstructor | ||
@Transactional(readOnly = true) | ||
public class RoomAutomaticService { | ||
|
||
private final AutomaticUpdateWriter automaticUpdateWriter; | ||
private final AutomaticUpdateReader automaticUpdateReader; | ||
|
||
private final AutomaticMatchingWriter automaticMatchingWriter; | ||
private final AutomaticMatchingReader automaticMatchingReader; | ||
|
||
private final AutomaticMatchingScheduler automaticMatchingScheduler; | ||
private final AutomaticUpdateScheduler automaticUpdateScheduler; | ||
|
||
@Transactional | ||
public void updateTime(Room updateRoom) { | ||
AutomaticMatching automaticMatching = automaticMatchingReader.findWithRoom(updateRoom); | ||
AutomaticUpdate automaticUpdate = automaticUpdateReader.findWithRoom(updateRoom); | ||
|
||
automaticMatchingWriter.updateTime(automaticMatching, updateRoom.getRecruitmentDeadline()); | ||
automaticUpdateWriter.updateTime(automaticUpdate, updateRoom.getReviewDeadline()); | ||
|
||
automaticMatchingScheduler.modifyTask(updateRoom); | ||
automaticUpdateScheduler.modifyTask(updateRoom); | ||
} | ||
|
||
@Transactional | ||
public void createAutomatic(Room room) { | ||
automaticMatchingWriter.create(room); | ||
automaticUpdateWriter.create(room); | ||
|
||
automaticMatchingScheduler.matchOnRecruitmentDeadline(room); | ||
automaticUpdateScheduler.updateAtReviewDeadline(room); | ||
} | ||
|
||
@Transactional | ||
public void deleteAutomatic(Room room) { | ||
AutomaticMatching automaticMatching = automaticMatchingReader.findWithRoom(room); | ||
AutomaticUpdate automaticUpdate = automaticUpdateReader.findWithRoom(room); | ||
|
||
automaticMatchingWriter.delete(automaticMatching); | ||
automaticUpdateWriter.delete(automaticUpdate); | ||
|
||
automaticMatchingScheduler.cancel(room.getId()); | ||
automaticUpdateScheduler.cancel(room.getId()); | ||
} | ||
|
||
@EventListener(ApplicationReadyEvent.class) | ||
public void schedulePendingAutomaticMatching() { | ||
List<AutomaticMatching> matchings = automaticMatchingReader.findAllByStatus(ScheduleStatus.PENDING); | ||
|
||
log.info("{}개의 방에 대해 자동 매칭 재예약 시작", matchings.size()); | ||
|
||
matchings.forEach(automaticMatchingScheduler::matchOnRecruitmentDeadline); | ||
|
||
log.info("{}개의 방에 대해 자동 매칭 재예약 완료", matchings.size()); | ||
} | ||
|
||
@EventListener(ApplicationReadyEvent.class) | ||
public void schedulePendingAutomaticUpdate() { | ||
List<AutomaticUpdate> updates = automaticUpdateReader.findAllByStatus(ScheduleStatus.PENDING); | ||
|
||
log.info("{}개의 방에 대해 자동 상태 업데이트 재예약 시작", updates.size()); | ||
|
||
updates.forEach(automaticUpdateScheduler::updateAtReviewDeadline); | ||
|
||
log.info("{}개의 방에 대해 자동 상태 업데이트 재예약 완료", updates.size()); | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,18 +11,10 @@ | |
import corea.participation.domain.ParticipationStatus; | ||
import corea.participation.repository.ParticipationRepository; | ||
import corea.room.domain.Room; | ||
import corea.room.domain.RoomClassification; | ||
import corea.room.domain.RoomStatus; | ||
import corea.room.dto.*; | ||
import corea.room.repository.RoomRepository; | ||
import corea.scheduler.domain.AutomaticMatching; | ||
import corea.scheduler.domain.AutomaticUpdate; | ||
import corea.scheduler.repository.AutomaticMatchingRepository; | ||
import corea.scheduler.repository.AutomaticUpdateRepository; | ||
import lombok.RequiredArgsConstructor; | ||
import lombok.extern.slf4j.Slf4j; | ||
import org.springframework.data.domain.Page; | ||
import org.springframework.data.domain.PageRequest; | ||
import org.springframework.stereotype.Service; | ||
import org.springframework.transaction.annotation.Transactional; | ||
|
||
|
@@ -46,8 +38,8 @@ public class RoomService { | |
private final MatchResultRepository matchResultRepository; | ||
private final ParticipationRepository participationRepository; | ||
private final FailedMatchingRepository failedMatchingRepository; | ||
private final AutomaticMatchingRepository automaticMatchingRepository; | ||
private final AutomaticUpdateRepository automaticUpdateRepository; | ||
private final RoomAutomaticService roomAutomaticService; | ||
|
||
|
||
@Transactional | ||
public RoomResponse create(long memberId, RoomCreateRequest request) { | ||
|
@@ -59,12 +51,28 @@ public RoomResponse create(long memberId, RoomCreateRequest request) { | |
Participation participation = new Participation(room, manager); | ||
|
||
participationRepository.save(participation); | ||
automaticMatchingRepository.save(new AutomaticMatching(room.getId(), request.recruitmentDeadline())); | ||
automaticUpdateRepository.save(new AutomaticUpdate(room.getId(), request.reviewDeadline())); | ||
roomAutomaticService.createAutomatic(room); | ||
|
||
return RoomResponse.of(room, participation.getMemberRole(), ParticipationStatus.MANAGER); | ||
} | ||
|
||
@Transactional | ||
public RoomResponse update(long memberId, RoomUpdateRequest request) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. P5
방을 업데이트하는 로직인데 참여 여부를 확인하고 있는 것도 살짝 어색하게 느껴지고요. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
�우선, 저는 방장이 무조건 리뷰어로 참여만 하는거 자체를 경계하고 있습니다.
위의 관점도 그렇고, 명확하게 |
||
Room room = getRoom(request.roomId()); | ||
if (room.isNotMatchingManager(memberId)) { | ||
throw new CoreaException(ExceptionType.MEMBER_IS_NOT_MANAGER); | ||
} | ||
Member member = memberRepository.findById(memberId) | ||
.orElseThrow(() -> new CoreaException(ExceptionType.MEMBER_NOT_FOUND)); | ||
|
||
Room updatedRoom = roomRepository.save(request.toEntity(member)); | ||
Participation participation = participationRepository.findByRoomIdAndMemberId(updatedRoom.getId(), memberId) | ||
.orElseThrow(() -> new CoreaException(ExceptionType.NOT_ALREADY_APPLY)); | ||
|
||
roomAutomaticService.updateTime(updatedRoom); | ||
return RoomResponse.of(updatedRoom, participation.getMemberRole(), ParticipationStatus.MANAGER); | ||
} | ||
|
||
private void validateDeadLine(LocalDateTime recruitmentDeadline, LocalDateTime reviewDeadline) { | ||
LocalDateTime currentDateTime = LocalDateTime.now(); | ||
|
||
|
@@ -114,8 +122,7 @@ public void delete(long roomId, long memberId) { | |
|
||
roomRepository.delete(room); | ||
participationRepository.deleteAllByRoomId(roomId); | ||
automaticMatchingRepository.deleteByRoomId(roomId); | ||
automaticUpdateRepository.deleteByRoomId(roomId); | ||
roomAutomaticService.deleteAutomatic(room); | ||
} | ||
|
||
private void validateDeletionAuthority(Room room, long memberId) { | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
package corea.scheduler.domain; | ||
|
||
import corea.exception.CoreaException; | ||
import corea.exception.ExceptionType; | ||
import corea.room.domain.Room; | ||
import corea.scheduler.repository.AutomaticMatchingRepository; | ||
import lombok.RequiredArgsConstructor; | ||
import org.springframework.stereotype.Component; | ||
import org.springframework.transaction.annotation.Transactional; | ||
|
||
import java.util.List; | ||
|
||
@Component | ||
@RequiredArgsConstructor | ||
@Transactional(readOnly = true) | ||
public class AutomaticMatchingReader { | ||
|
||
private final AutomaticMatchingRepository automaticMatchingRepository; | ||
|
||
public AutomaticMatching findWithRoom(Room room) { | ||
return automaticMatchingRepository.findByRoomId(room.getId()) | ||
.orElseThrow(() -> new CoreaException(ExceptionType.AUTOMATIC_MATCHING_NOT_FOUND)); | ||
} | ||
|
||
public List<AutomaticMatching> findAllByStatus(ScheduleStatus status) { | ||
return automaticMatchingRepository.findAllByStatus(status); | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
package corea.scheduler.domain; | ||
|
||
import corea.room.domain.Room; | ||
import corea.scheduler.repository.AutomaticMatchingRepository; | ||
import lombok.RequiredArgsConstructor; | ||
import org.springframework.stereotype.Component; | ||
import org.springframework.transaction.annotation.Transactional; | ||
|
||
import java.time.LocalDateTime; | ||
|
||
@Component | ||
@RequiredArgsConstructor | ||
@Transactional | ||
public class AutomaticMatchingWriter { | ||
|
||
private final AutomaticMatchingRepository automaticMatchingRepository; | ||
|
||
public AutomaticMatching updateTime(AutomaticMatching automaticMatching, LocalDateTime matchingStartTime) { | ||
AutomaticMatching updateEntity = new AutomaticMatching( | ||
automaticMatching.getId(), | ||
automaticMatching.getRoomId(), | ||
matchingStartTime, | ||
automaticMatching.getStatus() | ||
); | ||
return automaticMatchingRepository.save(updateEntity); | ||
} | ||
|
||
public AutomaticMatching create(Room room) { | ||
AutomaticMatching entity = new AutomaticMatching(room.getId(),room.getRecruitmentDeadline()); | ||
return automaticMatchingRepository.save(entity); | ||
} | ||
|
||
public void delete(AutomaticMatching automaticMatching) { | ||
automaticMatchingRepository.delete(automaticMatching); | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
명세서 있는 건가요?