[DDING-000] FileMetaData update시 일부 id 변경 시 에러 수정 (#189)

COW-dev · Nov 23, 2024 · fcff6b4 · fcff6b4
1 parent 5c803ed
commit fcff6b4
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/src/main/java/ddingdong/ddingdongBE/domain/filemetadata/service/FileMetaDataServiceImpl.java b/src/main/java/ddingdong/ddingdongBE/domain/filemetadata/service/FileMetaDataServiceImpl.java
@@ -84,7 +84,8 @@ public void update(List<String> ids, DomainType domainType, Long entityId) {
             updateStatusToDelete(domainType, entityId);
             return;
         }
-        List<String> newIds = deleteOldIds(ids, domainType, entityId); //기존 id제외하고 새로 업데이트할 id만 반환
+        deleteOldIds(ids, domainType, entityId); //ids에 포함된 id를 가진 fileMetaData외에 전부 제거
+        List<String> newIds = getNewIds(ids); //기존 id가 아닌 새로운 id 반환
         updateStatusToCoupled(newIds, domainType, entityId);
     }
 
@@ -99,6 +100,14 @@ public void updateStatusToDelete(DomainType domainType, Long entityId) {
         fileMetaDataRepository.deleteAll(fileMetaDatas);
     }
 
+    private List<String> getNewIds(List<String> ids) {
+        List<FileMetaData> fileMetaDatas = fileMetaDataRepository.findByIdIn(toUUIDs(ids));
+        return fileMetaDatas.stream()
+            .filter(FileMetaData::isPending)
+            .map(fileMetaData -> String.valueOf(fileMetaData.getId()))
+            .toList();
+    }
+
     private boolean isCoupled(String id) {
         if (id == null) {
             return false;
@@ -107,19 +116,14 @@ private boolean isCoupled(String id) {
         return fileMetaData.isCoupled();
     }
 
-    private List<String> deleteOldIds(List<String> ids, DomainType domainType, Long entityId) {
+    private void deleteOldIds(List<String> ids, DomainType domainType, Long entityId) {
         List<FileMetaData> fileMetaDatas = fileMetaDataRepository.findAllByDomainTypeAndEntityId(domainType, entityId);
-
         List<FileMetaData> deleteTarget = fileMetaDatas.stream()
             .filter(fileMetaData -> !ids.contains(String.valueOf(fileMetaData.getId())))
             .toList();
         deleteTarget.forEach(target -> target.updateStatus(DELETED));
         entityManager.flush();
         fileMetaDataRepository.deleteAll(deleteTarget);
-        return fileMetaDatas.stream()
-            .filter(FileMetaData::isPending)
-            .map(fileMetaData -> String.valueOf(fileMetaData.getId()))
-            .toList();
     }
 
     private FileMetaData findById(UUID id) {