Skip to content

[FEAT] 전체 회원의 출석 통계 API 구현 #286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rlajm1203 merged 10 commits into from
Sep 24, 2025
Merged

[FEAT] 전체 회원의 출석 통계 API 구현 #286

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9b1c9d6
feat: 출석 통계 조회 API 추가
rlajm1203 Sep 23, 2025
4957601
feat: 출석 통계 조회 기능 구현
rlajm1203 Sep 23, 2025
e6f0542
refactor: activeStatus 필터링 로직 추가
rlajm1203 Sep 23, 2025
7e27fc7
move: 패키지 이동
rlajm1203 Sep 23, 2025
88de19f
move: 패키지 이동
rlajm1203 Sep 23, 2025
a806738
move: 패키지 이동
rlajm1203 Sep 23, 2025
e6986ea
move: 패키지 이동
rlajm1203 Sep 23, 2025
367ebbb
move: teamBuilding 패키지 이동
rlajm1203 Sep 23, 2025
0dbca58
style: spotlessApply
rlajm1203 Sep 23, 2025
64a3207
refactor: review accept
rlajm1203 Sep 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions eeos/src/main/java/com/blackcompany/eeos/config/security/SecurityFilterChainConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ SecurityFilterChain authenticated(HttpSecurity httpSecurity) throws Exception {
requests
.requestMatchers(HttpMethod.PUT, "/api/members/{memberId}/department")
.hasAnyRole(ADMIN);
requests.requestMatchers(HttpMethod.GET, "/api/attend/statistic")
.hasAnyRole(ADMIN);
requests.anyRequest().authenticated();
});

Expand Down
18 changes: 18 additions & 0 deletions .../src/main/java/com/blackcompany/eeos/target/application/dto/AttendStatisticsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package com.blackcompany.eeos.target.application.dto;

import com.blackcompany.eeos.common.support.dto.AbstractResponseDto;
import java.util.List;

public record AttendStatisticsResponse(
List<MemberStatistics> members
) implements AbstractResponseDto {

public record MemberStatistics(
Long id,
String name,
String activeStatus,
int lateCount,
int absentCount,
int penaltyPoint
){}
}
2 changes: 1 addition & 1 deletion ...src/main/java/com/blackcompany/eeos/target/application/model/TeamBuildingTargetModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.blackcompany.eeos.common.application.model.MemberIdModel;
import com.blackcompany.eeos.common.support.AbstractModel;
import com.blackcompany.eeos.target.persistence.TeamBuildingInputStatus;
import com.blackcompany.eeos.target.persistence.teambuilding.TeamBuildingInputStatus;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
Expand Down
6 changes: 3 additions & 3 deletions ...ackcompany/eeos/target/application/model/converter/TeamBuildingTargetEntityConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import com.blackcompany.eeos.common.support.converter.AbstractEntityConverter;
import com.blackcompany.eeos.target.application.model.TeamBuildingTargetModel;
import com.blackcompany.eeos.target.persistence.TeamBuildingInputDataEntity;
import com.blackcompany.eeos.target.persistence.TeamBuildingInputStatus;
import com.blackcompany.eeos.target.persistence.TeamBuildingTargetEntity;
import com.blackcompany.eeos.target.persistence.teambuilding.TeamBuildingInputDataEntity;
import com.blackcompany.eeos.target.persistence.teambuilding.TeamBuildingInputStatus;
import com.blackcompany.eeos.target.persistence.teambuilding.TeamBuildingTargetEntity;
import org.springframework.stereotype.Component;

@Component
Expand Down
2 changes: 1 addition & 1 deletion ...istence/AttendWeightPolicyRepository.java → ...ository/AttendWeightPolicyRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.blackcompany.eeos.target.persistence;
package com.blackcompany.eeos.target.application.repository;

