Merge pull request #385 from depromeet/develop

v1.3.5

Author: mikekks

layer-admin/src/main/java/org/layer/admin/retrospect/controller/AdminRetrospectController.java

@@ -0,0 +1,45 @@
+package org.layer.admin.retrospect.controller;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+import org.layer.admin.retrospect.controller.dto.MeaningfulRetrospectMemberResponse;
+import org.layer.admin.retrospect.controller.dto.RetrospectStayTimeResponse;
+import org.layer.admin.retrospect.service.AdminRetrospectService;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequiredArgsConstructor
+public class AdminRetrospectController {
+
+	private final AdminRetrospectService adminRetrospectService;
+
+	@GetMapping("/admin/retrospect/stay-time")
+	public ResponseEntity<List<RetrospectStayTimeResponse>> getAllRetrospectStayTime(
+		@RequestParam(name = "startDate") LocalDateTime startDate,
+		@RequestParam(name = "endDate") LocalDateTime endDate) {
+
+		List<RetrospectStayTimeResponse> responses = adminRetrospectService.getAllRetrospectStayTime(
+			startDate, endDate);
+
+		return ResponseEntity.ok().body(responses);
+	}
+
+	@GetMapping("/admin/retrospect/meaningful")
+	public ResponseEntity<MeaningfulRetrospectMemberResponse> getAllMeaningfulRetrospect(
+		@RequestParam(name = "startDate") LocalDateTime startDate,
+		@RequestParam(name = "endDate") LocalDateTime endDate,
+		@RequestParam(name = "retrospectLength") int retrospectLength,
+		@RequestParam(name = "retrospectCount") int retrospectCount) {
+
+		MeaningfulRetrospectMemberResponse response = adminRetrospectService.getAllMeaningfulRetrospect(
+			startDate, endDate, retrospectLength, retrospectCount);
+
+		return ResponseEntity.ok().body(response);
+	}
+}

layer-admin/src/main/java/org/layer/admin/retrospect/controller/dto/MeaningfulRetrospectMemberResponse.java

@@ -0,0 +1,7 @@
+package org.layer.admin.retrospect.controller.dto;
+
+public record MeaningfulRetrospectMemberResponse(
+	long meaningfulMemberCount,
+	long totalMemberCount
+) {
+}

layer-admin/src/main/java/org/layer/admin/retrospect/controller/dto/RetrospectStayTimeResponse.java

@@ -0,0 +1,7 @@
+package org.layer.admin.retrospect.controller.dto;
+
+public record RetrospectStayTimeResponse(
+	String answerTimeRangeLabel,
+	long count
+) {
+}

layer-admin/src/main/java/org/layer/admin/retrospect/entity/AdminRetrospectAnswerHistory.java

@@ -1,5 +1,6 @@
 package org.layer.admin.retrospect.entity;
 
+import java.time.Duration;
 import java.time.LocalDateTime;
 
 import jakarta.persistence.Entity;
@@ -46,6 +47,15 @@ public void updateRetrospectCompleted (LocalDateTime answerEndTime, String answe
 		this.answerContent = answerContent;
 	}
 
