✨ Feature: dataFile 읽기 추가

src/main/kotlin/simplerag/ragback/domain/document/controller/DataFileController.kt

@@ -3,13 +3,16 @@ package simplerag.ragback.domain.document.controller
 import io.swagger.v3.oas.annotations.Parameter
 import io.swagger.v3.oas.annotations.media.Content
 import jakarta.validation.Valid
+import jakarta.validation.constraints.Max
+import jakarta.validation.constraints.Min
 import jakarta.validation.constraints.Size
 import org.springframework.http.HttpStatus
 import org.springframework.http.MediaType
 import org.springframework.validation.annotation.Validated
 import org.springframework.web.bind.annotation.*
 import org.springframework.web.multipart.MultipartFile
 import simplerag.ragback.domain.document.dto.DataFileBulkCreateRequest
+import simplerag.ragback.domain.document.dto.DataFileDetailResponseList
 import simplerag.ragback.domain.document.dto.DataFileResponseList
 import simplerag.ragback.domain.document.service.DataFileService
 import simplerag.ragback.global.response.ApiResponse
@@ -41,4 +44,13 @@ class DataFileController(
         return ApiResponse.ok(saved, "업로드 완료")
     }
 
+    @GetMapping
+    fun getDataFiles(
+        @RequestParam(name = "cursor") cursor: Long,
+        @RequestParam(name = "take") @Min(1) @Max(100) take: Int,
+    ): ApiResponse<DataFileDetailResponseList> {
+        val data = dataFileService.getDataFiles(cursor, take)
+        return ApiResponse.ok(data)
+    }
+
 }

src/main/kotlin/simplerag/ragback/domain/document/dto/DataFileResponseDTO.kt

@@ -1,10 +1,48 @@
 package simplerag.ragback.domain.document.dto
 
+import simplerag.ragback.domain.document.entity.DataFile
+import java.time.LocalDateTime
+
 data class DataFileResponseList(
     val dataFilePreviewResponseList: List<DataFilePreviewResponse>,
 )
 
 data class DataFilePreviewResponse(
     val id: Long,
     val sha256: String,
-)
+)
+
+data class DataFileDetailResponseList(
+    val dataFileDetailResponseList: List<DataFileDetailResponse>,
+    val cursor: Long?,
+    val hasNext: Boolean,
+)
+
+data class DataFileDetailResponse(
+    var id: Long?,
+    val title: String,
+    val type: String,
+    val lastModified: LocalDateTime,
+    val sizeMB: Double,
+    val tags: List<TagDTO>,
+    val sha256: String,
+) {
+    companion object {
+        fun of(dataFile: DataFile, tags: List<TagDTO>): DataFileDetailResponse {
+            return DataFileDetailResponse(
+                dataFile.id,
+                dataFile.title,
+                dataFile.type,
+                dataFile.updatedAt,
+                dataFile.sizeBytes / (1024.0 * 1024.0),
+                tags,
+                dataFile.sha256,
+            )
+        }
+    }
+}
+
+data class TagDTO(
+    val id: Long?,
+    val name: String,
+)

src/main/kotlin/simplerag/ragback/domain/document/repository/DataFileRepository.kt

@@ -1,8 +1,12 @@
 package simplerag.ragback.domain.document.repository
 
+import org.springframework.data.domain.Pageable
+import org.springframework.data.domain.Slice
 import org.springframework.data.jpa.repository.JpaRepository
 import simplerag.ragback.domain.document.entity.DataFile
 
 interface DataFileRepository : JpaRepository<DataFile, Long> {
     fun existsBySha256(sha256: String): Boolean
+
+    fun findByIdGreaterThanOrderById(cursorId: Long, pageable: Pageable): Slice<DataFile>
 }

src/main/kotlin/simplerag/ragback/domain/document/repository/DataFileTagRepository.kt

@@ -1,8 +1,19 @@
 package simplerag.ragback.domain.document.repository
 
 import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.data.jpa.repository.Query
+import org.springframework.data.repository.query.Param
+import simplerag.ragback.domain.document.entity.DataFile
 import simplerag.ragback.domain.document.entity.DataFileTag
 
 interface DataFileTagRepository : JpaRepository<DataFileTag, Long> {
     fun existsByDataFileIdAndTagId(dataFileId: Long, tagId: Long): Boolean
+
+    @Query("""
+        SELECT dft
+        FROM DataFileTag dft
+        JOIN FETCH dft.tag t
+        WHERE dft.dataFile = :dataFile
+    """)
+    fun findTagsByDataFile(@Param("dataFile") dataFile: DataFile): List<DataFileTag>
 }

src/main/kotlin/simplerag/ragback/domain/document/service/DataFileService.kt

@@ -1,14 +1,14 @@
 package simplerag.ragback.domain.document.service
 
 import org.springframework.dao.DataIntegrityViolationException
+import org.springframework.data.domain.PageRequest
+import org.springframework.data.domain.Pageable
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 import org.springframework.transaction.support.TransactionSynchronization
 import org.springframework.transaction.support.TransactionSynchronizationManager
 import org.springframework.web.multipart.MultipartFile
-import simplerag.ragback.domain.document.dto.DataFileBulkCreateRequest
-import simplerag.ragback.domain.document.dto.DataFilePreviewResponse
-import simplerag.ragback.domain.document.dto.DataFileResponseList
+import simplerag.ragback.domain.document.dto.*
 import simplerag.ragback.domain.document.entity.DataFile
 import simplerag.ragback.domain.document.entity.DataFileTag
 import simplerag.ragback.domain.document.entity.Tag
