Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
9d8c613
rename: ScheduleParticipant Service Layer 클래스명 UseCase로 변경
BonSik-Koo Feb 20, 2024
de7a3ea
refactor: 봉사 일정 참여 UseCase 로직 내 도메인 로직 분리 및 단위/통합 테스트 코드 추가
BonSik-Koo Feb 20, 2024
3eb99a8
refactor: 봉사 일정 Facade Layer command/query 분리
BonSik-Koo Feb 20, 2024
64b9667
test: 봉사 일정 참여 동시성 테스트 코드 수정
BonSik-Koo Feb 21, 2024
3e0abe2
refactor: 봉사 일정 참여 동시성 테스트 데이터 수정
BonSik-Koo Feb 21, 2024
5a002fd
refactor: 봉사 일정 참여 취소 UseCase 로직 내 도메인 로직 분리 및 통합 테스트 코드 추가
BonSik-Koo Feb 23, 2024
a3a3c97
refactor: 봉사 일정 참여 취소 승인 UseCase 로직 내 도메인 로직 분리 및 통합 테스트 코드 추가
BonSik-Koo Feb 23, 2024
1257e32
remove: 불필요한 클래스 삭제
BonSik-Koo Feb 23, 2024
081eec4
refactor: 봉사 일정 참여 완료 승인 UseCase 로직 내 도메인 로직 분리 및 통합 테스트 코드 추가
BonSik-Koo Feb 26, 2024
911b1dd
refactor: 봉사 일정 참여 정보 삭제 bulk update로 수정 및 통합 테스트 코드 추가
BonSik-Koo Feb 26, 2024
48a14e4
refactor: 불필요한 enum 상수값 제거
BonSik-Koo Feb 26, 2024
b0144fc
refactor: 메서드 매개변수 final 키워드 추가
BonSik-Koo Feb 26, 2024
52b8425
refactor: 일정 참여중 인원 조회 UseCase 쿼리 수정 및 통합 테스트 코드 추가
BonSik-Koo Feb 26, 2024
19bc081
Merge branch 'develop' into refactor/schedule-participation-domain
BonSik-Koo Feb 28, 2024
8d62475
refactor:일정 참여 취소 인원 조회 UseCase 쿼리 수정 및 통합 테스트 코드 추가
BonSik-Koo Feb 28, 2024
e624ea4
refactor: 일정 참여중 인원 조회 response DTO 반환 위치 변경
BonSik-Koo Feb 28, 2024
ddd6c5b
refactor: 일정 참여 완료 인원 조회 UseCase 쿼리 및 DTO 수정과 통합 테스트 코드 추가
BonSik-Koo Feb 28, 2024
da68fd6
test: schedule 인수 테스트 실패 수정
BonSik-Koo Feb 28, 2024
63e8ace
remove: 불필요한 메서드 및 의존성 제거
BonSik-Koo Feb 28, 2024
de73c91
refactor: 일정 참여 Controller DTO 수정 및 API document 테스트 분리
BonSik-Koo Feb 28, 2024
c0d2c19
test: 일정 참여 조회 API document 테스트 분리
BonSik-Koo Feb 28, 2024
0218e31
rename: RecruitmentParticipationController 네이밍 수정
BonSik-Koo Feb 28, 2024
77fa5be
test: API document 테스트 실패 해결
BonSik-Koo Feb 28, 2024
76f9273
test: 봉사 일정 참여 API 인수 테스트 추가
BonSik-Koo Mar 2, 2024
73547ee
test: 봉사 일정 참여 취소 API 인수 테스트 추가
BonSik-Koo Mar 3, 2024
bc7ac92
test: 봉사 일정 참여 취소 승인 API 인수 테스트 추가
BonSik-Koo Mar 3, 2024
4e69ce6
test: 봉사 일정 참여 완료 승인 API 인수 테스트 추가
BonSik-Koo Mar 3, 2024
41b0ec1
test: 봉사 일정 참여 리스트 조회 API 인수 테스트 추가
BonSik-Koo Mar 3, 2024
5a6b304
test: 봉사 일정 참여 취소 요청 리스트 조회 API 인수 테스트 추가
BonSik-Koo Mar 3, 2024
e041c1c
test: 봉사 일정 참여 완료 리스트 조회 API 인수 테스트 추가
BonSik-Koo Mar 3, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/docs/asciidoc/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ include::recruitment-participation.adoc[]

