Merge pull request #33 from aquality-automation/feature/fix_concurrent_imports

It is not possible to import several test run results one by one

Author: VladislavKostyukevich

CHANGELOG.md

@@ -7,6 +7,7 @@ Features:
 
 Bugfixes:
   - It should not be possible to delete Customer that assigned to the projects -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/9)
+  - It is not possible to import several test run results one by one -> [View Issue](https://github.com/aquality-automation/aquality-tracking/issues/35)
 
 ## 0.3.3 (2019-11-16)
 

src/main/java/main/utils/FileUtils.java

@@ -55,12 +55,12 @@ public List<String> doUpload(HttpServletRequest request, HttpServletResponse res
 
     public void removeFiles(List<String> filePaths){
         for (String path : filePaths){
-            boolean delete = new File(path).delete();
+            removeFile(path);
         }
     }
 
     public void removeFile(String path){
-        boolean delete = new File(path).delete();
+        new File(path).delete();
     }
 
     public String readFile(String path) throws AqualityException {
@@ -74,9 +74,8 @@ public String readFile(String path) throws AqualityException {
         }
     }
 
-    public String readFile(File file) throws IOException {
-        InputStream is = new FileInputStream(file);
-        return IOUtils.toString(is, "UTF-8");
+    public String getFileFolderPath(String path) {
+        return new File(path).getParent();
     }
 
     private String getFileName(final Part part) {

src/main/java/main/view/Project/ExecuteImportServlet.java

@@ -22,6 +22,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.security.InvalidParameterException;
+import java.util.Date;
 import java.util.List;
 
 @WebServlet("/import")
@@ -144,12 +145,16 @@ private void validateRequest() throws AqualityQueryParameterException {
 
     private List<String> doUpload(HttpServletRequest req, HttpServletResponse resp, Integer projectId) throws ServletException, IOException {
         FileUtils fileUtils = new FileUtils();
-        return fileUtils.doUpload(req, resp, PathUtils.createPathToBin("temp", projectId.toString()));
+        return fileUtils.doUpload(req, resp, PathUtils.createPathToBin("temp", projectId.toString(), String.valueOf(new Date().getTime())));
     }
 
     private void cleanup(List<String> filePaths){
-        FileUtils fileUtils = new FileUtils();
-        fileUtils.removeFiles(filePaths);
+        if(filePaths.size() > 0) {
+            FileUtils fileUtils = new FileUtils();
+            String fileFolderPath = fileUtils.getFileFolderPath(filePaths.get(0));
+            fileUtils.removeFiles(filePaths);
+            fileUtils.removeFile(fileFolderPath);
+        }
     }
 
     private TestNameNodeType getTestNameNodeType(HttpServletRequest req) {