[FIX] 나의 출석 현황 리스트 조회 오류를 해결합니다.

eeos/src/main/java/com/blackcompany/eeos/target/application/repository/AttendRepository.java

@@ -1,5 +1,6 @@
 package com.blackcompany.eeos.target.application.repository;
 
+import com.blackcompany.eeos.target.application.model.AttendModel;
 import com.blackcompany.eeos.target.application.model.AttendStatus;
 import com.blackcompany.eeos.target.persistence.AttendEntity;
 import java.time.LocalDateTime;
@@ -28,4 +29,6 @@ void updateAttendStatusByProgramId(
 	List<AttendEntity> findByProgramIdsAndMemberId(List<Long> programIds, Long memberId);
 
 	List<Long> findByPenaltyPointSum(LocalDateTime startDate, LocalDateTime endDate, Long limit);
+
+	List<AttendModel> findMyAttendList(Long memberId, LocalDateTime startDate, LocalDateTime endDate);
 }

eeos/src/main/java/com/blackcompany/eeos/target/application/service/AttendService.java

@@ -213,31 +213,35 @@ public PageResponse<AttendInfoWithProgramResponse> findMyAttendInfo(
 
 		Long memberId = RequestScope.getMemberId();
 
+		Sort.Order order = Sort.Order.desc("createdDate");
+		Pageable pageable = PageRequest.of(page - 1, size, Sort.by(order));
+
 		// 필요한 정보 : ProgramModel , AttendModel, MemberId
-		Page<ProgramModel> pages =
-				programDateRangeService.getPrograms(startDate, endDate, size, page - 1);
+		Page<AttendEntity> myAttend =
+				attendRepository.findAllByMemberIdAndCreatedDateGreaterThan(
+						memberId, new Timestamp(startDate), new Timestamp(endDate), pageable);
 
 		Page<AttendInfoWithProgramResponse> responses;
 
-		if (!pages.isEmpty()) {
+		if (!myAttend.isEmpty()) {
 			responses =
 					new PageImpl<>(
-							pages
+							myAttend.stream()
+									.map(attendEntityConverter::from)
 									.map(
-											program -> {
-												AttendModel attendModel =
-														attendRepository
-																.findByProgramIdAndMemberId(program.getId(), memberId)
-																.map(attendEntityConverter::from)
+											attendModel -> {
+												ProgramModel program =
+														programRepository
+																.findById(attendModel.getProgramId())
+																.map(programEntityConverter::from)
 																.orElse(null);
-												if (attendModel == null) return null;
+												if (program == null) return null;
 												return attendInfoWithProgramConverter.from(attendModel, program);
 											})
 									.filter(Objects::nonNull)
-									.stream()
 									.toList(),
-							pages.getPageable(),
-							pages.getTotalElements());
+							myAttend.getPageable(),
+							myAttend.getTotalElements());
 
 			return new PageResponse<>(responses);
 		}

eeos/src/main/java/com/blackcompany/eeos/target/persistence/AttendRepository.java

@@ -2,8 +2,11 @@
 
 import com.blackcompany.eeos.target.application.model.AttendStatus;
 import jakarta.persistence.LockModeType;
+import java.sql.Timestamp;
 import java.util.List;
 import java.util.Optional;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Lock;
 import org.springframework.data.jpa.repository.Modifying;
@@ -54,4 +57,12 @@ List<AttendEntity> findTop5ByProgramIdAndStatusOrderByRankAsc(
 			"SELECT a FROM AttendEntity a WHERE a.programId IN :programIds AND a.memberId=:memberId AND a.isDeleted=false")
 	List<AttendEntity> findByProgramIdsAndMemberId(
 			@Param("programIds") List<Long> programIds, @Param("memberId") Long memberId);
+
+	@Query(
+			"SELECT a FROM AttendEntity a WHERE a.memberId = :memberId AND a.isDeleted = false AND a.createdDate > :startDate AND a.createdDate < :endDate")
+	Page<AttendEntity> findAllByMemberIdAndCreatedDateGreaterThan(
+			@Param("memberId") Long memberId,
+			@Param("startDate") Timestamp startDate,
+			@Param("endDate") Timestamp endDate,
+			Pageable pageable);
 }