import com.blackcompany.eeos.target.application.model.AttendStatus;
import com.blackcompany.eeos.target.application.model.AttendWeightPolicyModel;
Expand Down
43 changes: 39 additions & 4 deletions eeos/src/main/java/com/blackcompany/eeos/target/application/service/AttendService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import com.blackcompany.eeos.common.utils.RequestScope;
import com.blackcompany.eeos.member.application.model.ActiveStatus;
import com.blackcompany.eeos.member.application.model.MemberModel;
import com.blackcompany.eeos.member.application.model.converter.MemberEntityConverter;
import com.blackcompany.eeos.member.application.repository.MemberRepository;
import com.blackcompany.eeos.member.application.service.QueryMemberService;
import com.blackcompany.eeos.program.application.exception.NotFoundProgramException;
Expand All @@ -19,6 +18,7 @@
import com.blackcompany.eeos.target.application.dto.AttendInfoWithProgramResponse;
import com.blackcompany.eeos.target.application.dto.AttendPenaltyRankingResponse;
import com.blackcompany.eeos.target.application.dto.AttendPenaltyResponse;
import com.blackcompany.eeos.target.application.dto.AttendStatisticsResponse.MemberStatistics;
import com.blackcompany.eeos.target.application.dto.AttendSummaryInfoResponse;
import com.blackcompany.eeos.target.application.dto.ChangeAttendStatusResponse;
import com.blackcompany.eeos.target.application.dto.QueryAttendActiveStatusResponse;
Expand All @@ -45,8 +45,8 @@
import com.blackcompany.eeos.target.persistence.AttendEntity;
import com.blackcompany.eeos.target.persistence.AttendRepository;
import com.blackcompany.eeos.target.persistence.PenaltyPointRepository;
import com.blackcompany.eeos.target.persistence.ProgramRankCounterEntity;
import com.blackcompany.eeos.target.persistence.ProgramRankCounterRepository;
import com.blackcompany.eeos.target.persistence.rank.ProgramRankCounterEntity;
import com.blackcompany.eeos.target.persistence.rank.ProgramRankCounterRepository;
import java.sql.Timestamp;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -76,7 +76,6 @@ public class AttendService
private final AttendEntityConverter attendEntityConverter;
private final QueryMemberService queryMemberService;
private final ChangeAttendStatusConverter changeAttendStatusConverter;
private final MemberEntityConverter memberEntityConverter;
private final AttendInfoConverter attendInfoConverter;
private final QueryAttendStatusResponseConverter attendStatusResponseConverter;
private final AttendInfoActiveStatusConverter attendInfoActiveStatusConverter;
Expand Down Expand Up @@ -348,6 +347,42 @@ public AttendPenaltyRankingResponse getMyPenaltyRanking(int rankOffset) {
return new AttendPenaltyRankingResponse(myPenaltyRank < rankOffset, (int) myPenaltyRank);
}

@Override
public PageResponse<MemberStatistics> getStatistics(int size, int page, String activeStatus, Long startDate,
Long endDate) {

Sort.Order penaltyScore = Sort.Order.desc("penaltyScore");
Sort.Order absent = Sort.Order.desc("absent");
Sort.Order late = Sort.Order.desc("late");

Pageable pageable = PageRequest.of(page - 1, size, Sort.by(penaltyScore, absent, late));

Timestamp startTimestamp =
startDate == null
? semesterPeriodProvider.getSemesterPeriod().getStartDate()
: new Timestamp(startDate);
Timestamp endTimestamp =
endDate == null
? semesterPeriodProvider.getSemesterPeriod().getEndDate()
: new Timestamp(endDate);

Page<Object[]> pages;

if(activeStatus==null)
pages = attendRepository.getStatistics(startTimestamp, endTimestamp, AttendStatus.LATE, AttendStatus.ABSENT, pageable);
else
pages = attendRepository.getStatistics(startTimestamp, endTimestamp, AttendStatus.LATE, AttendStatus.ABSENT, ActiveStatus.find(activeStatus), pageable);

if(pages.getTotalElements()!=0) {
List<MemberStatistics> statistics = pages.get().map(obj -> new MemberStatistics((Long) obj[0], (String) obj[1],
((ActiveStatus) obj[2]).getStatus(), ((Long) obj[3]).intValue(), ((Long) obj[4]).intValue(), ((Long) obj[5]).intValue())).toList();

return new PageResponse<>(new PageImpl<>(statistics, pageable, pages.getTotalElements()));
}

return new PageResponse<>(Page.empty(PageRequest.of(page - 1, size)));
}

