Merge pull request #14 from pagopa/hotfix-zip-function

Hotfix zip function
pagopa · Aug 8, 2024 · 5c9f48e · 5c9f48e
2 parents c81037b + b296f72
commit 5c9f48e
Show file tree

Hide file tree

Showing 8 changed files with 138 additions and 23 deletions.
diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: pagopa-print-payment-notice-functions
 description: Microservice that handles services for notice print generation
 type: application
-version: 0.38.0
-appVersion: 1.0.0
+version: 0.39.0
+appVersion: 1.0.0-1-hotfix-zip-function
 dependencies:
   - name: microservice-chart
     version: 2.8.0

diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml
@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: "print-payment-notice-functions"
   image:
     repository: ghcr.io/pagopa/pagopa-print-payment-notice-functions
-    tag: "1.0.0"
+    tag: "1.0.0-1-hotfix-zip-function"
     pullPolicy: Always
   livenessProbe:
     httpGet:

diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml
@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: "print-payment-notice-functions"
   image:
     repository: ghcr.io/pagopa/pagopa-print-payment-notice-functions
-    tag: "1.0.0"
+    tag: "1.0.0-1-hotfix-zip-function"
     pullPolicy: Always
   livenessProbe:
     httpGet:

diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml
@@ -4,7 +4,7 @@ microservice-chart:
   fullnameOverride: "print-payment-notice-functions"
   image:
     repository: ghcr.io/pagopa/pagopa-print-payment-notice-functions
-    tag: "1.0.0"
+    tag: "1.0.0-1-hotfix-zip-function"
     pullPolicy: Always
   livenessProbe:
     httpGet:

