Merge branch 'dillon/34.1-jenkins-vapor' into vapor/development

2026-08-22 05:53:58 +00:00 · 2024-04-30 11:27:16 +08:00
parent 393a494008 2c9c5d49ed
commit cb86c6e9fd
4 changed files with 109 additions and 59 deletions
@@ -15,6 +15,7 @@ use Illuminate\Support\Facades\Storage;
 use App\Classes\Exceptions\MalformedRequestException;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\DocumentType;
+use Illuminate\Support\Facades\Log;

 class DownloadBookingDocumentLogic
 {
@@ -32,71 +33,120 @@ class DownloadBookingDocumentLogic
        $zip_file = $document_type.'.zip';
        $attachment = storage_path().'/app/documents/collections/' . $zip_file;

-        $zip = new ZipArchive();
-        if ($zip->open($attachment, ZIPARCHIVE::CREATE | ZipArchive::OVERWRITE)) {
+        $bookings = Booking::where('status', ApprovalStatus::COMPLETED)
+        ->whereDate('created_at', '>=', Carbon::parse($request->input('startDate')))
+        ->whereDate('created_at', '<=', Carbon::parse($request->input('endDate')))
+        ->whereHas('transactions', function ($query) use ($request){
+            return $query->where('type', TransactionType::PAYMENT)->whereHas('transactions', function ($query) use ($request){
+                return $query->where('type', TransactionType::BILL)->where('issuer', $request->input('supplier'));
+            });
+        })->get();

-            $bookings = Booking::where('status', ApprovalStatus::COMPLETED)
-                ->whereDate('created_at', '>=', Carbon::parse($request->input('startDate')))
-                ->whereDate('created_at', '<=', Carbon::parse($request->input('endDate')))
-                ->whereHas('transactions', function ($query) use ($request){
-                    return $query->where('type', TransactionType::PAYMENT)->whereHas('transactions', function ($query) use ($request){
-                        return $query->where('type', TransactionType::BILL)->where('issuer', $request->input('supplier'));
-                    });
-                })->get();
+        if (!count($bookings)) {
+            return response()->json(['no file to download']);
+        }

+        $filesystemDriver = Storage::getDefaultDriver();
+        if($filesystemDriver === 's3'){
+            $zip = new ZipArchive();
+            if ($zip->open($attachment, ZIPARCHIVE::CREATE | ZipArchive::OVERWRITE)) {
+                foreach ($bookings as $booking) {

-            if (!count($bookings)) {
-                return response()->json(['no file to download']);
-            }
+                    if ($document_type == 'INVOICEPODO' || $document_type == 'INVOICEPODOSDO') {
+                        $invoice_file = $booking->documents()->where('document_type', DocumentType::INVOICE)->first()->files()->first();
+                        $purchase_file = $booking->documents()->where('document_type', DocumentType::PURCHASE_ORDER)->first()->files()->first();
+                        $deliver_file = $booking->documents()->where('document_type', DocumentType::DELIVER_ORDER)->first()->files()->first();
+                        if ($document_type == 'INVOICEPODOSDO') {
+                            $supplier_deliver_order_file = $booking->documents()->where('document_type', DocumentType::SUPPLIER_DELIVER_ORDER)->first()->files()->first();
+                        }
+                        $fileContent = Storage::disk('s3')->get('documents/'.$invoice_file->file->file_info->original->file);
+                        $zip->addFromString('invoice-' . $booking->created_at->format('d_m_Y') . '_' . $booking->marking . '.pdf', $fileContent);

-            foreach ($bookings as $booking) {
+                        $fileContent = Storage::disk('s3')->get('documents/'.$purchase_file->file->file_info->original->file);
+                        $zip->addFromString('purchase-order-' . $booking->created_at->format('d_m_Y') . '_' . $booking->marking . '.pdf', $fileContent);

-                if ($document_type == 'INVOICEPODO' || $document_type == 'INVOICEPODOSDO') {
-                    $invoice_file = $booking->documents()->where('document_type', DocumentType::INVOICE)->first()->files()->first();
-                    $purchase_file = $booking->documents()->where('document_type', DocumentType::PURCHASE_ORDER)->first()->files()->first();
-                    $deliver_file = $booking->documents()->where('document_type', DocumentType::DELIVER_ORDER)->first()->files()->first();
-                    if ($document_type == 'INVOICEPODOSDO') {
-                        $supplier_deliver_order_file = $booking->documents()->where('document_type', DocumentType::SUPPLIER_DELIVER_ORDER)->first()->files()->first();
+                        $fileContent = Storage::disk('s3')->get('documents/'.$deliver_file->file->file_info->original->file);
+                        $zip->addFromString('deliver-' . $booking->created_at->format('d_m_Y') . '_' . $booking->marking . '.pdf', $fileContent);
+
+                        $fileContent = Storage::disk('s3')->get('documents/'.$supplier_deliver_order_file->file->file_info->original->file);
+                        $zip->addFromString('supplier-deliver-order-' . $booking->created_at->format('d_m_Y') . '_' . $booking->marking . '.pdf', $fileContent);
+                    }
+                    else {
+                        $file = $booking->documents()->where('document_type', $document_type)->first()->files()->first();
+                        $fileContent = Storage::disk('s3')->get('documents/'.$file->file->file_info->original->file);
+                        $zip->addFromString($booking->created_at->format('d_m_Y') . '_' . $booking->marking . '.pdf', $fileContent);
                    }

-                    $zip->addFile(Storage::disk('documents')->path($invoice_file->file->file_info->original->file), 'invoice-' . $booking->created_at->format('d_m_Y') . '_' . $booking->marking . '.pdf');
-
-                    $zip->addFile(Storage::disk('documents')->path($purchase_file->file->file_info->original->file), 'purchase-order-' .  $booking->created_at->format('d_m_Y') . '_' . $booking->marking . '.pdf');
-
-                    $zip->addFile(Storage::disk('documents')->path($deliver_file->file->file_info->original->file), 'deliver-' . $booking->created_at->format('d_m_Y') . '_' . $booking->marking . '.pdf');
-
-                    $zip->addFile(Storage::disk('documents')->path($supplier_deliver_order_file->file->file_info->original->file), 'supplier-deliver-order-' . $booking->created_at->format('d_m_Y') . '_' . $booking->marking . '.pdf');
-                }
-                else {
-                    $file = $booking->documents()->where('document_type', $document_type)->first()->files()->first();
-                    $zip->addFile(Storage::disk('documents')->path($file->file->file_info->original->file), $booking->created_at->format('d_m_Y') . '_' . $booking->marking . '.pdf');
                }
+                $zip->close();

+                $filePathForS3 = 'collections/'.$zip_file;
+                Storage::disk('s3')->put($filePathForS3, file_get_contents($attachment));
+
+                Log::info('DownloadBookingDocumentLogic finished processing files to zip count: '.count($bookings));
+
+                $temporaryUrl = Storage::disk('s3')->temporaryUrl(
+                    $filePathForS3,
+                    Carbon::now()->addMinutes(10)
+                );
+
+                return response(['src' =>  $temporaryUrl ]);
            }
-            $zip->close();
-            while (ob_get_level()) {
-                ob_end_clean();
-            }
-            ob_start();
-            header($_SERVER['SERVER_PROTOCOL'] . ' 200 OK');
-            header("Content-Type: application/zip");
-            header("Content-Transfer-Encoding: Binary");
-            header("Content-Length: " . filesize($attachment));
-            header('Pragma: no-cache');
-            header("Content-Disposition: attachment; filename=\"" . basename($attachment) . "\"");
-            ob_flush();
-            ob_clean();
-
-            readfile($attachment);
-            File::delete($attachment);
-
-            exit;
-
-//            header('Content-Type: application/zip');
-//            header('Content-Length: ' . filesize($attachment));
-//            readfile($attachment);
-//            unlink($attachment);
-
        }
+        else{
+            $zip = new ZipArchive();
+            if ($zip->open($attachment, ZIPARCHIVE::CREATE | ZipArchive::OVERWRITE)) {
+
+                foreach ($bookings as $booking) {
+
+                    if ($document_type == 'INVOICEPODO' || $document_type == 'INVOICEPODOSDO') {
+                        $invoice_file = $booking->documents()->where('document_type', DocumentType::INVOICE)->first()->files()->first();
+                        $purchase_file = $booking->documents()->where('document_type', DocumentType::PURCHASE_ORDER)->first()->files()->first();
+                        $deliver_file = $booking->documents()->where('document_type', DocumentType::DELIVER_ORDER)->first()->files()->first();
+                        if ($document_type == 'INVOICEPODOSDO') {
+                            $supplier_deliver_order_file = $booking->documents()->where('document_type', DocumentType::SUPPLIER_DELIVER_ORDER)->first()->files()->first();
+                        }
+
+                        $zip->addFile(Storage::disk('documents')->path($invoice_file->file->file_info->original->file), 'invoice-' . $booking->created_at->format('d_m_Y') . '_' . $booking->marking . '.pdf');
+
+                        $zip->addFile(Storage::disk('documents')->path($purchase_file->file->file_info->original->file), 'purchase-order-' .  $booking->created_at->format('d_m_Y') . '_' . $booking->marking . '.pdf');
+
+                        $zip->addFile(Storage::disk('documents')->path($deliver_file->file->file_info->original->file), 'deliver-' . $booking->created_at->format('d_m_Y') . '_' . $booking->marking . '.pdf');
+
+                        $zip->addFile(Storage::disk('documents')->path($supplier_deliver_order_file->file->file_info->original->file), 'supplier-deliver-order-' . $booking->created_at->format('d_m_Y') . '_' . $booking->marking . '.pdf');
+                    }
+                    else {
+                        $file = $booking->documents()->where('document_type', $document_type)->first()->files()->first();
+                        $zip->addFile(Storage::disk('documents')->path($file->file->file_info->original->file), $booking->created_at->format('d_m_Y') . '_' . $booking->marking . '.pdf');
+                    }
+
+                }
+                $zip->close();
+                while (ob_get_level()) {
+                    ob_end_clean();
+                }
+                ob_start();
+                header($_SERVER['SERVER_PROTOCOL'] . ' 200 OK');
+                header("Content-Type: application/zip");
+                header("Content-Transfer-Encoding: Binary");
+                header("Content-Length: " . filesize($attachment));
+                header('Pragma: no-cache');
+                header("Content-Disposition: attachment; filename=\"" . basename($attachment) . "\"");
+                ob_flush();
+                ob_clean();
+
+                readfile($attachment);
+                File::delete($attachment);
+
+                exit;
+
+                //header('Content-Type: application/zip');
+                //header('Content-Length: ' . filesize($attachment));
+                //readfile($attachment);
+                //unlink($attachment);
+
+            }
+        }
+
    }
 }
@@ -75,10 +75,10 @@ class BulkDownloadCustomerInvoicesLogic
                    }
                    $zip->close();

-                    $filePathForS3 = 'bulk_whiteform/'.$zipFileName;
+                    $filePathForS3 = 'bulk_invoice/'.$zipFileName;
                    Storage::disk('s3')->put($filePathForS3, file_get_contents($zip_file));

-                    Log::info('BulkDownloadCustomerInvoicesLogic finished processing files count: '.count($invoicebookings));
+                    Log::info('BulkDownloadCustomerInvoicesLogic finished processing files to zip count: '.count($invoicebookings));

                    $temporaryUrl = Storage::disk('s3')->temporaryUrl(
                        $filePathForS3,
@@ -71,7 +71,7 @@ class BulkDownloadSupplierWhiteFormsLogic
                        $filePathForS3 = 'bulk_whiteform/'.$zipFileName;
                        Storage::disk('s3')->put($filePathForS3, file_get_contents($zip_file));

-                        Log::info('BulkDownloadSupplierWhiteFormsLogic finished processing files count: '.count($groups));
+                        Log::info('BulkDownloadSupplierWhiteFormsLogic finished processing files to zip count: '.count($groups));

                        $temporaryUrl = Storage::disk('s3')->temporaryUrl(
                            $filePathForS3,
@@ -55,7 +55,7 @@ environments:
          - exchange-default-development
          - exchange-high_priority-development
        database: cief-rds-mysql
-        storage: exchange-2.0-development
+        storage: exchange-2.0-production
        runtime: 'docker'
        timeout: 180
        build: