�[DDING-000] FileMetaData update시 발생하는 오류 수정 (#188)

COW-dev · Nov 23, 2024 · 5c803ed · 5c803ed
1 parent 0a4c6a5
commit 5c803ed
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 26 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
@@ -42,17 +42,17 @@ public void updateStatusToCoupled(List<String> ids, DomainType domainType, Long
         if (ids == null || ids.isEmpty()) {
             return;
         }
-        List<UUID> fileMetaDataId = toUUIDs(ids);
-        List<FileMetaData> fileMetaDatas = fileMetaDataRepository.findByIdIn(fileMetaDataId);
+        List<UUID> fileMetaDataIds = toUUIDs(ids);
+        List<FileMetaData> fileMetaDatas = fileMetaDataRepository.findByIdIn(fileMetaDataIds);
         if (ids.size() != fileMetaDatas.size()) {
-            throw new ResourceNotFound("해당 FileMetaData(id: " + fileMetaDataId + ")를 찾을 수 없습니다.");
+            throw new ResourceNotFound("해당 FileMetaData(id: " + fileMetaDataIds + ")를 찾을 수 없습니다.");
         }
         fileMetaDatas.stream()
             .filter(FileMetaData::isPending)
             .forEach(fileMetaData -> {
-            fileMetaData.updateCoupledEntityInfo(domainType, entityId);
-            fileMetaData.updateStatus(COUPLED);
-        });
+                fileMetaData.updateCoupledEntityInfo(domainType, entityId);
+                fileMetaData.updateStatus(COUPLED);
+            });
     }
 
     @Transactional
@@ -84,14 +84,14 @@ public void update(List<String> ids, DomainType domainType, Long entityId) {
             updateStatusToDelete(domainType, entityId);
             return;
         }
-        deleteExcludingIds(ids, domainType, entityId);
-        updateStatusToCoupled(ids, domainType, entityId);
+        List<String> newIds = deleteOldIds(ids, domainType, entityId); //기존 id제외하고 새로 업데이트할 id만 반환
+        updateStatusToCoupled(newIds, domainType, entityId);
     }
 
     @Transactional
     @Override
     public void updateStatusToDelete(DomainType domainType, Long entityId) {
-        List<FileMetaData> fileMetaDatas = getCoupledAllByDomainTypeAndEntityId(domainType, entityId);
+        List<FileMetaData> fileMetaDatas = fileMetaDataRepository.findAllByDomainTypeAndEntityId(domainType, entityId);
         fileMetaDatas.forEach(fileMetaData -> {
             fileMetaData.updateStatus(DELETED);
         });
@@ -107,15 +107,19 @@ private boolean isCoupled(String id) {
         return fileMetaData.isCoupled();
     }
 
-    private void deleteExcludingIds(List<String> ids, DomainType domainType, Long entityId) {
-        List<FileMetaData> fileMetaDatas = getCoupledAllByDomainTypeAndEntityId(domainType, entityId);
-        fileMetaDatas.stream()
-                .filter(fileMetaData -> !ids.contains(String.valueOf(fileMetaData.getId())))
-                .forEach(fileMetaData -> {
-                    fileMetaData.updateStatus(DELETED);
-                });
+    private List<String> 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(fileMetaDatas);
+        fileMetaDataRepository.deleteAll(deleteTarget);
+        return fileMetaDatas.stream()
+            .filter(FileMetaData::isPending)
+            .map(fileMetaData -> String.valueOf(fileMetaData.getId()))
+            .toList();
     }
 
     private FileMetaData findById(UUID id) {
@@ -125,7 +129,7 @@ private FileMetaData findById(UUID id) {
 
     private List<UUID> toUUIDs(List<String> ids) {
         return ids.stream()
-                .map(UUID::fromString)
-                .toList();
+            .map(UUID::fromString)
+            .toList();
     }
 }
diff --git a/...t/java/ddingdong/ddingdongBE/domain/filemetadata/service/FileMetaDataServiceImplTest.java b/...t/java/ddingdong/ddingdongBE/domain/filemetadata/service/FileMetaDataServiceImplTest.java
@@ -91,8 +91,7 @@ void updateAllToActivated() {
                 .set("fileStatus", FileStatus.PENDING)
                 .sample()
         ));
-        em.flush();
-        em.clear();
+
         //when
         fileMetaDataService.updateStatusToCoupled(List.of(id1.toString(), id2.toString()), domainType, entityId);
         em.flush();
@@ -117,9 +116,9 @@ void updateAllToActivatedAndAttached() {
         fileMetaDataRepository.saveAll(List.of(
             fixture.giveMeBuilder(FileMetaData.class)
                 .set("id", id1)
-                .set("domainType", null)
-                .set("entityId", null)
-                .set("fileStatus", FileStatus.PENDING)
+                .set("domainType", domainType)
+                .set("entityId", entityId)
+                .set("fileStatus", FileStatus.COUPLED)
                 .sample(),
             fixture.giveMeBuilder(FileMetaData.class)
                 .set("id", id2)
@@ -136,8 +135,8 @@ void updateAllToActivatedAndAttached() {
             .sample();
         fileMetaDataRepository.save(fileMetaData);
         //when
-        fileMetaDataService.update(List.of(id1.toString(), fileMetaData.getId().toString()), domainType, entityId);
-
+        fileMetaDataService.update(List.of(id1.toString(), id3.toString()), domainType, entityId);
+        em.flush();
         //then
         List<FileMetaData> result = fileMetaDataRepository.findAllByDomainTypeAndEntityIdWithFileStatus(
             domainType, entityId, FileStatus.COUPLED);