include::schedule.adoc[]

include::schedule-management.adoc[]
include::schedule-participation.adoc[]

include::notice.adoc[]

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[[Schedlue-Management-API]]
== Schedule Management API
[[Schedlue-Participation-API]]
== Schedule Participation API

=== 봉사 일정 참여
==== 발생 가능 예외
Expand All @@ -17,17 +17,17 @@

==== 요청
*HTTP Request*
include::{snippets}/schedule-participant-controller-test/participate-schedule/http-request.adoc[]
include::{snippets}/schedule-participation-controller-test/participate-schedule/http-request.adoc[]

*Request Header*
include::{snippets}/schedule-participant-controller-test/participate-schedule/request-headers.adoc[]
include::{snippets}/schedule-participation-controller-test/participate-schedule/request-headers.adoc[]

*Request Path*
include::{snippets}/schedule-participant-controller-test/participate-schedule/path-parameters.adoc[]
include::{snippets}/schedule-participation-controller-test/participate-schedule/path-parameters.adoc[]

==== 응답
*HTTP Response*
include::{snippets}/schedule-participant-controller-test/participate-schedule/http-response.adoc[]
include::{snippets}/schedule-participation-controller-test/participate-schedule/http-response.adoc[]


=== 봉사 일정 참여 취소 요청
Expand All @@ -44,17 +44,17 @@ include::{snippets}/schedule-participant-controller-test/participate-schedule/ht

==== 요청
*HTTP Request*
include::{snippets}/schedule-participant-controller-test/cancel-participation-schedule/http-request.adoc[]
include::{snippets}/schedule-participation-controller-test/cancel-participation-schedule/http-request.adoc[]

*Request Header*
include::{snippets}/schedule-participant-controller-test/cancel-participation-schedule/request-headers.adoc[]
include::{snippets}/schedule-participation-controller-test/cancel-participation-schedule/request-headers.adoc[]

*Request Path*
include::{snippets}/schedule-participant-controller-test/cancel-participation-schedule/path-parameters.adoc[]
include::{snippets}/schedule-participation-controller-test/cancel-participation-schedule/path-parameters.adoc[]

==== 응답
*HTTP Response*
include::{snippets}/schedule-participant-controller-test/cancel-participation-schedule/http-response.adoc[]
include::{snippets}/schedule-participation-controller-test/cancel-participation-schedule/http-response.adoc[]


=== 봉사 일정 취소 요청 승인
Expand All @@ -72,20 +72,20 @@ include::{snippets}/schedule-participant-controller-test/cancel-participation-sc

==== 요청
*HTTP Request*
include::{snippets}/schedule-participant-controller-test/approve-cancellation-schedule/http-request.adoc[]
include::{snippets}/schedule-participation-controller-test/approve-cancellation-schedule/http-request.adoc[]

*Request Header*
include::{snippets}/schedule-participant-controller-test/approve-cancellation-schedule/request-headers.adoc[]
include::{snippets}/schedule-participation-controller-test/approve-cancellation-schedule/request-headers.adoc[]

*Request Path*
include::{snippets}/schedule-participant-controller-test/approve-cancellation-schedule/path-parameters.adoc[]
include::{snippets}/schedule-participation-controller-test/approve-cancellation-schedule/path-parameters.adoc[]

*Request Body*
include::{snippets}/schedule-participant-controller-test/approve-cancellation-schedule/request-fields.adoc[]
include::{snippets}/schedule-participation-controller-test/approve-cancellation-schedule/request-fields.adoc[]

==== 응답
*HTTP Response*
include::{snippets}/schedule-participant-controller-test/approve-cancellation-schedule/http-response.adoc[]
include::{snippets}/schedule-participation-controller-test/approve-cancellation-schedule/http-response.adoc[]


=== 봉사 일정 참여 완료 승인
Expand All @@ -102,20 +102,20 @@ include::{snippets}/schedule-participant-controller-test/approve-cancellation-sc

==== 요청
*HTTP Request*
include::{snippets}/schedule-participant-controller-test/approval-completion-schedule/http-request.adoc[]
include::{snippets}/schedule-participation-controller-test/approve-participation-completion/http-request.adoc[]

