Merge pull request #405 from depromeet/develop

mikekks · web-flow · commit 6219cffe13d4 · 2025-07-18T13:06:17.000+09:00
v1.3.82
diff --git a/layer-admin/src/main/java/org/layer/admin/retrospect/controller/AdminRetrospectController.java b/layer-admin/src/main/java/org/layer/admin/retrospect/controller/AdminRetrospectController.java
@@ -5,6 +5,7 @@
 
 import org.layer.admin.retrospect.controller.dto.CumulativeRetrospectCountResponse;
 import org.layer.admin.retrospect.controller.dto.MeaningfulRetrospectMemberResponse;
+import org.layer.admin.retrospect.controller.dto.RetrospectCompletionRateResponse;
 import org.layer.admin.retrospect.controller.dto.RetrospectRetentionResponse;
 import org.layer.admin.retrospect.controller.dto.RetrospectStayTimeResponse;
 import org.layer.admin.retrospect.service.AdminRetrospectService;
@@ -63,4 +64,14 @@ public ResponseEntity<CumulativeRetrospectCountResponse> getCumulativeRetrospect
 
 		return ResponseEntity.ok().body(response);
 	}
+
+	@GetMapping("/admin/retrospect/completion-rate")
+	public ResponseEntity<RetrospectCompletionRateResponse> getRetrospectCompletionRate(
+		@RequestParam(name = "startDate") LocalDateTime startDate,
+		@RequestParam(name = "endDate") LocalDateTime endDate) {
+
+		RetrospectCompletionRateResponse response = adminRetrospectService.getRetrospectCompletionRate(startDate,
+			endDate);
+		return ResponseEntity.ok().body(response);
+	}
 }
diff --git a/layer-admin/src/main/java/org/layer/admin/retrospect/controller/dto/CumulativeRetrospectCountResponse.java b/layer-admin/src/main/java/org/layer/admin/retrospect/controller/dto/CumulativeRetrospectCountResponse.java
@@ -1,6 +1,6 @@
 package org.layer.admin.retrospect.controller.dto;
 
 public record CumulativeRetrospectCountResponse(
-	long averageCumulativeCount
+	double averageCumulativeCount
 ) {
 }
diff --git a/layer-admin/src/main/java/org/layer/admin/retrospect/controller/dto/RetrospectCompletionRateResponse.java b/layer-admin/src/main/java/org/layer/admin/retrospect/controller/dto/RetrospectCompletionRateResponse.java
@@ -0,0 +1,6 @@
+package org.layer.admin.retrospect.controller.dto;
+
+public record RetrospectCompletionRateResponse(
+	double completionRate
+) {
+}
diff --git a/layer-admin/src/main/java/org/layer/admin/retrospect/repository/AdminRetrospectAnswerRepository.java b/layer-admin/src/main/java/org/layer/admin/retrospect/repository/AdminRetrospectAnswerRepository.java
@@ -5,6 +5,7 @@
 import java.util.Optional;
 
 import org.layer.admin.retrospect.entity.AdminRetrospectAnswerHistory;
+import org.layer.admin.retrospect.repository.dto.RetrospectAnswerCompletionDto;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
@@ -15,19 +16,34 @@ Optional<AdminRetrospectAnswerHistory> findTopByMemberIdAndSpaceIdAndRetrospectI
 		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
+		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);
 
+	@Query("""
+		SELECT new org.layer.admin.retrospect.repository.dto.RetrospectAnswerCompletionDto(
+			a.retrospectId,
+			MIN(r.targetAnswerCount),
+			COUNT(*)
+		)
+		FROM AdminRetrospectAnswerHistory a
+		JOIN AdminRetrospectHistory r ON a.retrospectId = r.retrospectId
+		WHERE a.eventTime BETWEEN :start AND :end
+		GROUP BY a.retrospectId
+	""")
+	List<RetrospectAnswerCompletionDto> findRetrospectAnswerCompletionStatsBetween(
+		@Param("start") LocalDateTime startTime,
+		@Param("end") LocalDateTime endTime);
+
 	// 엣지 케이스로 답변 종료시간이 없는 경우도 있을 수 있기에 필터링한다.
 	List<AdminRetrospectAnswerHistory> findAllByEventTimeBetweenAndAnswerEndTimeIsNotNull(
 		LocalDateTime startTime, LocalDateTime endTime);
