diff --git a/oneco/src/main/java/com/oneco/backend/StudyRecord/application/dto/result/MemberItem.java b/oneco/src/main/java/com/oneco/backend/StudyRecord/application/dto/result/MemberItem.java index 0696b46..46695ff 100644 --- a/oneco/src/main/java/com/oneco/backend/StudyRecord/application/dto/result/MemberItem.java +++ b/oneco/src/main/java/com/oneco/backend/StudyRecord/application/dto/result/MemberItem.java @@ -2,6 +2,6 @@ public record MemberItem( Long memberId, - String name + String nickname ) { } diff --git a/oneco/src/main/java/com/oneco/backend/family/infrastructure/persistence/FamilyRelationJpaRepository.java b/oneco/src/main/java/com/oneco/backend/family/infrastructure/persistence/FamilyRelationJpaRepository.java index cecedf0..db7370d 100644 --- a/oneco/src/main/java/com/oneco/backend/family/infrastructure/persistence/FamilyRelationJpaRepository.java +++ b/oneco/src/main/java/com/oneco/backend/family/infrastructure/persistence/FamilyRelationJpaRepository.java @@ -44,7 +44,7 @@ public interface FamilyRelationJpaRepository extends JpaRepository missionsToStart = missionPort.findAllMissionsStartingToday(today); // ============================= diff --git a/oneco/src/main/java/com/oneco/backend/mission/domain/exception/MissionErrorCode.java b/oneco/src/main/java/com/oneco/backend/mission/domain/exception/MissionErrorCode.java index c2e5838..b4a3530 100644 --- a/oneco/src/main/java/com/oneco/backend/mission/domain/exception/MissionErrorCode.java +++ b/oneco/src/main/java/com/oneco/backend/mission/domain/exception/MissionErrorCode.java @@ -120,6 +120,11 @@ public enum MissionErrorCode implements ErrorCode { HttpStatus.BAD_REQUEST, "미션 ID가 유효하지 않습니다.", "MISSION_ERROR_400_INVALID_MISSION_ID" + ), + LATE_MISSION_APPROVAL( + HttpStatus.BAD_REQUEST, + "미션 종료일이 지난 후에는 승인할 수 없습니다.", + "MISSION_ERROR_400_LATE_MISSION_APPROVAL" ); private final HttpStatus httpStatus; diff --git a/oneco/src/main/java/com/oneco/backend/mission/domain/mission/Mission.java b/oneco/src/main/java/com/oneco/backend/mission/domain/mission/Mission.java index 3a4b43c..11ba99b 100644 --- a/oneco/src/main/java/com/oneco/backend/mission/domain/mission/Mission.java +++ b/oneco/src/main/java/com/oneco/backend/mission/domain/mission/Mission.java @@ -106,7 +106,7 @@ private Mission( } // 미션 생성 메서드 - public static Mission create( + public static Mission of( MemberId requesterId, MemberId recipientId, FamilyRelationId familyRelationId, diff --git a/oneco/src/main/java/com/oneco/backend/mission/presentation/MissionController.java b/oneco/src/main/java/com/oneco/backend/mission/presentation/MissionController.java index df77f71..8ee06d0 100644 --- a/oneco/src/main/java/com/oneco/backend/mission/presentation/MissionController.java +++ b/oneco/src/main/java/com/oneco/backend/mission/presentation/MissionController.java @@ -75,8 +75,10 @@ public ResponseEntity> createMission( description = """ - 미션 승인 또는 거절 요청을 처리한다. - 미션 수신자는 미션을 승인하거나 거절할 수 있다. - - 승인 시 미션 상태는 '진행중'으로 변경된다. + - 승인 시 미션 상태는 '승인 수락'으로 변경된다. - 거절 시 미션 상태는 '거절됨'으로 변경된다. + - 미션 승인 시점이 미션 시작일이과 같을 경우 미션 상태는 즉시 '진행중'으로 변경된다. + - 미션 승인 시점이 미션 시작일보다 이후 일 경우 미션 상태는 즉시 '진행중'으로 변경된다. """ ) @ApiResponses({