*Request Header*
include::{snippets}/schedule-participant-controller-test/approval-completion-schedule/request-headers.adoc[]
include::{snippets}/schedule-participation-controller-test/approve-participation-completion/request-headers.adoc[]

*Request Path*
include::{snippets}/schedule-participant-controller-test/approval-completion-schedule/path-parameters.adoc[]
include::{snippets}/schedule-participation-controller-test/approve-participation-completion/path-parameters.adoc[]

*Request Body*
include::{snippets}/schedule-participant-controller-test/approval-completion-schedule/request-fields.adoc[]
include::{snippets}/schedule-participation-controller-test/approve-participation-completion/request-fields.adoc[]

==== 응답
*HTTP Response*
include::{snippets}/schedule-participant-controller-test/approval-completion-schedule/http-response.adoc[]
include::{snippets}/schedule-participation-controller-test/approve-participation-completion/http-response.adoc[]


=== 봉사 일정 참여자 리스트 조회
Expand All @@ -130,20 +130,20 @@ include::{snippets}/schedule-participant-controller-test/approval-completion-sch

==== 요청
*HTTP Request*
include::{snippets}/schedule-participant-controller-test/find-list-participant-schedule/http-request.adoc[]
include::{snippets}/schedule-participation-controller-test/find-active-participants/http-request.adoc[]

*Request Header*
include::{snippets}/schedule-participant-controller-test/find-list-participant-schedule/request-headers.adoc[]
include::{snippets}/schedule-participation-controller-test/find-active-participants/request-headers.adoc[]

*Request Path*
include::{snippets}/schedule-participant-controller-test/find-list-participant-schedule/path-parameters.adoc[]
include::{snippets}/schedule-participation-controller-test/find-active-participants/path-parameters.adoc[]

==== 응답
*HTTP Response*
include::{snippets}/schedule-participant-controller-test/find-list-participant-schedule/http-response.adoc[]
include::{snippets}/schedule-participation-controller-test/find-active-participants/http-response.adoc[]

*Response Body*
include::{snippets}/schedule-participant-controller-test/find-list-participant-schedule/response-fields.adoc[]
include::{snippets}/schedule-participation-controller-test/find-active-participants/response-fields.adoc[]


=== 봉사 일정 참가 취소자 리스트 조회
Expand All @@ -158,20 +158,20 @@ include::{snippets}/schedule-participant-controller-test/find-list-participant-s

==== 요청
*HTTP Request*
include::{snippets}/schedule-participant-controller-test/find-list-cancellation-requester-schedule/http-request.adoc[]
include::{snippets}/schedule-participation-controller-test/find-cancelled-participants/http-request.adoc[]

*Request Header*
include::{snippets}/schedule-participant-controller-test/find-list-cancellation-requester-schedule/request-headers.adoc[]
include::{snippets}/schedule-participation-controller-test/find-cancelled-participants/request-headers.adoc[]

*Request Path*
include::{snippets}/schedule-participant-controller-test/find-list-cancellation-requester-schedule/path-parameters.adoc[]
include::{snippets}/schedule-participation-controller-test/find-cancelled-participants/path-parameters.adoc[]

==== 응답
*HTTP Response*
include::{snippets}/schedule-participant-controller-test/find-list-cancellation-requester-schedule/http-response.adoc[]
include::{snippets}/schedule-participation-controller-test/find-cancelled-participants/http-response.adoc[]

*Response Body*
include::{snippets}/schedule-participant-controller-test/find-list-cancellation-requester-schedule/response-fields.adoc[]
include::{snippets}/schedule-participation-controller-test/find-cancelled-participants/response-fields.adoc[]


=== 봉사 일정 참가 완료자 리스트 조회
Expand All @@ -186,17 +186,17 @@ include::{snippets}/schedule-participant-controller-test/find-list-cancellation-

==== 요청
*HTTP Request*
include::{snippets}/schedule-participant-controller-test/find-list-participant-completed-schedule/http-request.adoc[]
include::{snippets}/schedule-participation-controller-test/find-completed-participants/http-request.adoc[]

*Request Header*
include::{snippets}/schedule-participant-controller-test/find-list-participant-completed-schedule/request-headers.adoc[]
include::{snippets}/schedule-participation-controller-test/find-completed-participants/request-headers.adoc[]