diff --git a/openapi/openapi.json b/openapi/openapi.json
@@ -1 +1,70 @@
-
+{
+  "openapi": "3.0.1",
+  "info": {
+    "description": "PagoPA Print Payment Notices Functions",
+    "termsOfService": "https://www.pagopa.gov.it/",
+    "title": "pagopa-print-payment-notice-functions",
+    "version": "1.0.0-1-hotfix-zip-function"
+  },
+  "servers": [
+    {
+      "url": "http://localhost",
+      "description": "Generated server url"
+    }
+  ],
+  "paths": {
+    "/info": {
+      "get": {
+        "description": "Return OK if application is started",
+        "operationId": "healthCheck",
+        "responses": {
+          "200": {
+            "content": {
+              "*/*": {
+                "schema": {
+                  "$ref": "#/components/schemas/AppInfo"
+                }
+              }
+            },
+            "description": "OK"
+          }
+        },
+        "security": [
+          {
+            "ApiKey": []
+          }
+        ],
+        "summary": "health check",
+        "tags": [
+          "Home"
+        ]
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "AppInfo": {
+        "type": "object",
+        "properties": {
+          "environment": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "version": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "securitySchemes": {
+      "ApiKey": {
+        "description": "The API key to access this function app.",
+        "in": "header",
+        "name": "Ocp-Apim-Subscription-Key",
+        "type": "apiKey"
+      }
+    }
+  }
+}
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>it.gov.pagopa</groupId>
     <artifactId>print-payment-notice-functions</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.0-1-hotfix-zip-function</version>
     <name>pagopa-print-payment-notice-functions</name>
     <description>PagoPA Print Payment Notices Functions</description>
 

diff --git a/src/main/java/it/gov/pagopa/print/payment/notice/functions/storage/NoticeStorageClient.java b/src/main/java/it/gov/pagopa/print/payment/notice/functions/storage/NoticeStorageClient.java
@@ -6,19 +6,22 @@
 import com.azure.storage.blob.BlobServiceClientBuilder;
 import com.azure.storage.blob.models.ListBlobsOptions;
 import it.gov.pagopa.print.payment.notice.functions.model.response.BlobStorageResponse;
+import it.gov.pagopa.print.payment.notice.functions.utils.WorkingDirectoryUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Component;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
+import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
+import static it.gov.pagopa.print.payment.notice.functions.utils.WorkingDirectoryUtils.createWorkingDirectory;
+
 @Component
 @Slf4j
 public class NoticeStorageClient {
@@ -48,11 +51,16 @@ public NoticeStorageClient(
     public BlobStorageResponse compressFolder(String folderId) throws IOException {
         log.info("Create Zip file. Request {}", folderId);
 
-        try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
-
+        File workingDirectory = createWorkingDirectory();
+        Path tempDirectory = Files.createTempDirectory(workingDirectory.toPath(), "notice-generation-function")
+                .normalize()
+                .toAbsolutePath();
+        File pathFile = File.createTempFile("tempFile", ".zip", tempDirectory.toFile());
 
-            try (ZipOutputStream zipStream = new ZipOutputStream(outputStream)) {
-//                List<CompletableFuture<Void>> futures = new ArrayList<>();
+        try {
+            try (FileOutputStream fos = new FileOutputStream(pathFile);
+                 BufferedOutputStream outputStream = new BufferedOutputStream(fos);
+                 ZipOutputStream zipStream = new ZipOutputStream(outputStream)) {
 
                 String delimiter = "/";
                 ListBlobsOptions options = new ListBlobsOptions()
@@ -73,15 +81,14 @@ public BlobStorageResponse compressFolder(String folderId) throws IOException {
                                 log.info("Get info file {} from blob. Request {}", blobItem.getName(), folderId);
                                 final BlobClient blobClient = blobContainerClient.getBlobClient(blobItem.getName());
 
-
-//                                CompletableFuture<Void> future = CompletableFuture.runAsync(() -> {
                                 try (ByteArrayOutputStream fileOutputStream = new ByteArrayOutputStream()) {
                                     if (blobClient.exists()) {
                                         log.info("put file {} into zipStream. Request {}", blobItem.getName(), folderId);
                                         blobClient.downloadStream(fileOutputStream);
                                         zipStream.putNextEntry(new ZipEntry(finalSingleFileName));
                                         zipStream.write(fileOutputStream.toByteArray());
                                         zipStream.closeEntry();
+                                        zipStream.flush();
                                     } else {
                                         log.error("file not found: {}", finalSingleFileName);
                                         throw new RuntimeException("File not found: " + finalSingleFilepath);
@@ -91,22 +98,24 @@ public BlobStorageResponse compressFolder(String folderId) throws IOException {
                                     throw new RuntimeException("Error processing file: " + finalSingleFileName, e);
                                 }
                                 log.info("Download file completed. Request {}", folderId);
-//                                });
 
-//                                futures.add(future);
 
                             }
                         });
 
-//                CompletableFuture<Void> allOf = CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
-//                allOf.join();
-                // TODO : zip library is not thread-safe. Make multithread in the future with another library
+                zipStream.finish();
+
+
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
 
+            try (FileInputStream fis = new FileInputStream(pathFile);
+                 BufferedInputStream bif = new BufferedInputStream(fis)) {
 
                 BlobClient zipFileClient = blobContainerClient.getBlobClient(
                         folderId + "/" + folderId.concat(".zip"));
-                zipFileClient.upload(new ByteArrayInputStream(
-                        outputStream.toByteArray()), outputStream.size(), true);
+                zipFileClient.upload(bif, true);
                 log.info("Zip file uploaded. Request {}", folderId);
             } catch (IOException e) {
                 throw new RuntimeException(e);
@@ -115,6 +124,8 @@ public BlobStorageResponse compressFolder(String folderId) throws IOException {
             BlobStorageResponse blobStorageResponse = new BlobStorageResponse();
             blobStorageResponse.setStatusCode(HttpStatus.OK.value());
             return blobStorageResponse;
+        } finally {
+            WorkingDirectoryUtils.clearTempDirectory(tempDirectory);
         }
     }
 }
diff --git a/src/main/java/it/gov/pagopa/print/payment/notice/functions/utils/WorkingDirectoryUtils.java b/src/main/java/it/gov/pagopa/print/payment/notice/functions/utils/WorkingDirectoryUtils.java
@@ -0,0 +1,35 @@
+package it.gov.pagopa.print.payment.notice.functions.utils;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.FileUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+
+/**
+ * Utils methods for working directory
+ */
+@Slf4j
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class WorkingDirectoryUtils {
+
+    public static File createWorkingDirectory() throws IOException {
+        File workingDirectory = new File("temp");
+        if(!workingDirectory.exists()) {
+            Files.createDirectory(workingDirectory.toPath());
+        }
+        return workingDirectory;
+    }
+
+    public static void clearTempDirectory(java.nio.file.Path workingDirPath) {
+        try {
+            FileUtils.deleteDirectory(workingDirPath.toFile());
+        } catch (IOException e) {
+            log.warn("Unable to clear working directory", e);
+        }
+    }
+
+}