private List<AttendModel> findMyAttends(List<ProgramModel> programs) {
Long memberId = RequestScope.getMemberId();
return attendRepository
Expand Down
4 changes: 2 additions & 2 deletions ...main/java/com/blackcompany/eeos/target/application/service/AttendTeamBuildingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import com.blackcompany.eeos.target.application.usecase.AttendTeamBuildingUsecase;
import com.blackcompany.eeos.target.application.usecase.GetTargetInfoUsecase;
import com.blackcompany.eeos.target.application.usecase.UpdateAttendTeamBuildingUsecase;
import com.blackcompany.eeos.target.persistence.TeamBuildingTargetEntity;
import com.blackcompany.eeos.target.persistence.TeamBuildingTargetRepository;
import com.blackcompany.eeos.target.persistence.teambuilding.TeamBuildingTargetEntity;
import com.blackcompany.eeos.target.persistence.teambuilding.TeamBuildingTargetRepository;
import com.blackcompany.eeos.teamBuilding.application.model.TeamBuildingModel;
import com.blackcompany.eeos.teamBuilding.application.model.converter.TeamBuildingEntityConverter;
import com.blackcompany.eeos.teamBuilding.application.service.QueryTeamBuildingService;
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/com/blackcompany/eeos/target/application/service/AttendWeightCalculator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.blackcompany.eeos.target.application.model.AttendStatus;
import com.blackcompany.eeos.target.application.model.AttendWeightPolicyModel;
import com.blackcompany.eeos.target.application.model.SignType;
import com.blackcompany.eeos.target.persistence.AttendWeightPolicyRepository;
import com.blackcompany.eeos.target.application.repository.AttendWeightPolicyRepository;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/com/blackcompany/eeos/target/application/service/AttendWeightPolicyService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import com.blackcompany.eeos.target.application.model.SignType;
import com.blackcompany.eeos.target.application.usecase.CommandAttendWeightPolicyUsecase;
import com.blackcompany.eeos.target.application.usecase.GetAttendWeightPolicyUsecase;
import com.blackcompany.eeos.target.persistence.AttendWeightPolicyRepository;
import com.blackcompany.eeos.target.application.repository.AttendWeightPolicyRepository;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
Expand Down
2 changes: 1 addition & 1 deletion ...java/com/blackcompany/eeos/target/application/service/QueryTeamBuildingTargetService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.blackcompany.eeos.target.application.exception.NotFoundTargetTeamBuildingException;
import com.blackcompany.eeos.target.application.model.TeamBuildingTargetModel;
import com.blackcompany.eeos.target.application.model.converter.TeamBuildingTargetEntityConverter;
import com.blackcompany.eeos.target.persistence.TeamBuildingTargetRepository;
import com.blackcompany.eeos.target.persistence.teambuilding.TeamBuildingTargetRepository;
import java.util.List;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
Expand Down
4 changes: 2 additions & 2 deletions eeos/src/main/java/com/blackcompany/eeos/target/application/service/TeamPresentService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.blackcompany.eeos.target.application.service;

import com.blackcompany.eeos.target.application.usecase.PresentTeamUsecase;
import com.blackcompany.eeos.target.persistence.PresentationEntity;
import com.blackcompany.eeos.target.persistence.PresentationRepository;
import com.blackcompany.eeos.target.persistence.presentation.PresentationEntity;
import com.blackcompany.eeos.target.persistence.presentation.PresentationRepository;
import com.blackcompany.eeos.target.persistence.converter.PresentationConverter;
import com.blackcompany.eeos.team.application.exception.NotFoundTeamException;
import com.blackcompany.eeos.team.application.model.converter.TeamEntityConverter;
Expand Down
4 changes: 4 additions & 0 deletions ...c/main/java/com/blackcompany/eeos/target/application/usecase/GetAttendantInfoUsecase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
import com.blackcompany.eeos.target.application.dto.AttendInfoWithProgramResponse;
import com.blackcompany.eeos.target.application.dto.AttendPenaltyRankingResponse;
import com.blackcompany.eeos.target.application.dto.AttendPenaltyResponse;
import com.blackcompany.eeos.target.application.dto.AttendStatisticsResponse;
import com.blackcompany.eeos.target.application.dto.AttendStatisticsResponse.MemberStatistics;
import com.blackcompany.eeos.target.application.dto.AttendSummaryInfoResponse;
import com.blackcompany.eeos.target.application.dto.QueryAttendStatusResponse;
import java.util.List;
Expand Down Expand Up @@ -32,4 +34,6 @@ PageResponse<AttendPenaltyResponse> getPenaltyInfos(
AttendSummaryInfoResponse getMyAttendSummary(Long startDate, Long endDate);

AttendPenaltyRankingResponse getMyPenaltyRanking(int rankOffset);

PageResponse<MemberStatistics> getStatistics(int size, int page, String activeStatus, Long startDate, Long endDate);
}
34 changes: 34 additions & 0 deletions eeos/src/main/java/com/blackcompany/eeos/target/persistence/AttendRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.blackcompany.eeos.target.persistence;

import com.blackcompany.eeos.member.application.model.ActiveStatus;
import com.blackcompany.eeos.target.application.model.AttendStatus;
import jakarta.persistence.LockModeType;
import java.sql.Timestamp;
Expand Down Expand Up @@ -65,4 +66,37 @@ Page<AttendEntity> findAllByMemberIdAndCreatedDateGreaterThan(
@Param("startDate") Timestamp startDate,
@Param("endDate") Timestamp endDate,
Pageable pageable);

@Query("SELECT"
+ " m.id,"
+ " m.name,"
+ " m.activeStatus,"
+ " SUM(CASE WHEN a.status = :late THEN 1 ELSE 0 END) as late,"
+ " SUM (CASE WHEN a.status = :absent THEN 1 ELSE 0 END ) as absent,"
+ " COALESCE(SUM (a.penaltyScore), 0) as penaltyScore "
+ "FROM AttendEntity a JOIN MemberEntity m ON a.memberId=m.id WHERE a.createdDate >= :startDate AND a.createdDate <= :endDate "
+ "GROUP BY m.id, m.name")
Page<Object[]> getStatistics(
@Param("startDate") Timestamp startDate,
@Param("endDate") Timestamp endDate,
@Param("late") AttendStatus late,
@Param("absent") AttendStatus absent,
Pageable pageable);

@Query("SELECT"
+ " m.id,"
+ " m.name,"
+ " m.activeStatus,"
+ " SUM(CASE WHEN a.status = :late THEN 1 ELSE 0 END) as late,"
+ " SUM (CASE WHEN a.status = :absent THEN 1 ELSE 0 END ) as absent,"
+ " COALESCE(SUM (a.penaltyScore), 0) as penaltyScore "
+ "FROM AttendEntity a JOIN MemberEntity m ON a.memberId=m.id WHERE a.createdDate >= :startDate AND a.createdDate <= :endDate AND m.activeStatus=:activeStatus "
+ "GROUP BY m.id, m.name")
Page<Object[]> getStatistics(
@Param("startDate") Timestamp startDate,
@Param("endDate") Timestamp endDate,
@Param("late") AttendStatus late,
@Param("absent") AttendStatus absent,
@Param("activeStatus") ActiveStatus activeStatus,
Pageable pageable);
}
1 change: 1 addition & 0 deletions eeos/src/main/java/com/blackcompany/eeos/target/persistence/PenaltyPointRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,5 @@ Page<Object[]> findByPenaltyPointSum(
@Query(
"SELECT temp.memberId, temp.totalScore FROM (SELECT a.memberId as memberId, SUM(a.penaltyScore) as totalScore FROM AttendEntity a GROUP BY a.memberId) AS temp")
Page<Object[]> findByPenaltyPointSum(Pageable pageable);
Comment on lines 40 to 42
Copy link

@coderabbitai coderabbitai bot Sep 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

🧩 Analysis chain

JPQL FROM 서브쿼리 + Page 카운트/정렬 이슈 — JPQL로 재작성하고 countQuery/ORDER BY 추가 필요

  • 현재 @query는 기본적으로 JPQL로 해석되며 FROM 절의 서브쿼리를 허용하지 않아 런타임에 실패할 수 있습니다.
  • Page<Object[]> 반환 시 count 쿼리 자동 생성이 GROUP BY/서브쿼리로 인해 실패/비효율 가능성이 높습니다.
  • ORDER BY 없이 페이징하면 페이지 경계가 불안정합니다.

아래처럼 JPQL로 평탄화 + countQuery + 안정적 ORDER BY를 추가해 주세요.

-	@Query(
-			"SELECT temp.memberId, temp.totalScore FROM (SELECT a.memberId as memberId, SUM(a.penaltyScore) as totalScore FROM AttendEntity a GROUP BY a.memberId) AS temp")
-	Page<Object[]> findByPenaltyPointSum(Pageable pageable);
+	@Query(
+			value = "SELECT a.memberId, SUM(a.penaltyScore) FROM AttendEntity a GROUP BY a.memberId ORDER BY SUM(a.penaltyScore) DESC",
+			countQuery = "SELECT COUNT(DISTINCT a.memberId) FROM AttendEntity a")
+	Page<Object[]> findByPenaltyPointSum(Pageable pageable);

참고: 동일한 문제 패턴(서브쿼리/페이징)이 있는 기간 제한 오버로드(findByPenaltyPointSum(startDate, endDate, Pageable))에도 동일한 형태로 적용해 주세요.

🏁 Script executed:

#!/bin/bash
set -euo pipefail

echo "== repo files matching PenaltyPointRepository =="
rg -n --hidden --no-ignore 'PenaltyPointRepository' || true

echo
echo "== show file content =="
sed -n '1,240p' eeos/src/main/java/com/blackcompany/eeos/target/persistence/PenaltyPointRepository.java || true

echo
echo "== find usages of findByPenaltyPointSum =="
rg -n --hidden --no-ignore 'findByPenaltyPointSum' || true

echo
echo "== show other repository files in same package =="
ls -1 eeos/src/main/java/com/blackcompany/eeos/target/persistence || true

Length of output: 3577

JPQL FROM 서브쿼리 사용 제거·페이징/카운트 안정화 (즉시 수정 필요)

  • 문제: eeos/src/main/java/com/blackcompany/eeos/target/persistence/PenaltyPointRepository.java 내 여러 @query가 FROM 절에 서브쿼리 사용 — JPQL에서 허용되지 않아 런타임 에러 발생합니다. 대상 메서드: countByPenaltyPoint(..), countByPenaltyPointGreaterThan(..), findByPenaltyPointSum(startDate,endDate,Pageable), findByPenaltyPointSum(Pageable).
  • 조치(필수): findByPenaltyPointSum 오버로드들은 JPQL GROUP BY로 평탄화하고 value + countQuery + 안정적 ORDER BY를 추가하세요.

제안된 변경(예시)

@Query(
  value = "SELECT a.memberId, SUM(a.penaltyScore) FROM AttendEntity a GROUP BY a.memberId ORDER BY SUM(a.penaltyScore) DESC",
  countQuery = "SELECT COUNT(DISTINCT a.memberId) FROM AttendEntity a")
Page<Object[]> findByPenaltyPointSum(Pageable pageable);

@Query(
  value = "SELECT a.memberId, SUM(a.penaltyScore) FROM AttendEntity a WHERE a.createdDate >= :startDate AND a.createdDate <= :endDate GROUP BY a.memberId ORDER BY SUM(a.penaltyScore) DESC",
  countQuery = "SELECT COUNT(DISTINCT a.memberId) FROM AttendEntity a WHERE a.createdDate >= :startDate AND a.createdDate <= :endDate")
Page<Object[]> findByPenaltyPointSum(
  @Param("startDate") Timestamp startDate,
  @Param("endDate") Timestamp endDate,
  Pageable pageable);
  • countByPenaltyPoint / countByPenaltyPointGreaterThan: 현재도 FROM 서브쿼리 사용으로 동일 실패. 의도가 “행 단위(AttendEntity 레코드) 카운트”라면 서브쿼리 없이 단순 COUNT(a) JPQL로 교체하세요. 만약 의도가 “회원별 합계(totalScore) 기준으로 카운트”라면 JPQL에서 FROM 서브쿼리로 래핑할 수 없어 native query 또는 custom 리포지토리 구현으로 처리해야 합니다.

행 단위 카운트 예시:

@Query("SELECT COUNT(a) FROM AttendEntity a WHERE a.createdDate >= :startDate AND a.createdDate <= :endDate AND a.penaltyScore = :penaltyPoint")
Long countByPenaltyPoint(...);

@Query("SELECT COUNT(a) FROM AttendEntity a WHERE a.createdDate >= :startDate AND a.createdDate <= :endDate AND a.penaltyScore > :penaltyPoint")
Long countByPenaltyPointGreaterThan(...);

파일: eeos/src/main/java/com/blackcompany/eeos/target/persistence/PenaltyPointRepository.java — 위 항목들 즉시 수정 필요.

🤖 Prompt for AI Agents 
eeos/src/main/java/com/blackcompany/eeos/target/persistence/PenaltyPointRepository.java
lines ~40-42: the current @Query uses a FROM subquery which JPQL does not
support; replace the subquery queries with JPQL that groups AttendEntity by
memberId (e.g. SELECT a.memberId, SUM(a.penaltyScore) FROM AttendEntity a GROUP
BY a.memberId) and add an ORDER BY on SUM(a.penaltyScore) plus a corresponding
countQuery (COUNT(DISTINCT a.memberId)) so pagination works; do the same for the
date-range overload by moving the date filters into the WHERE clause; for
countByPenaltyPoint and countByPenaltyPointGreaterThan, replace the
FROM-subquery implementations with simple JPQL counting AttendEntity rows
(SELECT COUNT(a) FROM AttendEntity a WHERE ... ) unless you really need a count
of members by aggregated sum, in which case implement a native query or custom
repository method.


}
2 changes: 1 addition & 1 deletion ...c/main/java/com/blackcompany/eeos/target/persistence/converter/PresentationConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.blackcompany.eeos.target.persistence.converter;

