Skip to content

Commit

Permalink
feat: 참가자 수정 API 로직 개선
Browse files Browse the repository at this point in the history
  • Loading branch information
@SHEOMM
SHEOMM committed Apr 1, 2024
1 parent 3447f16 commit d66c6b6
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 28 deletions.
3 changes: 2 additions & 1 deletion src/main/java/com/waruru/areyouhere/attendance/controller/AttendanceController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ public class AttendanceController {

private final String COOKIE_ENCODE = "SRCT";

//FIXME: 중복 인원인 경우 코드 중복이 생겨도 API 분리가 나아 보인다. 한 API에서 너무 많은 일을 하는 중.
//FIXME: 중복 인원인 경우 코드 중복이 생겨도 API 분리가 나아 보인다. 한 API에서 너무 많은 일을 하는 중이다.
// FIXME: 사실상 다른 형태의 response를 억지로 하나의 controller에서 반환한다고 봐도 무방하다. -> 프론트와 합의 후 변경.
@PostMapping
public ResponseEntity<AttendResponseDto> attend(HttpServletRequest request, @RequestBody AttendRequestDto attendRequestDto){
String attendeeName = attendRequestDto.getAttendeeName();
Expand Down
47 changes: 20 additions & 27 deletions src/main/java/com/waruru/areyouhere/attendee/service/AttendeeServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.waruru.areyouhere.course.domain.repository.CourseRepository;
import com.waruru.areyouhere.attendee.exception.AttendeesNotUniqueException;
import com.waruru.areyouhere.course.exception.CourseNotFoundException;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
Expand All @@ -27,7 +28,6 @@
import java.util.function.Function;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

Expand All @@ -37,7 +37,6 @@

@Service
@RequiredArgsConstructor
@Slf4j
@Transactional
public class AttendeeServiceImpl implements AttendeeService{

Expand All @@ -50,7 +49,7 @@ public void createAll(Long courseId, List<AttendeeInfo> newAttendees){
Course course = courseRepository.findById(courseId)
.orElseThrow(CourseNotFoundException::new);

throwIfNameAndNoteNotUnique(newAttendees, courseId);
throwIfAttendeesNameAndNoteNotUnique(newAttendees, courseId);

List<Attendee> attendeeToUpdate = new LinkedList<>();
List<Attendee> attendeesToSave = new LinkedList<>();
Expand Down Expand Up @@ -205,7 +204,7 @@ public AttendeeDetailDto getAttendanceCount(Long attendeeId){
@Override
public void updateAll(Long courseId, List<AttendeeInfo> updatedAttendees){

throwIfNameAndNoteNotUnique(updatedAttendees, courseId);
throwIfAttendeesNameAndNoteNotUnique(updatedAttendees, courseId);

updatedAttendees.stream()
.map(attendee ->
Expand All @@ -219,15 +218,15 @@ public void updateAll(Long courseId, List<AttendeeInfo> updatedAttendees){

}

// Name에 index가 없다면 위에 비해 그리 빠를 지 모르겠다.
private void throwIfNameAndNoteNotUnique(List<AttendeeInfo> newAttendees, Long courseId) {
List<String> newAttendeeNames = getAttendeeNames(newAttendees);
// TODO: Name에 index가 없다면 위에 비해 그리 빠를 지 모르겠다.
// FIXME: Map<String, Set<String>> 같은 것 대신 그냥 class 선언해서 쓰는게
private void throwIfAttendeesNameAndNoteNotUnique(List<AttendeeInfo> newAttendees, Long courseId) {
List<String> newAttendeeNames = getAttendeeUniqueNames(newAttendees);
Map<Long, Attendee> existingAttendees = getExistingAttendeesMap(courseId, newAttendeeNames);
Set<String> uniqueAttendees = checkNewAttendees(newAttendees, existingAttendees);
checkExistingAttendees(existingAttendees, uniqueAttendees);
checkNameSake(newAttendees, existingAttendees);
}

private List<String> getAttendeeNames(List<AttendeeInfo> attendees) {
private List<String> getAttendeeUniqueNames(List<AttendeeInfo> attendees) {
return attendees.stream()
.map(AttendeeInfo::getName)
.distinct()
Expand All @@ -240,43 +239,37 @@ private Map<Long, Attendee> getExistingAttendeesMap(Long courseId, List<String>
.collect(Collectors.toMap(Attendee::getId, Function.identity()));
}

private Set<String> checkNewAttendees(List<AttendeeInfo> newAttendees, Map<Long, Attendee> existingAttendees) {
Set<String> uniqueAttendees = new HashSet<>();
private void checkNameSake(List<AttendeeInfo> newAttendees, Map<Long, Attendee> existingAttendees) {
Map<String, Set<String>> uniqueAttendees = new HashMap<>();

newAttendees.forEach(attendeeInfo -> uniqueAttendees.put(attendeeInfo.getName(), new HashSet<>()));

newAttendees.forEach(attendeeInfo -> {
String key = concatNameAndNote(attendeeInfo);
if (attendeeInfo.getId() != null) {

existingAttendees.computeIfAbsent(attendeeInfo.getId(), id -> {
throw new IllegalArgumentException("Attendee not found");
}).update(attendeeInfo.getName(), attendeeInfo.getNote());

} else if (!uniqueAttendees.add(key)) {
} else if (!checkOneAttendeeUnique(attendeeInfo, uniqueAttendees)) {
throw new AttendeesNotUniqueException();
}
});
return uniqueAttendees;
}

private void checkExistingAttendees(Map<Long, Attendee> existingAttendees, Set<String> uniqueAttendees) {
existingAttendees.values()
.stream()
.filter(attendee -> !uniqueAttendees.add(concatNameAndNote(attendee)))
.filter(attendee -> !checkOneAttendeeUnique(attendee, uniqueAttendees))
.findAny()
.ifPresent(attendee -> {
throw new AttendeesNotUniqueException();
});
}

private String concatNameAndNote(AttendeeInfo attendeeInfo) {
return attendeeInfo.getName() + Optional.ofNullable(attendeeInfo.getNote()).orElse("");
private boolean checkOneAttendeeUnique(AttendeeInfo attendeeInfo, Map<String, Set<String>> uniqueAttendees) {
return uniqueAttendees.get(attendeeInfo.getName()).add(Optional.ofNullable(attendeeInfo.getNote()).orElse(""));
}

private String concatNameAndNote(Attendee attendee) {
return attendee.getName() + Optional.ofNullable(attendee.getNote()).orElse("");
private boolean checkOneAttendeeUnique(Attendee attendee, Map<String, Set<String>> uniqueAttendees) {
return uniqueAttendees.get(attendee.getName()).add(Optional.ofNullable(attendee.getNote()).orElse(""));
}





}

0 comments on commit d66c6b6

Please sign in to comment.