+	public long getAnswerTime() {
+		if (answerStartTime == null || answerEndTime == null) {
+			return 0L;
+		}
+		Duration duration = Duration.between(answerEndTime, answerStartTime);
+
+		return duration.toMinutes();
+	}
+
 	@Builder
 	private AdminRetrospectAnswerHistory(LocalDateTime eventTime, Long memberId, String eventId, Long spaceId,
 		Long retrospectId, LocalDateTime answerStartTime, LocalDateTime answerEndTime, String answerContent) {

layer-admin/src/main/java/org/layer/admin/retrospect/enums/AnswerTimeRange.java

@@ -0,0 +1,29 @@
+package org.layer.admin.retrospect.enums;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Getter
+public enum AnswerTimeRange {
+	MIN_0_TO_5(0, 5, "0-5분"),
+	MIN_5_TO_10(5, 10, "5-10분"),
+	MIN_10_TO_15(10, 15, "10-15분"),
+	MIN_15_TO_20(15, 20, "15-20분"),
+	MIN_20_TO_25(20, 25, "20-25분"),
+	MIN_25_TO_30(25, 30, "25-30분"),
+	MIN_30_PLUS(30, Integer.MAX_VALUE, "30분 이상");
+
+	private final int min;
+	private final int max;
+	private final String label;
+
+	public static AnswerTimeRange from(long minutes) {
+		for (AnswerTimeRange range : values()) {
+			if (minutes >= range.min && minutes < range.max) {
+				return range;
+			}
+		}
+		throw new IllegalArgumentException("Unknown time range for minutes: " + minutes);
+	}
+}

layer-admin/src/main/java/org/layer/admin/retrospect/repository/AdminRetrospectRepository.java

@@ -1,17 +1,38 @@
 package org.layer.admin.retrospect.repository;
 
-
+import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Optional;
 
 import org.layer.admin.retrospect.entity.AdminRetrospectAnswerHistory;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
 public interface AdminRetrospectRepository extends JpaRepository<AdminRetrospectAnswerHistory, Long> {
 
-	Optional<AdminRetrospectAnswerHistory> findByMemberIdAndSpaceIdAndRetrospectId(
-		@Param("memberId") Long memberId,
-		@Param("spaceId") Long spaceId,
-		@Param("retrospectId") Long retrospectId
+	Optional<AdminRetrospectAnswerHistory> findTopByMemberIdAndSpaceIdAndRetrospectIdOrderByAnswerStartTimeDesc(
+		Long memberId, Long spaceId, Long retrospectId);
+
+	@Query("""
+    SELECT a.memberId
+    FROM AdminRetrospectAnswerHistory a
+    WHERE LENGTH(a.answerContent) >= :minLength
+      AND a.eventTime BETWEEN :start AND :end
+    GROUP BY a.memberId
+    HAVING COUNT(a) >= :minCount
+	""")
+	List<Long> findMeaningfulMemberIds(
+		@Param("start") LocalDateTime start,
+		@Param("end") LocalDateTime end,
+		@Param("minLength") int minLength,
+		@Param("minCount") int minCount);
+
+	// 엣지 케이스로 답변 종료시간이 없는 경우도 있을 수 있기에 필터링한다.
+	List<AdminRetrospectAnswerHistory> findAllByEventTimeBetweenAndAnswerEndTimeIsNotNull(
+		LocalDateTime startTime, LocalDateTime endTime);
+
+	void deleteByMemberIdAndSpaceIdAndRetrospectId(
+		Long memberId, Long spaceId, Long retrospectId
 	);
 }

layer-admin/src/main/java/org/layer/admin/retrospect/service/AdminRetrospectService.java

@@ -2,8 +2,17 @@
 
 import static org.springframework.transaction.annotation.Propagation.*;
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
+import org.layer.admin.member.repository.AdminMemberRepository;
+import org.layer.admin.retrospect.controller.dto.MeaningfulRetrospectMemberResponse;
+import org.layer.admin.retrospect.controller.dto.RetrospectStayTimeResponse;
 import org.layer.admin.retrospect.entity.AdminRetrospectAnswerHistory;
+import org.layer.admin.retrospect.enums.AnswerTimeRange;
 import org.layer.admin.retrospect.repository.AdminRetrospectRepository;
 import org.layer.event.retrospect.WriteRetrospectEndEvent;
 import org.layer.event.retrospect.WriteRetrospectStartEvent;
@@ -18,10 +27,44 @@
 public class AdminRetrospectService {
 
 	private final AdminRetrospectRepository adminRetrospectRepository;
+	private final AdminMemberRepository adminMemberRepository;
+
+	public MeaningfulRetrospectMemberResponse getAllMeaningfulRetrospect(
+		LocalDateTime startTime, LocalDateTime endTime, int retrospectLength, int retrospectCount) {
+		List<Long> meaningfulMemberIds = adminRetrospectRepository.findMeaningfulMemberIds(
+			startTime, endTime, retrospectLength, retrospectCount);
+
+		long totalMemberCount = adminMemberRepository.count();
+
+		return new MeaningfulRetrospectMemberResponse(meaningfulMemberIds.size(), totalMemberCount);
+	}
+
+	public List<RetrospectStayTimeResponse> getAllRetrospectStayTime(
+		LocalDateTime startTime, LocalDateTime endTime) {
+		List<AdminRetrospectAnswerHistory> retrospectAnswerHistories = adminRetrospectRepository.findAllByEventTimeBetweenAndAnswerEndTimeIsNotNull(
+			startTime, endTime);
+
+		Map<AnswerTimeRange, Long> countMap = new HashMap<>();
+		retrospectAnswerHistories.forEach(history -> {
+			AnswerTimeRange range = AnswerTimeRange.from(history.getAnswerTime());
+			countMap.put(range, countMap.getOrDefault(range, 0L) + 1);
+		});
+
+		List<RetrospectStayTimeResponse> response = new ArrayList<>();
+		for (AnswerTimeRange range : AnswerTimeRange.values()) {
+			Long count = countMap.getOrDefault(range, 0L);
+			response.add(new RetrospectStayTimeResponse(range.getLabel(), count));
+		}
+
+		return response;
+	}
 
 	@Transactional(propagation = REQUIRES_NEW)
 	@Async
 	public void saveRetrospectAnswerHistory(WriteRetrospectStartEvent event) {
+		adminRetrospectRepository.deleteByMemberIdAndSpaceIdAndRetrospectId(event.memberId(), event.spaceId(),
+			event.retrospectId());
+
 		AdminRetrospectAnswerHistory retrospectAnswerHistory = AdminRetrospectAnswerHistory.builder()
 			.eventTime(event.eventTime())
 			.memberId(event.memberId())
@@ -38,7 +81,8 @@ public void saveRetrospectAnswerHistory(WriteRetrospectStartEvent event) {
 	@Async
 	public void updateRetrospectAnswerHistory(WriteRetrospectEndEvent event) {
 
-		adminRetrospectRepository.findByMemberIdAndSpaceIdAndRetrospectId(event.memberId(), event.spaceId(), event.retrospectId())
+		adminRetrospectRepository.findTopByMemberIdAndSpaceIdAndRetrospectIdOrderByAnswerStartTimeDesc(
+			event.memberId(), event.spaceId(), event.retrospectId())
 			.ifPresentOrElse(
 				history -> {
 					history.updateRetrospectCompleted(event.eventTime(), event.answerContent());

layer-api/src/main/java/org/layer/global/exception/GlobalExceptionHandler.java

@@ -13,6 +13,7 @@
 import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.web.HttpRequestMethodNotSupportedException;
 import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.MissingServletRequestParameterException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.servlet.resource.NoResourceFoundException;
@@ -74,4 +75,10 @@ public ResponseEntity<ExceptionResponse> handleHttpRequestMethodNotSupportedExce
 			.body(ExceptionResponse.of(HttpStatus.METHOD_NOT_ALLOWED.name(), "지원하지 않는 HTTP 메서드입니다."));
 	}
 
+	@ExceptionHandler(MissingServletRequestParameterException.class)
+	public ResponseEntity<ExceptionResponse> handleMissingServletRequestParameterException(Exception e) {
+		log.warn(String.format(LOG_FORMAT, e.getMessage()), e);
+		return ResponseEntity.status(HttpStatus.BAD_REQUEST)
+			.body(ExceptionResponse.of(HttpStatus.BAD_REQUEST.name(), "유효하지 않은 값."));
+	}
 }