import com.blackcompany.eeos.target.persistence.PresentationEntity;
import com.blackcompany.eeos.target.persistence.presentation.PresentationEntity;
import org.springframework.stereotype.Component;

@Component
Expand Down
2 changes: 1 addition & 1 deletion ...persistence/AttendWeightPolicyEntity.java → ...ence/policy/AttendWeightPolicyEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.blackcompany.eeos.target.persistence;
package com.blackcompany.eeos.target.persistence.policy;

import com.blackcompany.eeos.common.persistence.BaseEntity;
import com.blackcompany.eeos.target.application.model.AttendStatus;
Expand Down
3 changes: 2 additions & 1 deletion ...nce/AttendWeightPolicyRepositoryImpl.java → ...icy/AttendWeightPolicyRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package com.blackcompany.eeos.target.persistence;
package com.blackcompany.eeos.target.persistence.policy;

import com.blackcompany.eeos.target.application.model.AttendStatus;
import com.blackcompany.eeos.target.application.model.AttendWeightPolicyModel;
import com.blackcompany.eeos.target.application.repository.AttendWeightPolicyRepository;
import java.util.Collection;
import java.util.List;
import java.util.Set;
Expand Down
2 changes: 1 addition & 1 deletion ...ersistence/JpaWeightPolicyRepository.java → ...nce/policy/JpaWeightPolicyRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.blackcompany.eeos.target.persistence;
package com.blackcompany.eeos.target.persistence.policy;

