fix: review comments

Signed-off-by: Luka Trovic <luka@nextcloud.com>
nextcloud · Jul 31, 2024 · 88eb9d7 · 88eb9d7
1 parent c01c855
commit 88eb9d7
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 36 deletions.
diff --git a/appinfo/routes.php b/appinfo/routes.php
@@ -77,6 +77,6 @@
 		['name' => 'Target#getPreview', 'url' => '/api/v1/targets/preview', 'verb' => 'GET'],
 
 		['name' => 'TemplateField#extractFields', 'url' => '/api/v1/template/fields/extract/{fileId}', 'verb' => 'GET'],
-		['name' => 'TemplateField#fillFields', 'url' => '/api/v1/template/fields/fill', 'verb' => 'POST'],
+		['name' => 'TemplateField#fillFields', 'url' => '/api/v1/template/fields/fill/{fileId}', 'verb' => 'POST'],
 	],
 ];
diff --git a/composer/composer/autoload_static.php b/composer/composer/autoload_static.php
@@ -7,27 +7,27 @@
 class ComposerStaticInitRichdocuments
 {
     public static $prefixLengthsPsr4 = array (
-        'm' => 
+        'm' =>
         array (
             'mikehaertl\\shellcommand\\' => 24,
             'mikehaertl\\pdftk\\' => 17,
         ),
-        'O' => 
+        'O' =>
         array (
             'OCA\\Richdocuments\\' => 18,
         ),
     );
 
     public static $prefixDirsPsr4 = array (
-        'mikehaertl\\shellcommand\\' => 
+        'mikehaertl\\shellcommand\\' =>
         array (
             0 => __DIR__ . '/..' . '/../vendor/mikehaertl/php-shellcommand/src',
         ),
-        'mikehaertl\\pdftk\\' => 
+        'mikehaertl\\pdftk\\' =>
         array (
             0 => __DIR__ . '/..' . '/../vendor/mikehaertl/php-pdftk/src',
         ),
-        'OCA\\Richdocuments\\' => 
+        'OCA\\Richdocuments\\' =>
         array (
             0 => __DIR__ . '/..' . '/../lib',
         ),

diff --git a/lib/Controller/TemplateFieldController.php b/lib/Controller/TemplateFieldController.php
@@ -63,7 +63,7 @@ public function extractFields(int $fileId): DataResponse {
 	public function fillFields(int $fileId, array $fields): DataResponse {
 		try {
 			$this->templateFieldService->fillFields($fileId, $fields);
-		
+
 			return new DataResponse([], Http::STATUS_OK);
 		} catch (\Exception $e) {
 			return new DataResponse(["Unable to fill fields into the given file"], Http::STATUS_INTERNAL_SERVER_ERROR);

diff --git a/lib/Service/PdfService.php b/lib/Service/PdfService.php
@@ -9,12 +9,12 @@
 
 use mikehaertl\pdftk\Pdf;
 use OCP\Files\Node;
-use OCP\IConfig;
+use OCP\Files\Template\Field;
+use OCP\Files\Template\FieldType;
 use Psr\Log\LoggerInterface;
 
 class PdfService {
 	public function __construct(
-		private IConfig $config,
 		private LoggerInterface $logger
 	) {
 	}
@@ -26,32 +26,38 @@ public function extractFields(Node $file): array {
 			$pdf = new Pdf($filePath);
 			$fields = $pdf->getDataFields();
 			$templateFields = [];
+			$index = 0;
 			foreach ($fields as $field) {
-				$templateFields[] = [
-					'name' => $field['FieldName'],
-					'type' => $field['FieldType'],
-					'default' => $field['FieldValueDefault'] ?? '',
-					'options' => $field['FieldStateOption'] ?? [],
-				];
+				$fieldType = FieldType::tryFrom($field['FieldType']) ?? null;
+
+				if ($fieldType === null) {
+					continue;
+				}
+
+				$templateFields[] = new Field(
+					$index,
+					$field['FieldName'],
+					$fieldType,
+				);
+				$index++;
 			}
 			return $templateFields;
 		} catch (\Exception $e) {
-			$this->logger->debug('Failed to extract fields from PDF: {error}', ['error' => $e->getMessage()]);
+			$this->logger->error('Failed to extract fields from PDF: {error}', ['error' => $e->getMessage(), 'exception' => $e]);
 			return [];
 		}
 	}
 
 	public function fillFields(Node $file, array $fieldValues): void {
-		$dataDir = $this->config->getSystemValue('datadirectory');
-		$filePath = $dataDir . $file->getPath();
+		$filePath = $file->getStorage()->getLocalFile($file->getInternalPath());
 
 		try {
 			$pdf = new Pdf($filePath);
 			$pdf->fillForm($fieldValues);
 			$pdf->flatten();
 			$pdf->saveAs($filePath);
 		} catch (\Exception $e) {
-			$this->logger->debug('Failed to fill fields in PDF: {error}', ['error' => $e->getMessage()]);
+			$this->logger->error('Failed to fill fields in PDF: {error}', ['error' => $e->getMessage(), 'exception' => $e]);
 			throw $e;
 		}
 	}

diff --git a/lib/Service/TemplateFieldService.php b/lib/Service/TemplateFieldService.php
@@ -21,28 +21,21 @@ public function __construct(
 		private AppConfig $appConfig,
 		private IRootFolder $rootFolder,
 		private LoggerInterface $logger,
-		private PdfService $pdfService
+		private PdfService $pdfService,
 	) {
 	}
 
-	public function extractFields(Node $file): ?array {
-		if ($file->getMimeType() === 'application/pdf') {
-			return $this->pdfService->extractFields($file);
+	/**
+	 * @param Node|int $file
+	 * @return array|string
+	 */
+	public function extractFields(Node|int $file) {
+		if (is_int($file)) {
+			$file = $this->rootFolder->getFirstNodeById($file);
 		}
 
-		// TODO: Won't work until Collabora's endpoint is ready
-		$collaboraUrl = $this->appConfig->getCollaboraUrlInternal();
-		$httpClient = $this->clientService->newClient();
-
-		try {
-			$response = $httpClient->get(
-				$collaboraUrl . "/cool/extract-doc-structure",
-				['query' => ['limit' => 'content-control']]
-			);
-
-			return [$response->getBody()];
-		} catch (\Exception $e) {
-			return null;
+		if ($file->getMimeType() === 'application/pdf') {
+			return $this->pdfService->extractFields($file);
 		}
 
 		$collaboraUrl = $this->appConfig->getCollaboraUrlInternal();
@@ -100,6 +93,11 @@ public function fillFields(Node|int $file, array $fields = []) {
 			$file = $this->rootFolder->getFirstNodeById($file);
 		}
 
+		if ($file->getMimeType() === 'application/pdf') {
+			$this->pdfService->fillFields($file, $fields);
+			return '';
+		}
+
 		$collaboraUrl = $this->appConfig->getCollaboraUrlInternal();
 		$httpClient = $this->clientService->newClient();