*Request Path*
include::{snippets}/schedule-participant-controller-test/find-list-participant-completed-schedule/path-parameters.adoc[]
include::{snippets}/schedule-participation-controller-test/find-completed-participants/path-parameters.adoc[]

==== 응답
*HTTP Response*
include::{snippets}/schedule-participant-controller-test/find-list-participant-completed-schedule/http-response.adoc[]
include::{snippets}/schedule-participation-controller-test/find-completed-participants/http-response.adoc[]

*Response Body*
include::{snippets}/schedule-participant-controller-test/find-list-participant-completed-schedule/response-fields.adoc[]
include::{snippets}/schedule-participation-controller-test/find-completed-participants/response-fields.adoc[]
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
import project.volunteer.domain.logboard.dao.LogboardRepository;
import project.volunteer.domain.logboard.dao.dto.LogboardListQuery;
import project.volunteer.domain.reply.application.ReplyService;
import project.volunteer.domain.scheduleParticipation.service.ScheduleParticipationDtoService;
import project.volunteer.domain.scheduleParticipation.service.ScheduleParticipationQueryUseCase;
import project.volunteer.domain.scheduleParticipation.service.dto.ParsingCompleteSchedule;
import project.volunteer.domain.image.domain.Storage;
import project.volunteer.global.Interceptor.OrganizationAuth;
Expand All @@ -62,7 +62,7 @@ public class LogboardController {
private final FileService fileService;
private final ImageRepository imageRepository;
private final LogboardRepository logboardRepository;
private final ScheduleParticipationDtoService spDtoService ;
private final ScheduleParticipationQueryUseCase spDtoService ;
private final ReplyService replyService;
private final ReplyRepository replyRepository;
private final UserService userService;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import project.volunteer.domain.notice.application.NoticeService;
import project.volunteer.domain.recruitmentParticipation.application.RecruitmentParticipationUseCase;
import project.volunteer.domain.recruitment.api.dto.request.RecruitmentRequest;
import project.volunteer.domain.scheduleParticipation.service.ScheduleParticipationService;
import project.volunteer.domain.scheduleParticipation.service.ScheduleParticipationCommandUseCase;
import project.volunteer.domain.sehedule.application.ScheduleCommandUseCase;
import project.volunteer.domain.user.application.UserService;
import project.volunteer.domain.user.domain.User;
Expand All @@ -30,7 +30,7 @@ public class RecruitmentFacade {


private final ImageService imageService;
private final ScheduleParticipationService scheduleParticipationService;
private final ScheduleParticipationCommandUseCase scheduleParticipationService;
private final NoticeService noticeService;
private final ConfirmationService confirmationService;

Expand All @@ -48,6 +48,7 @@ public void deleteRecruitment(Long recruitmentNo){

recruitmentParticipationUseCase.deleteRecruitmentParticipations(recruitmentNo);

scheduleParticipationService.deleteAllScheduleParticipationByRecruitment(recruitmentNo);



Expand All @@ -60,9 +61,6 @@ public void deleteRecruitment(Long recruitmentNo){

//공지사항 확인 리스트 삭제
confirmationService.deleteAllConfirmation(RealWorkCode.NOTICE, noticeNoList);

//일정 참여자 삭제
scheduleParticipationService.deleteAllScheduleParticipation(recruitmentNo);
}

public StateResult findState(Long recruitmentNo, Long userNo){
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
@RestController
@RequiredArgsConstructor
@RequestMapping("/recruitment")
public class ParticipationController {
public class RecruitmentParticipationController {
private final RecruitmentParticipationFacade participationFacade;

@PutMapping("/{recruitmentNo}/join")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,15 +104,6 @@ public void deleteRecruitmentParticipations(Long recruitmentNo) {
.forEach(RecruitmentParticipation::delete);
}










@Override
public RecruitmentParticipation findParticipation(Long recruitmentNo, Long userNo) {
return recruitmentParticipationRepository.findByRecruitment_RecruitmentNoAndUser_UserNo(recruitmentNo, userNo)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,8 @@ public interface RecruitmentParticipationUseCase {

void deleteRecruitmentParticipations(Long recruitmentNo);



RecruitmentParticipation findParticipation(Long recruitmentNo, Long userNo);


//팀 탈퇴(미정)

RecruitmentParticipation findParticipation(Long recruitmentNo, Long userNo);

}

This file was deleted.

Loading