import com.blackcompany.eeos.target.application.model.AttendStatus;
import java.util.Collection;
Expand Down
2 changes: 1 addition & 1 deletion ...arget/persistence/PresentationEntity.java → ...ence/presentation/PresentationEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.blackcompany.eeos.target.persistence;
package com.blackcompany.eeos.target.persistence.presentation;

import com.blackcompany.eeos.common.persistence.BaseEntity;
import jakarta.persistence.Column;
Expand Down
2 changes: 1 addition & 1 deletion ...t/persistence/PresentationRepository.java → .../presentation/PresentationRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.blackcompany.eeos.target.persistence;
package com.blackcompany.eeos.target.persistence.presentation;

import com.blackcompany.eeos.team.persistence.TeamEntity;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion ...persistence/ProgramRankCounterEntity.java → ...stence/rank/ProgramRankCounterEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.blackcompany.eeos.target.persistence;
package com.blackcompany.eeos.target.persistence.rank;

import jakarta.persistence.Column;
import jakarta.persistence.Entity;
Expand Down
2 changes: 1 addition & 1 deletion ...istence/ProgramRankCounterRepository.java → ...ce/rank/ProgramRankCounterRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.blackcompany.eeos.target.persistence;
package com.blackcompany.eeos.target.persistence.rank;

