Skip to content

feat(core-attendance): refine controller endpoints & auth-aware team … #233

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.

Sign up for GitHub

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

Merged
CSE-Shaco merged 1 commit into from
Oct 23, 2025
Merged

feat(core-attendance): refine controller endpoints & auth-aware team … #233

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 5 additions & 12 deletions src/main/java/inha/gdgoc/domain/core/attendance/controller/CoreAttendanceController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ public ResponseEntity<ApiResponse<List<Map<String, Object>>, Void>> membersOfMee
/* ===== 특정 날짜 출석 일괄 저장 (멱등 스냅샷) ===== */
// Body: { "userIds": ["1","2",...], "present": true } → presentUserIds만 보내는 구조로도 쉽게 변환 가능
@PutMapping("/{date}/attendance")
public ResponseEntity<ApiResponse<Map<String, Object>, Void>> saveAttendanceSnapshot(@AuthenticationPrincipal CustomUserDetails me, @PathVariable @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, @RequestParam(required = false) TeamType team, // 관리자만 사용, 리드는 무시
@RequestBody @Valid SetAttendanceRequest req) {
public ResponseEntity<ApiResponse<Map<String, Object>, Void>> saveAttendanceSnapshot(@AuthenticationPrincipal CustomUserDetails me, @PathVariable @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date, @RequestBody @Valid SetAttendanceRequest req) {
var userIds = req.safeUserIds();

// LEAD → 본인 팀 검증
if (me.getRole() == UserRole.LEAD) {
TeamType myTeam = requiredTeamFrom(me);
var validation = service.filterUserIdsNotInTeam(myTeam, userIds);
Expand All @@ -100,16 +100,9 @@ public ResponseEntity<ApiResponse<Map<String, Object>, Void>> saveAttendanceSnap
return okUpdated(updated, validation.invalidIds());
}

// ORGANIZER / ADMIN
TeamType effectiveTeam = (team != null) ? team : service.inferTeamFromUserIds(userIds)
.orElseThrow(() -> new IllegalArgumentException("userIds로 팀을 추론할 수 없습니다."));

var validation = service.filterUserIdsNotInTeam(effectiveTeam, userIds);
if (validation.validIds().isEmpty()) {
return okUpdated(0L, validation.invalidIds());
}
long updated = service.setAttendance(date.toString(), validation.validIds(), req.presentValue());
return okUpdated(updated, validation.invalidIds());
// ORGANIZER / ADMIN → 팀 추론/검증 없이 바로 업서트
long updated = service.setAttendance(date.toString(), userIds, req.presentValue());
return okUpdated(updated, List.of());
}

/* ===== 날짜 요약(JSON) ===== */
Expand Down
Loading