[#189] 강퇴, 퇴장 로직 수정 (#192)

* fix(crewMember): 현재인원 조회와, 해당 모임의 모임원 조회 메서드 수정
- 강퇴당한 인원은 모임 조회나, 현재인원 카운트에서 제외합니다.
- 퇴장에서 누란된 Transactionl 어노테이션 추가

* fix(crewMember): 조건 수정
- 멤버 역할이 BLOKCED인 멤버를 현재인원 카운트와, 조회에서 제외합니다.

Author: gw0215

src/main/generated/com/prgrms/mukvengers/domain/crewmember/mapper/CrewMemberMapperImpl.java

@@ -0,0 +1,57 @@
+package com.prgrms.mukvengers.domain.crewmember.mapper;
+
+import com.prgrms.mukvengers.domain.crew.model.Crew;
+import com.prgrms.mukvengers.domain.crewmember.dto.response.CrewMemberResponse;
+import com.prgrms.mukvengers.domain.crewmember.model.CrewMember;
+import com.prgrms.mukvengers.domain.crewmember.model.vo.CrewMemberRole;
+import com.prgrms.mukvengers.domain.user.model.User;
+import javax.annotation.processing.Generated;
+import org.springframework.stereotype.Component;
+
+@Generated(
+    value = "org.mapstruct.ap.MappingProcessor",
+    date = "2023-04-02T18:01:10+0900",
+    comments = "version: 1.5.3.Final, compiler: javac, environment: Java 17.0.5 (Oracle Corporation)"
+)
+@Component
+public class CrewMemberMapperImpl implements CrewMemberMapper {
+
+    @Override
+    public CrewMember toCrewMember(Crew crew, Long userId, CrewMemberRole crewMemberRole) {
+        if ( crew == null && userId == null && crewMemberRole == null ) {
+            return null;
+        }
+
+        CrewMember.CrewMemberBuilder crewMember = CrewMember.builder();
+
+        crewMember.crew( crew );
+        crewMember.userId( userId );
+        crewMember.crewMemberRole( crewMemberRole );
+
+        return crewMember.build();
+    }
+
+    @Override
+    public CrewMemberResponse toCrewMemberResponse(User user, CrewMemberRole crewMemberRole, Long crewMemberId) {
+        if ( user == null && crewMemberRole == null && crewMemberId == null ) {
+            return null;
+        }
+
+        Long userId = null;
+        String nickname = null;
+        String profileImgUrl = null;
+        if ( user != null ) {
+            userId = user.getId();
+            nickname = user.getNickname();
+            profileImgUrl = user.getProfileImgUrl();
+        }
+        CrewMemberRole crewMemberRole1 = null;
+        crewMemberRole1 = crewMemberRole;
+        Long id = null;
+        id = crewMemberId;
+
+        CrewMemberResponse crewMemberResponse = new CrewMemberResponse( id, userId, nickname, profileImgUrl, crewMemberRole1 );
+
+        return crewMemberResponse;
+    }
+}

src/main/java/com/prgrms/mukvengers/domain/crewmember/repository/CrewMemberRepository.java

@@ -25,8 +25,18 @@ Optional<CrewMember> findCrewMemberByCrewIdAndUserId(@Param(value = "crewId") Lo
 		""")
 	List<Crew> findAllByUserIdOrderByStatus(@Param("userId") Long userId);
 
+	@Query(value = """
+				SELECT COUNT(cm)
+				FROM  CrewMember cm
+				WHERE cm.crew.id = :crewId AND cm.deleted = false
+		""")
 	Integer countCrewMemberByCrewId(@Param(value = "crewId") Long crewId);
 
+	@Query(value = """
+						SELECT cm
+						FROM CrewMember cm
+						WHERE cm.crew.id = :crewId AND cm.deleted = false
+		""")
 	List<CrewMember> findAllByCrewId(@Param(value = "crewId") Long crewId);
 
 	void deleteByUserIdAndCrewId(@Param(value = "userId") Long userId, @Param(value = "crewId") Long crewId);

src/main/java/com/prgrms/mukvengers/domain/crewmember/service/CrewMemberServiceImpl.java

@@ -52,11 +52,12 @@ public void block(Long userId, Long blockUserId, Long crewId) {
 		}
 
 		member.blockMember();
-  	}
-  
+	}
+
+	@Transactional
 	public void delete(Long userId, Long crewId) {
 
 		crewMemberRepository.deleteByUserIdAndCrewId(userId, crewId);
 	}
-  
+
 }