import jakarta.persistence.LockModeType;
import java.util.Optional;
Expand Down
2 changes: 1 addition & 1 deletion ...sistence/TeamBuildingInputDataEntity.java → ...building/TeamBuildingInputDataEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.blackcompany.eeos.target.persistence;
package com.blackcompany.eeos.target.persistence.teambuilding;

import jakarta.persistence.Column;
import jakarta.persistence.Embeddable;
Expand Down
2 changes: 1 addition & 1 deletion .../persistence/TeamBuildingInputStatus.java → ...teambuilding/TeamBuildingInputStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.blackcompany.eeos.target.persistence;
package com.blackcompany.eeos.target.persistence.teambuilding;

import com.blackcompany.eeos.target.application.exception.NotFoundTeamBuildingInputStatus;
import java.util.Arrays;
Expand Down
2 changes: 1 addition & 1 deletion ...persistence/TeamBuildingTargetEntity.java → ...eambuilding/TeamBuildingTargetEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.blackcompany.eeos.target.persistence;
package com.blackcompany.eeos.target.persistence.teambuilding;

import com.blackcompany.eeos.common.persistence.BaseEntity;
import jakarta.persistence.Column;
Expand Down
2 changes: 1 addition & 1 deletion ...istence/TeamBuildingTargetRepository.java → ...uilding/TeamBuildingTargetRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.blackcompany.eeos.target.persistence;
package com.blackcompany.eeos.target.persistence.teambuilding;

