Merge branch 'feature/gotenberg'

Author: jekuaitk

.env

@@ -79,8 +79,7 @@ TRUSTED_PROXIES=
 # Default time zone (default: Europe/Copenhagen)
 # DEFAULT_TIME_ZONE=
 
-# Use environment variables set by symfony (cli) with fallback to docker compose values.
-LIBREOFFICE_API_BASE_URL="http://${LIBREOFFICE_API_HOST:-libreoffice-api}:${LIBREOFFICE_API_PORT:-9980}"
+GOTENBERG_API_BASE_URL="http://gotenberg:3000"
 
 # Digital post
 DIGITAL_POST_SYSTEM_ID=''

CHANGELOG.md

@@ -10,6 +10,11 @@ about writing changes to this log.
 
 ## [Unreleased]
 
+## [1.9.0] - 2025-01-22
+
+- Switched to [Gotenberg](https://github.com/gotenberg/gotenberg) for docx
+  to pdf generation.
+
 ## [1.8.0] - 2025-01-14
 
 - Made kle searchable.
@@ -371,7 +376,8 @@ Fixed error in unescaped characters in filename
 - [TVIST1-604](https://jira.itkdev.dk/browse/TVIST1-604):
   Resolved issue regarding time formats.
 
-[Unreleased]: https://github.com/itk-dev/naevnssekretariatet/compare/1.8.0...HEAD
+[Unreleased]: https://github.com/itk-dev/naevnssekretariatet/compare/1.9.0...HEAD
+[1.9.0]: https://github.com/itk-dev/naevnssekretariatet/compare/1.8.0...1.9.0
 [1.8.0]: https://github.com/itk-dev/naevnssekretariatet/compare/1.7.1...1.8.0
 [1.7.1]: https://github.com/itk-dev/naevnssekretariatet/compare/1.7.0...1.7.1
 [1.7.0]: https://github.com/itk-dev/naevnssekretariatet/compare/1.6.2...1.7.0

config/services.yaml

@@ -85,8 +85,8 @@ services:
                 # This value must match vich_uploader.mappings.user_signatures.upload_destination
                 user_signatures_file_directory: '%kernel.project_dir%/upload/user-signatures'
                 user_signature_height: '%env(USER_SIGNATURE_HEIGHT)%'
-                libreoffice_http_client_options:
-                    base_uri: '%env(LIBREOFFICE_API_BASE_URL)%'
+                gotenberg_http_client_options:
+                    base_uri: '%env(GOTENBERG_API_BASE_URL)%'
                     verify_peer: false
                     verify_host: false
 

docker-compose.override.yml

@@ -11,10 +11,10 @@ services:
       # Allow uploading 9 very large files.
       - PHP_POST_MAX_SIZE=700M
     depends_on:
-      - libreoffice-api
+      - gotenberg
 
-  libreoffice-api:
-    build: ./.docker/libreoffice-api
+  gotenberg:
+    image: gotenberg/gotenberg:8
     restart: unless-stopped
     networks:
       - app

docker-compose.server.override.yml

@@ -7,15 +7,15 @@ services:
       # Allow uploading 9 very large files.
       - PHP_POST_MAX_SIZE=700M
     depends_on:
-      - libreoffice-api
+      - gotenberg
 
   nginx:
     environment:
       # Allow uploading 9 very large files.
       NGINX_MAX_BODY_SIZE: 100M
 
-  libreoffice-api:
-    build: ./.docker/libreoffice-api
+  gotenberg:
+    image: gotenberg/gotenberg:8
     restart: unless-stopped
     networks:
       - app

src/Service/MailTemplateHelper.php

@@ -245,21 +245,28 @@ public function renderMailTemplate(MailTemplate $mailTemplate, $entity = null, a
             return $processedFileName;
         }
 
-        $client = HttpClient::create($this->options['libreoffice_http_client_options']);
+        $client = HttpClient::create($this->options['gotenberg_http_client_options']);
+
+        // Gotenberg requires file extension to work.
+        $renamedProcessedFileName = $processedFileName.'.docx';
+        $this->filesystem->copy($processedFileName, $renamedProcessedFileName);
+
         $formFields = [
-            'data' => DataPart::fromPath($processedFileName),
+            'files' => [DataPart::fromPath($renamedProcessedFileName)],
         ];
         $formData = new FormDataPart($formFields);
 
         try {
-            $response = $client->request('POST', '/convert-to/pdf', [
+            $response = $client->request('POST', '/forms/libreoffice/convert', [
                 'headers' => $formData->getPreparedHeaders()->toArray(),
                 'body' => $formData->bodyToIterable(),
             ]);
             $content = $response->getContent();
         } catch (ClientException|TransportException $exception) {
-            $this->logger->critical(sprintf('Error talking to Libreoffice: %s', $exception->getMessage()), ['exception' => $exception]);
+            $this->logger->critical(sprintf('Error talking to Gotenberg: %s', $exception->getMessage()), ['exception' => $exception]);
             throw new MailTemplateException(sprintf('Error rendering mail template %s', $mailTemplate->getName()), $exception->getCode(), $exception);
+        } finally {
+            $this->filesystem->remove($renamedProcessedFileName);
         }
 
         $fileName = $this->filesystem->tempnam('/tmp/', 'mail_template', '.pdf');
@@ -596,7 +603,7 @@ private function configureOptions(OptionsResolver $resolver)
             'template_file_directory',
             'user_signatures_file_directory',
             'user_signature_height',
-            'libreoffice_http_client_options',
+            'gotenberg_http_client_options',
         ]);
         $resolver->setAllowedTypes('template_types', 'array');
     }