[Refactor/#291] remove not necessary part

teamWaggle · Jun 10, 2024 · f8d6cce · f8d6cce
1 parent 9783cd0
commit f8d6cce
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 26 deletions.
diff --git a/src/main/java/com/example/waggle/domain/schedule/application/TeamCommandServiceImpl.java b/src/main/java/com/example/waggle/domain/schedule/application/TeamCommandServiceImpl.java
@@ -81,7 +81,9 @@ public void deleteTeam(Long teamId, Member member) {
         Team team = teamRepository.findById(teamId)
                 .orElseThrow(() -> new TeamHandler(ErrorStatus.TEAM_NOT_FOUND));
         validateCallerIsLeader(team, member);
-        awsS3Service.deleteFile(team.getCoverImageUrl());
+        if (MediaUtil.validateRemoveImgInS3(team.getCoverImageUrl(), null)) {
+            awsS3Service.deleteFile(team.getCoverImageUrl());
+        }
         teamRepository.deleteTeamWithRelations(teamId);
     }
 
@@ -130,7 +132,7 @@ public void changeTeamLeader(Long teamId, Long memberId, Member leader) {
 
         validateCallerIsLeader(team, leader);
         validateTargetIsNotLeader(memberId, team);
-        validateMemberBelongsToTeam(team, member);
+        validateMemberIsInTeam(team, member);
         team.updateLeader(member);
     }
 
@@ -140,6 +142,7 @@ public Long requestParticipation(Long teamId, Member member) {
                 .orElseThrow(() -> new TeamHandler(ErrorStatus.TEAM_NOT_FOUND));
 
         validateNonExistenceOfParticipationRequest(team, member);
+        validateMemberIsNotInTeam(team, member);
 
         Participation participation = buildParticipation(member, team);
         participationRepository.save(participation);
@@ -181,7 +184,7 @@ public void respondToParticipation(Long teamId, Long memberId, Member leader,
                             content)
             );
         }
-        participationRepository.deleteByMemberAndTeam(member, team);
+        participationRepository.delete(participation);
     }
 
     private static ParticipationDto buildParticipationDto(Team team) {
@@ -197,14 +200,18 @@ private void validateCallerIsLeader(Team team, Member member) {
         }
     }
 
-    private void validateMemberBelongsToTeam(Team team, Member member) {
-        boolean isMember = team.getTeamMembers().stream()
-                .anyMatch(tm -> tm.getMember().equals(member));
-        if (!isMember) {
+    private void validateMemberIsInTeam(Team team, Member member) {
+        if (!teamMemberRepository.existsByMemberAndTeam(member, team)) {
             throw new TeamHandler(ErrorStatus.TEAM_MEMBER_NOT_IN_TEAM);
         }
     }
 
+    private void validateMemberIsNotInTeam(Team team, Member member) {
+        if (teamMemberRepository.existsByMemberAndTeam(member, team)) {
+            throw new TeamHandler(ErrorStatus.TEAM_MEMBER_ALREADY_EXISTS);
+        }
+    }
+
     private void validateNonExistenceOfParticipationRequest(Team team, Member member) {
         if (participationRepository.existsByTeamAndMember(team, member)) {
             throw new TeamHandler(ErrorStatus.TEAM_PARTICIPATION_REQUEST_ALREADY_EXISTS);

diff --git a/src/main/java/com/example/waggle/domain/schedule/application/TeamQueryService.java b/src/main/java/com/example/waggle/domain/schedule/application/TeamQueryService.java
@@ -8,7 +8,6 @@
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;
-import java.util.Optional;
 
 public interface TeamQueryService {
 
@@ -22,9 +21,5 @@ public interface TeamQueryService {
 
     List<Participation> getParticipationList(Member leader, Long teamId);
 
-    Optional<Participation> getParticipation(Member member, Long teamId);
-
-    boolean isMemberOfTeam(Member member, Long teamId);
-
     Status getParticipationStatus(Member member, Long teamId);
 }
diff --git a/src/main/java/com/example/waggle/domain/schedule/application/TeamQueryServiceImpl.java b/src/main/java/com/example/waggle/domain/schedule/application/TeamQueryServiceImpl.java
@@ -16,7 +16,6 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
-import java.util.Optional;
 
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
@@ -63,19 +62,6 @@ private static void validateIsLeader(Member leader, Team team) {
         }
     }
 
-    @Override
-    public Optional<Participation> getParticipation(Member member, Long teamId) {
-        return participationRepository.findByTeamIdAndMemberId(teamId, member.getId());
-    }
-
-    @Override
-    public boolean isMemberOfTeam(Member member, Long teamId) {
-        Team team = teamRepository.findById(teamId)
-                .orElseThrow(() -> new TeamHandler(ErrorStatus.TEAM_NOT_FOUND));
-        return team.getTeamMembers().stream()
-                .anyMatch(teamMember -> teamMember.getMember().equals(member));
-    }
-
     @Override
     public Status getParticipationStatus(Member member, Long teamId) {
         if (teamMemberRepository.existsByMemberIdAndTeamId(member.getId(), teamId)) {