import java.util.List;
import java.util.Optional;
Expand Down
15 changes: 15 additions & 0 deletions .../src/main/java/com/blackcompany/eeos/target/presentation/controller/AttendController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
import com.blackcompany.eeos.target.application.dto.AttendInfosSearchRequest;
import com.blackcompany.eeos.target.application.dto.AttendPenaltyRankingResponse;
import com.blackcompany.eeos.target.application.dto.AttendPenaltyResponse;
import com.blackcompany.eeos.target.application.dto.AttendStatisticsResponse;
import com.blackcompany.eeos.target.application.dto.AttendStatisticsResponse.MemberStatistics;
import com.blackcompany.eeos.target.application.dto.AttendSummaryInfoResponse;
import com.blackcompany.eeos.target.application.dto.ChangeAttendStatusResponse;
import com.blackcompany.eeos.target.application.dto.PenaltyInfoRequest;
Expand Down Expand Up @@ -139,4 +141,17 @@ public ApiResponse<SuccessBody<AttendPenaltyRankingResponse>> getMyPenaltyRankin
AttendPenaltyRankingResponse response = getAttendantInfoUsecase.getMyPenaltyRanking(rankOffset);
return ApiResponseGenerator.success(response, HttpStatus.OK, MessageCode.GET);
}

@Override
@GetMapping("/attend/statistic")
public ApiResponse<SuccessBody<PageResponse<MemberStatistics>>> getStatistics(
@RequestParam("size") int size,
@RequestParam("page") int page,
@RequestParam("activeStatus") String activeStatus,
@RequestParam(value = "startDate", required = false) Long startDate,
@RequestParam(value = "endDate", required = false) Long endDate) {
PageResponse<MemberStatistics> response = getAttendantInfoUsecase.getStatistics(size, page, activeStatus, startDate, endDate);

return ApiResponseGenerator.success(response, HttpStatus.OK, MessageCode.CREATE);
}
}
5 changes: 5 additions & 0 deletions eeos/src/main/java/com/blackcompany/eeos/target/presentation/docs/AttendApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
import com.blackcompany.eeos.target.application.dto.AttendInfosSearchRequest;
import com.blackcompany.eeos.target.application.dto.AttendPenaltyRankingResponse;
import com.blackcompany.eeos.target.application.dto.AttendPenaltyResponse;
import com.blackcompany.eeos.target.application.dto.AttendStatisticsResponse;
import com.blackcompany.eeos.target.application.dto.AttendStatisticsResponse.MemberStatistics;
import com.blackcompany.eeos.target.application.dto.AttendSummaryInfoResponse;
import com.blackcompany.eeos.target.application.dto.ChangeAttendStatusResponse;
import com.blackcompany.eeos.target.application.dto.PenaltyInfoRequest;
Expand Down Expand Up @@ -73,4 +75,7 @@ ApiResponse<SuccessBody<AttendSummaryInfoResponse>> getMyAttendSummaryInfo(

@Operation(summary = "나의 벌점 순위 조회", description = "나의 벌점 순위를 조회합니다.")
ApiResponse<SuccessBody<AttendPenaltyRankingResponse>> getMyPenaltyRankingInfo(int rankOffset);

@Operation(summary = "전체 출석 통계 조회", description = "전체 회원의 출석 통계를 조회합니다.")
ApiResponse<SuccessBody<PageResponse<MemberStatistics>>> getStatistics(int size, int page, String memberStatus, Long startDate, Long endDate);
}
2 changes: 1 addition & 1 deletion eeos/src/main/java/com/blackcompany/eeos/team/application/Service/TeamService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.blackcompany.eeos.team.application.Service;

