[SAMBAD-242] 질문 답변 활성화 및 비활성화 플로우 이슈 픽스 (#94)

src/main/java/org/depromeet/sambad/moring/file/infrastructure/ObjectStorageFileUploader.java

@@ -75,10 +75,9 @@ public String upload(String fileUrl) throws ObjectStorageServerException {
 		try {
 			String filePath = generateUploadPath(fileUrl);
 			HttpURLConnection conn = getHttpURLConnection(fileUrl);
-			String contentType = conn.getHeaderField(CONTENT_TYPE);
 
 			try (InputStream in = conn.getInputStream()) {
-				amazonS3.putObject(bucketName, filePath, in, setObjectMetaData(in, contentType));
+				amazonS3.putObject(bucketName, filePath, in, setObjectMetaData(conn));
 			}
 
 			return filePath;
@@ -120,10 +119,13 @@ private HttpURLConnection getHttpURLConnection(String fileUrl) throws IOExceptio
 		return conn;
 	}
 
-	private ObjectMetadata setObjectMetaData(InputStream in, String contentType) throws IOException {
+	private ObjectMetadata setObjectMetaData(HttpURLConnection conn) throws IOException {
 		ObjectMetadata objectMetadata = new ObjectMetadata();
 
-		objectMetadata.setContentLength(in.available());
+		String contentType = conn.getHeaderField(CONTENT_TYPE);
+		long contentLength = Long.parseLong(conn.getHeaderField(CONTENT_LENGTH));
+
+		objectMetadata.setContentLength(contentLength);
 		objectMetadata.setContentType(contentType);
 		return objectMetadata;
 	}

src/main/java/org/depromeet/sambad/moring/meeting/answer/infrastructure/MeetingAnswerQueryRepository.java

@@ -30,14 +30,18 @@ public class MeetingAnswerQueryRepository {
 	private final JPAQueryFactory queryFactory;
 
 	public boolean isAllAnsweredByMeetingIdAndMeetingQuestionId(Long meetingId, Long meetingQuestionId) {
-		return queryFactory.select(meetingAnswer.count())
+		Long answeredMeetingMemberCount = queryFactory.select(meetingAnswer.meetingMember.countDistinct())
 			.from(meetingAnswer)
 			.where(meetingAnswer.meetingQuestion.id.eq(meetingQuestionId))
-			.fetchOne()
-			.equals(queryFactory.select(meetingMember.count())
-				.from(meetingMember)
-				.where(meetingMember.meeting.id.eq(meetingId))
-				.fetchOne());
+			.groupBy(meetingAnswer.meetingQuestion.id)
+			.fetchOne();
+
+		Long allMemberCount = queryFactory.select(meetingMember.count())
+			.from(meetingMember)
+			.where(meetingMember.meeting.id.eq(meetingId))
+			.fetchOne();
+
+		return Objects.equals(answeredMeetingMemberCount, allMemberCount);
 	}
 
 	// TODO: 가장 많이 선택된 답변이 여러개일 수 있으나, 현재 로직은 하나만 반환. 추후 기획에 따라 수정 필요.

src/main/java/org/depromeet/sambad/moring/meeting/comment/presentation/comment/request/MeetingQuestionCommentRequest.java

@@ -12,7 +12,7 @@ public record MeetingQuestionCommentRequest(
 
 	@Schema(description = "릴레이 질문 코멘트 내용", example = "코멘트 예시")
 	@NotBlank
-	@Size(max = 10)
+	@Size(max = 20)
 	String content
 ) {
 }

src/main/java/org/depromeet/sambad/moring/meeting/member/application/MeetingMemberService.java

@@ -3,6 +3,7 @@
 import java.time.LocalDateTime;
 import java.util.List;
 
+import org.depromeet.sambad.moring.event.application.EventService;
 import org.depromeet.sambad.moring.meeting.meeting.application.MeetingRepository;
 import org.depromeet.sambad.moring.meeting.meeting.domain.Meeting;
 import org.depromeet.sambad.moring.meeting.meeting.domain.MeetingCode;
@@ -27,6 +28,9 @@
 
 import lombok.RequiredArgsConstructor;
 
+import static org.depromeet.sambad.moring.event.domain.EventType.QUESTION_REGISTERED;
+import static org.depromeet.sambad.moring.event.domain.EventType.TARGET_MEMBER;
+
 @RequiredArgsConstructor
 @Service
 @Transactional(readOnly = true)
@@ -40,6 +44,7 @@ public class MeetingMemberService {
 	private final HobbyRepository hobbyRepository;
 	private final MeetingQuestionRepository meetingQuestionRepository;
 	private final MeetingMemberHobbyRepository meetingMemberHobbyRepository;
+	private final EventService eventService;
 
 	public MeetingMemberListResponse getMeetingMembers(Long userId, Long meetingId) {
 		meetingMemberValidator.validateUserIsMemberOfMeeting(userId, meetingId);
@@ -92,11 +97,14 @@ public MeetingMemberPersistResponse registerMeetingMember(
 	}
 
 	private void createMeetingQuestionIfFirstMeetingMember(Meeting meeting, MeetingMember meetingMember) {
-		if (meetingMemberRepository.isCountOfMembersIsOne(meeting.getId())) {
+		Long meetingId = meeting.getId();
+
+		if (meetingMemberRepository.isCountOfMembersIsOne(meetingId)) {
 			MeetingQuestion activeMeetingQuestion = MeetingQuestion.createActiveMeetingQuestion(
 				meeting, meetingMember, null, LocalDateTime.now());
 
 			meetingQuestionRepository.save(activeMeetingQuestion);
+			eventService.publish(meetingMember.getUser().getId(), meetingId, TARGET_MEMBER);
 		}
 	}
 

src/main/java/org/depromeet/sambad/moring/meeting/question/domain/MeetingQuestion.java

@@ -117,7 +117,11 @@ public void updateStatusToActive(LocalDateTime now) {
 	}
 
 	public int getResponseCount() {
-		return this.memberAnswers.size();
+		return this.memberAnswers.stream()
+			.map(MeetingAnswer::getMeetingMember)
+			.map(MeetingMember::getId)
+			.distinct()
+			.toList().size();
 	}
 
 	public String getQuestionImageUrl() {

src/main/java/org/depromeet/sambad/moring/meeting/question/infrastructure/MeetingQuestionQueryRepository.java

@@ -164,7 +164,7 @@ private BooleanExpression registeredCond() {
 		LocalDateTime now = LocalDateTime.now();
 		return meetingQuestion.startTime.loe(now)
 			.and(meetingQuestion.startTime.goe(now.minusHours(RESPONSE_TIME_LIMIT_HOURS)))
-			.and(isAnsweredByAllCond().not());
+            .and(meetingQuestion.meetingQuestionStatus.eq(ACTIVE));
 	}
 
 	private BooleanExpression activeCond() {
@@ -175,11 +175,7 @@ private BooleanExpression activeCond() {
 	private BooleanExpression inactiveCond() {
 		LocalDateTime now = LocalDateTime.now();
 		return meetingQuestion.startTime.lt(now.minusHours(RESPONSE_TIME_LIMIT_HOURS))
-			.or(isAnsweredByAllCond());
-	}
-
-	private BooleanExpression isAnsweredByAllCond() {
-		return meetingQuestion.memberAnswers.size().eq(meetingQuestion.meeting.meetingMembers.size());
+			.or(meetingQuestion.meetingQuestionStatus.eq(INACTIVE));
 	}
 
 	public List<MeetingQuestionStatisticsDetail> findStatistics(Long meetingQuestionId) {

src/main/resources/application.yml

@@ -2,7 +2,7 @@ spring:
   application:
     name: moring-api
   datasource:
-    url: jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:moring}?useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:moring}?useSSL=false&allowPublicKeyRetrieval=true
     username: ${DB_USERNAME:root}
     password: ${DB_PASSWORD:root}
     driver-class-name: com.mysql.cj.jdbc.Driver