@@ -24,6 +24,7 @@ import simplerag.ragback.global.util.computeMetricsStreaming
 import simplerag.ragback.global.util.resolveContentType
 import java.time.LocalDateTime
 import java.util.*
+import kotlin.collections.ArrayList
 
 @Service
 class DataFileService(
@@ -76,6 +77,28 @@ class DataFileService(
         return DataFileResponseList(responses)
     }
 
+    @Transactional(readOnly = true)
+    fun getDataFiles(cursor: Long, take: Int): DataFileDetailResponseList {
+
+        val dataSlice = dataFileRepository.findByIdGreaterThanOrderById(cursor, PageRequest.of(0, take))
+
+        val dataFileList: MutableList<DataFileDetailResponse> = ArrayList()
+        dataSlice.forEach{ dataFile ->
+            val dataFileTags: List<DataFileTag> = dataFileTagRepository.findTagsByDataFile(dataFile)
+
+            val tagDtos: List<TagDTO> = dataFileTags.map{
+                dataFileTag ->
+                val tag = dataFileTag.tag
+                TagDTO(tag.id, tag.name)
+            }
+
+            dataFileList.add(DataFileDetailResponse.of(dataFile, tagDtos))
+        }
+
+        val nextCursor: Long? = dataFileList.lastOrNull()?.id
+        return DataFileDetailResponseList(dataFileList, nextCursor, dataSlice.hasNext())
+    }
+
     private fun registerRollbackCleanup(uploadedUrls: MutableList<String>) {
         if (TransactionSynchronizationManager.isSynchronizationActive()) {
             TransactionSynchronizationManager.registerSynchronization(object : TransactionSynchronization {

src/main/kotlin/simplerag/ragback/global/storage/FakeS3Util.kt

@@ -50,4 +50,5 @@ class FakeS3Util : S3Util {
     // 테스트 용 함수
     fun exists(url: String): Boolean = keyFromUrl(url)?.let { store.containsKey(it) } == true
     fun count(): Int = store.size
+    fun clear() = store.clear()
 }

src/main/resources/application.yml

@@ -16,3 +16,4 @@ spring:
       hibernate:
         dialect: org.hibernate.dialect.PostgreSQLDialect
         format_sql: true
+        default_batch_fetch_size: 500

src/test/kotlin/simplerag/ragback/domain/document/service/DataFileServiceTest.kt

@@ -1,6 +1,8 @@
 package simplerag.ragback.domain.document.service
 
+import jakarta.annotation.PostConstruct
 import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
@@ -23,7 +25,6 @@ import simplerag.ragback.global.storage.FakeS3Util
 import simplerag.ragback.global.util.S3Type
 import simplerag.ragback.global.util.sha256Hex
 import java.security.MessageDigest
-import java.time.LocalDateTime
 
 @SpringBootTest
 @ActiveProfiles("test")
@@ -40,6 +41,14 @@ class DataFileServiceTest(
 
     private fun txTemplate() = TransactionTemplate(txManager)
 
+    @BeforeEach
+    fun clean() {
+        dataFileTagRepository.deleteAll()
+        tagRepository.deleteAll()
+        dataFileRepository.deleteAll()
+        s3Util.clear()
+    }
+
     @Test
     @Transactional
     @DisplayName("업로드 시 잘 저장이 된다.")
@@ -207,6 +216,57 @@ class DataFileServiceTest(
         assertFalse(s3Util.exists(expectedUrl), "롤백 시 S3도 보상 삭제되어야 합니다")
     }
 
+    @Test
+    @DisplayName("데이터 조회가 잘 된다")
+    @Transactional
+    fun getDataFilesOK() {
+        // given
+        val bytes1 = "test1".toByteArray()
+        val sha1 = sha256Hex(bytes1)
+        val bytes2 = "test2".toByteArray()
+        val sha2 = sha256Hex(bytes2)
+        dataFileRepository.saveAll(
+            listOf(
+                DataFile(
+                title = "exists",
+                type = "text/plain",
+                sizeBytes = 0,
+                sha256 = sha1,
+                fileUrl = "fake://original/exists.txt",
+            ),
+                DataFile(
+                    title = "exists2",
+                    type = "text/pdf",
+                    sizeBytes = 0,
+                    sha256 = sha2,
+                    fileUrl = "fake://original/exists.txt",
+                )
+            )
+        )
+
+        val cursor = 0L
+        val take = 2
+
+        // when
+        val dataFiles = dataFileService.getDataFiles(cursor, take)
+
+        // then
+        val dataFileDetailResponse = dataFiles.dataFileDetailResponseList[0]
+        assertEquals(dataFileDetailResponse.title, "exists")
+        assertEquals(dataFileDetailResponse.type, "text/plain")
+        assertEquals(dataFileDetailResponse.sizeMB, 0.0)
+        assertEquals(dataFileDetailResponse.sha256, sha1)
+
+        val dataFileDetailResponse2 = dataFiles.dataFileDetailResponseList[1]
+        assertEquals(dataFileDetailResponse2.title, "exists2")
+        assertEquals(dataFileDetailResponse2.type, "text/pdf")
+        assertEquals(dataFileDetailResponse2.sizeMB, 0.0)
+        assertEquals(dataFileDetailResponse2.sha256, sha2)
+
+        assertEquals(dataFiles.cursor, dataFileDetailResponse2.id)
+        assertEquals(dataFiles.hasNext, false)
+    }
+
     // -----------------------
     // helpers
     // -----------------------