Merge pull request #40 from lab-cherry/develop

Fix: QSheet File Updated
lab-cherry · Oct 17, 2023 · 700f46a · 700f46a
2 parents 1676565 + 534280e
commit 700f46a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/nw/src/main/java/lab/cherry/nw/configuration/bean/BeanConfig.java b/nw/src/main/java/lab/cherry/nw/configuration/bean/BeanConfig.java
@@ -1,7 +1,6 @@
 package lab.cherry.nw.configuration.bean;
 
-import lab.cherry.nw.service.security.CustomUserDetailsService;
-import lombok.RequiredArgsConstructor;
+import java.util.Arrays;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.mongodb.core.mapping.event.ValidatingMongoEventListener;
@@ -16,8 +15,8 @@
 import org.springframework.web.cors.CorsConfigurationSource;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import org.yaml.snakeyaml.Yaml;
-
-import java.util.Arrays;
+import lab.cherry.nw.service.security.CustomUserDetailsService;
+import lombok.RequiredArgsConstructor;
 
 /**
  * <pre>

diff --git a/nw/src/main/java/lab/cherry/nw/controller/QsheetController.java b/nw/src/main/java/lab/cherry/nw/controller/QsheetController.java
@@ -200,7 +200,6 @@ public ResponseEntity<?> downloadQsheetBySeq(@RequestBody QsheetEntity.QsheetDow
 
         HttpHeaders headers = new HttpHeaders();
         headers.add(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + "download.zip");
-
         return new ResponseEntity<>(qsheetService.download(qsheetDownloadDto.getUser()), new HttpHeaders(), HttpStatus.OK);
 
    }

diff --git a/nw/src/main/java/lab/cherry/nw/service/Impl/QsheetServiceImpl.java b/nw/src/main/java/lab/cherry/nw/service/Impl/QsheetServiceImpl.java
@@ -244,7 +244,7 @@ public void updateById(String id, QsheetEntity.QsheetUpdateDto qsheetUpdateDto,
             //     .org_confirm(qsheetUpdateDto.getFinalConfirm().isOrg_confirm()==!(qsheetEntity.getFinalConfirm().isOrg_confirm())?qsheetUpdateDto.getFinalConfirm().isOrg_confirm():qsheetEntity.getFinalConfirm().isOrg_confirm())
             //     .client_confirm(qsheetUpdateDto.getFinalConfirm().isClient_confirm()==!(qsheetEntity.getFinalConfirm().isClient_confirm())?qsheetUpdateDto.getFinalConfirm().isClient_confirm():qsheetEntity.getFinalConfirm().isClient_confirm())    
             //     .build():qsheetEntity.getFinalConfirm() )
-            .memo(qsheetUpdateDto.getMemo())
+            .memo(qsheetUpdateDto.getMemo() != null ? qsheetUpdateDto.getMemo() : qsheetEntity.getMemo())
 			.updated_at(instant)
 			.build();
 			qsheetRepository.save(qsheetEntity);
@@ -340,17 +340,20 @@ public byte[] download(List<String> users) {
         List<byte[]> userData = new ArrayList<>();
 
         for(String user : users) {
+
             if (userService.checkId(user)) {
                 UserEntity _user = userService.findById(user);
                 userList.add(_user);
 
-                String objectName = _user.getId() +"/";
-                userData.add(fileService.downloadZip("user", objectName)); 
+                // String objectName = _user.getId() + "/";
+                // userData.add(fileService.downloadZip("user", objectName));
             }
         }
 
         if(userList.size() > 1) {
 
+            log.error("userList 가 1명 초과인 경우 # ", userList.size());
+
             ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
             try (ZipOutputStream zipOut = new ZipOutputStream(byteArrayOutputStream)) {
                 for (UserEntity user : userList) {
@@ -380,7 +383,7 @@ public byte[] download(List<String> users) {
 
             String objectName = "사용자/" + user.getId();
 
-            return fileService.downloadZip(user.getOrg().getId(), objectName);
+            return fileService.downloadZip("user", objectName);
         }
     }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
             HttpHeaders headers = new HttpHeaders();
             headers.add(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + "download.zip");
             return new ResponseEntity<>(qsheetService.download(qsheetDownloadDto.getUser()), new HttpHeaders(), HttpStatus.OK);
        }
@@ Expand Down @@