WIP

codebar-ag · Dec 7, 2023 · 56e67d5 · 56e67d5
1 parent 100b825
commit 56e67d5
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 27 deletions.
diff --git a/src/DTO/DocumentIndex/PrepareDTO.php b/src/DTO/DocumentIndex/PrepareDTO.php
@@ -19,7 +19,7 @@ public static function guess(string $name, mixed $value): mixed
         };
     }
 
-    public static function makeContent(Collection $indexes): array
+    public static function makeFields(Collection $indexes): array
     {
         return [
             'Fields' => $indexes
@@ -28,4 +28,15 @@ public static function makeContent(Collection $indexes): array
                 ->values(),
         ];
     }
+
+    public static function makeField(Collection $indexes, bool $forceUpdate = false): array
+    {
+        return [
+            'Field' => $indexes
+                ->map(fn (IndexTextDTO|IndexDateDTO|IndexDateTimeDTO|IndexNumericDTO|IndexDecimalDTO|IndexTableDTO $index) => $index->values())
+                ->filter()
+                ->values(),
+            'ForceUpdate' => $forceUpdate,
+        ];
+    }
 }
diff --git a/src/Requests/Document/PostDocumentRequest.php b/src/Requests/Document/PostDocumentRequest.php
@@ -36,7 +36,7 @@ protected function defaultBody(): array
         $body = [];
 
         if ($this->indexes) {
-            $indexContent = json_encode(PrepareDTO::makeContent($this->indexes));
+            $indexContent = json_encode(PrepareDTO::makeFields($this->indexes));
             $body[] = new MultipartValue(name: 'document', value: $indexContent, filename: 'index.json');
         }
 

diff --git a/src/Requests/Document/PutDocumentFieldsRequest.php b/src/Requests/Document/PutDocumentFieldsRequest.php
@@ -2,8 +2,10 @@
 
 namespace CodebarAg\DocuWare\Requests\Document;
 
+use CodebarAg\DocuWare\DTO\DocumentIndex\PrepareDTO;
 use CodebarAg\DocuWare\Exceptions\UnableToUpdateFields;
 use CodebarAg\DocuWare\Responses\Document\PutDocumentFieldsResponse;
+use Illuminate\Support\Collection;
 use Saloon\Contracts\Body\HasBody;
 use Saloon\Enums\Method;
 use Saloon\Http\Request;
@@ -22,7 +24,7 @@ class PutDocumentFieldsRequest extends Request implements HasBody
     public function __construct(
         protected readonly string $fileCabinetId,
         protected readonly string $documentId,
-        protected readonly array $values,
+        protected readonly ?Collection $indexes = null,
         protected readonly bool $forceUpdate = false,
     ) {
     }
@@ -34,27 +36,16 @@ public function resolveEndpoint(): string
 
     public function defaultBody(): array
     {
-        throw_unless(count($this->values) > 0, UnableToUpdateFields::noValuesProvided());
+        $body = [];
 
-        $fields = [];
-
-        foreach ($this->values as $key => $value) {
-            throw_unless($value, UnableToUpdateFields::noValuesProvidedForField($key));
-            $fields[] = [
-                'FieldName' => $key,
-                'Item' => $value,
-            ];
+        if ($this->indexes) {
+            $bodyEncode = json_encode(PrepareDTO::makeField($this->indexes));
+            $bodyDecode = json_decode($bodyEncode, true);
+            $body = $bodyDecode;
         }
 
-        $content = [
-            'Field' => $fields,
-        ];
-
-        if ($this->forceUpdate) {
-            $content['ForceUpdate'] = true;
-        }
+        return $body;
 
-        return $content;
     }
 
     public function createDtoFromResponse(Response $response): mixed

diff --git a/tests/Feature/Requests/Document/PutDocumentFieldsRequestTest.php b/tests/Feature/Requests/Document/PutDocumentFieldsRequestTest.php
@@ -2,6 +2,7 @@
 
 use CodebarAg\DocuWare\Connectors\DocuWareStaticConnector;
 use CodebarAg\DocuWare\DTO\Config;
+use CodebarAg\DocuWare\DTO\DocumentIndex\IndexTextDTO;
 use CodebarAg\DocuWare\Events\DocuWareResponseLog;
 use CodebarAg\DocuWare\Requests\Document\DeleteDocumentRequest;
 use CodebarAg\DocuWare\Requests\Document\PostDocumentRequest;
@@ -41,7 +42,9 @@
     $response = $this->connector->send(new PutDocumentFieldsRequest(
         $fileCabinetId,
         $document->id,
-        ['UUID' => $newValue]
+        collect([
+            IndexTextDTO::make('UUID', $newValue),
+        ])
     ))->dto();
 
     $this->assertSame('laravel-docuware', $response['UUID']);
@@ -57,10 +60,6 @@
     Event::fake();
 
     $fileCabinetId = config('laravel-docuware.tests.file_cabinet_id');
-    $values = [
-        'UUID' => 'laravel-docuware',
-        'DOCUMENT_LABEL' => 'laravel-docuware-2',
-    ];
 
     $document = $this->connector->send(new PostDocumentRequest(
         $fileCabinetId,
@@ -71,7 +70,10 @@
     $response = $this->connector->send(new PutDocumentFieldsRequest(
         $fileCabinetId,
         $document->id,
-        $values,
+        collect([
+            IndexTextDTO::make('UUID', 'laravel-docuware'),
+            IndexTextDTO::make('DOCUMENT_LABEL', 'laravel-docuware-2'),
+        ]),
         true
     ))->dto();
 

diff --git a/tests/Unit/DTO/DocumentIndex/PrepareDTOTest.php b/tests/Unit/DTO/DocumentIndex/PrepareDTOTest.php
@@ -21,7 +21,7 @@
 
     $indexes = collect([PrepareDTO::guess($name, $value)]);
 
-    expect(PrepareDTO::makeContent($indexes))
+    expect(PrepareDTO::makeFields($indexes))
         ->toBeArray();
 
 })->group('dto');