-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Feature: 멤버의 기수별 출결 목록 반환 기능 구현 (#89)
* refactor: 출결 결과 컬럼명 변경 - 출결 상태 -> 출결 결과로 변경 * refactor: 출결 열림 상태 반환 메서드명 변경 - openStatus로 명시적으로 변경 * feat: 출결 열림 상태에 '시작 전' 상태 추가 * feat: 출결 시작 전 상태 판단 로직 추가 * feat: 출석 목록에서 부원의 출결 기록을 조회하는 JPA 메서드 추가 * feat: 멤버의 기수별 출결 목록 반환 * feat: 출석 기록 반환 값에 출결 형식 추가 * test: 기준 시간이전이면 출석이 '이전'인지에 대한 테스트 * fix: 기존 브랜치 병합에 따른 컨플릭 수정 * refactor: 출결 상태가 고정된 경우 파라미터 대신 생성자에 값을 고정
- Loading branch information
Showing
16 changed files
with
183 additions
and
56 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
src/main/java/org/cotato/csquiz/api/attendance/dto/AttendResponse.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 48 additions & 0 deletions
48
src/main/java/org/cotato/csquiz/api/attendance/dto/MemberAttendResponse.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
package org.cotato.csquiz.api.attendance.dto; | ||
|
||
import io.swagger.v3.oas.annotations.media.Schema; | ||
import java.time.LocalDate; | ||
import org.cotato.csquiz.domain.attendance.entity.AttendanceRecord; | ||
import org.cotato.csquiz.domain.attendance.enums.AttendanceOpenStatus; | ||
import org.cotato.csquiz.domain.attendance.enums.AttendanceResult; | ||
import org.cotato.csquiz.domain.attendance.enums.AttendanceType; | ||
import org.cotato.csquiz.domain.generation.entity.Session; | ||
|
||
public record MemberAttendResponse( | ||
@Schema(description = "멤버 PK") | ||
Long memberId, | ||
@Schema(description = "세션 타이틀", example = "3주차 세션") | ||
String sessionTitle, | ||
@Schema(description = "세션 날짜") | ||
LocalDate sessionDate, | ||
@Schema(description = "출결 진행 여부", examples = { | ||
"CLOSED", "OPEN" | ||
}) | ||
AttendanceOpenStatus isOpened, | ||
@Schema(description = "출결 형식") | ||
AttendanceType attendanceType, | ||
@Schema(description = "마감된 출석에 대한 출결 결과", nullable = true) | ||
AttendanceResult attendanceResult | ||
) { | ||
public static MemberAttendResponse closedAttendanceResponse(Session session, AttendanceRecord attendanceRecord) { | ||
return new MemberAttendResponse( | ||
attendanceRecord.getMemberId(), | ||
session.getTitle(), | ||
session.getSessionDate(), | ||
AttendanceOpenStatus.CLOSED, | ||
attendanceRecord.getAttendanceType(), | ||
attendanceRecord.getAttendanceResult() | ||
); | ||
} | ||
|
||
public static MemberAttendResponse openedAttendanceResponse(Session session, Long memberId) { | ||
return new MemberAttendResponse( | ||
memberId, | ||
session.getTitle(), | ||
session.getSessionDate(), | ||
AttendanceOpenStatus.OPEN, | ||
null, | ||
null | ||
); | ||
} | ||
} |
17 changes: 17 additions & 0 deletions
17
src/main/java/org/cotato/csquiz/api/attendance/dto/MemberAttendanceRecordsResponse.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
package org.cotato.csquiz.api.attendance.dto; | ||
|
||
import io.swagger.v3.oas.annotations.media.Schema; | ||
import java.util.List; | ||
|
||
public record MemberAttendanceRecordsResponse( | ||
@Schema(description = "요청한 기수 PK") | ||
Long generationId, | ||
List<MemberAttendResponse> memberAttendResponses | ||
) { | ||
public static MemberAttendanceRecordsResponse of(Long generationId, List<MemberAttendResponse> memberAttendResponses) { | ||
return new MemberAttendanceRecordsResponse( | ||
generationId, | ||
memberAttendResponses | ||
); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.