Skip to content

Commit

Permalink
refactor(crewMember): 삭제 쿼리 변경
Browse files Browse the repository at this point in the history
- Hard delete로 수정
  • Loading branch information
gw0215 committed Apr 6, 2023
1 parent ccbf58b commit 591df0d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 26 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import java.util.Optional;

import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;

Expand Down Expand Up @@ -36,6 +37,8 @@ SELECT COUNT(cm)
""")
List<CrewMember> findAllByCrewId(@Param(value = "crewId") Long crewId);

void deleteByUserIdAndCrewId(@Param(value = "userId") Long userId, @Param(value = "crewId") Long crewId);
@Modifying
@Query(value = "DELETE FROM crew_member cm WHERE user_id = :userId AND crew_id = :crewId", nativeQuery = true)
int deleteByUserIdAndCrewId(@Param(value = "userId") Long userId, @Param(value = "crewId") Long crewId);

}
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,10 @@ void deleteByUserId_success() {
crewMemberRepository.save(crewMember);

//when
crewMemberRepository.deleteByUserIdAndCrewId(savedUser1Id, crew.getId());
int delete = crewMemberRepository.deleteByUserIdAndCrewId(savedUser1Id, crew.getId());

//then
Optional<CrewMember> optionalCrewMember = crewMemberRepository.findById(crewMember.getId());
assertThat(optionalCrewMember).isEmpty();
assertThat(delete).isEqualTo(1);

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import com.prgrms.mukvengers.domain.crewmember.model.CrewMember;
import com.prgrms.mukvengers.domain.crewmember.repository.CrewMemberRepository;
import com.prgrms.mukvengers.global.common.dto.IdResponse;
import com.prgrms.mukvengers.utils.CrewMemberObjectProvider;

class CrewMemberServiceImplTest extends ServiceTest {

Expand Down Expand Up @@ -51,7 +50,7 @@ void create_success() {
.hasFieldOrPropertyWithValue("crew", crew)
.hasFieldOrPropertyWithValue("crewMemberRole", LEADER);
}

@Test
@DisplayName("[성공] 사용자 아이디, 강퇴할 사용자 아이디, 모임 아이디로 사용자를 강퇴한다.")
void block_success() {
Expand All @@ -60,7 +59,7 @@ void block_success() {
Crew crew = createCrew(savedStore);
crewRepository.save(crew);

CrewMember leader = createCrewMember(savedUser1Id, crew, LEADER);
CrewMember leader = createCrewMember(savedUser1Id, crew, LEADER);
CrewMember member = createCrewMember(savedUser2Id, crew, MEMBER);

crewMemberRepository.save(leader);
Expand Down Expand Up @@ -109,24 +108,6 @@ void block_fail_NotMember() {
assertThatThrownBy(
() -> crewMemberService.block(leader.getUserId(), leader.getUserId(), crew.getId())).isInstanceOf(
NotMemberException.class);
}

@Test
@DisplayName("[성공] 모임원 아이디로 모임원을 삭제한다")
void delete_success() {

//given
Crew crew = createCrew(savedStore);
crewRepository.save(crew);

CrewMember crewMember = CrewMemberObjectProvider.createCrewMember(savedUser1Id, crew, MEMBER);
crewMemberRepository.save(crewMember);

//when
crewMemberService.delete(crewMember.getUserId(), crew.getId());

//then
Optional<CrewMember> optionalCrewMember = crewMemberRepository.findById(crewMember.getId());
assertThat(optionalCrewMember).isEmpty();
}

}

0 comments on commit 591df0d

Please sign in to comment.