[DDING-044] FileMetaData 조회 쿼리에서 id 오름차순 정렬 조건 추가 (#192)

COW-dev · Nov 27, 2024 · 6497982 · 6497982
1 parent 92aa824
commit 6497982
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 1 deletion.
diff --git a/...ain/java/ddingdong/ddingdongBE/domain/filemetadata/repository/FileMetaDataRepository.java b/...ain/java/ddingdong/ddingdongBE/domain/filemetadata/repository/FileMetaDataRepository.java
@@ -42,4 +42,18 @@ where id in (:ids)
         and file_status != 'DELETED'
         """, nativeQuery = true)
     List<FileMetaData> findByIdIn(@Param("ids") List<UUID> ids);
+
+    @Query("""
+        select fmd from FileMetaData fmd
+        where fmd.domainType = :domainType
+        and fmd.entityId = :entityId
+        and fmd.fileStatus = :fileStatus
+        and fmd.fileStatus != 'DELETED'
+        order by fmd.id asc
+        """)
+    List<FileMetaData> findAllByDomainTypeAndEntityIdWithFileStatusOrderedAsc(
+        @Param("domainType") DomainType domainType,
+        @Param("entityId") Long entityId,
+        @Param("fileStatus") FileStatus fileStatus
+    );
 }
diff --git a/src/main/java/ddingdong/ddingdongBE/domain/filemetadata/service/FileMetaDataService.java b/src/main/java/ddingdong/ddingdongBE/domain/filemetadata/service/FileMetaDataService.java
@@ -11,6 +11,9 @@ public interface FileMetaDataService {
 
     List<FileMetaData> getCoupledAllByDomainTypeAndEntityId(DomainType domainType, Long entityId);
 
+    List<FileMetaData> getCoupledAllByDomainTypeAndEntityIdOrderedAsc(DomainType domainType,
+        Long entityId);
+
     void updateStatusToCoupled(List<String> ids, DomainType domainType, Long entityId);
 
     void updateStatusToCoupled(String id, DomainType domainType, Long entityId);

diff --git a/src/main/java/ddingdong/ddingdongBE/domain/filemetadata/service/FileMetaDataServiceImpl.java b/src/main/java/ddingdong/ddingdongBE/domain/filemetadata/service/FileMetaDataServiceImpl.java
@@ -36,6 +36,13 @@ public List<FileMetaData> getCoupledAllByDomainTypeAndEntityId(DomainType domain
         return fileMetaDataRepository.findAllByDomainTypeAndEntityIdWithFileStatus(domainType, entityId, COUPLED);
     }
 
+    @Override
+    public List<FileMetaData> getCoupledAllByDomainTypeAndEntityIdOrderedAsc(DomainType domainType,
+        Long entityId) {
+        return fileMetaDataRepository.findAllByDomainTypeAndEntityIdWithFileStatusOrderedAsc(
+            domainType, entityId, COUPLED);
+    }
+
     @Transactional
     @Override
     public void updateStatusToCoupled(List<String> ids, DomainType domainType, Long entityId) {

diff --git a/src/main/java/ddingdong/ddingdongBE/domain/notice/service/FacadeNoticeServiceImpl.java b/src/main/java/ddingdong/ddingdongBE/domain/notice/service/FacadeNoticeServiceImpl.java
@@ -41,7 +41,7 @@ public NoticeQuery getNotice(Long noticeId) {
         Notice notice = noticeService.getById(noticeId);
 
         List<UploadedFileUrlQuery> imageUrlQueries = fileMetaDataService
-            .getCoupledAllByDomainTypeAndEntityId(DomainType.NOTICE_IMAGE, noticeId)
+            .getCoupledAllByDomainTypeAndEntityIdOrderedAsc(DomainType.NOTICE_IMAGE, noticeId)
             .stream()
             .map(fileMetaData -> s3FileService.getUploadedFileUrl(fileMetaData.getFileKey()))
             .toList();