diff --git a/layer-admin/src/main/java/org/layer/admin/retrospect/repository/dto/RetrospectAnswerCompletionDto.java b/layer-admin/src/main/java/org/layer/admin/retrospect/repository/dto/RetrospectAnswerCompletionDto.java
@@ -0,0 +1,14 @@
+package org.layer.admin.retrospect.repository.dto;
+
+public record RetrospectAnswerCompletionDto(
+	Long retrospectId,
+	Long targetAnswerCount,
+	Long actualAnswerCount
+) {
+	public RetrospectAnswerCompletionDto(Long retrospectId, Long targetAnswerCount, Long actualAnswerCount) {
+		this.retrospectId = retrospectId;
+		this.targetAnswerCount = targetAnswerCount;
+		this.actualAnswerCount = actualAnswerCount;
+	}
+}
+
diff --git a/layer-admin/src/main/java/org/layer/admin/retrospect/service/AdminRetrospectService.java b/layer-admin/src/main/java/org/layer/admin/retrospect/service/AdminRetrospectService.java
@@ -18,13 +18,15 @@
 import org.layer.admin.member.repository.AdminMemberRepository;
 import org.layer.admin.retrospect.controller.dto.CumulativeRetrospectCountResponse;
 import org.layer.admin.retrospect.controller.dto.MeaningfulRetrospectMemberResponse;
+import org.layer.admin.retrospect.controller.dto.RetrospectCompletionRateResponse;
 import org.layer.admin.retrospect.controller.dto.RetrospectRetentionResponse;
 import org.layer.admin.retrospect.controller.dto.RetrospectStayTimeResponse;
 import org.layer.admin.retrospect.entity.AdminRetrospectAnswerHistory;
 import org.layer.admin.retrospect.entity.AdminRetrospectHistory;
 import org.layer.admin.retrospect.enums.AnswerTimeRange;
 import org.layer.admin.retrospect.repository.AdminRetrospectAnswerRepository;
 import org.layer.admin.retrospect.repository.AdminRetrospectRepository;
+import org.layer.admin.retrospect.repository.dto.RetrospectAnswerCompletionDto;
 import org.layer.admin.retrospect.repository.dto.SpaceRetrospectCountDto;
 import org.layer.admin.space.repository.AdminSpaceRepository;
 import org.layer.event.retrospect.CreateRetrospectEvent;
@@ -181,10 +183,31 @@ public CumulativeRetrospectCountResponse getCumulativeRetrospectCount(
 			.sum();
 
 		Long totalSpaceCount = adminSpaceRepository.countAllByEventTimeBetween(startTime, endTime);
-		long averageCumulativeCount = totalSpaceCount == 0 ? 0 : totalRetrospectCount / totalSpaceCount;
+		double averageCumulativeCount = totalSpaceCount == 0 ? 0.0 : (double)totalRetrospectCount / totalSpaceCount;
 		return new CumulativeRetrospectCountResponse(averageCumulativeCount);
 	}
 
+	public RetrospectCompletionRateResponse getRetrospectCompletionRate(LocalDateTime startTime, LocalDateTime endTime) {
+		List<RetrospectAnswerCompletionDto> answerHistories = adminRetrospectAnswerRepository.findRetrospectAnswerCompletionStatsBetween(
+			startTime, endTime);
+
+		// 회고별 완수율 계산 (단위: %)
+		List<Double> completionRates = answerHistories.stream()
+			.filter(dto -> dto.targetAnswerCount() > 0) // division by zero 방지
+			.map(dto -> (double) dto.actualAnswerCount() / dto.targetAnswerCount() * 100.0)
+			.toList();
+
+		// 평균 완수율 계산
+		double averageCompletionRate = completionRates.isEmpty()
+			? 0.0
+			: completionRates.stream()
+			.mapToDouble(Double::doubleValue)
+			.average()
+			.orElse(0.0);
+
+		return new RetrospectCompletionRateResponse(averageCompletionRate);
+	}
+
 	@Transactional(propagation = REQUIRES_NEW)
 	@Async
 	public void saveRetrospectAnswerHistory(AnswerRetrospectStartEvent event) {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package org.layer.admin.retrospect.controller.dto;`
`2`	`2`
`3`	`3`	`public record CumulativeRetrospectCountResponse(`
`4`		`- long averageCumulativeCount`
	`4`	`+ double averageCumulativeCount`
`5`	`5`	`) {`
`6`	`6`	`}`