import com.blackcompany.eeos.member.application.service.QueryMemberService;
import com.blackcompany.eeos.target.persistence.PresentationRepository;
import com.blackcompany.eeos.target.persistence.presentation.PresentationRepository;
import com.blackcompany.eeos.team.application.dto.CreateTeamRequest;
import com.blackcompany.eeos.team.application.dto.CreateTeamResponse;
import com.blackcompany.eeos.team.application.dto.QueryTeamsResponse;
Expand Down
2 changes: 1 addition & 1 deletion ...om/blackcompany/eeos/teamBuilding/application/event/DeletedTeamBuildingEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.blackcompany.eeos.teamBuilding.application.event;

import com.blackcompany.eeos.target.persistence.TeamBuildingTargetRepository;
import com.blackcompany.eeos.target.persistence.teambuilding.TeamBuildingTargetRepository;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Async;
Expand Down
4 changes: 2 additions & 2 deletions ...company/eeos/teamBuilding/application/service/CommandTeamBuildingTargetMemberService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import com.blackcompany.eeos.target.application.model.converter.TeamBuildingTargetEntityConverter;
import com.blackcompany.eeos.target.application.service.CommandTargetMemberService;
import com.blackcompany.eeos.target.application.service.SelectTargetMemberService;
import com.blackcompany.eeos.target.persistence.TeamBuildingTargetEntity;
import com.blackcompany.eeos.target.persistence.TeamBuildingTargetRepository;
import com.blackcompany.eeos.target.persistence.teambuilding.TeamBuildingTargetEntity;
import com.blackcompany.eeos.target.persistence.teambuilding.TeamBuildingTargetRepository;
import java.util.List;
import java.util.stream.Collectors;
import org.springframework.stereotype.Service;
Expand Down
Loading
Loading