Skip to content

Commit

Permalink
🔥 Remove: 참여자 수 추가/삭제 업데이트 로직 삭제
Browse files Browse the repository at this point in the history
<footer>
- 관련: #419
  • Loading branch information
joowojr committed Dec 1, 2024
1 parent fc5d084 commit 209eedc
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 20 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.namo.spring.application.external.api.schedule.controller;

import static com.namo.spring.application.external.global.utils.MeetingParticipantValidationUtils.validateParticipantCount;
import static com.namo.spring.application.external.global.utils.MeetingParticipantValidationUtils.validateUniqueParticipantIds;
import static com.namo.spring.application.external.global.utils.PeriodValidationUtils.validatePeriod;
import static com.namo.spring.core.common.code.status.ErrorStatus.*;
Expand All @@ -13,7 +12,6 @@
import jakarta.validation.Valid;

import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.http.MediaType;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.web.bind.annotation.*;

Expand Down Expand Up @@ -65,7 +63,7 @@ public ResponseDto<String> inviteMeetingParticipants(
@PathVariable Long meetingScheduleId,
@Valid @RequestBody MeetingScheduleRequest.PostMeetingParticipantsDto request,
@AuthenticationPrincipal SecurityUserDetails memberInfo) {
validateUniqueParticipantIds(memberInfo.getUserId(), request.getParticipants());
validateUniqueParticipantIds(memberInfo.getUserId(), request.getMemberIds());
meetingScheduleUsecase.createMeetingParticipants(meetingScheduleId, request, memberInfo);
return ResponseDto.onSuccess("모임 초대 성공");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,21 +44,6 @@ public static void validateUniqueParticipantIds(Long ownerId, List<Long> partici
validateDuplicateParticipantIds(participantIds);
}

/**
* 모임 일정에 초대 / 삭제할 유저에
* 모임 일정 생성자가 포함되어있는지,
* 중복되는 ID가 있는지 검증합니다.
*
* @param ownerId 모임 일정 생정자 ID
* @param dto 참석자 ID 배열
*/
public static void validateUniqueParticipantIds(Long ownerId, MeetingScheduleRequest.PatchMeetingScheduleDto dto) {
List<Long> participantIds = new ArrayList<>();
participantIds.addAll(dto.getParticipantsToAdd());
participantIds.addAll(dto.getParticipantsToRemove());
validateUniqueParticipantIds(ownerId, participantIds);
}

/**
* 기존에 초대된 참석자와 새로 초대할 참석자에
* 중복되는 참석자가 있는지 검증합니다.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,15 @@ public void updateContent(String title, Period period, Location location, String
public void setMemberParticipantsInfo(List<String> nicknames) {
if (nicknames.isEmpty())
throw new IllegalArgumentException("nickname은 null이거나 빈 list일 수 없습니다.");
this.participantNicknames = String.join(", ", nicknames);
this.participantCount = nicknames.size();

if (this.participantNicknames != null && !this.participantNicknames.isEmpty()) {
List<String> allNicknames = new ArrayList<>(Arrays.asList(this.participantNicknames.split(", ")));
allNicknames.addAll(nicknames);
this.participantNicknames = String.join(", ", allNicknames);
} else {
this.participantNicknames = String.join(", ", nicknames);
}
this.participantCount += nicknames.size();
}

public void setGuestParticipantsInfo(String nickname) {
Expand Down

0 comments on commit 209eedc

Please sign in to comment.