diff --git a/src/test/java/gdsc/konkuk/platformcore/controller/attendance/AttendanceControllerTest.java b/src/test/java/gdsc/konkuk/platformcore/controller/attendance/AttendanceControllerTest.java index 7afc6d98..14c128ae 100644 --- a/src/test/java/gdsc/konkuk/platformcore/controller/attendance/AttendanceControllerTest.java +++ b/src/test/java/gdsc/konkuk/platformcore/controller/attendance/AttendanceControllerTest.java @@ -10,6 +10,7 @@ import gdsc.konkuk.platformcore.controller.attendance.dtos.AttendanceRegisterRequest; import gdsc.konkuk.platformcore.domain.attendance.entity.Attendance; +import gdsc.konkuk.platformcore.domain.attendance.entity.AttendanceType; import gdsc.konkuk.platformcore.domain.member.entity.Member; import gdsc.konkuk.platformcore.domain.member.entity.MemberRole; import gdsc.konkuk.platformcore.fixture.attendance.AttendanceFixture; @@ -139,7 +140,7 @@ void should_attend_when_pass_event_id_and_member_id() throws Exception { .id(1L).activeQrUuid("uuid").build().getFixture(); given(attendanceService.attend(memberToAttend.getId(), attendanceToAttend.getId(), attendanceToAttend.getActiveQrUuid())) .willReturn(ParticipantFixture.builder() - .isAttended(true) + .attendanceType(AttendanceType.ATTEND) .memberId(memberToAttend.getId()) .attendance(attendanceToAttend) .build().getFixture()); diff --git a/src/test/java/gdsc/konkuk/platformcore/controller/member/MemberControllerTest.java b/src/test/java/gdsc/konkuk/platformcore/controller/member/MemberControllerTest.java index c9ba4212..5b626905 100644 --- a/src/test/java/gdsc/konkuk/platformcore/controller/member/MemberControllerTest.java +++ b/src/test/java/gdsc/konkuk/platformcore/controller/member/MemberControllerTest.java @@ -22,6 +22,7 @@ import gdsc.konkuk.platformcore.controller.member.dtos.MemberRegisterRequest; import gdsc.konkuk.platformcore.controller.member.dtos.MemberUpdateInfo; import gdsc.konkuk.platformcore.controller.member.dtos.MemberUpdateRequest; +import gdsc.konkuk.platformcore.domain.attendance.entity.AttendanceType; import gdsc.konkuk.platformcore.domain.member.entity.Member; import gdsc.konkuk.platformcore.domain.member.entity.MemberRole; import gdsc.konkuk.platformcore.fixture.member.MemberAttendancesFixture; @@ -324,18 +325,15 @@ void should_success_when_get_attendances_by_batch() throws Exception { fieldWithPath("data[].department").description("멤버 학과"), fieldWithPath("data[].totalAttendances").description("전체 등록 횟수"), fieldWithPath("data[].actualAttendances").description("실제 출석 횟수"), - fieldWithPath("data[].attendanceInfoList").description("멤버 출석 정보 리스트"), fieldWithPath("data[].attendanceInfoList[].attendanceId") .description("출석 아이디"), fieldWithPath("data[].attendanceInfoList[].memberId") .description("멤버 아이디"), - fieldWithPath("data[].attendanceInfoList[].eventId") - .description("이벤트 아이디"), fieldWithPath("data[].attendanceInfoList[].participantId") .description("참가자 아이디"), fieldWithPath("data[].attendanceInfoList[].attendanceDate") .description("출석 날짜"), - fieldWithPath("data[].attendanceInfoList[].attended") + fieldWithPath("data[].attendanceInfoList[].attendanceType") .description("출석 여부")) .build()))); } @@ -347,9 +345,9 @@ void should_success_when_update_attendances_by_batch() throws Exception { Member member = MemberFixture.builder().role(MemberRole.CORE).build().getFixture(); String jwt = jwtTokenProvider.createToken(member); List attendanceUpdateInfoList = List.of( - AttendanceUpdateInfo.builder().participantId(1L).isAttended(true).build(), - AttendanceUpdateInfo.builder().participantId(2L).isAttended(false).build(), - AttendanceUpdateInfo.builder().participantId(3L).isAttended(true).build()); + AttendanceUpdateInfo.builder().participantId(1L).attendanceType(AttendanceType.ATTEND).build(), + AttendanceUpdateInfo.builder().participantId(2L).attendanceType(AttendanceType.ABSENT).build(), + AttendanceUpdateInfo.builder().participantId(3L).attendanceType(AttendanceType.LATE).build()); AttendanceUpdateRequest attendanceUpdateRequest = new AttendanceUpdateRequest(attendanceUpdateInfoList); willDoNothing().given(memberService).updateAttendances( "24-25", @@ -389,7 +387,7 @@ void should_success_when_update_attendances_by_batch() throws Exception { fieldWithPath("attendanceUpdateInfoList[]").description("출석 정보 수정 리스트"), fieldWithPath("attendanceUpdateInfoList[].participantId") .description("참가자 아이디"), - fieldWithPath("attendanceUpdateInfoList[].attended") + fieldWithPath("attendanceUpdateInfoList[].attendanceType") .description("출석 여부")) .responseFields( fieldWithPath("success").description(true), diff --git a/src/test/java/gdsc/konkuk/platformcore/fixture/attendance/ParticipantFixture.java b/src/test/java/gdsc/konkuk/platformcore/fixture/attendance/ParticipantFixture.java index 03b0f277..ada7c905 100644 --- a/src/test/java/gdsc/konkuk/platformcore/fixture/attendance/ParticipantFixture.java +++ b/src/test/java/gdsc/konkuk/platformcore/fixture/attendance/ParticipantFixture.java @@ -3,6 +3,7 @@ import static gdsc.konkuk.platformcore.global.utils.GetDefault.getDefault; import gdsc.konkuk.platformcore.domain.attendance.entity.Attendance; +import gdsc.konkuk.platformcore.domain.attendance.entity.AttendanceType; import gdsc.konkuk.platformcore.domain.attendance.entity.Participant; import lombok.Builder; import lombok.Getter; @@ -12,11 +13,11 @@ public class ParticipantFixture { private final Participant fixture; @Builder - public ParticipantFixture(Long memberId, Attendance attendance, Boolean isAttended) { + public ParticipantFixture(Long memberId, Attendance attendance, AttendanceType attendanceType) { this.fixture = Participant.builder() .memberId(getDefault(memberId, 0L)) .attendance(getDefault(attendance, AttendanceFixture.builder().build().getFixture())) - .isAttended(getDefault(isAttended, false)) + .attendanceType(getDefault(attendanceType, AttendanceType.ABSENT)) .build(); } } diff --git a/src/test/java/gdsc/konkuk/platformcore/fixture/member/MemberAttendancesFixture.java b/src/test/java/gdsc/konkuk/platformcore/fixture/member/MemberAttendancesFixture.java index 7ca9ff9f..7f3007b3 100644 --- a/src/test/java/gdsc/konkuk/platformcore/fixture/member/MemberAttendancesFixture.java +++ b/src/test/java/gdsc/konkuk/platformcore/fixture/member/MemberAttendancesFixture.java @@ -4,6 +4,7 @@ import gdsc.konkuk.platformcore.application.attendance.dtos.MemberAttendanceInfo; import gdsc.konkuk.platformcore.application.member.dtos.MemberAttendances; +import gdsc.konkuk.platformcore.domain.attendance.entity.AttendanceType; import gdsc.konkuk.platformcore.domain.member.entity.MemberRole; import java.time.LocalDateTime; import java.util.List; @@ -27,26 +28,23 @@ public MemberAttendancesFixture(Long memberId, String memberName, MemberRole mem MemberAttendanceInfo.builder() .attendanceId(0L) .memberId(0L) - .eventId(0L) .participantId(0L) + .attendanceType(AttendanceType.ABSENT) .attendanceDate(LocalDateTime.now()) - .isAttended(true) .build(), MemberAttendanceInfo.builder() .attendanceId(1L) .memberId(0L) - .eventId(1L) .participantId(1L) + .attendanceType(AttendanceType.LATE) .attendanceDate(LocalDateTime.now().plusDays(3)) - .isAttended(false) .build(), MemberAttendanceInfo.builder() .attendanceId(2L) .memberId(0L) - .eventId(2L) .participantId(2L) + .attendanceType(AttendanceType.ATTEND) .attendanceDate(LocalDateTime.now().plusDays(5)) - .isAttended(true) .build()))) .build(); }